Changeset 2371 for trunk/src/user32/oslibwin.cpp

Timestamp:

Jan 8, 2000, 3:15:38 PM (26 years ago)

Author:

sandervl

Message:

OSLibGetMsg bugfix + WM_QUIT translation fix

File:

• trunk/src/user32/oslibwin.cpp (modified) (5 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.56 1999-12-29 22:54:01 cbratschi Exp $ */
+/* $Id: oslibwin.cpp,v 1.57 2000-01-08 14:15:06 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -70 +70 @@
   }
   ULONG dwClientStyle;
-#if 1
 
   BOOL TopLevel = hwndParent == HWND_DESKTOP;
@@ -98 +97 @@
                                   NULL, dwClientStyle, 0, 0, 0, 0,
                                   *hwndFrame, HWND_TOP, FID_CLIENT, NULL, NULL);
-    if (hwndClient != NULLHANDLE)
-      WinSendMsg (*hwndFrame, WM_UPDATEFRAME, 0, 0);
-
+   
+    if (hwndClient != NULLHANDLE) {
+        WinSendMsg (*hwndFrame, WM_UPDATEFRAME, 0, 0);
+    }
     return hwndClient;
   }
   dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
   return 0;
-#else
-        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
-
-        dwFrameStyle |= FCF_NOBYTEALIGN;
-        if ((hwndParent == HWND_DESKTOP) && (dwFrameStyle & FCF_TITLEBAR))
-                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
-
-        dwWinStyle   &= ~WS_CLIPCHILDREN;
-
-        *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
-                                       &dwFrameStyle, WIN32_STDCLASS,
-                                       "", dwClientStyle, 0, id, &hwndClient);
-        if(*hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(*hwndFrame, pszName);
-                }
-                return hwndClient;
-        }
-        dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
-        return 0;
-#endif
 }
 //******************************************************************************
@@ -216 +195 @@
     if(dwStyle & WS_THICKFRAME_W)
           *OSFrameStyle |= FCF_SIZEBORDER;        //??
-    if(dwStyle & WS_MINIMIZEBOX_W)
+
+    //SvL: We subclass the titlebar control when win32 look is selected
+    if(fOS2Look) {
+        if(dwStyle & WS_MINIMIZEBOX_W)
           *OSFrameStyle |= FCF_MINBUTTON;
-    if(dwStyle & WS_MAXIMIZEBOX_W)
+        if(dwStyle & WS_MAXIMIZEBOX_W)
           *OSFrameStyle |= FCF_MAXBUTTON;
+    }
 
     if(*dwExStyle & WS_EX_DLGMODALFRAME_W)
@@ -1165 +1148 @@
   return WinGetLastError(GetThreadHAB()) & 0xFFFF;
 }
+//******************************************************************************
+//TODO: Include scroll bars?
+//******************************************************************************
+HWND OSLibWinIsFrameControl(HWND hwnd)
+{
+ HWND hwndFrame = WinQueryWindow(hwnd, QW_PARENT);
+    
+   if(hwnd == WinWindowFromID(hwndFrame, FID_TITLEBAR)) {
+        return hwndFrame;
+   }
+   if(hwnd == WinWindowFromID(hwndFrame, FID_MENU)) {
+        return hwndFrame;
+   }
+   return 0;
+}
+//******************************************************************************
+//******************************************************************************