Ignore ReleaseBuild directory (Created by MSVC's "Win32 Release With Debug Info"...

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 066f36c368f3b962eb112ac4c8b82961fdf3095d..0a0735d4a79c1e06b0b8dc9464cf50baa6f96bad 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        utils.cpp
 // Purpose:     Various utilities
 /////////////////////////////////////////////////////////////////////////////
 // Name:        utils.cpp
 // Purpose:     Various utilities

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,7 +17,11 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"

-#include "wx/mac/uma.h"
+#include "wx/apptrait.h"
+
+#if wxUSE_GUI
+    #include "wx/mac/uma.h"
+#endif

 
 #include <ctype.h>
 
 
 #include <ctype.h>
 


@@ -26,14 +30,55 @@
 #include <string.h>
 #include <stdarg.h>
 
 #include <string.h>
 #include <stdarg.h>
 

-#include "MoreFiles.h"
-#include "MoreFilesExtras.h"
+#ifdef __DARWIN__
+#  include "MoreFilesX.h"
+#else
+#  include "MoreFiles.h"
+#  include "MoreFilesExtras.h"
+#endif

 
 #ifndef __DARWIN__
 #include <Threads.h>
 #include <Sound.h>
 #endif
 
 
 #ifndef __DARWIN__
 #include <Threads.h>
 #include <Sound.h>
 #endif
 

+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"
+
+#include  "wx/mac/private.h"  // includes mac headers
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+// ---------------------------------------------------------------------------
+// code used in both base and GUI compilation
+// ---------------------------------------------------------------------------
+
+// our OS version is the same in non GUI and GUI cases
+static int DoGetOSVersion(int *majorVsn, int *minorVsn)
+{
+    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
+}
+
+#if wxUSE_BASE
+

 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 
 #ifndef __DARWIN__
 // defined in unix/utilsunx.cpp for Mac OS X
 


@@ -44,79 +89,88 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 }
 
 // Get hostname only (without domain name)
 }
 
 // Get hostname only (without domain name)

-bool wxGetHostName(char *buf, int maxSize)
-{
-       // Gets Chooser name of user by examining a System resource.
-
-       const short kComputerNameID = -16413;
-       
-       short oldResFile = CurResFile() ;
-       UseResFile(0);
-       StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
-       UseResFile(oldResFile);
-
-       if (chooserName && *chooserName)
-       {
-         int length = (*chooserName)[0] ;
-         if ( length + 1 > maxSize )
-         {
-           length = maxSize - 1 ;
-         }
-         strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
-         buf[length] = 0 ;
-       }
-       else
-               buf[0] = 0 ;
+bool wxGetHostName(wxChar *buf, int maxSize)
+{
+    // Gets Chooser name of user by examining a System resource.
+
+    const short kComputerNameID = -16413;
+
+    short oldResFile = CurResFile() ;
+    UseResFile(0);
+    StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
+    UseResFile(oldResFile);
+
+    if (chooserName && *chooserName)
+    {
+        HLock( (Handle) chooserName ) ;
+        wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+        HUnlock( (Handle) chooserName ) ;
+        ReleaseResource( (Handle) chooserName ) ;
+        wxStrncpy( buf , name , maxSize - 1 ) ;
+    }
+    else
+        buf[0] = 0 ;

 
   return TRUE;
 }
 
 // Get user ID e.g. jacs
 
   return TRUE;
 }
 
 // Get user ID e.g. jacs

-bool wxGetUserId(char *buf, int maxSize)
+bool wxGetUserId(wxChar *buf, int maxSize)

 {
   return wxGetUserName( buf , maxSize ) ;
 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)
 {
 {
   return wxGetUserName( buf , maxSize ) ;
 }
 
 const wxChar* wxGetHomeDir(wxString *pstr)
 {

-       *pstr = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
-       return pstr->c_str() ;
+    *pstr = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+    return pstr->c_str() ;

 }
 
 }
 

