adapting to API change from GetContentAreaInset to GetContentArea, fixes #10071
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1535,7 +1535,7 @@ bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
|
||||
|
||||
wxRect client = wxGetClientDisplayRect() ;
|
||||
|
||||
int left , top , right , bottom ;
|
||||
int left, top, width, height ;
|
||||
int x, y, w, h ;
|
||||
|
||||
x = client.x ;
|
||||
@@ -1543,19 +1543,23 @@ bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
|
||||
w = client.width ;
|
||||
h = client.height ;
|
||||
|
||||
GetContentArea( left , top , right , bottom ) ;
|
||||
GetContentArea( left, top, width, height ) ;
|
||||
int outerwidth, outerheight;
|
||||
GetSize( outerwidth, outerheight );
|
||||
|
||||
if ( style & wxFULLSCREEN_NOCAPTION )
|
||||
{
|
||||
y -= top ;
|
||||
h += top ;
|
||||
// avoid adding the caption twice to the height
|
||||
outerheight -= top;
|
||||
}
|
||||
|
||||
if ( style & wxFULLSCREEN_NOBORDER )
|
||||
{
|
||||
x -= left ;
|
||||
w += left + right ;
|
||||
h += bottom ;
|
||||
w += outerwidth - width;
|
||||
h += outerheight - height;
|
||||
}
|
||||
|
||||
if ( style & wxFULLSCREEN_NOTOOLBAR )
|
||||
|
Reference in New Issue
Block a user