Changeset 6762 for trunk/src/user32/menu.cpp

Timestamp:

Sep 19, 2001, 5:39:52 PM (24 years ago)

Author:

sandervl

Message:

ported the Wine MDI control + some menu fixes

File:

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

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.35 2001-07-08 08:06:14 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.36 2001-09-19 15:39:48 sandervl Exp $*/
 /*
  * Menu functions
@@ -34 +34 @@
 #include <objhandle.h>
 #include "pmwindow.h"
+#include "win32wmisc.h"
 
 #define DBG_LOCALLOG    DBG_menu
@@ -318 +319 @@
 }
 
-HMENU getSysMenu(HWND hwnd)
-{
-  Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-  if(win32wnd) {
-      HMENU hmenu = win32wnd->GetSysMenu();
-      RELEASE_WNDOBJ(win32wnd);
-      return hmenu;
-  }
-  return (HMENU)0;
-}
-
-VOID setSysMenu(HWND hwnd,HMENU hMenu)
-{
-  Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-  if(win32wnd) {
-      win32wnd->SetSysMenu(hMenu);
-      RELEASE_WNDOBJ(win32wnd);
-  }
-}
 
 /***********************************************************************
@@ -936 +916 @@
 
 
-    /* If we get here, then it must be a text item */
-    if (IS_STRING_ITEM( lpitem->fType ))
+    /* it must be a text item - unless it's the system menu */
+    if (!(lpitem->fType & MF_SYSMENU) && IS_STRING_ITEM( lpitem->fType ))
     {   SIZE size;
 
@@ -3517 +3497 @@
  *         EnableMenuItem32    (USER32.170)
  */
-ULONG WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
+UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
 {
     UINT    oldflags;
@@ -4340 +4320 @@
         switch (MENU_ITEM_TYPE(menu->fType)) {
                 case MF_STRING:
-                    if (menu->text && lpmii->dwTypeData && lpmii->cch) {
+                    if (menu->text) {
                         if (unicode) {
-                            lstrcpynAtoW((LPWSTR) lpmii->dwTypeData, menu->text, lpmii->cch);
-                            lpmii->cch = lstrlenW((LPWSTR)menu->text);
+                            if(lpmii->dwTypeData && lpmii->cch)
+                                lstrcpynAtoW((LPWSTR) lpmii->dwTypeData, menu->text, lpmii->cch);
+                            lpmii->cch = lstrlenA(menu->text);
                         } else {
-                            lstrcpynA(lpmii->dwTypeData, menu->text, lpmii->cch);
+                            if(lpmii->dwTypeData && lpmii->cch)
+                                lstrcpynA(lpmii->dwTypeData, menu->text, lpmii->cch);
                             lpmii->cch = lstrlenA(menu->text);
                         }