X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ea5ef0190b1b2f4d248af6b06d718a9adef2d41..b42468496c00cc7384234093227c03edcf04d84c:/include/wx/osx/menu.h diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index bac68f21b5..56bbe5789c 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -58,20 +58,20 @@ public: void HandleMenuClosed(); wxMenuImpl* GetPeer() { return m_peer; } - + // make sure we can veto void SetAllowRearrange( bool allow ); bool AllowRearrange() const { return m_allowRearrange; } - + // if a menu is used purely for internal implementation reasons (eg wxChoice) // we don't want native menu events being triggered void SetNoEventsMode( bool noEvents ); bool GetNoEventsMode() const { return m_noEventsMode; } protected: // hide special menu items like exit, preferences etc - // that are expected in the app menu + // that are expected in the app menu void DoRearrange() ; - + bool DoHandleMenuEvent( wxEvent& evt ); virtual wxMenuItem* DoAppend(wxMenuItem *item); virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); @@ -92,13 +92,13 @@ private: // in this menu rearranging of menu items (esp hiding) is allowed bool m_allowRearrange; - + // don't trigger native events bool m_noEventsMode; - + // the position of the first item in the current radio group or -1 int m_startRadioGroup; - + wxMenuImpl* m_peer; DECLARE_DYNAMIC_CLASS(wxMenu) @@ -137,7 +137,7 @@ public: virtual void EnableTop( size_t pos, bool flag ); virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual wxString GetMenuLabel( size_t pos ) const; - virtual bool Enable( bool enable = TRUE ); + virtual bool Enable( bool enable = true ); // for virtual function hiding virtual void Enable( int itemid, bool enable ) { @@ -163,7 +163,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(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL); + void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; } static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; } @@ -187,7 +187,7 @@ protected: private: static wxMenuBar* s_macInstalledMenuBar ; static wxMenuBar* s_macCommonMenuBar ; - + wxMenu* m_rootMenu; wxMenu* m_appleMenu;