applied SourceForge patch # 544164 (hidden virtual method in wxMenuBar)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/menu.h b/include/wx/mac/menu.h
index 39b0f0a918806ac0bbbf89e2332d6bb03bfa0bba..63a2598097c3d5f0207330c2bf82da53c3e324e3 100644 (file)
--- a/include/wx/mac/menu.h
+++ b/include/wx/mac/menu.h
@@ -173,7 +173,7 @@ public:
 
     // if the menubar is modified, the display is not updated automatically,
     // call this function to update it (m_menuBarFrame should be !NULL)
-    void Refresh();
+    void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL);
 
   void MacInstallMenuBar() ;
   void MacMenuSelect(wxEvtHandler* handler, long when , int macMenuId, int macMenuItemNum) ;

diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp
index 213c14cd48c63c9b2897baab95a507650815cdd7..e31651102caa61ddb110b34760d1cd802045718a 100644 (file)
--- a/src/mac/carbon/menu.cpp
+++ b/src/mac/carbon/menu.cpp
@@ -577,7 +577,7 @@ wxMenuBar::~wxMenuBar()
 
 }
 
-void wxMenuBar::Refresh()
+void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );
 

diff --git a/src/mac/menu.cpp b/src/mac/menu.cpp
index 213c14cd48c63c9b2897baab95a507650815cdd7..e31651102caa61ddb110b34760d1cd802045718a 100644 (file)
--- a/src/mac/menu.cpp
+++ b/src/mac/menu.cpp
@@ -577,7 +577,7 @@ wxMenuBar::~wxMenuBar()
 
 }
 
-void wxMenuBar::Refresh()
+void wxMenuBar::Refresh(bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect))
 {
     wxCHECK_RET( IsAttached(), wxT("can't refresh unatteched menubar") );