-// Get user name e.g. AUTHOR
-bool wxGetUserName(char *buf, int maxSize)
+// Get user name e.g. Stefan Csomor
+bool wxGetUserName(wxChar *buf, int maxSize)

 {
 {

-       // Gets Chooser name of user by examining a System resource.
+    // Gets Chooser name of user by examining a System resource.
+
+    const short kChooserNameID = -16096;

 
 

-       const short kChooserNameID = -16096;
-       
-       short oldResFile = CurResFile() ;
-       UseResFile(0);
-       StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
-       UseResFile(oldResFile);
+    short oldResFile = CurResFile() ;
+    UseResFile(0);
+    StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
+    UseResFile(oldResFile);

 
 

-       if (chooserName && *chooserName)
-       {
-         int length = (*chooserName)[0] ;
-         if ( length + 1 > maxSize )
-         {
-           length = maxSize - 1 ;
-         }
-         strncpy( buf , (char*) &(*chooserName)[1] , length ) ;
-         buf[length] = 0 ;
-       }
-       else
-               buf[0] = 0 ;
+    if (chooserName && *chooserName)
+    {
+        HLock( (Handle) chooserName ) ;
+        wxString name = wxMacMakeStringFromPascal( *chooserName ) ;
+        HUnlock( (Handle) chooserName ) ;
+        ReleaseResource( (Handle) chooserName ) ;
+        wxStrncpy( buf , name , maxSize - 1 ) ;
+    }
+    else
+        buf[0] = 0 ;

 
   return TRUE;
 }
 
 
   return TRUE;
 }
 

-int wxKill(long pid, wxSignal sig)
+int wxKill(long pid, wxSignal sig , wxKillError *rc )

 {
     // TODO
     return 0;
 }
 
 {
     // 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
 //
 //
 // Execute a program in an Interactive Shell
 //


@@ -126,6 +180,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()
 {


@@ -135,10 +196,10 @@ long wxGetFreeMemory()
 void wxUsleep(unsigned long milliseconds)
 {
     clock_t start = clock() ;
 void wxUsleep(unsigned long milliseconds)
 {
     clock_t start = clock() ;

-    do 
+    do

     {
     {

-       YieldToAnyThread() ;
-    } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ;
+        YieldToAnyThread() ;
+    } while( clock() - start < milliseconds /  1000.0 * CLOCKS_PER_SEC ) ;

 }
 
 void wxSleep(int nSecs)
 }
 
 void wxSleep(int nSecs)


@@ -151,40 +212,6 @@ void wxFlushEvents()
 {
 }
 
 {
 }
 

-// Output a debug message, in a system dependent fashion.
-void wxDebugMsg(const char *fmt ...)
-{
-  va_list ap;
-  static char buffer[512];
-
-  if (!wxTheApp->GetWantDebugOutput())
-    return ;
-
-  va_start(ap, fmt);
-
-  vsprintf(buffer,fmt,ap) ;
-  strcat(buffer,";g") ;
-  c2pstr(buffer) ;
-  DebugStr((unsigned char*) buffer) ;
-
-  va_end(ap);
-}
-
-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(const wxString& msg, const wxString& title)
-{
-  wxSprintf(wxBuffer, wxT("%s\nContinue?"), WXSTRINGCAST msg);
-  if (wxMessageBox(wxBuffer, title, wxYES_NO) == wxID_NO )
-    wxExit();
-}
-
-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& msg, const wxString& title)
-{
-  wxSprintf(wxBuffer, wxT("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg);
-  wxMessageBox(wxBuffer);
-  wxExit();
-}

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


@@ -193,24 +220,29 @@ void wxBell()
     SysBeep(30);
 }
 
     SysBeep(30);
 }
 

-int wxGetOsVersion(int *majorVsn, int *minorVsn)
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()

 {
 {

-    long theSystem ;
-    
-    // are there x-platform conventions ?
+    static wxToolkitInfo info;
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
+    info.name = _T("wxBase");
+    return info;
+}

 
 

-    Gestalt(gestaltSystemVersion, &theSystem) ;
-    if (minorVsn != NULL) {
-       *minorVsn = (theSystem & 0xFF ) ;
-    }
-    if (majorVsn != NULL) {
-       *majorVsn = (theSystem >> 8 ) ;
-    }
-#ifdef __DARWIN__
-    return wxMAC_DARWIN;
-#else
-    return wxMAC;
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
+    info.shortName = _T("mac");
+    info.name = _T("wxMac");
+#ifdef __WXUNIVERSAL__
+    info.shortName << _T("univ");
+    info.name << _T("/wxUniversal");

 #endif
 #endif

+    return info;

 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 }
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)


