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

adapting to API change from GetContentAreaInset to GetContentArea, fixes #10071

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-10-18 16:09:33 +00:00
parent b47d6bc416
commit b4afc5ec37
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/carbon/nonownedwnd.cpp
View File

@@ -1535,7 +1535,7 @@ bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
wxRect client = wxGetClientDisplayRect() ; wxRect client = wxGetClientDisplayRect() ;
int left , top , right , bottom ; int left, top, width, height ;
int x, y, w, h ; int x, y, w, h ;
x = client.x ; x = client.x ;
@@ -1543,19 +1543,23 @@ bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
w = client.width ; w = client.width ;
h = client.height ; h = client.height ;
GetContentArea( left , top , right , bottom ) ; GetContentArea( left, top, width, height ) ;
int outerwidth, outerheight;
GetSize( outerwidth, outerheight );
if ( style & wxFULLSCREEN_NOCAPTION ) if ( style & wxFULLSCREEN_NOCAPTION )
{ {
y -= top ; y -= top ;
h += top ; h += top ;
// avoid adding the caption twice to the height
outerheight -= top;
} }
if ( style & wxFULLSCREEN_NOBORDER ) if ( style & wxFULLSCREEN_NOBORDER )
{ {
x -= left ; x -= left ;
w += left + right ; w += outerwidth - width;
h += bottom ; h += outerheight - height;
} }
if ( style & wxFULLSCREEN_NOTOOLBAR ) if ( style & wxFULLSCREEN_NOTOOLBAR )