X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67308c21671f6fa92685355057f73875c70d2265..101b4778087e78ba64e7dd700ea4b01b9c272f5b:/src/mac/carbon/dccg.cpp

diff --git a/src/mac/carbon/dccg.cpp b/src/mac/carbon/dccg.cpp
index cc980ed04e..c5ed4a9bae 100755
--- a/src/mac/carbon/dccg.cpp
+++ b/src/mac/carbon/dccg.cpp
@@ -40,9 +40,7 @@ using namespace std ;
 #include <FixMath.h>
 #include <CGContext.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
 
 //-----------------------------------------------------------------------------
 // constants
@@ -1296,7 +1294,7 @@ void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-	wxMBConvUTF16BE converter ;
+	wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
 	size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
 	ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
@@ -1456,7 +1454,7 @@ void  wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
     UniCharCount chars = str.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-	wxMBConvUTF16BE converter ;
+	wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
 	size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
 	ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
@@ -1528,7 +1526,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     UniCharCount chars = text.Length() ;
     UniChar* ubuf = NULL ;
 #if SIZEOF_WCHAR_T == 4
-    wxMBConvUTF16BE converter ;
+    wxMBConvUTF16 converter ;
 #if wxUSE_UNICODE
     size_t unicharlen = converter.WC2MB( NULL , text.wc_str() , 0 ) ;
     ubuf = (UniChar*) malloc( unicharlen + 2 ) ;