X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..7bea7b91482dd41568e11fc9e91ce485db680ddd:/include/wx/motif/menu.h diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h index 081d9dec79..b4f94426d1 100644 --- a/include/wx/motif/menu.h +++ b/include/wx/motif/menu.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MOTIF_MENU_H_ @@ -67,7 +67,7 @@ public: WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu, const wxString& title = wxEmptyString, - bool isPulldown = FALSE); + bool isPulldown = false); // For popups, need to destroy, then recreate menu for a different (or // possibly same) window, since the parent may change. @@ -81,7 +81,7 @@ public: void SetBackgroundColour(const wxColour& colour); void SetForegroundColour(const wxColour& colour); void SetFont(const wxFont& colour); - void ChangeFont(bool keepOriginalSize = FALSE); + void ChangeFont(bool keepOriginalSize = false); WXWidget GetHandle() const { return m_menuWidget; } @@ -117,8 +117,8 @@ class wxMenuBar : public wxMenuBarBase public: wxMenuBar() { Init(); } wxMenuBar(long WXUNUSED(style)) { Init(); } - wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); - wxMenuBar(int n, wxMenu *menus[], const wxArrayString& titles); + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); + wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0); virtual ~wxMenuBar(); // implement base class (pure) virtuals @@ -158,7 +158,7 @@ public: virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetFont(const wxFont& colour); - void ChangeFont(bool keepOriginalSize = FALSE); + void ChangeFont(bool keepOriginalSize = false); public: // common part of all ctors