implemented wxMenuBar ctor taking array of menus/titles for all ports; added optional flags argument to it (patch 1162726)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -78,6 +78,7 @@ class WXDLLEXPORT wxMenuBar : public wxMenuBarBase, public wxCocoaNSMenu
|
||||
public:
|
||||
// ctors and dtor
|
||||
wxMenuBar(long style = 0) { Create(style); }
|
||||
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0)
|
||||
bool Create(long style = 0);
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
|
@@ -24,7 +24,7 @@ public:
|
||||
// ctors
|
||||
wxMenuBar();
|
||||
wxMenuBar(long style);
|
||||
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
||||
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
// implement base class (pure) virtuals
|
||||
@@ -56,6 +56,8 @@ public:
|
||||
wxWindow *m_invokingWindow;
|
||||
|
||||
private:
|
||||
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||
};
|
||||
|
||||
|
@@ -24,7 +24,7 @@ public:
|
||||
// ctors
|
||||
wxMenuBar();
|
||||
wxMenuBar(long style);
|
||||
wxMenuBar(int n, wxMenu *menus[], const wxString titles[]);
|
||||
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
// implement base class (pure) virtuals
|
||||
@@ -56,6 +56,8 @@ public:
|
||||
wxWindow *m_invokingWindow;
|
||||
|
||||
private:
|
||||
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMenuBar)
|
||||
};
|
||||
|
||||
|
@@ -108,7 +108,7 @@ 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
|
||||
|
@@ -108,7 +108,7 @@ 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
|
||||
|
@@ -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
|
||||
|
@@ -165,7 +165,7 @@ 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
|
||||
|
@@ -194,6 +194,7 @@ public:
|
||||
wxMenuBar( int n
|
||||
,wxMenu* vMenus[]
|
||||
,const wxString sTitles[]
|
||||
,long lStyle = 0
|
||||
);
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
|
@@ -146,7 +146,7 @@ public:
|
||||
|
||||
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
|
||||
|
@@ -147,6 +147,7 @@ class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
|
||||
public:
|
||||
// ctors and dtor
|
||||
wxMenuBar(long WXUNUSED(style) = 0) { Init(); }
|
||||
wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0)
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
// implement base class virtuals
|
||||
|
Reference in New Issue
Block a user