added missing wxCMPFUNC_CONVs (patch 820862)

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index c644dfe32a5a48053c364634d5fc14e91f98b6a9..cd800e3ea4b337a4a037ac93e60f55c109294674 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>
 


@@ -38,6 +42,43 @@
 #include <Sound.h>
 #endif
 
 #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
 


@@ -48,69 +89,65 @@ 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;
-       
-       short oldResFile = CurResFile() ;
-       UseResFile(0);
-       StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
-       UseResFile(oldResFile);
+    const short kChooserNameID = -16096;

 
 

-       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 ;
+    short oldResFile = CurResFile() ;
+    UseResFile(0);
+    StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
+    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;
 }
 
   return TRUE;
 }


@@ -123,15 +160,15 @@ int wxKill(long pid, wxSignal sig , wxKillError *rc )
 
 WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
 {
 
 WXDLLEXPORT bool wxGetEnv(const wxString& var, wxString *value)
 {

-  // TODO : under classic there is no environement support, under X yes
-  return false ;
+    // 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)
 {
 }
 
 // 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 ;
+    // TODO : under classic there is no environement support, under X yes
+    return false ;

 }
 
 //
 }
 
 //


@@ -143,7 +180,7 @@ bool wxShell(const wxString& command)
     return FALSE;
 }
 
     return FALSE;
 }
 

-// Shutdown or reboot the PC 
+// Shutdown or reboot the PC

 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO
 bool wxShutdown(wxShutdownFlags wFlags)
 {
     // TODO


@@ -159,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)


@@ -175,43 +212,6 @@ void wxFlushEvents()
 {
 }
 
 {
 }
 

-#if WXWIN_COMPATIBILITY_2_2
-
-// 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)
-{
-       if (wxMessageBox(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO )
-               wxExit();
-}
-
-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& msg, const wxString& title)
-{
-  wxMessageBox(wxString::Format(wxT("%s: %s"),title,msg));
-  wxExit();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-

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


@@ -220,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)


@@ -250,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)


@@ -277,86 +285,90 @@ 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
 
 int gs_wxBusyCursorCount = 0;
 }
 #endif // wxUSE_RESOURCES
 
 int gs_wxBusyCursorCount = 0;

