X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6f64c7d8c6c7553e55823f30fc5a1c2ab76f4f..e3c55eb333d273693ed2aea23da909b33e9e5484:/include/wx/generic/mdig.h diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 007ab2e4e4..243a7c575f 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -158,12 +158,12 @@ public: #endif // no size hints - virtual void SetSizeHints( int WXUNUSED(minW), + virtual void DoSetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW) = -1, - int WXUNUSED(maxH) = -1, - int WXUNUSED(incW) = -1, - int WXUNUSED(incH) = -1) {} + int WXUNUSED(maxW) = wxDefaultCoord, + int WXUNUSED(maxH) = wxDefaultCoord, + int WXUNUSED(incW) = wxDefaultCoord, + int WXUNUSED(incH) = wxDefaultCoord) {} #if wxUSE_TOOLBAR // no toolbar bars @@ -179,15 +179,15 @@ public: void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } // no maximize etc - virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ } + virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ } virtual void Restore() { /* Has no effect */ } - virtual void Iconize(bool WXUNUSED(iconize) = TRUE) { /* Has no effect */ } - virtual bool IsMaximized() const { return TRUE; } - virtual bool IsIconized() const { return FALSE; } - virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; } - virtual bool IsFullScreen() const { return FALSE; } + virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ } + virtual bool IsMaximized() const { return true; } + virtual bool IsIconized() const { return false; } + virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; } + virtual bool IsFullScreen() const { return false; } - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } void OnMenuHighlight(wxMenuEvent& event); void OnActivate(wxActivateEvent& event); @@ -282,13 +282,13 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr) - :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name) - { - } + :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name) + { + } wxMDIChildFrame * GetActiveChild() const ; - - + + private: DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) }; @@ -309,10 +309,9 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ) - :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name) - { - } - + :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name) + { + } private: DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) };