using new method for implementing Maximize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -994,7 +994,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
|
|||||||
wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ;
|
wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ;
|
||||||
wxMacWindowClipper clip( this );
|
wxMacWindowClipper clip( this );
|
||||||
#endif
|
#endif
|
||||||
|
#if 0
|
||||||
if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
|
if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
|
||||||
{
|
{
|
||||||
Rect rect;
|
Rect rect;
|
||||||
@@ -1003,8 +1003,18 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
|
|||||||
SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
|
SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
|
||||||
SetWindowUserState((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 ) ;
|
||||||
|
#else
|
||||||
|
Point idealSize = { 0 , 0 } ;
|
||||||
|
if ( maximize )
|
||||||
|
{
|
||||||
|
Rect rect ;
|
||||||
|
GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
|
||||||
|
idealSize.h = rect.right - rect.left ;
|
||||||
|
idealSize.v = rect.bottom - rect.top ;
|
||||||
|
}
|
||||||
|
ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxTopLevelWindowMac::IsMaximized() const
|
bool wxTopLevelWindowMac::IsMaximized() const
|
||||||
|
Reference in New Issue
Block a user