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 56c404aa9972d5348a9ea22f2af82de740b1c99b..1d0252c810528312d92951151e21127f8bea160f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -11,7 +11,6 @@
 
 #ifdef __GNUG__
 // Note: this is done in utilscmn.cpp now.
-// #pragma implementation
 // #pragma implementation "utils.h"
 #endif
 
@@ -30,6 +29,11 @@
 #include "MoreFiles.h"
 #include "MoreFilesExtras.h"
 
+#ifndef __DARWIN__
+#include <Threads.h>
+#include <Sound.h>
+#endif
+
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
@@ -107,12 +111,25 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )
 {
     // TODO
     return 0;
 }
 
+WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
+// set the env var name to the given value, return TRUE on success
+WXDLLEXPORT bool wxSetEnv(const wxString& var, const wxChar *value)
+{
+  // TODO : under classic there is no environement support, under X yes
+  return false ;
+}
+
 //
 // Execute a program in an Interactive Shell
 //
@@ -122,6 +139,13 @@ bool wxShell(const wxString& command)
     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()
 {
@@ -130,11 +154,11 @@ long wxGetFreeMemory()
 
 void wxUsleep(unsigned long milliseconds)
 {
-               clock_t start = clock() ;
-               do 
-               {
-                       YieldToAnyThread() ;
-               } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+    clock_t start = clock() ;
+    do 
+    {
+       YieldToAnyThread() ;
+    } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
 }
 
 void wxSleep(int nSecs)
@@ -147,6 +171,8 @@ void wxFlushEvents()
 {
 }
 
+#if WXWIN_COMPATIBILITY_2_2
+
 // Output a debug message, in a system dependent fashion.
 void wxDebugMsg(const char *fmt ...)
 {
@@ -181,6 +207,9 @@ void wxFatalError(const wxString& msg, const wxString& title)
   wxMessageBox(wxBuffer);
   wxExit();
 }
+
+#endif // WXWIN_COMPATIBILITY_2_2
+
 #endif // !__DARWIN__
 
 // Emit a beeeeeep
@@ -191,11 +220,22 @@ void wxBell()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-       long theSystem ;
-  Gestalt(gestaltSystemVersion, &theSystem) ;
-  *minorVsn = (theSystem & 0xFF ) ;
-  *majorVsn = (theSystem >> 8 ) ; // are there x-platform conventions ?
-  return wxMACINTOSH;
+    long theSystem ;
+    
+    // are there x-platform conventions ?
+
+    Gestalt(gestaltSystemVersion, &theSystem) ;
+    if (minorVsn != NULL) {
+       *minorVsn = (theSystem & 0xFF ) ;
+    }
+    if (majorVsn != NULL) {
+       *majorVsn = (theSystem >> 8 ) ;
+    }
+#ifdef __DARWIN__
+    return wxMAC_DARWIN;
+#else
+    return wxMAC;
+#endif
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
@@ -318,9 +358,9 @@ bool wxIsBusy()
   return (wxBusyCursorCount > 0);
 }
 
-wxString wxMacFindFolder( short                                        vol,
-                                                                OSType                                 folderType,
-                                                                Boolean                                createFolder)
+wxString wxMacFindFolder( short        vol,
+                         OSType       folderType,
+                         Boolean      createFolder)
 {
        short           vRefNum  ;
        long            dirID ;
@@ -331,7 +371,7 @@ wxString wxMacFindFolder( short                                     vol,
                FSSpec file ;
                if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
                {
-                       strDir = wxMacFSSpec2MacFilename( &file ) + ":" ;
+                       strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
                }
        }
        return strDir ;
@@ -343,7 +383,6 @@ char *wxGetUserHome (const wxString& user)
     // TODO
     return NULL;
 }
-#endif
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
@@ -378,6 +417,7 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
+#endif
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
@@ -421,37 +461,52 @@ int wxDisplayDepth()
 // 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)
 {
-   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)
 {
-    // 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;
-    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)
 {
     return wxGenericFindWindowAtPoint(pt);
 }
+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+#else
+    return "MacOS" ; //TODO:define further
+#endif
+}
+