Changeset 2426 for trunk/src/user32/new/oslibmsgtranslate.cpp

Timestamp:

Jan 13, 2000, 2:54:55 PM (26 years ago)

Author:

sandervl

Message:

wm_activate fixes, scrollbar fix, drawframe fix

File:

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

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.12 2000-01-12 15:14:15 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.13 2000-01-13 13:54:52 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -23 +23 @@
 #include <misc.h>
 #include "oslibmsg.h"
-#include <win32wnd.h>
+#include "win32wnd.h"
+#include "win32wdesktop.h"
 #include "oslibutil.h"
 #include "timer.h"
@@ -104 +105 @@
 ULONG GetMouseKeyState()
 {
-  ULONG keystate;
+  ULONG keystate = 0;
 
   if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) & 0x8000)
@@ -349 +350 @@
         if(WinQueryWindowULong(hwndActivate, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
-                //set to NULL (allowed according to win32 SDK) to avoid problems
-                hwndActivate = NULL;
+                //set to desktop window handle
+                hwndActivate = windowDesktop->getWindowHandle();
         }
         else    hwndActivate = Win32BaseWindow::OS2ToWin32Handle(hwndActivate);
@@ -441 +442 @@
           winMsg->wParam  = (WPARAM)hittest;
           winMsg->lParam  = MAKELONG(winMsg->pt.x,winMsg->pt.y);
-        } else
+        } 
+        else
         {
           winMsg->message = WINWM_MOUSEMOVE;