X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f752a2282fb36bb5e429c8c83e589b9ac66d7cb..0e32fdb872d413f14da8ce045766f0e2f13e202d:/src/univ/menu.cpp?ds=sidebyside

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 1d819ad0fe..2bcfe84777 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -1682,6 +1682,12 @@ wxString wxMenuBar::GetLabelTop(size_t pos) const
 
 void wxMenuBar::RefreshAllItemsAfter(size_t pos)
 {
+    if ( !IsCreated() )
+    {
+        // no need to refresh if nothing is shown yet
+        return;
+    }
+
     wxRect rect = GetItemRect(pos);
     rect.width = GetClientSize().x - rect.x;
     RefreshRect(rect);
@@ -1692,6 +1698,12 @@ void wxMenuBar::RefreshItem(size_t pos)
     wxCHECK_RET( pos != (size_t)-1,
                  _T("invalid item in wxMenuBar::RefreshItem") );
 
+    if ( !IsCreated() )
+    {
+        // no need to refresh if nothing is shown yet
+        return;
+    }
+
     RefreshRect(GetItemRect(pos));
 }
 
@@ -1760,6 +1772,7 @@ void wxMenuBar::DoDraw(wxControlRenderer *renderer)
 wxRect wxMenuBar::GetItemRect(size_t pos) const
 {
     wxASSERT_MSG( pos < GetCount(), _T("invalid menu bar item index") );
+    wxASSERT_MSG( IsCreated(), _T("can't call this method yet") );
 
     wxRect rect;
     rect.x =
@@ -2038,7 +2051,7 @@ void wxMenuBar::OnKeyDown(wxKeyEvent& event)
                 }
                 else // right
                 {
-                    if ( ++currentNew == (int)count )
+                    if ( ++currentNew == count )
                         currentNew = 0;
                 }
 
@@ -2263,7 +2276,7 @@ void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 
 void wxMenuBar::OnDismiss()
 {
-    ReleaseCapture();
+    ReleaseMouse();
 
     if ( m_current != -1 )
     {