Remove duplicated control names strings declarations from wxOSX.

[wxWidgets.git] / include / wx / aui / tabmdi.h

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 2da0bdd809e8b516330ff09229c341a860880509..e4e7b8182cb56d9f1d0f579093b6cb08020ade2a 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -61,7 +61,7 @@ public:
     void SetArtProvider(wxAuiTabArt* provider);
     wxAuiTabArt* GetArtProvider();
     wxAuiNotebook* GetNotebook() const;
     void SetArtProvider(wxAuiTabArt* provider);
     wxAuiTabArt* GetArtProvider();
     wxAuiNotebook* GetNotebook() const;

-    
+

 #if wxUSE_MENUS
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);
 #if wxUSE_MENUS
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);


@@ -71,8 +71,6 @@ public:
 
     void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
 
 
     void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
 

-    virtual bool ProcessEvent(wxEvent& event);
-

     wxAuiMDIChildFrame *GetActiveChild() const;
     void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 
     wxAuiMDIChildFrame *GetActiveChild() const;
     void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 


@@ -105,6 +103,8 @@ protected:
     void DoHandleMenu(wxCommandEvent &event);
 #endif // wxUSE_MENUS
 
     void DoHandleMenu(wxCommandEvent &event);
 #endif // wxUSE_MENUS
 

+    virtual bool ProcessEvent(wxEvent& event);
+

     virtual void DoGetClientSize(int *width, int *height) const;
 
 private:
     virtual void DoGetClientSize(int *width, int *height) const;
 
 private:


@@ -147,7 +147,7 @@ public:
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual const wxIconBundle& GetIcons() const;
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual const wxIconBundle& GetIcons() const;

-    
+

     virtual void SetIcon(const wxIcon& icon);
     virtual const wxIcon& GetIcon() const;
 
     virtual void SetIcon(const wxIcon& icon);
     virtual const wxIcon& GetIcon() const;
 


@@ -196,7 +196,7 @@ public:
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;

-    
+

 protected:
     void Init();
     virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
 protected:
     void Init();
     virtual void DoSetSize(int x, int y, int width, int height, int size_flags);