Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-20 15:04:27 +00:00
parent 4012b958f2
commit d11e8786ed
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/gtk/mdi.h
View File

@@ -158,7 +158,7 @@ public:
const wxString& WXUNUSED(name) ) const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; } { return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
#endif #endif // wxUSE_TOOLBAR
// no icon // no icon
void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
@@ -169,10 +169,15 @@ public:
wxString GetTitle() const { return m_title; } wxString GetTitle() const { return m_title; }
// no maximize etc // 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 void Restore() {}
virtual bool IsTopLevel() const { return FALSE; } virtual bool IsTopLevel() const { return false; }
void OnActivate( wxActivateEvent& event ); void OnActivate( wxActivateEvent& event );
void OnMenuHighlight( wxMenuEvent& event ); void OnMenuHighlight( wxMenuEvent& event );

11
include/wx/gtk1/mdi.h
View File

@@ -158,7 +158,7 @@ public:
const wxString& WXUNUSED(name) ) const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; } { return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; } virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
#endif #endif // wxUSE_TOOLBAR
// no icon // no icon
void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); } void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
@@ -169,10 +169,15 @@ public:
wxString GetTitle() const { return m_title; } wxString GetTitle() const { return m_title; }
// no maximize etc // 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 void Restore() {}
virtual bool IsTopLevel() const { return FALSE; } virtual bool IsTopLevel() const { return false; }
void OnActivate( wxActivateEvent& event ); void OnActivate( wxActivateEvent& event );
void OnMenuHighlight( wxMenuEvent& event ); void OnMenuHighlight( wxMenuEvent& event );