blind fix for iconizing/restoring hidden child frames bug

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index f95be7f54005f878b28b138c1a1a1809a9b3d4a7..c87a217ce6f8b60ec15e2c8c7e8eb647cdd48f48 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MENUS
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"


@@ -39,18 +41,29 @@
     #include "wx/string.h"
 #endif
 
     #include "wx/string.h"
 #endif
 

-#include "wx/ownerdrw.h"

 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

+#if wxUSE_ACCEL
+    #include "wx/accel.h"
+#endif // wxUSE_ACCEL
+

 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------

-// convenience macro
+// macro

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

+// hide the ugly cast

 #define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())
 
 #define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())
 

+// conditional compilation
+#if wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code
+#else // !wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code )
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+

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


@@ -59,15 +72,12 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-#if     !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-  IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn)
+    IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)

 #else   //!USE_OWNER_DRAWN
 #else   //!USE_OWNER_DRAWN

-  IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)

 #endif  //USE_OWNER_DRAWN
 
 #endif  //USE_OWNER_DRAWN
 

-#endif  //USE_SHARED_LIBRARY
-

 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------


@@ -75,19 +85,17 @@
 // ctor & dtor
 // -----------
 
 // ctor & dtor
 // -----------
 

-wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
-                       const wxString& strName, const wxString& strHelp,
+wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& strHelp,

                        bool bCheckable,
                        bool bCheckable,

-                       wxMenu *pSubMenu) :
+                       wxMenu *pSubMenu)

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-                        wxOwnerDrawn(strName, bCheckable),
-#else   //no owner drawn support
-                        m_bCheckable(bCheckable),
-                        m_strName(strName),
-#endif  //owner drawn
-                        m_strHelp(strHelp)
+                       : wxOwnerDrawn(GetLabelFromText(text), bCheckable)
+#endif // owner drawn

 {
 {

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

 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors


@@ -96,17 +104,23 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 

+    #undef  SYS_COLOR
+

     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 
     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 

-    #undef  SYS_COLOR
-#endif
-
-    m_pParentMenu = pParentMenu;
-    m_pSubMenu    = pSubMenu;
-    m_bEnabled    = TRUE;
-    m_bChecked    = FALSE;
-    m_idItem      = id;
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(text.AfterFirst(_T('\t')));
+#endif // wxUSE_OWNER_DRAWN
+
+    m_parentMenu  = pParentMenu;
+    m_subMenu     = pSubMenu;
+    m_isEnabled   = TRUE;
+    m_isChecked   = FALSE;
+    m_id          = id;
+    m_text        = text;
+    m_isCheckable = bCheckable;
+    m_help        = strHelp;

 }
 
 wxMenuItem::~wxMenuItem()
 }
 
 wxMenuItem::~wxMenuItem()


@@ -119,69 +133,85 @@ wxMenuItem::~wxMenuItem()
 // return the id for calling Win32 API functions
 int wxMenuItem::GetRealId() const
 {
 // return the id for calling Win32 API functions
 int wxMenuItem::GetRealId() const
 {

-    return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
+    return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();

 }
 
 }
 

-// delete the sub menu
-// -------------------
-void wxMenuItem::DeleteSubMenu()
+// get item state
+// --------------
+
+bool wxMenuItem::IsChecked() const

 {
 {

-    delete m_pSubMenu;
-    m_pSubMenu = NULL;
+    int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
+
+    return (flag & MF_CHECKED) != 0;
+}
+
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);

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

-void wxMenuItem::Enable(bool bDoEnable)
+void wxMenuItem::Enable(bool enable)

 {
 {

-    if ( m_bEnabled != bDoEnable ) {
-        long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
-                                 GetRealId(),
-                                 MF_BYCOMMAND |
-                                 (bDoEnable ? MF_ENABLED : MF_GRAYED));
-
-        if ( rc == -1 ) {
-            wxLogLastError("EnableMenuItem");
-        }
+    if ( m_isEnabled == enable )
+        return;
+
+    long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
+                             GetRealId(),
+                             MF_BYCOMMAND |
+                             (enable ? MF_ENABLED : MF_GRAYED));

 
 

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

     }
     }

+
+    wxMenuItemBase::Enable(enable);

 }
 
 }
 

-void wxMenuItem::Check(bool bDoCheck)
+void wxMenuItem::Check(bool check)

 {
 {

-    wxCHECK_RET( IsCheckable(), T("only checkable items may be checked") );
+    wxCHECK_RET( m_isCheckable, wxT("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 ( m_isChecked == check )
+        return;

 
 

-        if ( rc == -1 ) {
-            wxLogLastError("CheckMenuItem");
-        }
+    long rc = CheckMenuItem(GetHMenuOf(m_parentMenu),
+                            GetRealId(),
+                            MF_BYCOMMAND |
+                            (check ? MF_CHECKED : MF_UNCHECKED));

 
 

-        m_bChecked = bDoCheck;
+    if ( rc == -1 ) {
+        wxLogLastError(wxT("CheckMenuItem"));

     }
     }

+
+    wxMenuItemBase::Check(check);

 }
 
 }
 

-void wxMenuItem::SetName(const wxString& strName)
+void wxMenuItem::SetText(const wxString& text)

 {
     // don't do anything if label didn't change
 {
     // don't do anything if label didn't change

-    if ( m_strName == strName )
+    if ( m_text == text )

         return;
 
         return;
 

-    m_strName = strName;
+    wxMenuItemBase::SetText(text);
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(text) );
+
+    HMENU hMenu = GetHMenuOf(m_parentMenu);
+    wxCHECK_RET( hMenu, wxT("menuitem without menu") );

 
 

-    HMENU hMenu = GetHMenuOf(m_pParentMenu);
+#if wxUSE_ACCEL
+    m_parentMenu->UpdateAccel(this);
+#endif // wxUSE_ACCEL

 
     UINT id = GetRealId();
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {
 
     UINT id = GetRealId();
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {

-        wxLogLastError("GetMenuState");
+        wxLogLastError(wxT("GetMenuState"));

     }
     else
     {
     }
     else
     {


@@ -193,6 +223,7 @@ void wxMenuItem::SetName(const wxString& strName)
         }
 
         LPCTSTR data;
         }
 
         LPCTSTR data;

+

 #if wxUSE_OWNER_DRAWN
         if ( IsOwnerDrawn() )
         {
 #if wxUSE_OWNER_DRAWN
         if ( IsOwnerDrawn() )
         {


@@ -203,15 +234,36 @@ void wxMenuItem::SetName(const wxString& strName)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;

-            data = strName;
+            data = (wxChar*) text.c_str();

         }
 
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,
         }
 
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,

-                          id, data) == 0xFFFFFFFF )
+                          id, data) == (int)0xFFFFFFFF )

         {
         {

-            wxLogLastError(T("ModifyMenu"));
+            wxLogLastError(wxT("ModifyMenu"));

         }
     }
 }
 
         }
     }
 }
 

+void wxMenuItem::SetCheckable(bool checkable)
+{
+    wxMenuItemBase::SetCheckable(checkable);
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuItemBase
+// ----------------------------------------------------------------------------
+
+wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
+                                int id,
+                                const wxString& name,
+                                const wxString& help,
+                                bool isCheckable,
+                                wxMenu *subMenu)
+{
+    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+}
+
+#endif // wxUSE_MENUS