Changeset 7446 for trunk/src

Timestamp:

Nov 24, 2001, 2:55:14 PM (24 years ago)

Author:

sandervl

Message:

minor updates

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (2 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.40 2001-11-21 11:51:37 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.41 2001-11-24 13:55:13 sandervl Exp $*/
 /*
  * Menu functions
@@ -4128 +4128 @@
     }
     retvalue = (HMENU)GetWindowLongA( hWnd, GWL_ID );
+#ifdef __WIN32OS2__
     if(MENU_GetMenu(retvalue) != NULL) {
         return retvalue;
     }
     return 0;
+#else
+    return retvalue;
+#endif
 }
 
@@ -4335 +4339 @@
     LPPOPUPMENU menu = MENU_GetMenu(hmenu);
 
-    dprintf(("USER32: IsMenu"));
+    dprintf(("USER32: IsMenu %x", hmenu));
 
     return IS_A_MENU(menu);

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.301 2001-11-21 11:51:38 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.302 2001-11-24 13:55:13 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3848 +3848 @@
 }
 //******************************************************************************
-//******************************************************************************
-void Win32BaseWindow::setWindowId(DWORD id)
-{
-    dwIDMenu = id;
-}
-//******************************************************************************
 //Locates window in linked list and increases reference count (if found)
 //Window object must be unreferenced after usage

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.134 2001-11-21 11:51:38 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.135 2001-11-24 13:55:14 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -206 +206 @@
          void   setWindowProc(WNDPROC newproc)  { win32wndproc = newproc; };
         DWORD   getWindowId()                   { return dwIDMenu; };
-         void   setWindowId(DWORD id);
+         void   setWindowId(DWORD id)           { dwIDMenu = id; };
          ULONG  getWindowHeight()               { return rectWindow.bottom - rectWindow.top; };
          ULONG  getWindowWidth()                { return rectWindow.right - rectWindow.left; };