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

Timestamp:

Oct 22, 2003, 2:43:14 PM (22 years ago)

Author:

sandervl

Message:

Use WC_FRAME for the Odin frame window and subclass it; Updates for new keyboard hook

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.144 2003-10-20 17:17:22 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.145 2003-10-22 12:43:13 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -6 +6 @@
  * Copyright 1999 Sander van Leeuwen (sandervl@xs4all.nl)
  * Copyright 1999 Daniela Engert (dani@ngrt.de)
- *
+ * Copyright 2002-2003 Innotek Systemberatung GmbH
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -37 +37 @@
 #define WS_TOPMOST                 0x00200000L
 
+//pmwindow.cpp
+MRESULT EXPENTRY Win32FrameWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+
 //******************************************************************************
 //******************************************************************************
@@ -64 +67 @@
                           DWORD classStyle, HWND *hwndFrame)
 {
- HWND  hwndClient;
- ULONG dwFrameStyle = 0;
+    HWND  hwndClient;
+    ULONG dwFrameStyle = 0;
 
     if(pszName && *pszName == 0) {
@@ -98 +101 @@
     //    a window with WS_CLIPCHILDREN -> result: dialog window won't update groupbox background as groupbox only draws the border
     *hwndFrame = WinCreateWindow(hwndParent,
-                           WIN32_STDFRAMECLASS,
+                           WC_FRAME,
                            pszName, (dwWinStyle & ~WS_CLIPCHILDREN), 0, 0, 0, 0,
                            Owner, (fHWND_BOTTOM) ? HWND_BOTTOM : HWND_TOP,
                            id, (PVOID)&FCData, NULL);
 
+    //We no longer register our own frame window class as there is code in PM
+    //that makes assumptions about frame window class names.
+    //Instead we subclass the frame window right after creating it.
+    if(*hwndFrame) {
+        WinSubclassWindow(*hwndFrame, Win32FrameWindowProc);
+    }
     if(fOS2Look && *hwndFrame) {
         FCData.flCreateFlags = dwOSFrameStyle;
@@ -118 +127 @@
     if (hwndParent == HWND_DESKTOP && *hwndFrame)
        OSLibWinCreateInvisibleScroller(*hwndFrame, SBS_VERT);
-
 
     if(hwndClient == 0) {