moving string conversions at one place

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/utils.cpp

@@ -199,16 +199,14 @@ void wxDebugMsg(const char *fmt ...)
 // 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(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO )
-  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(wxString::Format(wxT("%s: %s"),title,msg));
-  wxMessageBox(wxBuffer);
   wxExit();
 }
 
@@ -511,6 +509,165 @@ wxString wxGetOsDescription()
 // wxMac Specific utility functions
 //---------------------------------------------------------------------------
 
+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 ;
+        }
+    }
+}
+
+wxString wxMacMakeMacStringFromPC( const char * p )
+{
+	wxString result ;
+    int len = strlen ( p ) ;
+	if ( len > 0 )
+	{
+		wxChar* ptr = result.GetWriteBuf(len) ;
+	    wxMacConvertFromPC( p , ptr , len ) ;
+		ptr[len] = 0 ;
+	    result.UngetWriteBuf( len ) ;
+	}
+    return result ;
+}
+
+wxString wxMacMakePCStringFromMac( const char * p )
+{
+	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 result ;
+}
+
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+{
+    if (mac2pcEncoding)
+    {
+      return wxMacMakePCStringFromMac( from ) ;
+    }
+    else
+    {
+      return wxString( from ) ;
+    }
+}
+
+// 
+// Pascal Strings
+//
+
+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)
+    {
+      return wxMacMakePCStringFromMac( s ) ;
+    }
+    else
+    {
+      return wxString( s ) ;
+    }
+}
+
+void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
+{
+    if (pc2macEncoding)
+    {
+      CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
+    }
+    else
+    {
+      CopyCStringToPascal( from , to ) ;
+    }
+}
+
+// 
+// CFStringRefs (Carbon only)
+//
+
 #if TARGET_CARBON
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding ) 

src/mac/utils.cpp

@@ -199,16 +199,14 @@ void wxDebugMsg(const char *fmt ...)
 // 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(wxString::Format(wxT("%s\nContinue?"),msg), title, wxYES_NO) == wxID_NO )
-  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(wxString::Format(wxT("%s: %s"),title,msg));
-  wxMessageBox(wxBuffer);
   wxExit();
 }
 
@@ -511,6 +509,165 @@ wxString wxGetOsDescription()
 // wxMac Specific utility functions
 //---------------------------------------------------------------------------
 
+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 ;
+        }
+    }
+}
+
+wxString wxMacMakeMacStringFromPC( const char * p )
+{
+	wxString result ;
+    int len = strlen ( p ) ;
+	if ( len > 0 )
+	{
+		wxChar* ptr = result.GetWriteBuf(len) ;
+	    wxMacConvertFromPC( p , ptr , len ) ;
+		ptr[len] = 0 ;
+	    result.UngetWriteBuf( len ) ;
+	}
+    return result ;
+}
+
+wxString wxMacMakePCStringFromMac( const char * p )
+{
+	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 result ;
+}
+
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding )
+{
+    if (mac2pcEncoding)
+    {
+      return wxMacMakePCStringFromMac( from ) ;
+    }
+    else
+    {
+      return wxString( from ) ;
+    }
+}
+
+// 
+// Pascal Strings
+//
+
+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)
+    {
+      return wxMacMakePCStringFromMac( s ) ;
+    }
+    else
+    {
+      return wxString( s ) ;
+    }
+}
+
+void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding )
+{
+    if (pc2macEncoding)
+    {
+      CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
+    }
+    else
+    {
+      CopyCStringToPascal( from , to ) ;
+    }
+}
+
+// 
+// CFStringRefs (Carbon only)
+//
+
 #if TARGET_CARBON
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 CFStringRef wxMacCreateCFString( const wxString &str , bool pc2macEncoding )