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

applied Maximize patches (1203976)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-05-19 05:48:47 +00:00
parent e59ea2c592
commit 699b6af4f4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/toplevel.cpp
View File

@@ -976,8 +976,18 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
void wxTopLevelWindowMac::Maximize(bool maximize) void wxTopLevelWindowMac::Maximize(bool maximize)
{ {
// TODO Check, is this still necessary
#if 0
wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
wxMacWindowClipper clip (this); 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 ) ; ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
} }
@@ -999,7 +1009,10 @@ bool wxTopLevelWindowMac::IsIconized() const
void wxTopLevelWindowMac::Restore() void wxTopLevelWindowMac::Restore()
{ {
// not available on mac if ( IsMaximized() )
Maximize(false);
else if ( IsIconized() )
Iconize(false);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------