Changeset 882

Timestamp:

Dec 11, 2007, 1:11:58 AM (18 years ago)

Author:

Gregg Young

Message:

Update CopyPresParams to include all types of Pres Params

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/misc.c (modified) (1 diff)
• dll/presparm.c (modified) (3 diffs)
• warpin/makefile (modified) (1 diff)

trunk/HISTORY

@@ -2 +2 @@
 
 3.09(pre)
+ o Update CopyPresParams to copy all types of pres parameters (Gregg)
  o Add "Save as" menu item to internal viewer (Gregg)
  o Eliminate deletion of ext path if it was not valid on startup

trunk/dll/misc.c

@@ -1411 +1411 @@
   if (!rc) {
 
-      // If window owned by some other process or some other thread?
-      if (!IsFm2Window(h, 1)) {
-          QMSG qmsg;
-          for (;;) {
-            DosSleep(1);
-            rc = WinPostMsg(h, msg, mp1, mp2);
-            if (rc)
-              break;                    // OK
-            if (!WinIsWindow((HAB) 0, h))
-              break;                    // Window gone
-            if (WinPeekMsg((HAB) 0, &qmsg, (HWND) 0, 0, 0, PM_NOREMOVE))
-              break;                    // Queue has message(s)
-          }                             // for
-        }
-    }
+    // If window owned by some other process or some other thread?
+    if (!IsFm2Window(h, 1)) {
+      QMSG qmsg;
+      for (;;) {
+        DosSleep(1);
+        rc = WinPostMsg(h, msg, mp1, mp2);
+        if (rc)
+          break;                        // OK
+        if (!WinIsWindow((HAB) 0, h))
+          break;                        // Window gone
+        if (WinPeekMsg((HAB) 0, &qmsg, (HWND) 0, 0, 0, PM_NOREMOVE))
+          break;                        // Queue has message(s)
+      }                         // for
+    }
+  }
   return rc;
 }

trunk/dll/presparm.c

@@ -12 +12 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   22 Nov 07 GKY Use CopyPresParams to fix presparam inconsistencies in menus
+  10 Dec 07 GKY Updated CopyPresParams to copy all parameter types
 
 ***********************************************************************/
@@ -328 +329 @@
     PP_BACKGROUNDCOLOR, PP_HILITEBACKGROUNDCOLOR,
     PP_HILITEFOREGROUNDCOLOR, PP_BORDERCOLOR, PP_MENUFOREGROUNDCOLOR,
-    PP_MENUBACKGROUNDCOLOR};
-
-  for (x=0; x < 8; x++) {
+    PP_MENUBACKGROUNDCOLOR, PP_FOREGROUNDCOLORINDEX, PP_BACKGROUNDCOLORINDEX,
+    PP_HILITEFOREGROUNDCOLORINDEX, PP_HILITEBACKGROUNDCOLORINDEX,
+    PP_DISABLEDFOREGROUNDCOLOR, PP_DISABLEDBACKGROUNDCOLOR,
+    PP_DISABLEDFOREGROUNDCOLORINDEX, PP_DISABLEDBACKGROUNDCOLORINDEX,
+    PP_BORDERCOLOR, PP_BORDERCOLORINDEX, PP_FONTHANDLE, PP_ACTIVECOLOR,
+    PP_ACTIVECOLORINDEX, PP_INACTIVECOLOR, PP_INACTIVECOLORINDEX,
+    PP_ACTIVETEXTFGNDCOLOR, PP_ACTIVETEXTFGNDCOLORINDEX, PP_ACTIVETEXTBGNDCOLOR,
+    PP_ACTIVETEXTBGNDCOLORINDEX, PP_INACTIVETEXTFGNDCOLOR,
+    PP_INACTIVETEXTFGNDCOLORINDEX, PP_INACTIVETEXTBGNDCOLOR,
+    PP_INACTIVETEXTBGNDCOLORINDEX, PP_SHADOW, PP_MENUFOREGROUNDCOLORINDEX,
+    PP_MENUBACKGROUNDCOLORINDEX, PP_MENUHILITEFGNDCOLOR, PP_MENUHILITEFGNDCOLORINDEX,
+    PP_MENUHILITEBGNDCOLOR, PP_MENUHILITEBGNDCOLORINDEX, PP_MENUDISABLEDFGNDCOLOR,
+    PP_MENUDISABLEDFGNDCOLORINDEX, PP_MENUDISABLEDBGNDCOLOR,
+    PP_MENUDISABLEDBGNDCOLORINDEX, PP_SHADOWTEXTCOLOR, PP_SHADOWTEXTCOLORINDEX,
+    PP_SHADOWHILITEFGNDCOLOR, PP_SHADOWHILITEFGNDCOLORINDEX, PP_SHADOWHILITEBGNDCOLOR,
+    PP_SHADOWHILITEBGNDCOLORINDEX, PP_ICONTEXTBACKGROUNDCOLOR,
+    PP_ICONTEXTBACKGROUNDCOLORINDEX, PP_BORDERLIGHTCOLOR, PP_BORDERDARKCOLOR,
+    PP_BORDER2COLOR, PP_BORDER2LIGHTCOLOR, PP_BORDER2DARKCOLOR, PP_BORDERDEFAULTCOLOR,
+    PP_FIELDBACKGROUNDCOLOR, PP_BUTTONBACKGROUNDCOLOR, PP_BUTTONBORDERLIGHTCOLOR,
+    PP_BUTTONBORDERDARKCOLOR, PP_ARROWCOLOR, PP_ARROWBORDERLIGHTCOLOR,
+    PP_ARROWBORDERDARKCOLOR, PP_ARROWDISABLEDCOLOR, PP_CHECKLIGHTCOLOR,
+    PP_CHECKMIDDLECOLOR, PP_CHECKDARKCOLOR, PP_PAGEFOREGROUNDCOLOR,
+    PP_PAGEBACKGROUNDCOLOR, PP_MAJORTABFOREGROUNDCOLOR, PP_MAJORTABBACKGROUNDCOLOR,
+    PP_MINORTABFOREGROUNDCOLOR, PP_MINORTABBACKGROUNDCOLOR, PP_USER, 0 };
+
+  while (AttrName[x]) {
     cbRetLen = WinQueryPresParam(source,
                                  AttrName[x],
@@ -341 +365 @@
     if (cbRetLen)
       WinSetPresParam(target, AttrName[x], cbRetLen, (PVOID) AttrValue);
-  } //for
+    x++;
+  } //while
 }
 

trunk/warpin/makefile

@@ -12 +12 @@
 
 !ifndef FM2_VER                  # if defined on wmake command, use it
-FM2_VER=-3-6-0                   # default value
+FM2_VER=-3-9-0                   # default value
 !ifdef %FM2_VER                  # if defined via env. var.
 FM2_VER=$(%FM2_VER)              #     use the env. var.