Changeset 5951 for trunk/src/user32/pmwindow.cpp

Timestamp:

Jun 10, 2001, 2:05:41 PM (24 years ago)

Author:

sandervl

Message:

bugfixes + os/2 look support added

File:

• trunk/src/user32/pmwindow.cpp (modified) (10 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.133 2001-06-09 14:50:19 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.134 2001-06-10 12:05:39 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -41 +41 @@
 #include "timer.h"
 #include <codepage.h>
+#include "syscolor.h"
+#include "options.h"
+
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -55 +58 @@
 ULONG ScreenHeight = 0;
 ULONG ScreenBitsPerPel = 0;
+BOOL  fOS2Look = FALSE;
 
 static PFNWP pfnFrameWndProc = NULL;
@@ -144 +148 @@
     DevQueryCaps(hdc, CAPS_COLOR_BITCOUNT, 1, (PLONG)&ScreenBitsPerPel);
     DevCloseDC(hdc);
+
+    fOS2Look = PROFILE_GetOdinIniBool(ODINSYSTEM_SECTION, "OS2Look", FALSE);
+    if(fOS2Look) {
+        SYSCOLOR_Init(FALSE); //use OS/2 colors
+    }
 
     dprintf(("InitPM: Desktop (%d,%d) bpp %d", ScreenWidth, ScreenHeight, ScreenBitsPerPel));
@@ -807 +816 @@
                 {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                    if(fOS2Look) {
+                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(TRUE), 0);
+                    }
                 }
             }
@@ -816 +828 @@
                 {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
+                    if(fOS2Look) {
+                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(FALSE), 0);
+                    }
                 }
             }
@@ -958 +973 @@
              {
                 WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                if(fOS2Look) {
+                    WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(TRUE), 0);
+                }
              }
         }
@@ -967 +985 @@
             {
                     WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)FALSE, (MPARAM)hwnd);
+                    if(fOS2Look) {
+                        WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, MPFROMSHORT(FALSE), 0);
+                    }
             }
         }
@@ -1113 +1134 @@
         {
             WinSendMsg(WinWindowFromID(hwnd,FID_CLIENT),WM_ACTIVATE,mp1,mp2);
+            if(fOS2Look) {
+                WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, mp1, 0);
+            }
             WinSetWindowUShort(hwnd,QWS_FLAGS,mp1 ? (flags | FF_ACTIVE):(flags & ~FF_ACTIVE));
 
@@ -1237 +1261 @@
         dprintf(("PMFRAME:WM_UPDATEFRAME %x", win32wnd->getWindowHandle()));
         goto RunDefFrameWndProc;
+
+    case WM_TRACKFRAME:
+        if(fOS2Look) {//sent by titlebar control
+            FrameTrackFrame(win32wnd, TF_MOVE);
+        }
+        rc = 0;
+        break;
 
     default: