From 699b6af4f46104f929812d8872089e29b68f04b0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 19 May 2005 05:48:47 +0000 Subject: [PATCH] applied Maximize patches (1203976) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 0723699637..5c67dbfb3b 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -976,8 +976,18 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() void wxTopLevelWindowMac::Maximize(bool maximize) { + // TODO Check, is this still necessary +#if 0 wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; wxMacWindowClipper clip (this); +#endif + if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL) ) + { + Rect rect; + GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect); + SetWindowIdealUserState((WindowRef)m_macWindow, &rect); + SetWindowUserState((WindowRef)m_macWindow, &rect); + } ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ; } @@ -999,7 +1009,10 @@ bool wxTopLevelWindowMac::IsIconized() const void wxTopLevelWindowMac::Restore() { - // not available on mac + if ( IsMaximized() ) + Maximize(false); + else if ( IsIconized() ) + Iconize(false); } // ---------------------------------------------------------------------------- -- 2.45.2