fixed somebody's poorly done StreamSize-->GetSize transition

[wxWidgets.git] / src / msw / menuitem.cpp

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 916819d272beeb9dd78ae7ee8ba6368212fcec11..bd46e7336a8d805f1774db2aae6a32c9eb87bc1d 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -2,44 +2,54 @@
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin
 // Name:        menuitem.cpp
 // Purpose:     wxMenuItem implementation
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     11.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "menuitem.h"
+    #pragma implementation "menuitem.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/menu.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/settings.h"
-#include "wx/font.h"
+    #include "wx/font.h"
+    #include "wx/bitmap.h"
+    #include "wx/settings.h"
+    #include "wx/font.h"
+    #include "wx/window.h"
+    #include "wx/accel.h"
+    #include "wx/menu.h"
+    #include "wx/string.h"

 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"

+#include "wx/log.h"

 
 

-#include <windows.h>
+#include "wx/msw/private.h"

 
 

-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
+// ---------------------------------------------------------------------------
+// convenience macro
+// ---------------------------------------------------------------------------

 
 

-#ifdef GetClassName
-#undef GetClassName
-#endif
+#define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -77,12 +87,12 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 #endif  //owner drawn
                         m_strHelp(strHelp)
 {
 #endif  //owner drawn
                         m_strHelp(strHelp)
 {

-  wxASSERT( pParentMenu != NULL );
+    wxASSERT_MSG( pParentMenu != NULL, _T("a menu item should have a parent") );

 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
     #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))

-    
+

     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 


@@ -92,26 +102,32 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
     #undef  SYS_COLOR
 #endif
 
     #undef  SYS_COLOR
 #endif
 

-  m_pParentMenu = pParentMenu;
-  m_pSubMenu    = pSubMenu;
-  m_idItem      = id;
-  m_bEnabled    = TRUE;
+    m_pParentMenu = pParentMenu;
+    m_pSubMenu    = pSubMenu;
+    m_bEnabled    = TRUE;
+    m_bChecked    = FALSE;
+    m_idItem      = id;

 }
 
 }
 

-wxMenuItem::~wxMenuItem() 
+wxMenuItem::~wxMenuItem()

 {
 }
 
 // misc
 // ----
 
 {
 }
 
 // misc
 // ----
 

+// return the id for calling Win32 API functions
+int wxMenuItem::GetRealId() const
+{
+    return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
+}
+

 // delete the sub menu
 // delete the sub menu

+// -------------------

 void wxMenuItem::DeleteSubMenu()
 {
 void wxMenuItem::DeleteSubMenu()
 {

-  wxASSERT( m_pSubMenu != NULL );
-
-  delete m_pSubMenu;
-  m_pSubMenu = NULL;
+    delete m_pSubMenu;
+    m_pSubMenu = NULL;

 }
 
 // change item state
 }
 
 // change item state


@@ -119,39 +135,83 @@ void wxMenuItem::DeleteSubMenu()
 
 void wxMenuItem::Enable(bool bDoEnable)
 {
 
 void wxMenuItem::Enable(bool bDoEnable)
 {

-  if ( m_bEnabled != bDoEnable ) {
-    if ( m_pSubMenu == NULL ) {     // normal menu item
-      EnableMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, 
-                     MF_BYCOMMAND | (bDoEnable ? MF_ENABLED: MF_GRAYED));
-    }
-    else                            // submenu
-    {
-      wxMenu *father = m_pSubMenu->m_topLevelMenu ;
-      wxNode *node = father->m_menuItems.First() ;
-      int i = 0 ;
-      while (node) {
-        wxMenuItem *matched = (wxMenuItem*)node->Data();
-        if ( matched == this)
-          break;
-        i++;
-        node = node->Next();
-      }
-      EnableMenuItem((HMENU)father->m_savehMenu, i, 
-                     MF_BYPOSITION | (bDoEnable ? MF_ENABLED: MF_GRAYED));
-    }
+    if ( m_bEnabled != bDoEnable ) {
+        long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
+                                 GetRealId(),
+                                 MF_BYCOMMAND |
+                                 (bDoEnable ? MF_ENABLED : MF_GRAYED));

 
 

-    m_bEnabled = bDoEnable;
-  }
+        if ( rc == -1 ) {
+            wxLogLastError("EnableMenuItem");
+        }
+
+        m_bEnabled = bDoEnable;
+    }

 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 }
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-  wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
+    wxCHECK_RET( IsCheckable(), _T("only checkable items may be checked") );
+
+    if ( m_bChecked != bDoCheck ) {
+        long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
+                                GetId(),
+                                MF_BYCOMMAND |
+                                (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
+
+        if ( rc == -1 ) {
+            wxLogLastError("CheckMenuItem");
+        }
+
+        m_bChecked = bDoCheck;
+    }
+}
+
+void wxMenuItem::SetName(const wxString& strName)
+{
+    // don't do anything if label didn't change
+    if ( m_strName == strName )
+        return;
+
+    m_strName = strName;
+
+    HMENU hMenu = GetHMenuOf(m_pParentMenu);

 
 

-  if ( m_bChecked != bDoCheck ) {
-    CheckMenuItem((HMENU)m_pParentMenu->GetHMenu(), m_idItem, 
-                  MF_BYCOMMAND | (bDoCheck ? MF_CHECKED : MF_UNCHECKED));
+    UINT id = GetRealId();
+    UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
+    if ( flagsOld == 0xFFFFFFFF )
+    {
+        wxLogLastError("GetMenuState");
+    }
+    else
+    {
+        if ( IsSubMenu() )
+        {
+            // high byte contains the number of items in a submenu for submenus
+            flagsOld &= 0xFF;
+            flagsOld |= MF_POPUP;
+        }
+
+        LPCTSTR data;
+#if wxUSE_OWNER_DRAWN
+        if ( IsOwnerDrawn() )
+        {
+            flagsOld |= MF_OWNERDRAW;
+            data = (LPCTSTR)this;
+        }
+        else
+#endif  //owner drawn
+        {
+            flagsOld |= MF_STRING;
+            data = strName;
+        }
+
+        if ( ::ModifyMenu(hMenu, id,
+                          MF_BYCOMMAND | flagsOld,
+                          id, data) == 0xFFFFFFFF )
+        {
+            wxLogLastError(_T("ModifyMenu"));
+        }
+    }
+}

 
 

-    m_bChecked = bDoCheck;
-  }
-}
\ No newline at end of file