correct boundaries for carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -456,6 +456,18 @@ void wxDisplaySizeMM(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;
|
||||
GetQDGlobalsScreenBits( &screenBits );
|
||||
|
||||
@@ -480,6 +492,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
}
|
||||
if (y)
|
||||
*y = mheight ;
|
||||
#endif
|
||||
}
|
||||
|
||||
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
|
@@ -456,6 +456,18 @@ void wxDisplaySizeMM(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;
|
||||
GetQDGlobalsScreenBits( &screenBits );
|
||||
|
||||
@@ -480,6 +492,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
}
|
||||
if (y)
|
||||
*y = mheight ;
|
||||
#endif
|
||||
}
|
||||
|
||||
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
|
Reference in New Issue
Block a user