made globals static to avoid linking problems

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

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 7066114eb1caa2bd173aae33056d01e5153b10fe..16f91e18e350ba621e7d7d047111c43f9077291d 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -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>
 


@@ -42,6 +46,41 @@
 #include "TextCommon.h"
 #include "TextEncodingConverter.h"
 
 #include "TextCommon.h"
 #include "TextEncodingConverter.h"
 

+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+#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
 


@@ -57,7 +96,7 @@ bool wxGetHostName(wxChar *buf, int maxSize)
     // Gets Chooser name of user by examining a System resource.
 
     const short kComputerNameID = -16413;
     // Gets Chooser name of user by examining a System resource.
 
     const short kComputerNameID = -16413;

-    
+

     short oldResFile = CurResFile() ;
     UseResFile(0);
     StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);
     short oldResFile = CurResFile() ;
     UseResFile(0);
     StringHandle chooserName = (StringHandle)::GetString(kComputerNameID);


@@ -95,7 +134,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     // Gets Chooser name of user by examining a System resource.
 
     const short kChooserNameID = -16096;
     // Gets Chooser name of user by examining a System resource.
 
     const short kChooserNameID = -16096;

-    
+

     short oldResFile = CurResFile() ;
     UseResFile(0);
     StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);
     short oldResFile = CurResFile() ;
     UseResFile(0);
     StringHandle chooserName = (StringHandle)::GetString(kChooserNameID);


@@ -143,7 +182,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,7 +198,7 @@ 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 /  1000.0 * CLOCKS_PER_SEC ) ;
     {
         YieldToAnyThread() ;
     } while( clock() - start < milliseconds /  1000.0 * CLOCKS_PER_SEC ) ;


@@ -175,69 +214,37 @@ 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);
-}
+#endif // !__DARWIN__

 
 

-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(const wxString& msg, const wxString& title)
+// Emit a beeeeeep
+void wxBell()

 {
 {

-      if (wxMessageBox(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO )
-        wxExit();
+    SysBeep(30);

 }
 
 }
 

-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& msg, const wxString& title)
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()

 {
 {

-    wxMessageBox(wxString::Format(wxT("%s: %s"),title,msg));
-    wxExit();
+    static wxToolkitInfo info;
+    info.os = DoGetOSVersion(&info.versionMajor, &info.versionMinor);
+    info.name = _T("wxBase");
+    return info;

 }
 
 }
 

-#endif // WXWIN_COMPATIBILITY_2_2
+#endif // wxUSE_BASE

 
 

-#endif // !__DARWIN__
+#if wxUSE_GUI

 
 

-// Emit a beeeeeep
-void wxBell()
+wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()

 {
 {

-    SysBeep(30);
-}
-
-int wxGetOsVersion(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;
+    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)


@@ -338,7 +345,7 @@ void wxEndBusyCursor()
 {
     wxCHECK_RET( gs_wxBusyCursorCount > 0,
         wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );
 {
     wxCHECK_RET( gs_wxBusyCursorCount > 0,
         wxT("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );

-    
+

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


@@ -352,6 +359,10 @@ bool wxIsBusy()
     return (gs_wxBusyCursorCount > 0);
 }
 
     return (gs_wxBusyCursorCount > 0);
 }
 

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

 wxString wxMacFindFolder( short        vol,
               OSType       folderType,
               Boolean      createFolder)
 wxString wxMacFindFolder( short        vol,
               OSType       folderType,
               Boolean      createFolder)


@@ -359,7 +370,7 @@ wxString wxMacFindFolder( short        vol,
     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 ;


@@ -371,47 +382,9 @@ wxString wxMacFindFolder( short        vol,
     return strDir ;
 }
 
     return strDir ;
 }
 

-#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 ) ;
-      }
-    }
+#endif // wxUSE_BASE

 
 

-    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.


@@ -457,9 +430,13 @@ 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)


@@ -467,8 +444,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)


@@ -479,8 +461,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


@@ -488,8 +474,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 ;
 }
 