-extern wxCursor        gMacCurrentCursor ;
-wxCursor               gMacStoredActiveCursor ;
+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)
 {

-  if (gs_wxBusyCursorCount++ == 0)
-  {
-       gMacStoredActiveCursor = gMacCurrentCursor ;
-       cursor->MacInstall() ;
-  }
-  //else: nothing to do, already set
+    if (gs_wxBusyCursorCount++ == 0)
+    {
+        gMacStoredActiveCursor = gMacCurrentCursor ;
+        cursor->MacInstall() ;
+    }
+    //else: nothing to do, already set

 }
 
 // Restore cursor to normal
 void wxEndBusyCursor()
 {
     wxCHECK_RET( gs_wxBusyCursorCount > 0,
 }
 
 // Restore cursor to normal
 void wxEndBusyCursor()
 {
     wxCHECK_RET( gs_wxBusyCursorCount > 0,

-                 wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
+        wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );

 
 

-  if (--gs_wxBusyCursorCount == 0)
-  {
-       gMacStoredActiveCursor.MacInstall() ;
-       gMacStoredActiveCursor = wxNullCursor ;
-  }
+    if (--gs_wxBusyCursorCount == 0)
+    {
+        gMacStoredActiveCursor.MacInstall() ;
+        gMacStoredActiveCursor = wxNullCursor ;
+    }

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

-  return (gs_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 ;
 {
     short    vRefNum  ;
     long     dirID ;
     wxString strDir ;

-    
+

     if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
     {
         FSSpec file ;
     if ( FindFolder( vol, folderType, createFolder, &vRefNum, &dirID) == noErr)
     {
         FSSpec file ;


@@ -368,47 +380,9 @@ wxString wxMacFindFolder( short        vol,
     return strDir ;
 }
 
     return strDir ;
 }
 

-#ifndef __DARWIN__
-char *wxGetUserHome (const wxString& user)
-{
-    // TODO
-    return NULL;
-}
+#endif // wxUSE_BASE

 
 

-bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
-{
-    if ( path.empty() )
-        return FALSE;
-        
-    wxString p = path ;
-    if (p[0] == ':' ) {
-      p = wxGetCwd() + p ;
-    }
-    
-    int pos = p.Find(':') ;
-    if ( pos != wxNOT_FOUND ) {
-      p = p.Mid(1,pos) ;
-    }
-    
-    p = p + ":" ;
-    
-    Str255 volumeName ;
-    XVolumeParam pb ;
-
-    wxMacStringToPascal( p  , volumeName ) ;
-    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
-    if ( err == noErr ) {
-      if ( pTotal ) {
-        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
-      }
-      if ( pFree ) {
-        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
-      }
-    }
-
-    return err == noErr ;
-}
-#endif
+#if wxUSE_GUI

 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.


@@ -437,26 +411,30 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

-       Rect globRect ;
-       SetRect(&globRect, -32760, -32760, 32760, 32760);
-       GDHandle        theMaxDevice;
+    Rect globRect ;
+    SetRect(&globRect, -32760, -32760, 32760, 32760);
+    GDHandle    theMaxDevice;

 
 

-       int theDepth = 8;
-       theMaxDevice = GetMaxDevice(&globRect);
-       if (theMaxDevice != nil)
-               theDepth = (**(**theMaxDevice).gdPMap).pixelSize;
+    int theDepth = 8;
+    theMaxDevice = GetMaxDevice(&globRect);
+    if (theMaxDevice != nil)
+        theDepth = (**(**theMaxDevice).gdPMap).pixelSize;

 
 

-       return theDepth ;
+    return theDepth ;

 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-       BitMap screenBits;
-       GetQDGlobalsScreenBits( &screenBits );
+    BitMap screenBits;
+    GetQDGlobalsScreenBits( &screenBits );

 
 

-    *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+    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)
 }
 
 void wxDisplaySizeMM(int *width, int *height)


@@ -464,8 +442,13 @@ void wxDisplaySizeMM(int *width, int *height)
     wxDisplaySize(width, height);
     // on mac 72 is fixed (at least now ;-)
     float cvPt2Mm = 25.4 / 72;
     wxDisplaySize(width, height);
     // on mac 72 is fixed (at least now ;-)
     float cvPt2Mm = 25.4 / 72;

-    *width = int( *width * cvPt2Mm );
-    *height = int( *height * cvPt2Mm );
+
+    if (width != NULL) {
+        *width = int( *width * cvPt2Mm );
+    }
+    if (height != NULL) {
+        *height = int( *height * cvPt2Mm );
+    }

 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)


@@ -476,8 +459,12 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
     if (x) *x = 0;
     if (y) *y = 0;
 
     if (x) *x = 0;
     if (y) *y = 0;
 

-    *width = screenBits.bounds.right - screenBits.bounds.left  ;
-    *height = screenBits.bounds.bottom - screenBits.bounds.top ;
+    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
 
     SInt16 mheight ;
 #if TARGET_CARBON


@@ -485,8 +472,10 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 #else
     mheight = LMGetMBarHeight() ;
 #endif
 #else
     mheight = LMGetMBarHeight() ;
 #endif

-    *height -= mheight ;
-    if ( y )
+    if (height != NULL) {
+        *height -= mheight ;
+    }
+    if (y)

         *y = mheight ;
 }
 
         *y = mheight ;
 }
 


@@ -495,20 +484,68 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
     return wxGenericFindWindowAtPoint(pt);
 }
 

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

 wxString wxGetOsDescription()
 {
 #ifdef WXWIN_OS_DESCRIPTION
     // use configure generated description if available
 wxString wxGetOsDescription()
 {
 #ifdef WXWIN_OS_DESCRIPTION
     // use configure generated description if available

-    return wxString("MacOS (") + WXWIN_OS_DESCRIPTION + wxString(")");
+    return wxString(wxT("MacOS (")) + wxT(WXWIN_OS_DESCRIPTION) + wxString(wxT(")"));

 #else
 #else

-    return "MacOS" ; //TODO:define further
+    return wxT("MacOS") ; //TODO:define further

 #endif
 }
 
 #endif
 }
 

