X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5e2ca7c529320e42d14d3a37450237a53553038..e3e8e3c0aa864da4c7e5bfbee200d9f0732cf4c5:/include/wx/aui/tabmdi.h diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index 48275eba39..5e94dffd64 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -63,7 +63,7 @@ public: wxAuiNotebook* GetNotebook() const; #if wxUSE_MENUS - wxMenu* GetWindowMenu() const { return m_pWindowMenu; }; + wxMenu* GetWindowMenu() const { return m_pWindowMenu; } void SetWindowMenu(wxMenu* pMenu); virtual void SetMenuBar(wxMenuBar *pMenuBar); @@ -74,13 +74,13 @@ public: virtual bool ProcessEvent(wxEvent& event); wxAuiMDIChildFrame *GetActiveChild() const; - inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); + void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); wxAuiMDIClientWindow *GetClientWindow() const; virtual wxAuiMDIClientWindow *OnCreateClient(); virtual void Cascade() { /* Has no effect */ } - virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } + virtual void Tile(wxOrientation orient = wxHORIZONTAL); virtual void ArrangeIcons() { /* Has no effect */ } virtual void ActivateNext(); virtual void ActivatePrevious(); @@ -222,6 +222,7 @@ protected: wxString m_title; wxIcon m_icon; wxIconBundle m_icon_bundle; + bool m_activate_on_create; #if wxUSE_MENUS wxMenuBar* m_pMenuBar; @@ -255,8 +256,8 @@ public: protected: void PageChanged(int old_selection, int new_selection); - void OnPageClose(wxAuiNotebookEvent& event); - void OnPageChanged(wxAuiNotebookEvent& event); + void OnPageClose(wxAuiNotebookEvent& evt); + void OnPageChanged(wxAuiNotebookEvent& evt); void OnSize(wxSizeEvent& evt); private: