From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 29 Jan 2003 15:07:24 +0000 (+0000)
Subject: string conversion
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/233d603a0961d82b2222c4733035924ee86da9b2

string conversion


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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 402293c36b..49a96bdc56 100644
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -103,13 +103,9 @@ void wxFontRefData::MacFindFont()
 			m_macFontNum = ::GetAppFont() ;
 		else
 		{
-#if TARGET_CARBON
-			c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
-#else
-			strcpy( (char *) wxBuffer, m_faceName ) ;
-			c2pstr( (char *) wxBuffer ) ;
-#endif
-			::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);
+			Str255 fontname ;
+			wxMacStringToPascal( m_faceName , fontname ) ;
+			::GetFNum( fontname, &m_macFontNum);
 		}
 	}
 
diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index 402293c36b..49a96bdc56 100644
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -103,13 +103,9 @@ void wxFontRefData::MacFindFont()
 			m_macFontNum = ::GetAppFont() ;
 		else
 		{
-#if TARGET_CARBON
-			c2pstrcpy( (StringPtr) wxBuffer, m_faceName ) ;
-#else
-			strcpy( (char *) wxBuffer, m_faceName ) ;
-			c2pstr( (char *) wxBuffer ) ;
-#endif
-			::GetFNum( (StringPtr) wxBuffer, &m_macFontNum);
+			Str255 fontname ;
+			wxMacStringToPascal( m_faceName , fontname ) ;
+			::GetFNum( fontname, &m_macFontNum);
 		}
 	}