Don't call a function that might do drawing when setting a null image list

[wxWidgets.git] / src / univ / menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 6eed51bf9766c65d220c33adf793345f6736f9d8..1a70ef1eb4320cc3f7a9a19a5c4fbf5d16aba4ec 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -1397,20 +1397,10 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
                        const wxString& help,
                        int id,
                        const wxString& text,
                        const wxString& help,

-                       bool isCheckable,
+                       wxItemKind kind,

                        wxMenu *subMenu)
                        wxMenu *subMenu)

+          : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)

 {
 {

-    m_id = id;
-    m_parentMenu = parentMenu;
-    m_subMenu = subMenu;
-
-    m_text = text;
-    m_help = help;
-
-    m_isCheckable = isCheckable;
-    m_isEnabled = TRUE;
-    m_isChecked = FALSE;
-

     m_posY =
     m_height = -1;
 
     m_posY =
     m_height = -1;
 


@@ -1430,10 +1420,10 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,
                                 int id,
                                 const wxString& name,
                                 const wxString& help,

-                                bool isCheckable,
+                                wxItemKind kind,

                                 wxMenu *subMenu)
 {
                                 wxMenu *subMenu)
 {

-    return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
+    return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);

 }
 
 /* static */
 }
 
 /* static */


@@ -1474,7 +1464,7 @@ void wxMenuItem::SetText(const wxString& text)
 
 void wxMenuItem::SetCheckable(bool checkable)
 {
 
 void wxMenuItem::SetCheckable(bool checkable)
 {

-    if ( checkable != m_isCheckable )
+    if ( checkable != IsCheckable() )

     {
         wxMenuItemBase::SetCheckable(checkable);
 
     {
         wxMenuItemBase::SetCheckable(checkable);
 


@@ -1524,6 +1514,8 @@ void wxMenuBar::Init()
     m_menuShown = NULL;
 
     m_shouldShowMenu = FALSE;
     m_menuShown = NULL;
 
     m_shouldShowMenu = FALSE;

+    
+    m_windowStyle |= wxNO_FULL_REPAINT_ON_RESIZE;

 }
 
 void wxMenuBar::Attach(wxFrame *frame)
 }
 
 void wxMenuBar::Attach(wxFrame *frame)


@@ -2250,7 +2242,7 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
     wxCHECK_RET( m_current != -1, _T("no menu to popup") );
 
     // forgot to call DismissMenu()?
     wxCHECK_RET( m_current != -1, _T("no menu to popup") );
 
     // forgot to call DismissMenu()?

-    wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menu at once!") );
+    wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menus at once!") );

 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = TRUE;
 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = TRUE;