X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e75491071dbefcada61175e3eb89ce4edf335983..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/mac/menu.h?ds=sidebyside diff --git a/include/wx/mac/menu.h b/include/wx/mac/menu.h index 98b840a56f..4c79dbf2aa 100644 --- a/include/wx/mac/menu.h +++ b/include/wx/mac/menu.h @@ -12,7 +12,7 @@ #ifndef _WX_MENU_H_ #define _WX_MENU_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "menu.h" #endif @@ -74,9 +74,6 @@ public: // get the menu handle WXHMENU GetHMenu() const { return m_hMenu; } - // attach/detach menu to/from wxMenuBar - void Attach(wxMenuBar *menubar); - void Detach(); short MacGetMenuId() { return m_macMenuId ; } #if wxUSE_ACCEL // called by wxMenuBar to build its accel table from the accels of all menus @@ -176,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) ; @@ -192,8 +189,6 @@ protected: wxArrayString m_titles; - wxFrame *m_menuBarFrame; - #if wxUSE_ACCEL // the accelerator table for all accelerators in all our menus wxAcceleratorTable m_accelTable;