Changeset 15084

Timestamp:

Oct 22, 2000, 9:53:25 PM (25 years ago)

Author:

sandervl

Message:

RegisterClassW fix + use different version of IsWindow in menu.cpp

Location:

tags/trunk/src/user32

Files:

• menu.cpp (modified) (2 diffs)
• windowclass.cpp (modified) (2 diffs)

tags/trunk/src/user32/menu.cpp ¶

@@ -1 @@
-/* $Id: menu.cpp,v 1.24 2000-10-22 16:18:59 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.25 2000-10-22 19:53:23 sandervl Exp $*/
 /*
  * Menu functions
@@ -99 +99 @@
 
 #define MENU_MAGIC   0x554d  /* 'MU' */
-#define IS_A_MENU(pmenu) ((pmenu) && !IsWindow((HWND)pmenu) && (pmenu)->wMagic == MENU_MAGIC)
+
+#ifdef __WIN32OS2__
+//******************************************************************************
+//Used by our menu code (we don't want any logging)
+//******************************************************************************
+BOOL IsWindowInternal(HWND hwnd)
+{
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        return FALSE;
+    }
+    return window->IsWindow();
+}
+#define IS_A_MENU(pmenu) ((pmenu) && !IsWindowInternal((HWND)pmenu) && (pmenu)->wMagic == MENU_MAGIC)
+#else
+#define IS_A_MENU(pmenu) ((pmenu) && (pmenu)->wMagic == MENU_MAGIC)
+#endif
 
 #define ITEM_PREV               -1

tags/trunk/src/user32/windowclass.cpp ¶

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.12 2000-10-17 17:11:09 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.13 2000-10-22 19:53:25 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -107 +107 @@
     wc.cbSize = sizeof(wc);
     memcpy(&wc.style, lpwc, sizeof(WNDCLASSA));
+    wc.hIconSm = 0;
 
     if(Win32WndClass::FindClass(wc.hInstance, (LPWSTR)wc.lpszClassName)) {