@@ -498,20 +486,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
     return wxT("MacOS") ; //TODO:define further
 #endif
 }
 
 #else
     return wxT("MacOS") ; //TODO:define further
 #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"


@@ -598,30 +634,26 @@ void wxMacConvertToPC( const char *from , char *to , int len )
 
 TECObjectRef s_TECNativeCToUnicode = NULL ;
 TECObjectRef s_TECUnicodeToNativeC = NULL ;
 
 TECObjectRef s_TECNativeCToUnicode = NULL ;
 TECObjectRef s_TECUnicodeToNativeC = NULL ;

-TECObjectRef s_TECPlatformToNativeC = NULL ;
-TECObjectRef s_TECNativeCToPlatform = NULL ;
-void wxMacSetupConverters() 
+
+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 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 ;
     OSStatus status = noErr ;

-    status = TECCreateConverter(&s_TECNativeCToUnicode, 
-       wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman, kTextEncodingUnicodeDefault);
-
+    status = TECCreateConverter(&s_TECNativeCToUnicode,
+                                kEncoding,
+                                kTextEncodingUnicodeDefault);

 
 

-    status = TECCreateConverter(&s_TECUnicodeToNativeC, 
-       kTextEncodingUnicodeDefault, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman);
-
-    if ( wxApp::s_macDefaultEncodingIsPC )
-    {
-        status = TECCreateConverter(&s_TECPlatformToNativeC, 
-               kTextEncodingMacRoman, wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman);

 
 

-               
-        status = TECCreateConverter(&s_TECNativeCToPlatform, 
-               wxApp::s_macDefaultEncodingIsPC ? kTextEncodingWindowsLatin1 : kTextEncodingMacRoman , kTextEncodingMacRoman );
-    }
+    status = TECCreateConverter(&s_TECUnicodeToNativeC,
+                                kTextEncodingUnicodeDefault,
+                                kEncoding);

 }
 
 void wxMacCleanupConverters()
 }
 
 void wxMacCleanupConverters()


@@ -630,13 +662,9 @@ void wxMacCleanupConverters()
     status = TECDisposeConverter(s_TECNativeCToUnicode);
 
     status = TECDisposeConverter(s_TECUnicodeToNativeC);
     status = TECDisposeConverter(s_TECNativeCToUnicode);
 
     status = TECDisposeConverter(s_TECUnicodeToNativeC);

-
-    status = TECDisposeConverter(s_TECPlatformToNativeC);
-
-    status = TECDisposeConverter(s_TECNativeCToPlatform);

 }
 
 }
 

-wxWCharBuffer wxMacStringToWString( const wxString &from ) 
+wxWCharBuffer wxMacStringToWString( const wxString &from )

 {
 #if wxUSE_UNICODE
     wxWCharBuffer result( from.wc_str() ) ;
 {
 #if wxUSE_UNICODE
     wxWCharBuffer result( from.wc_str() ) ;


@@ -653,7 +681,8 @@ wxWCharBuffer wxMacStringToWString( const wxString &from )
     return result ;
 }
 
     return result ;
 }
 

-wxString wxMacMakeStringFromCString( const char * from , int len ) 
+
+wxString wxMacMakeStringFromCString( const char * from , int len )

 {
     OSStatus status = noErr ;
     wxString result ;
 {
     OSStatus status = noErr ;
     wxString result ;


@@ -666,18 +695,7 @@ wxString wxMacMakeStringFromCString( const char * from , int len )
     status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen,
         (TextPtr)buf, byteBufferLen, &byteOutLen);
 #else
     status = TECConvertText(s_TECNativeCToUnicode, (ConstTextPtr)from , byteInLen, &byteInLen,
         (TextPtr)buf, byteBufferLen, &byteOutLen);
 #else

-    if ( !wxApp::s_macDefaultEncodingIsPC )
-        memcpy( buf , from , len ) ;
-    else
-    {
-        OSStatus status = noErr ;
-        ByteCount byteOutLen ;
-        ByteCount byteInLen = len ;
-        ByteCount byteBufferLen = byteInLen ;
-
-        status = TECConvertText(s_TECPlatformToNativeC, (ConstTextPtr)from , byteInLen, &byteInLen,
-            (TextPtr)buf, byteBufferLen, &byteOutLen);
-    }
+    memcpy( buf , from , len ) ;

 #endif
     buf[len] = 0 ;
     result.UngetWriteBuf() ;
 #endif
     buf[len] = 0 ;
     result.UngetWriteBuf() ;


@@ -689,7 +707,7 @@ wxString wxMacMakeStringFromCString( const char * from )
     return wxMacMakeStringFromCString( from , strlen(from) ) ;
 }
 
     return wxMacMakeStringFromCString( from , strlen(from) ) ;
 }
 