@@ -223,23 +255,26 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
 {
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%.4f", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxString buf;
+    buf.Printf(wxT("%.4f"), value);
+
+    return wxWriteResource(section, entry, buf, file);

 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
 {
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%ld", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxString buf;
+    buf.Printf(wxT("%ld"), value);
+
+    return wxWriteResource(section, entry, buf, file);

 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
 {
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%d", value);
-  return wxWriteResource(section, entry, buf, file);
+    wxString buf;
+    buf.Printf(wxT("%d"), value);
+
+    return wxWriteResource(section, entry, buf, file);

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)


@@ -250,110 +285,221 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
 {
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = (float)strtod(s, NULL);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    char *s = NULL;
+    bool succ = wxGetResource(section, entry, (char **)&s, file);
+    if (succ)
+    {
+        *value = (float)strtod(s, NULL);
+        delete[] s;
+        return TRUE;
+    }
+    else return FALSE;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
 {
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = strtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    char *s = NULL;
+    bool succ = wxGetResource(section, entry, (char **)&s, file);
+    if (succ)
+    {
+        *value = strtol(s, NULL, 10);
+        delete[] s;
+        return TRUE;
+    }
+    else return FALSE;

 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
 {
 }
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
-  if (succ)
-  {
-    *value = (int)strtol(s, NULL, 10);
-    delete[] s;
-    return TRUE;
-  }
-  else return FALSE;
+    char *s = NULL;
+    bool succ = wxGetResource(section, entry, (char **)&s, file);
+    if (succ)
+    {
+        *value = (int)strtol(s, NULL, 10);
+        delete[] s;
+        return TRUE;
+    }
+    else return FALSE;

 }
 #endif // wxUSE_RESOURCES
 
 }
 #endif // wxUSE_RESOURCES
 

-int wxBusyCursorCount = 0;
-extern CursHandle      gMacCurrentCursor ;
-CursHandle                     gMacStoredActiveCursor = NULL ;
+int gs_wxBusyCursorCount = 0;
+extern wxCursor    gMacCurrentCursor ;
+wxCursor        gMacStoredActiveCursor ;

 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {
 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {

-  wxBusyCursorCount ++;
-  if (wxBusyCursorCount == 1)
-  {
-       gMacStoredActiveCursor = gMacCurrentCursor ;
-               ::SetCursor( *::GetCursor( watchCursor ) ) ;
-  }
-  else
-  {
-        // TODO
-  }
+    if (gs_wxBusyCursorCount++ == 0)
+    {
+        gMacStoredActiveCursor = gMacCurrentCursor ;
+        cursor->MacInstall() ;
+    }
+    //else: nothing to do, already set

 }
 
 // Restore cursor to normal
 void wxEndBusyCursor()
 {
 }
 
 // Restore cursor to normal
 void wxEndBusyCursor()
 {

-  if (wxBusyCursorCount == 0)
-    return;
+    wxCHECK_RET( gs_wxBusyCursorCount > 0,
+        wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );

 
 

-  wxBusyCursorCount --;
-  if (wxBusyCursorCount == 0)
-  {
-    if ( gMacStoredActiveCursor )
-       ::SetCursor( *gMacStoredActiveCursor ) ;
-    else
+    if (--gs_wxBusyCursorCount == 0)

     {
     {

-               Cursor          MacArrow ;
-       ::SetCursor( GetQDGlobalsArrow( &MacArrow ) ) ;
+        gMacStoredActiveCursor.MacInstall() ;
+        gMacStoredActiveCursor = wxNullCursor ;

     }
     }

-       gMacStoredActiveCursor = NULL ;
-  }

 }
 
 // TRUE if we're between the above two calls
 bool wxIsBusy()
 {
 }
 
 // TRUE if we're between the above two calls
 bool wxIsBusy()
 {

-  return (wxBusyCursorCount > 0);
+    return (gs_wxBusyCursorCount > 0);

 }
 
 }
 

+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+

 wxString wxMacFindFolder( short        vol,
 wxString wxMacFindFolder( short        vol,

-                         OSType       folderType,
-                         Boolean      createFolder)
+              OSType       folderType,
+              Boolean      createFolder)
+{
+    short    vRefNum  ;
+    long     dirID ;
+    wxString strDir ;
+
+    if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
+    {
+        FSSpec file ;
+        if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
+        {
+            strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
+        }
+    }
+    return strDir ;
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+// Check whether this window wants to process messages, e.g. Stop button
+// in long calculations.
+bool wxCheckForInterrupt(wxWindow *wnd)
+{
+    // TODO
+    return FALSE;
+}
+
+void wxGetMousePosition( int* x, int* y )
+{
+    Point pt ;
+
+    GetMouse( &pt ) ;
+    LocalToGlobal( &pt ) ;
+    *x = pt.h ;
+    *y = pt.v ;
+};
+
+// Return TRUE if we have a colour display
+bool wxColourDisplay()
+{
+    return TRUE;
+}
+
+// Returns depth of screen
+int wxDisplayDepth()
+{
+    Rect globRect ;
+    SetRect(&globRect, -32760, -32760, 32760, 32760);
+    GDHandle    theMaxDevice;
+
+    int theDepth = 8;
+    theMaxDevice = GetMaxDevice(&globRect);
+    if (theMaxDevice != nil)
+        theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+
+    return theDepth ;
+}
+
+// Get size of display
+void wxDisplaySize(int *width, int *height)
+{
+    BitMap screenBits;
+    GetQDGlobalsScreenBits( &screenBits );
+
+    if (width != NULL) {
+        *width = screenBits.bounds.right - screenBits.bounds.left  ;
+    }
+    if (height != NULL) {
+        *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+    }
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+    wxDisplaySize(width, height);
+    // on mac 72 is fixed (at least now ;-)
+    float cvPt2Mm = 25.4 / 72;
+
+    if (width != NULL) {
+        *width = int( *width * cvPt2Mm );
+    }
+    if (height != NULL) {
+        *height = int( *height * cvPt2Mm );
+    }
+}
+
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    BitMap screenBits;
+    GetQDGlobalsScreenBits( &screenBits );
+
+    if (x) *x = 0;
+    if (y) *y = 0;
+
+    if (width != NULL) {
+        *width = screenBits.bounds.right - screenBits.bounds.left  ;
+    }
+    if (height != NULL) {
+        *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+    }
+
+    SInt16 mheight ;
+#if TARGET_CARBON
+    GetThemeMenuBarHeight( &mheight ) ;
+#else
+    mheight = LMGetMBarHeight() ;
+#endif
+    if (height != NULL) {
+        *height -= mheight ;
+    }
+    if (y)
+        *y = mheight ;
+}
+
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-       short           vRefNum  ;
-       long            dirID ;
-       wxString strDir ;
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+#endif // wxUSE_GUI

 
 

-       if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
-       {
-               FSSpec file ;
-               if ( FSMakeFSSpec( vRefNum , dirID , "\p" , &file ) == noErr )
-               {
-                       strDir = wxMacFSSpec2MacFilename( &file ) + wxFILE_SEP_PATH ;
-               }
-       }
-       return strDir ;
+#if wxUSE_BASE
+
+wxString wxGetOsDescription()
+{
+#ifdef WXWIN_OS_DESCRIPTION
+    // use configure generated description if available
+    return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));
+#else
+    return wxT("MacOS") ; //TODO:define further
+#endif

 }
 
 #ifndef __DARWIN__
 }
 
 #ifndef __DARWIN__

