Changeset 2371 for trunk/src/user32/win32wbase.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/win32wbase.cpp (modified) (8 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.132 2000-01-02 20:20:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.133 2000-01-08 14:15:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -38 +38 @@
 #include "dc.h"
 #include "pmframe.h"
+#include "pmtitlebar.h"
 #include "win32wdesktop.h"
 #include "pmwindow.h"
@@ -136 +137 @@
 void Win32BaseWindow::Init()
 {
-  isUnicode        = FALSE;
-  fIsSubclassedOS2Wnd = FALSE;
-  fFirstShow       = TRUE;
-  fIsDialog        = FALSE;
-  fIsModalDialogOwner = FALSE;
-  OS2HwndModalDialog  = 0;
-  fInternalMsg     = FALSE;
-  fNoSizeMsg       = FALSE;
-  fIsDestroyed     = FALSE;
+  isUnicode            = FALSE;
+  fIsSubclassedOS2Wnd  = FALSE;
+  fFirstShow           = TRUE;
+  fIsDialog            = FALSE;
+  fIsModalDialogOwner  = FALSE;
+  OS2HwndModalDialog   = 0;
+  fInternalMsg         = FALSE;
+  fNoSizeMsg           = FALSE;
+  fIsDestroyed         = FALSE;
   fDestroyWindowCalled = FALSE;
-  fCreated         = FALSE;
-  fTaskList        = FALSE;
-  fParentDC        = FALSE;
+  fCreated             = FALSE;
+  fTaskList            = FALSE;
+  fParentDC            = FALSE;
+  fDefWndProcCalled    = FALSE;
 
   windowNameA      = NULL;
@@ -180 +182 @@
   contextHelpId    = 0;
 
-  pOldFrameProc = NULL;
+  pOldFrameProc    = NULL;
+  pOldTitleBarProc = NULL;
+  pOldMenuProc     = NULL;
+
   borderWidth   = 0;
   borderHeight  = 0;
@@ -639 +644 @@
   FrameGetScrollBarHandles(this,dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
   subclassScrollBars(dwStyle & WS_HSCROLL,dwStyle & WS_VSCROLL);
+
+  FrameSubclassTitleBar(this);
 
   fakeWinBase.hwndThis     = OS2Hwnd;
@@ -1057 +1064 @@
     }
 
-    //TODO: hiword should be 0 if window enters menu mode (SDK docs)
-    SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, msg->message));
+    //SvL: Correct??
+    if(msg->message != WM_NCMOUSEMOVE) {
+        //TODO: hiword should be 0 if window enters menu mode (SDK docs)
+        SendInternalMessageA(WM_SETCURSOR, Win32Hwnd, MAKELONG(lastHitTestVal, msg->message));
+    }
 
     //translated message == WM_(NC)MOUSEMOVE
@@ -1543 +1553 @@
 LRESULT Win32BaseWindow::DefWindowProcA(UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+    fDefWndProcCalled = TRUE;
     switch(Msg)
     {
     case WM_CLOSE:
-    dprintf(("DefWindowProcA: WM_CLOSE %x", getWindowHandle()));
+        dprintf(("DefWindowProcA: WM_CLOSE %x", getWindowHandle()));
         DestroyWindow();
         return 0;
@@ -1936 +1947 @@
 LRESULT Win32BaseWindow::DefWindowProcW(UINT Msg, WPARAM wParam, LPARAM lParam)
 {
+    fDefWndProcCalled = TRUE;
+
     switch(Msg)
     {