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

display rect fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-08 23:28:24 +00:00
parent 14862aeb88
commit 7cfebe05f0
2 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,34 +461,37 @@ int wxDisplayDepth()
// Get size of display // Get size of display
void wxDisplaySize(int *width, int *height) void wxDisplaySize(int *width, int *height)
{ {
BitMap screenBits; wxClientDisplayRect( NULL , NULL , width , height ) ;
GetQDGlobalsScreenBits( &screenBits );
*width = screenBits.bounds.right - screenBits.bounds.left ;
*height = screenBits.bounds.bottom - screenBits.bounds.top ;
#if TARGET_CARBON
SInt16 mheight ;
GetThemeMenuBarHeight( &mheight ) ;
*height -= mheight ;
#else
*height -= LMGetMBarHeight() ;
#endif
} }
void wxDisplaySizeMM(int *width, int *height) void wxDisplaySizeMM(int *width, int *height)
{ {
wxDisplaySize(width, height); wxDisplaySize(width, height);
// on mac 72 is fixed (at least now ;-)
*width *= 25.4 / 72 ;
*height *= 25.4 / 72 ;
} }
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
// This is supposed to return desktop dimensions minus any window BitMap screenBits;
// manager panels, menus, taskbars, etc. If there is a way to do that GetQDGlobalsScreenBits( &screenBits );
// for this platform please fix this function, otherwise it defaults
// to the entire desktop.
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
wxDisplaySize(width, height);
*width = screenBits.bounds.right - screenBits.bounds.left ;
*height = screenBits.bounds.bottom - screenBits.bounds.top ;
SInt16 mheight ;
#if TARGET_CARBON
GetThemeMenuBarHeight( &mheight ) ;
#else
mheight = LMGetMBarHeight() ;
#endif
*height -= mheight ;
if ( y )
*y = mheight ;
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

37
src/mac/utils.cpp
View File

@@ -461,34 +461,37 @@ int wxDisplayDepth()
// Get size of display // Get size of display
void wxDisplaySize(int *width, int *height) void wxDisplaySize(int *width, int *height)
{ {
BitMap screenBits; wxClientDisplayRect( NULL , NULL , width , height ) ;
GetQDGlobalsScreenBits( &screenBits );
*width = screenBits.bounds.right - screenBits.bounds.left ;
*height = screenBits.bounds.bottom - screenBits.bounds.top ;
#if TARGET_CARBON
SInt16 mheight ;
GetThemeMenuBarHeight( &mheight ) ;
*height -= mheight ;
#else
*height -= LMGetMBarHeight() ;
#endif
} }
void wxDisplaySizeMM(int *width, int *height) void wxDisplaySizeMM(int *width, int *height)
{ {
wxDisplaySize(width, height); wxDisplaySize(width, height);
// on mac 72 is fixed (at least now ;-)
*width *= 25.4 / 72 ;
*height *= 25.4 / 72 ;
} }
void wxClientDisplayRect(int *x, int *y, int *width, int *height) void wxClientDisplayRect(int *x, int *y, int *width, int *height)
{ {
// This is supposed to return desktop dimensions minus any window BitMap screenBits;
// manager panels, menus, taskbars, etc. If there is a way to do that GetQDGlobalsScreenBits( &screenBits );
// for this platform please fix this function, otherwise it defaults
// to the entire desktop.
if (x) *x = 0; if (x) *x = 0;
if (y) *y = 0; if (y) *y = 0;
wxDisplaySize(width, height);
*width = screenBits.bounds.right - screenBits.bounds.left ;
*height = screenBits.bounds.bottom - screenBits.bounds.top ;
SInt16 mheight ;
#if TARGET_CARBON
GetThemeMenuBarHeight( &mheight ) ;
#else
mheight = LMGetMBarHeight() ;
#endif
*height -= mheight ;
if ( y )
*y = mheight ;
} }
wxWindow* wxFindWindowAtPoint(const wxPoint& pt) wxWindow* wxFindWindowAtPoint(const wxPoint& pt)