-char *wxGetUserHome (const wxString& user)
+wxChar *wxGetUserHome (const wxString& user)

 {
     // TODO
     return NULL;
 {
     // TODO
     return NULL;


@@ -363,19 +509,19 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
     if ( path.empty() )
         return FALSE;
 {
     if ( path.empty() )
         return FALSE;

-        
+

     wxString p = path ;
     if (p[0] == ':' ) {
       p = wxGetCwd() + p ;
     }
     wxString p = path ;
     if (p[0] == ':' ) {
       p = wxGetCwd() + p ;
     }

-    
+

     int pos = p.Find(':') ;
     if ( pos != wxNOT_FOUND ) {
       p = p.Mid(1,pos) ;
     }
     int pos = p.Find(':') ;
     if ( pos != wxNOT_FOUND ) {
       p = p.Mid(1,pos) ;
     }

-    
-    p = p + ":" ;
-    
+
+    p = p + wxT(":") ;
+

     Str255 volumeName ;
     XVolumeParam pb ;
 
     Str255 volumeName ;
     XVolumeParam pb ;
 


@@ -392,81 +538,458 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 
     return err == noErr ;
 }
 
     return err == noErr ;
 }

+#endif // !__DARWIN__
+
+//---------------------------------------------------------------------------
+// wxMac Specific utility functions
+//---------------------------------------------------------------------------
+
+#if 0
+
+char StringMac[] =  "\x0d\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                    "\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                    "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf"
+                    "\xb1\xb4\xb5\xb6\xbb\xbc\xbe\xbf"
+                    "\xc0\xc1\xc2\xc4\xc7\xc8\xc9\xcb\xcc\xcd\xce\xcf"
+                    "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xca\xdb" ;
+
+char StringANSI[] = "\x0a\xC4\xC5\xC7\xC9\xD1\xD6\xDC\xE1\xE0\xE2\xE4\xE3\xE5\xE7\xE9\xE8"
+                    "\xEA\xEB\xED\xEC\xEE\xEF\xF1\xF3\xF2\xF4\xF6\xF5\xFA\xF9\xFB\xFC"
+                    "\x86\xBA\xA2\xA3\xA7\x95\xB6\xDF\xAE\xA9\x99\xB4\xA8\xC6\xD8"
+                    "\xB1\xA5\xB5\xF0\xAA\xBA\xE6\xF8"
+                    "\xBF\xA1\xAC\x83\xAB\xBB\x85\xC0\xC3\xD5\x8C\x9C"
+                    "\x96\x97\x93\x94\x91\x92\xF7\xFF\xA0\x80" ;
+
+void wxMacConvertFromPC( const char *from , char *to , int len )
+{
+    char *c ;
+    if ( from == to )
+    {
+        for( int i = 0 ; i < len ; ++ i )
+        {
+            c = strchr( StringANSI , *from ) ;
+            if ( c != NULL )
+            {
+                *to = StringMac[ c - StringANSI] ;
+            }
+            ++to ;
+            ++from ;
+        }
+    }
+    else
+    {
+        for( int i = 0 ; i < len ; ++ i )
+        {
+            c = strchr( StringANSI , *from ) ;
+            if ( c != NULL )
+            {
+                *to = StringMac[ c - StringANSI] ;
+            }
+            else
+            {
+                *to = *from ;
+            }
+            ++to ;
+            ++from ;
+        }
+    }
+}
+
+void wxMacConvertToPC( const char *from , char *to , int len )
+{
+    char *c ;
+    if ( from == to )
+    {
+        for( int i = 0 ; i < len ; ++ i )
+        {
+            c = strchr( StringMac , *from ) ;
+            if ( c != NULL )
+            {
+                *to = StringANSI[ c - StringMac] ;
+            }
+            ++to ;
+            ++from ;
+        }
+    }
+    else
+    {
+        for( int i = 0 ; i < len ; ++ i )
+        {
+            c = strchr( StringMac , *from ) ;
+            if ( c != NULL )
+            {
+                *to = StringANSI[ c - StringMac] ;
+            }
+            else
+            {
+                *to = *from ;
+            }
+            ++to ;
+            ++from ;
+        }
+    }
+}
+
+TECObjectRef s_TECNativeCToUnicode = NULL ;
+TECObjectRef s_TECUnicodeToNativeC = NULL ;
+
+void wxMacSetupConverters()
+{
+    // if we assume errors are happening here we need low level debugging
+    // since the high level assert will use the encoders that are not yet
+    // setup...
+#if TARGET_CARBON
+    const TextEncodingBase kEncoding = CFStringGetSystemEncoding();
+#else
+    const TextEncodingBase kEncoding = kTextEncodingMacRoman;

 #endif
 #endif

+    OSStatus status = noErr ;
+    status = TECCreateConverter(&s_TECNativeCToUnicode,
+                                kEncoding,
+                                kTextEncodingUnicodeDefault);

 
 

-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
+
+    status = TECCreateConverter(&s_TECUnicodeToNativeC,
+                                kTextEncodingUnicodeDefault,
+                                kEncoding);
+}
+
+void wxMacCleanupConverters()

 {
 {

-    // TODO
-    return FALSE;
+    OSStatus status = noErr ;
+    status = TECDisposeConverter(s_TECNativeCToUnicode);
+
+    status = TECDisposeConverter(s_TECUnicodeToNativeC);

 }
 
 }
 

-void wxGetMousePosition( int* x, int* y )
+wxWCharBuffer wxMacStringToWString( const wxString &from )

 {
 {

-    Point pt ;
+#if wxUSE_UNICODE
+    wxWCharBuffer result( from.wc_str() ) ;
+#else
+    OSStatus status = noErr ;
+    ByteCount byteOutLen ;
+    ByteCount byteInLen = from.Length() ;
+    ByteCount byteBufferLen = byteInLen *2 ;
+    wxWCharBuffer result( from.Length() ) ;
+    status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen,
+        (TextPtr)result.data(), byteBufferLen, &byteOutLen);
+    result.data()[byteOutLen/2] = 0 ;
+#endif
+    return result ;
+}

 
 

-    GetMouse( &pt ) ;
-    LocalToGlobal( &pt ) ;
-    *x = pt.h ;
-    *y = pt.v ;
-};

 
 

