X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e10daccc99be6d3ca7a206c69e94d3bfe6b03d..5cbda74b6606482f5286a5599fc60f3f91995a52:/include/wx/aui/tabmdi.h diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index 1084829cf0..fa1fd058d5 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/tabmdi.h +// Name: wx/aui/tabmdi.h // Purpose: Generic MDI (Multiple Document Interface) classes // Author: Hans Van Leemputten // Modified by: Benjamin I. Williams / Kirix Corporation @@ -61,7 +61,7 @@ public: void SetArtProvider(wxAuiTabArt* provider); wxAuiTabArt* GetArtProvider(); wxAuiNotebook* GetNotebook() const; - + #if wxUSE_MENUS wxMenu* GetWindowMenu() const { return m_pWindowMenu; } void SetWindowMenu(wxMenu* pMenu); @@ -71,8 +71,6 @@ public: void SetChildMenuBar(wxAuiMDIChildFrame *pChild); - virtual bool ProcessEvent(wxEvent& event); - wxAuiMDIChildFrame *GetActiveChild() const; void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); @@ -105,6 +103,8 @@ protected: void DoHandleMenu(wxCommandEvent &event); #endif // wxUSE_MENUS + virtual bool ProcessEvent(wxEvent& event); + 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 SetIcon(const wxIcon& icon); virtual const wxIcon& GetIcon() const; @@ -162,9 +162,9 @@ public: long WXUNUSED(style) = 1, wxWindowID WXUNUSED(winid) = 1, const wxString& WXUNUSED(name) = wxEmptyString) - { return (wxStatusBar*)NULL; } + { return NULL; } - virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; } + virtual wxStatusBar *GetStatusBar() const { return NULL; } virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {} virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {} #endif @@ -174,8 +174,8 @@ public: virtual wxToolBar* CreateToolBar(long WXUNUSED(style), wxWindowID WXUNUSED(winid), const wxString& WXUNUSED(name)) - { return (wxToolBar*)NULL; } - virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } + { return NULL; } + virtual wxToolBar *GetToolBar() const { return NULL; } #endif @@ -196,7 +196,7 @@ public: void SetMDIParentFrame(wxAuiMDIParentFrame* parent); wxAuiMDIParentFrame* GetMDIParentFrame() const; - + protected: void Init(); virtual void DoSetSize(int x, int y, int width, int height, int size_flags);