-wxCharBuffer wxMacStringToCString( const wxString &from ) 
+wxCharBuffer wxMacStringToCString( const wxString &from )

 {
 #if wxUSE_UNICODE
     OSStatus status = noErr ;
 {
 #if wxUSE_UNICODE
     OSStatus status = noErr ;


@@ -701,26 +719,14 @@ wxCharBuffer wxMacStringToCString( const wxString &from )
         (TextPtr)result.data(), byteBufferLen, &byteOutLen);
     return result ;
 #else
         (TextPtr)result.data(), byteBufferLen, &byteOutLen);
     return result ;
 #else

-    if ( !wxApp::s_macDefaultEncodingIsPC )
-        return wxCharBuffer( from.c_str() ) ;
-    else
-    {
-        wxCharBuffer result( from.Length() ) ;
-        OSStatus status = noErr ;
-        ByteCount byteOutLen ;
-        ByteCount byteInLen = from.Length() ;
-        ByteCount byteBufferLen = byteInLen ;
-
-        status = TECConvertText(s_TECNativeCToPlatform, (ConstTextPtr)from.c_str() , byteInLen, &byteInLen,
-            (TextPtr)result.data(), byteBufferLen, &byteOutLen);
-        return result ;
-    }
+    return wxCharBuffer( from.c_str() ) ;

 #endif
 }
 #endif
 }

+#endif

 
 

-void wxMacStringToPascal( const wxString&from , StringPtr to ) 
+void wxMacStringToPascal( const wxString&from , StringPtr to )

 {
 {

-    wxCharBuffer buf = wxMacStringToCString( from ) ;
+    wxCharBuffer buf = from.mb_str( wxConvLocal ) ;

     int len = strlen(buf) ;
 
     if ( len > 255 )
     int len = strlen(buf) ;
 
     if ( len > 255 )


@@ -729,31 +735,35 @@ void wxMacStringToPascal( const wxString&from , StringPtr to )
     memcpy( (char*) &to[1] , buf , len ) ;
 }
 
     memcpy( (char*) &to[1] , buf , len ) ;
 }
 

-wxString wxMacMakeStringFromPascal( ConstStringPtr from ) 
+wxString wxMacMakeStringFromPascal( ConstStringPtr from )

 {
 {

-    return wxMacMakeStringFromCString( (char*) &from[1] , from[0] ) ;
+    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
 // 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 &str ) 
+void wxMacCFStringHolder::Assign( const wxString &str )

 {
 #if wxUSE_UNICODE
 {
 #if wxUSE_UNICODE

-       m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault, 
+       m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,

                (const unsigned short*)str.wc_str(), str.Len() );
 #else
     m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
                (const unsigned short*)str.wc_str(), str.Len() );
 #else
     m_cfs = CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,

-        wxApp::s_macDefaultEncodingIsPC ? 
-        kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+        CFStringGetSystemEncoding() ) ;

 #endif
     m_release = true ;
 }
 
 #endif
     m_release = true ;
 }
 

-wxString wxMacCFStringHolder::AsString() 
+wxString wxMacCFStringHolder::AsString()

 {
     wxString result ;
     Size len = CFStringGetLength( m_cfs )  ;
 {
     wxString result ;
     Size len = CFStringGetLength( m_cfs )  ;


@@ -761,88 +771,154 @@ wxString wxMacCFStringHolder::AsString()
 #if wxUSE_UNICODE
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
 #else
 #if wxUSE_UNICODE
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , len ) , (UniChar*) buf ) ;
 #else