-// Return TRUE if we have a colour display
-bool wxColourDisplay()
+wxString wxMacMakeStringFromCString( const char * from , int len )

 {
 {

-    return TRUE;
+    OSStatus status = noErr ;
+    wxString result ;
+    wxChar* buf = result.GetWriteBuf( len ) ;
+#if wxUSE_UNICODE
+    ByteCount byteOutLen ;
+    ByteCount byteInLen = len ;
+    ByteCount byteBufferLen = len *2 ;
+
+    status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen,
+        (TextPtr)buf, byteBufferLen, &byteOutLen);
+#else
+    memcpy( buf , from , len ) ;
+#endif
+    buf[len] = 0 ;
+    result.UngetWriteBuf() ;
+    return result ;

 }
 
 }
 

-// Returns depth of screen
-int wxDisplayDepth()
+wxString wxMacMakeStringFromCString( const char * from )
+{
+    return wxMacMakeStringFromCString( from , strlen(from) ) ;
+}
+
+wxCharBuffer wxMacStringToCString( const wxString &from )

 {
 {

-       Rect globRect ;
-       SetRect(&globRect, -32760, -32760, 32760, 32760);
-       GDHandle        theMaxDevice;
+#if wxUSE_UNICODE
+    OSStatus status = noErr ;
+    ByteCount byteOutLen ;
+    ByteCount byteInLen = from.Length() * 2 ;
+    ByteCount byteBufferLen = from.Length() ;
+    wxCharBuffer result( from.Length() ) ;
+    status = TECConvertText(s_TECUnicodeToNativeC , (ConstTextPtr)from.wc_str() , byteInLen, &byteInLen,
+        (TextPtr)result.data(), byteBufferLen, &byteOutLen);
+    return result ;
+#else
+    return wxCharBuffer( from.c_str() ) ;
+#endif
+}
+#endif

 
 

-       int theDepth = 8;
-       theMaxDevice = GetMaxDevice(&globRect);
-       if (theMaxDevice != nil)
-               theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+void wxMacStringToPascal( const wxString&from , StringPtr to )
+{
+    wxCharBuffer buf = from.mb_str( wxConvLocal ) ;
+    int len = strlen(buf) ;

 
 

-       return theDepth ;
+    if ( len > 255 )
+        len = 255 ;
+    to[0] = len ;
+    memcpy( (char*) &to[1] , buf , len ) ;

 }
 
 }
 

