From d11e8786ed13b72766eea18cb577cc00f9f08f41 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Mar 2005 15:04:27 +0000 Subject: [PATCH] wxMDIChildFrame::Maximize() should have default value for its argument just as wxFrame does; override other functions which don't make sense for wxGTK implementation of MDI git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/mdi.h | 11 ++++++++--- include/wx/gtk1/mdi.h | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index b6e054b648..08ba0abef2 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -158,7 +158,7 @@ public: const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } -#endif +#endif // wxUSE_TOOLBAR // no icon void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } @@ -169,10 +169,15 @@ public: wxString GetTitle() const { return m_title; } // no maximize etc - virtual void Maximize( bool WXUNUSED(maximize) ) {} + virtual void Maximize( bool WXUNUSED(maximize) = true ) { } + virtual bool IsMaximized() const { return true; } + virtual void Iconize(bool WXUNUSED(iconize) = true) { } + virtual bool IsIconized() const { return false; } + virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { } + virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { } virtual void Restore() {} - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event ); diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h index b6e054b648..08ba0abef2 100644 --- a/include/wx/gtk1/mdi.h +++ b/include/wx/gtk1/mdi.h @@ -158,7 +158,7 @@ public: const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } -#endif +#endif // wxUSE_TOOLBAR // no icon void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } @@ -169,10 +169,15 @@ public: wxString GetTitle() const { return m_title; } // no maximize etc - virtual void Maximize( bool WXUNUSED(maximize) ) {} + virtual void Maximize( bool WXUNUSED(maximize) = true ) { } + virtual bool IsMaximized() const { return true; } + virtual void Iconize(bool WXUNUSED(iconize) = true) { } + virtual bool IsIconized() const { return false; } + virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { } + virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { } virtual void Restore() {} - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } void OnActivate( wxActivateEvent& event ); void OnMenuHighlight( wxMenuEvent& event );