Changeset 2378 for trunk/src

Timestamp:

Jan 8, 2000, 5:53:38 PM (26 years ago)

Author:

sandervl

Message:

Message translation bugfixes

Location:

trunk/src/user32

Files:

• oslibmenu.cpp (modified) (3 diffs)
• oslibmsg.cpp (modified) (2 diffs)
• oslibmsgtranslate.cpp (modified) (2 diffs)

trunk/src/user32/oslibmenu.cpp

@@ -1 @@
-/* $Id: oslibmenu.cpp,v 1.6 2000-01-08 14:15:06 sandervl Exp $ */
+/* $Id: oslibmenu.cpp,v 1.7 2000-01-08 16:53:38 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -62 +62 @@
 HMENU OSLibWinCreateMenu(PVOID menutemplate)
 {
-    return (HMENU)WinCreateMenu(HWND_OBJECT, menutemplate);
+   return (HMENU)WinCreateMenu(HWND_OBJECT, menutemplate);
 }
 //******************************************************************************
@@ -98 +98 @@
    pRect->left  = rectl.xLeft;
    pRect->right = rectl.xRight;
-   pRect->top   = OSLibQueryScreenHeight() - rectl.yTop;
-   pRect->bottom= OSLibQueryScreenHeight() - rectl.yBottom;
+   pRect->top   = mapScreenY(rectl.yTop);
+   pRect->bottom= mapScreenY(rectl.yBottom);
    return TRUE;
 }

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.22 2000-01-08 14:15:06 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.23 2000-01-08 16:53:38 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -174 +174 @@
         memcpy(&os2msg, MsgThreadPtr, sizeof(QMSG));
         MsgThreadPtr->time = -1;
-        if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
+        if(msg->hwnd) {
             thdb->nrOfMsgs = 1;
             thdb->msgstate++; //odd -> next call to our PM window handler should dispatch the translated msg
             memcpy(&thdb->msg, msg, sizeof(MSG));
+        }
+        if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
             return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
         }

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.9 2000-01-08 14:15:06 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.10 2000-01-08 16:53:38 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -111 +111 @@
   int i;
 
-  if(os2Msg->msg == WM_COMMAND) {
-    i = 0;
-  }
   memset(winMsg, 0, sizeof(MSG));
   win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(os2Msg->hwnd);