-// Get size of display
-void wxDisplaySize(int *width, int *height)
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )

 {
 {

-       BitMap screenBits;
-       GetQDGlobalsScreenBits( &screenBits );
+    return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+
+//
+// CFStringRefs (Carbon only)
+//

 
 

-    *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    *height = screenBits.bounds.bottom - screenBits.bounds.top ;

 #if TARGET_CARBON
 #if TARGET_CARBON

-       SInt16 mheight ;
-       GetThemeMenuBarHeight( &mheight ) ;
-     *height -= mheight ;
+// converts this string into a carbon foundation string with optional pc 2 mac encoding
+void wxMacCFStringHolder::Assign( const wxString &st )
+{
+    wxString str = st ;
+    wxMacConvertNewlines13To10( &str ) ;
+#if wxUSE_UNICODE
+       m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
+               (const unsigned short*)str.wc_str(), str.Len() );

 #else
 #else

-     *height -= LMGetMBarHeight() ;
+    m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
+        CFStringGetSystemEncoding() ) ;

 #endif
 #endif

+    m_release = true ;

 }
 
 }
 

-void wxDisplaySizeMM(int *width, int *height)
+wxString wxMacCFStringHolder::AsString()

 {
 {

-   wxDisplaySize(width, height);
+    wxString result ;
+    Size len = CFStringGetLength( m_cfs )  ;
+    wxChar* buf = result.GetWriteBuf( len ) ;
+#if wxUSE_UNICODE
+    CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
+#else
+    CFStringGetCString( m_cfs , buf , len+1 , CFStringGetSystemEncoding() ) ;
+#endif
+    buf[len] = 0 ;
+    wxMacConvertNewlines10To13( buf ) ;
+    result.UngetWriteBuf() ;
+    return result ;

 }
 
 }
 