+#ifndef __DARWIN__
+wxChar *wxGetUserHome (const wxString& user)
+{
+    // TODO
+    return NULL;
+}
+
+bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
+{
+    if ( path.empty() )
+        return FALSE;
+
+    wxString p = path ;
+    if (p[0] == ':' ) {
+      p = wxGetCwd() + p ;
+    }
+
+    int pos = p.Find(':') ;
+    if ( pos != wxNOT_FOUND ) {
+      p = p.Mid(1,pos) ;
+    }
+
+    p = p + wxT(":") ;
+
+    Str255 volumeName ;
+    XVolumeParam pb ;
+
+    wxMacStringToPascal( p  , volumeName ) ;
+    OSErr err = XGetVolumeInfoNoName( volumeName , 0 , &pb ) ;
+    if ( err == noErr ) {
+      if ( pTotal ) {
+        (*pTotal) = wxLongLong( pb.ioVTotalBytes ) ;
+      }
+      if ( pFree ) {
+        (*pFree) = wxLongLong( pb.ioVFreeBytes ) ;
+      }
+    }
+
+    return err == noErr ;
+}
+#endif // !__DARWIN__
+

 //---------------------------------------------------------------------------
 // wxMac Specific utility functions
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 // 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"
 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"


@@ -593,89 +630,356 @@ void wxMacConvertToPC( const char *from , char *to , int len )
     }
 }
 
     }
 }
 

-wxString wxMacMakeMacStringFromPC( const char * p )
+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
+    OSStatus status = noErr ;
+    status = TECCreateConverter(&s_TECNativeCToUnicode,
+                                kEncoding,
+                                kTextEncodingUnicodeDefault);
+
+
+    status = TECCreateConverter(&s_TECUnicodeToNativeC,
+                                kTextEncodingUnicodeDefault,
+                                kEncoding);
+}
+
+void wxMacCleanupConverters()

 {
 {

-       wxString result ;
-    int len = strlen ( p ) ;
-       if ( len > 0 )
-       {
-               wxChar* ptr = result.GetWriteBuf(len) ;
-           wxMacConvertFromPC( p , ptr , len ) ;
-               ptr[len] = 0 ;
-           result.UngetWriteBuf( len ) ;
-       }
+    OSStatus status = noErr ;
+    status = TECDisposeConverter(s_TECNativeCToUnicode);
+
+    status = TECDisposeConverter(s_TECUnicodeToNativeC);
+}
+
+wxWCharBuffer wxMacStringToWString( const wxString &from )
+{
+#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 ;
+}
+
+
+wxString wxMacMakeStringFromCString( const char * from , int len )
+{
+    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 ;
 }
 
     return result ;
 }
 

-wxString wxMacMakePCStringFromMac( const char * p )
+wxString wxMacMakeStringFromCString( const char * from )

 {
 {

-       wxString result ;
-    int len = strlen ( p ) ;
-       if ( len > 0 )
-       {
-               wxChar* ptr = result.GetWriteBuf(len) ;
-           wxMacConvertToPC( p , ptr , len ) ;
-               ptr[len] = 0 ;
-           result.UngetWriteBuf( len ) ;
-       }
+    return wxMacMakeStringFromCString( from , strlen(from) ) ;
+}
+
+wxCharBuffer wxMacStringToCString( const wxString &from )
+{
+#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 ;
     return result ;

+#else
+    return wxCharBuffer( from.c_str() ) ;
+#endif
+}
+#endif
+
+void wxMacStringToPascal( const wxString&from , StringPtr to )
+{
+    wxCharBuffer buf = from.mb_str( wxConvLocal ) ;
+    int len = strlen(buf) ;
+
+    if ( len > 255 )
+        len = 255 ;
+    to[0] = len ;
+    memcpy( (char*) &to[1] , buf , len ) ;
+}
+
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )
+{
+    return wxString( (char*) &from[1] , wxConvLocal , from[0] ) ;
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+
+//
+// CFStringRefs (Carbon only)
+//
+
+#if TARGET_CARBON
+// 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
+    m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
+        CFStringGetSystemEncoding() ) ;
+#endif
+    m_release = true ;

 }
 
 }
 

-wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+wxString wxMacCFStringHolder::AsString()

 {
 {

-    if (mac2pcEncoding)
+    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 ;
+}
+
+#endif //TARGET_CARBON
+
+void wxMacConvertNewlines13To10( char * data ) 
+{        
+       char * buf = data ;
+    while( (buf=strchr(buf,0x0d)) != NULL )

     {
     {

-      return wxMacMakePCStringFromMac( from ) ;
+        *buf = 0x0a ;
+        buf++ ;

     }
     }

-    else
+}
+
+void wxMacConvertNewlines10To13( char * data )
+{        
+       char * buf = data ;
+    while( (buf=strchr(buf,0x0a)) != NULL )

     {
     {

-      return wxString( from ) ;
+        *buf = 0x0d ;
+        buf++ ;

     }
 }
 
     }
 }
 

-// 
-// Pascal Strings
-//
+void wxMacConvertNewlines13To10( wxString * data ) 
+{        
+    if ( data->Length() == 0 )
+        return ;
+        
+       wxMacConvertNewlines13To10( data->GetWriteBuf( data->Length() ) ) ;
+    data->UngetWriteBuf() ;
+}

 
 

-wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding )
-{
-       // this is safe since a pascal string can never be larger than 256 bytes
-       char s[256] ;
-       CopyPascalStringToC( from , s ) ;
-    if (mac2pcEncoding)
+void wxMacConvertNewlines10To13( wxString * data )
+{        
+    if ( data->Length() == 0 )
+        return ;
+       wxMacConvertNewlines10To13( data->GetWriteBuf( data->Length() ) ) ;
+    data->UngetWriteBuf() ;
+}
+
+
+#if wxUSE_UNICODE
+void wxMacConvertNewlines13To10( wxChar * data ) 
+{        
+       wxChar * buf = data ;
+    while( (buf=wxStrchr(buf,0x0d)) != NULL )

     {
     {

-      return wxMacMakePCStringFromMac( s ) ;
+        *buf = 0x0a ;
+        buf++ ;

     }
     }

-    else
+}
+
+void wxMacConvertNewlines10To13( wxChar * data )
+{        
+       wxChar * buf =  data ;
+    while( (buf=wxStrchr(buf,0x0a)) != NULL )

     {
     {

-      return wxString( s ) ;
+        *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

 
 

-void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
+static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+/* ---------------------------------------------------------------------------
+        IsMetroNubInstalled
+   --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()

 {
 {

-    if (pc2macEncoding)
+    if (!fRunOnce)

     {
     {

-      CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
+        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
+}
+
+/* ---------------------------------------------------------------------------
+        IsMWDebuggerRunning                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()
+{
+    if (IsMetroNubInstalled())
+        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);

     else
     else

-    {
-      CopyCStringToPascal( from , to ) ;
-    }
+        return false;

 }
 
 }
 

-// 
-// CFStringRefs (Carbon only)
-//
+/* ---------------------------------------------------------------------------
+        AmIBeingMWDebugged                                            [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-#if TARGET_CARBON
-// converts this string into a carbon foundation string with optional pc 2 mac encoding
-CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding ) 
+Boolean AmIBeingMWDebugged()

 {
 {

-       return CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
-               pc2macEncoding ? 
-               kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+    if (IsMetroNubInstalled())
+        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+    else
+        return false;

 }
 
 }
 

-#endif //TARGET_CARBON
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return IsMWDebuggerRunning() && AmIBeingMWDebugged();
+}
+
+#else
+
+extern bool WXDLLEXPORT wxIsDebuggerRunning()
+{
+    return false;
+}
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+
+#endif // wxUSE_GUI