Changeset 1612 for trunk/src/user32/oslibmsg.cpp

Timestamp:

Nov 5, 1999, 1:54:11 PM (26 years ago)

Author:

sandervl

Message:

InsertMenu & msg translation fixes

File:

• trunk/src/user32/oslibmsg.cpp (modified) (4 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.7 1999-11-05 09:16:22 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.8 1999-11-05 12:54:10 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -78 +78 @@
    0x020a, 0x020a,   // WM_???,             WM_???
    WM_CHAR,          WINWM_CHAR,
+   
+   //TODO: Needs better translation!
+   WM_CHAR,          WINWM_KEYDOWN,
+   WM_CHAR,          WINWM_KEYUP,
+   WM_CHAR,          WINWM_SYSKEYDOWN,
+   WM_CHAR,          WINWM_SYSKEYUP,
+   WM_CHAR,          WINWM_KEYLAST
 };
 #define MAX_MSGTRANSTAB (sizeof(MsgTransTab)/sizeof(MsgTransTab[0]))
@@ -121 +128 @@
   memcpy(winMsg, os2Msg, sizeof(MSG));
   winMsg->hwnd = Win32Window::OS2ToWin32Handle(os2Msg->hwnd);
+
+  if(os2Msg->msg >= WIN32APP_USERMSGBASE) {
+        winMsg->message = os2Msg->msg - WIN32APP_USERMSGBASE;
+        return;
+  }
   for(i=0;i<MAX_MSGTRANSTAB;i++)
   {
@@ -145 +157 @@
   }
 
-  if(msg >= WIN32APP_USERMSGBASE)
-    return msg - WIN32APP_USERMSGBASE;
+  if(msg >= WINWM_USER)
+    return msg + WIN32APP_USERMSGBASE;
 
   for(int i=0;i<MAX_MSGTRANSTAB;i++)