Changeset 2834 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 20, 2000, 7:28:35 PM (26 years ago)

Author:

cbratschi

Message:

WM_EX_CONTEXTHELP

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.164 2000-02-16 17:21:06 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.165 2000-02-20 18:28:34 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -50 +50 @@
 #include "timer.h"
 
-#define DBG_LOCALLOG    DBG_win32wbase
+#define DBG_LOCALLOG    DBG_win32wbase
 #include "dbglocal.h"
 
@@ -608 +608 @@
         else {
                 if (windowClass->getMenuNameA()) {
-                        cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
+                        cs->hMenu = LoadMenuA(windowClass->getInstance(),windowClass->getMenuNameA());
+#if 0 //CB: hack for treeview test cases bug
+if (!cs->hMenu) cs->hMenu = LoadMenuA(windowClass->getInstance(),"MYAPP");
+#endif
                         if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
                 }
@@ -1587 +1590 @@
         return 0;
 
+#if 0 //CB: todo: MSDN docu: Windown handles these messages and not WM_SYSCHAR (the code below doesn't work)
+    case WM_KEYDOWN:
+    case WM_KEYUP:
+    case WM_SYSKEYDOWN:
+    case WM_SYSKEYUP:
+#endif
+
     case WM_SYSCHAR:
     {
@@ -1608 +1618 @@
             break;
     }
+
     case WM_SETHOTKEY:
         hotkey = wParam;