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 402293c36bc73e0a27bd9e30c97a8f07aabfa584..49a96bdc56b561e987b0f8b72ac355abba94584e 100644 (file)
--- 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 402293c36bc73e0a27bd9e30c97a8f07aabfa584..49a96bdc56b561e987b0f8b72ac355abba94584e 100644 (file)
--- 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);
                }
        }