X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/motif/menu.h diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h index eb26667a36..f1ab13da3c 100644 --- a/include/wx/motif/menu.h +++ b/include/wx/motif/menu.h @@ -20,13 +20,13 @@ #include "wx/font.h" #include "wx/arrstr.h" -class wxFrame; +class WXDLLIMPEXP_CORE wxFrame; // ---------------------------------------------------------------------------- // Menu // ---------------------------------------------------------------------------- -class wxMenu : public wxMenuBase +class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase { public: // ctors & dtor @@ -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; } @@ -112,13 +112,13 @@ private: // Menu Bar // ---------------------------------------------------------------------------- -class wxMenuBar : public wxMenuBarBase +class WXDLLIMPEXP_CORE 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