Changeset 741 for trunk/src/user32/new/winmenu.cpp

Timestamp:

Aug 30, 1999, 2:00:12 PM (26 years ago)

Author:

sandervl

Message:

Redesign; base class for all window types

File:

• trunk/src/user32/new/winmenu.cpp (modified) (6 diffs)

trunk/src/user32/new/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.1 1999-07-20 07:42:36 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.2 1999-08-30 11:59:54 sandervl Exp $ */
 
 /*
@@ -18 +18 @@
 #include <os2win.h>
 #include <stdlib.h>
-#include <win32wnd.h>
+#include <win32wbase.h>
 
 //******************************************************************************
@@ -51 +51 @@
     rc = O32_LoadMenuIndirect(arg1);
     if(astring)
-        FreeAsciiString(astring);
+    FreeAsciiString(astring);
     return(rc);
 }
@@ -62 +62 @@
     dprintf(("OS2DestroyMenu\n"));
     if(HIWORD(hmenu) == 0) {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }    
+    SetLastError(ERROR_INVALID_PARAMETER);
+    return FALSE;
+    }
     winres = (Win32Resource *)hmenu;
     delete winres;
@@ -83 +83 @@
 HMENU WIN32API GetMenu( HWND hwnd)
 {
-  Win32Window *window;
-
-    window = Win32Window::GetWindowFromHandle(hwnd);
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("GetMenu, window %x not found", hwnd));
-        return 0;
+        dprintf(("GetMenu, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("GetMenu %x", hwnd));
@@ -97 +97 @@
 BOOL WIN32API SetMenu( HWND hwnd, HMENU hmenu)
 {
-  Win32Window *window;
-
-    window = Win32Window::GetWindowFromHandle(hwnd);
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     if(!window) {
-        dprintf(("GetMenu, window %x not found", hwnd));
-        return 0;
+        dprintf(("GetMenu, window %x not found", hwnd));
+        return 0;
     }
     dprintf(("SetMenu %x %x\n", hwnd, hmenu));