X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/aui/tabmdi.h?ds=sidebyside diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index b677a0fdf2..cf9005bfc6 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); @@ -87,7 +85,6 @@ public: protected: wxAuiMDIClientWindow* m_pClientWindow; - wxAuiMDIChildFrame* m_pActiveChild; wxEvent* m_pLastEvt; #if wxUSE_MENUS @@ -103,8 +100,11 @@ protected: void AddWindowMenu(wxMenuBar *pMenuBar); void DoHandleMenu(wxCommandEvent &event); + void DoHandleUpdateUI(wxUpdateUIEvent &event); #endif // wxUSE_MENUS + virtual bool ProcessEvent(wxEvent& event); + virtual void DoGetClientSize(int *width, int *height) const; private: @@ -138,7 +138,7 @@ public: const wxString& name = wxFrameNameStr); #if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menu_bar); + virtual void SetMenuBar(wxMenuBar *menuBar); virtual wxMenuBar *GetMenuBar() const; #endif // wxUSE_MENUS @@ -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,27 +162,20 @@ 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 - // no size hints - virtual void DoSetSizeHints(int WXUNUSED(minW), - int WXUNUSED(minH), - int WXUNUSED(maxW) = wxDefaultCoord, - int WXUNUSED(maxH) = wxDefaultCoord, - int WXUNUSED(incW) = wxDefaultCoord, - int WXUNUSED(incH) = wxDefaultCoord) {} #if wxUSE_TOOLBAR // no toolbar bars 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 @@ -203,12 +196,16 @@ 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); + virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); virtual void DoMoveWindow(int x, int y, int width, int height); + // no size hints + virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), + int WXUNUSED(maxW), int WXUNUSED(maxH), + int WXUNUSED(incW), int WXUNUSED(incH)) {} public: // This function needs to be called when a size change is confirmed, // we needed this function to prevent anybody from the outside @@ -218,12 +215,12 @@ public: protected: wxAuiMDIParentFrame* m_pMDIParentFrame; - wxRect m_mdi_newrect; - wxRect m_mdi_currect; + wxRect m_mdiNewRect; + wxRect m_mdiCurRect; wxString m_title; wxIcon m_icon; - wxIconBundle m_icon_bundle; - bool m_activate_on_create; + wxIconBundle m_iconBundle; + bool m_activateOnCreate; #if wxUSE_MENUS wxMenuBar* m_pMenuBar; @@ -247,16 +244,20 @@ class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook public: wxAuiMDIClientWindow(); wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); - ~wxAuiMDIClientWindow(); virtual bool CreateClient(wxAuiMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); virtual int SetSelection(size_t page); + virtual wxAuiMDIChildFrame* GetActiveChild(); + virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame) + { + SetSelection(GetPageIndex(pChildFrame)); + } protected: - void PageChanged(int old_selection, int new_selection); + void PageChanged(int oldSelection, int newSelection); void OnPageClose(wxAuiNotebookEvent& evt); void OnPageChanged(wxAuiNotebookEvent& evt); void OnSize(wxSizeEvent& evt);