Fixed overlapping buttons in wizard on MacOS X

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 2e2ffd6c4a37c12ccabd251f0f11d7a7adcc1301..1d0252c810528312d92951151e21127f8bea160f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -139,6 +139,13 @@ bool wxShell(const wxString& command)
     return FALSE;
 }
 
     return FALSE;
 }
 

+// Shutdown or reboot the PC 
+bool wxShutdown(wxShutdownFlags wFlags)
+{
+    // TODO
+    return FALSE;
+}
+

 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 long wxGetFreeMemory()
 {


@@ -164,6 +171,8 @@ void wxFlushEvents()
 {
 }
 
 {
 }
 

+#if WXWIN_COMPATIBILITY_2_2
+

 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {


@@ -198,6 +207,9 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
   wxMessageBox(wxBuffer);
   wxExit();
 }

+
+#endif // WXWIN_COMPATIBILITY_2_2
+

 #endif // !__DARWIN__
 
 // Emit a beeeeeep
 #endif // !__DARWIN__
 
 // Emit a beeeeeep


@@ -449,34 +461,38 @@ int wxDisplayDepth()
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-       BitMap screenBits;
-       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
+  wxClientDisplayRect( NULL , NULL , width , height ) ;

 }
 
 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 ;-)
+    float cvPt2Mm = 25.4 / 72;
+    *width = int( *width * cvPt2Mm );
+    *height = int( *height * cvPt2Mm );

 }
 
 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
-    // manager panels, menus, taskbars, etc.  If there is a way to do that
-    // for this platform please fix this function, otherwise it defaults
-    // to the entire desktop.
+       BitMap screenBits;
+       GetQDGlobalsScreenBits( &screenBits );
+

     if (x) *x = 0;
     if (y) *y = 0;
     if (x) *x = 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)