X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598ddd96f45745188c96f16757f7ceeaa0c8d70d..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/msw/menu.h?ds=inline diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h index 21853e4728..f049ba8f41 100644 --- a/include/wx/msw/menu.h +++ b/include/wx/msw/menu.h @@ -140,19 +140,19 @@ private: class WXDLLEXPORT wxMenuInfo : public wxObject { public : - wxMenuInfo() { m_menu = NULL ; } + wxMenuInfo() { m_menu = NULL; } virtual ~wxMenuInfo() { } void Create( wxMenu *menu , const wxString &title ) - { m_menu = menu ; m_title = title ; } - wxMenu* GetMenu() const { return m_menu ; } - wxString GetTitle() const { return m_title ; } + { m_menu = menu; m_title = title; } + wxMenu* GetMenu() const { return m_menu; } + wxString GetTitle() const { return m_title; } private : - wxMenu *m_menu ; - wxString m_title ; + wxMenu *m_menu; + wxString m_title; - DECLARE_DYNAMIC_CLASS(wxMenuInfo) ; -} ; + DECLARE_DYNAMIC_CLASS(wxMenuInfo) +}; WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList ); @@ -165,12 +165,12 @@ public: // unused under MSW wxMenuBar(long style); // menubar takes ownership of the menus arrays but copies the titles - wxMenuBar(int n, wxMenu *menus[], const wxString titles[]); + wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); virtual ~wxMenuBar(); // menubar construction - bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ) ; } - const wxMenuInfoList& GetMenuInfos() const ; + bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ); } + const wxMenuInfoList& GetMenuInfos() const; virtual bool Append( wxMenu *menu, const wxString &title ); virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); @@ -220,7 +220,7 @@ protected: // common part of all ctors void Init(); - wxArrayString m_titles ; + wxArrayString m_titles; wxMenuInfoList m_menuInfos; WXHMENU m_hMenu;