Changeset 9741 for trunk/src

Timestamp:

Jan 29, 2003, 2:07:31 PM (23 years ago)

Author:

sandervl

Message:

OS/2 Look & Feel is now default; use OS/2 colors again in OS/2 L&F mode

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (3 diffs)
• syscolor.cpp (modified) (2 diffs)
• uitools.cpp (modified) (1 diff)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.193 2003-01-04 13:49:27 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.194 2003-01-29 13:07:30 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -238 +238 @@
 
     // check if we have the OS/2 Look and Feel enabled
-    fOS2Look = PROFILE_GetOdinIniBool(ODINSYSTEM_SECTION, "OS2Look", FALSE);
+    fOS2Look = PROFILE_GetOdinIniBool(ODINSYSTEM_SECTION, "OS2Look", TRUE);
     if(fOS2Look)
     {
-#if 0
         SYSCOLOR_Init(FALSE); //use OS/2 colors
-#endif
         QueryPMMenuBitmaps();
     }
@@ -322 +320 @@
     if(fLooks == OS2_APPEARANCE || fLooks == OS2_APPEARANCE_SYSMENU)
     {
-#if 0
         SYSCOLOR_Init(FALSE); //use OS/2 colors
-#endif
         QueryPMMenuBitmaps();
     }

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.35 2003-01-03 21:43:16 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.36 2003-01-29 13:07:31 sandervl Exp $ */
 
 /*
@@ -216 +216 @@
   if ((nIndex >= 0) && (nIndex < NUM_SYS_COLORS))
   {
-       return SysColors[nIndex];
+    if (USEWINCOLORS) return SysColors[nIndex];
+    else
+        if(nIndex < NUM_OPEN32_SYSCOLORS)
+                return O32_GetSysColor(nIndex);
+        else    return SysColors[nIndex];
   }
   else return 0;

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.33 2003-01-28 16:21:18 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.34 2003-01-29 13:07:31 sandervl Exp $ */
 /*
  * User Interface Functions