-    CFStringGetCString( m_cfs , buf , len+1 , wxApp::s_macDefaultEncodingIsPC ? 
-        kCFStringEncodingWindowsLatin1 : CFStringGetSystemEncoding() ) ;
+    CFStringGetCString( m_cfs , buf , len+1 , CFStringGetSystemEncoding() ) ;

 #endif
     buf[len] = 0 ;
     result.UngetWriteBuf() ;
     return result ;
 }
 
 #endif
     buf[len] = 0 ;
     result.UngetWriteBuf() ;
     return result ;
 }
 

-#if 0
+#endif //TARGET_CARBON

 
 

-wxString wxMacMakeMacStringFromPC( const wxChar * p )
-{
-    wxString result ;
-    int len = wxStrlen ( p ) ;
-    if ( len > 0 )
-    {
-        wxChar* ptr = result.GetWriteBuf(len) ;
-        wxMacConvertFromPC( p , ptr , len ) ;
-        ptr[len] = 0 ;
-        result.UngetWriteBuf( len ) ;
-    }
-    return result ;
-}
+// ----------------------------------------------------------------------------
+// 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>

 
 

-wxString wxMacMakePCStringFromMac( const wxChar * p )
+    extern "C" long CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+    ProcPtr gCallUniversalProc_Proc = NULL;
+
+#endif
+
+static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+/* ---------------------------------------------------------------------------
+        IsMetroNubInstalled
+   --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()

 {
 {

-    wxString result ;
-    int len = wxStrlen ( p ) ;
-    if ( len > 0 )
+    if (!fRunOnce)

     {
     {

-        wxChar* ptr = result.GetWriteBuf(len) ;
-        wxMacConvertToPC( p , ptr , len ) ;
-        ptr[len] = 0 ;
-        result.UngetWriteBuf( len ) ;
+        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! */
+                }
+
+            }
+        }

     }
     }

-    return result ;
+
+end:
+
+#if TARGET_API_MAC_CARBON
+    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+    return (gMetroNubEntry != NULL);
+#endif

 }
 
 }
 

-wxString wxMacMakeStringFromMacString( const wxChar* from , bool mac2pcEncoding )
+/* ---------------------------------------------------------------------------
+        IsMWDebuggerRunning                                            [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()

 {
 {

-    if (mac2pcEncoding)
-    {
-      return wxMacMakePCStringFromMac( from ) ;
-    }
+    if (IsMetroNubInstalled())
+        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);

     else
     else

-    {
-      return wxString( from ) ;
-    }
+        return false;

 }
 
 }
 

-// 
-// Pascal Strings
-//
+/* ---------------------------------------------------------------------------
+        AmIBeingMWDebugged                                            [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-wxString wxMacMakeStringFromPascal( ConstStringPtr from , bool mac2pcEncoding )
+Boolean AmIBeingMWDebugged()

 {
 {

-      // this is safe since a pascal string can never be larger than 256 bytes
-      char s[256] ;
-      CopyPascalStringToC( from , s ) ;
-    if (mac2pcEncoding)
-    {
-      return wxMacMakePCStringFromMac( s ) ;
-    }
+    if (IsMetroNubInstalled())
+        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);

     else
     else

-    {
-      return wxString( s ) ;
-    }
+        return false;

 }
 
 }
 

-void wxMacStringToPascal( const wxChar * from , StringPtr to , bool pc2macEncoding )
+extern bool WXDLLEXPORT wxIsDebuggerRunning()

 {
 {

-    if (pc2macEncoding)
-    {
-      CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
-    }
-    else
-    {
-      CopyCStringToPascal( from , to ) ;
-    }
+    return IsMWDebuggerRunning() && AmIBeingMWDebugged();

 }
 }

-#endif

 
 

+#else

 
 

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