From 885df446a383a7eb999edc9bb7146b4884ed20b8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Aug 2000 10:59:02 +0000 Subject: [PATCH] src/gtk/mdi.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/mdi.h | 34 +++++++++++++++++++++++----------- include/wx/gtk1/mdi.h | 34 +++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index 08a518e3c2..2e4d00c55e 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -66,7 +66,6 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr ); - void GetClientSize(int *width, int *height) const; wxMDIChildFrame *GetActiveChild() const; wxMDIClientWindow *GetClientWindow() const; @@ -89,6 +88,8 @@ public: protected: void Init(); + virtual void DoGetClientSize(int *width, int *height) const; + private: friend class wxMDIChildFrame; @@ -104,19 +105,25 @@ class wxMDIChildFrame: public wxFrame public: wxMDIChildFrame(); wxMDIChildFrame( wxMDIParentFrame *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); - ~wxMDIChildFrame(); + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr ); + + virtual ~wxMDIChildFrame(); bool Create( wxMDIParentFrame *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr ); virtual void SetMenuBar( wxMenuBar *menu_bar ); virtual wxMenuBar *GetMenuBar() const; - virtual void GetClientSize( int *width, int *height ) const; virtual void AddChild( wxWindowBase *child ); virtual void Activate(); @@ -141,8 +148,10 @@ public: #if wxUSE_TOOLBAR // no toolbar bars - virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), - const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } + virtual wxToolBar* CreateToolBar( long WXUNUSED(style), + wxWindowID WXUNUSED(id), + const wxString& WXUNUSED(name) ) + { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } #endif @@ -168,6 +177,9 @@ public: GtkNotebookPage *m_page; bool m_justInserted; +protected: + virtual void DoGetClientSize( int *width, int *height ) const; + private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index 08a518e3c2..2e4d00c55e 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -66,7 +66,6 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr ); - void GetClientSize(int *width, int *height) const; wxMDIChildFrame *GetActiveChild() const; wxMDIClientWindow *GetClientWindow() const; @@ -89,6 +88,8 @@ public: protected: void Init(); + virtual void DoGetClientSize(int *width, int *height) const; + private: friend class wxMDIChildFrame; @@ -104,19 +105,25 @@ class wxMDIChildFrame: public wxFrame public: wxMDIChildFrame(); wxMDIChildFrame( wxMDIParentFrame *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); - ~wxMDIChildFrame(); + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr ); + + virtual ~wxMDIChildFrame(); bool Create( wxMDIParentFrame *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ); + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr ); virtual void SetMenuBar( wxMenuBar *menu_bar ); virtual wxMenuBar *GetMenuBar() const; - virtual void GetClientSize( int *width, int *height ) const; virtual void AddChild( wxWindowBase *child ); virtual void Activate(); @@ -141,8 +148,10 @@ public: #if wxUSE_TOOLBAR // no toolbar bars - virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), - const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } + virtual wxToolBar* CreateToolBar( long WXUNUSED(style), + wxWindowID WXUNUSED(id), + const wxString& WXUNUSED(name) ) + { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } #endif @@ -168,6 +177,9 @@ public: GtkNotebookPage *m_page; bool m_justInserted; +protected: + virtual void DoGetClientSize( int *width, int *height ) const; + private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) -- 2.45.2