-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+#endif //TARGET_CARBON
+
+void wxMacConvertNewlines13To10( char * data ) 
+{        
+       char * buf = data ;
+    while( (buf=strchr(buf,0x0d)) != NULL )
+    {
+        *buf = 0x0a ;
+        buf++ ;
+    }
+}
+
+void wxMacConvertNewlines10To13( char * data )
+{        
+       char * buf = data ;
+    while( (buf=strchr(buf,0x0a)) != NULL )
+    {
+        *buf = 0x0d ;
+        buf++ ;
+    }
+}
+
+void wxMacConvertNewlines13To10( wxString * data ) 
+{        
+    size_t len = data->Length() ;
+
+    if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
+        return ;
+        
+    wxString temp(*data) ;
+    wxStringBuffer buf(*data,len ) ;
+    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
+
+       wxMacConvertNewlines13To10( buf ) ;
+}
+
+void wxMacConvertNewlines10To13( wxString * data )
+{        
+    size_t len = data->Length() ;
+
+    if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
+        return ;
+
+    wxString temp(*data) ;
+    wxStringBuffer buf(*data,len ) ;
+    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ; 
+       wxMacConvertNewlines10To13( buf ) ;
+}
+
+
+#if wxUSE_UNICODE
+void wxMacConvertNewlines13To10( wxChar * data ) 
+{        
+       wxChar * buf = data ;
+    while( (buf=wxStrchr(buf,0x0d)) != NULL )
+    {
+        *buf = 0x0a ;
+        buf++ ;
+    }
+}
+
+void wxMacConvertNewlines10To13( wxChar * data )
+{        
+       wxChar * buf =  data ;
+    while( (buf=wxStrchr(buf,0x0a)) != NULL )
+    {
+        *buf = 0x0d ;
+        buf++ ;
+    }
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// debugging support
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
+
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+    #include <CodeFragments.h>
+
+    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+    ProcPtr gCallUniversalProc_Proc = NULL;
+
+#endif
+
+static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+/* ---------------------------------------------------------------------------
+        IsMetroNubInstalled
+   --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()

 {
 {

-    // 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.
-    if (x) *x = 0;
-    if (y) *y = 0;
-    wxDisplaySize(width, height);
+    if (!fRunOnce)
+    {
+        long result, value;
+
+        fRunOnce = true;
+        gMetroNubEntry = NULL;
+
+        if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+        {
+            /* look for MetroNub's Gestalt selector */
+            if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+            {
+
+            #if TARGET_API_MAC_CARBON
+                if (gCallUniversalProc_Proc == NULL)
+                {
+                    CFragConnectionID   connectionID;
+                    Ptr                 mainAddress;
+                    Str255              errorString;
+                    ProcPtr             symbolAddress;
+                    OSErr               err;
+                    CFragSymbolClass    symbolClass;
+
+                    symbolAddress = NULL;
+                    err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+                                           &connectionID, &mainAddress, errorString);
+
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;
+                    }
+
+                    err = FindSymbol(connectionID, "\pCallUniversalProc",
+                                    (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;
+                    }
+                }
+            #endif
+
+                {
+                    MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+
+                    /* make sure the version of the API is compatible */
+                    if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+                        kMetroNubUserAPIVersion <= block->apiHiVersion)
+                        gMetroNubEntry = block;        /* success! */
+                }
+
+            }
+        }
+    }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+    return (gMetroNubEntry != NULL);
+#endif

 }
 
 }
 

-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+/* ---------------------------------------------------------------------------
+        IsMWDebuggerRunning                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()

 {
 {

-    return wxGenericFindWindowAtPoint(pt);
+    if (IsMetroNubInstalled())
+        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+    else
+        return false;
+}
+
+/* ---------------------------------------------------------------------------
+        AmIBeingMWDebugged                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean AmIBeingMWDebugged()
+{
+    if (IsMetroNubInstalled())
+        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+    else
+        return false;
+}
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return IsMWDebuggerRunning() && AmIBeingMWDebugged();
+}
+
+#else
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return false;

 }
 }

+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+
+#endif // wxUSE_GUI
+