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

correct boundaries for carbon

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-19 05:32:09 +00:00
parent 22faec7d06
commit ee65839881
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mac/carbon/utils.cpp
View File

@@ -456,6 +456,18 @@ void wxDisplaySizeMM(int *width, int *height)
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
#if TARGET_CARBON
Rect r ;
GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
if ( x )
*x = r.left ;
if ( y )
*y = r.top ;
if ( width )
*width = r.right - r.left ;
if ( height )
*height = r.bottom - r.top ;
#else
BitMap screenBits; BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits ); GetQDGlobalsScreenBits( &screenBits );
@@ -480,6 +492,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
} }
if (y) if (y)
*y = mheight ; *y = mheight ;
#endif
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

13
src/mac/utils.cpp
View File

@@ -456,6 +456,18 @@ void wxDisplaySizeMM(int *width, int *height)
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
#if TARGET_CARBON
Rect r ;
GetAvailableWindowPositioningBounds( GetMainDevice() , &r ) ;
if ( x )
*x = r.left ;
if ( y )
*y = r.top ;
if ( width )
*width = r.right - r.left ;
if ( height )
*height = r.bottom - r.top ;
#else
BitMap screenBits; BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits ); GetQDGlobalsScreenBits( &screenBits );
@@ -480,6 +492,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
} }
if (y) if (y)
*y = mheight ; *y = mheight ;
#endif
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)