bringing wxmac in line using cflocale

[wxWidgets.git] / src / mac / corefoundation / cfstring.cpp

diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp
index 8571f130978cd40cb591e654fe8cf77de5354ce2..95a2c7a04259c8c304791847c00d138376ac4ea8 100644 (file)
--- a/src/mac/corefoundation/cfstring.cpp
+++ b/src/mac/corefoundation/cfstring.cpp
@@ -7,6 +7,7 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
+// Usage:       Darwin (base library)
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -596,7 +597,7 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
 //
 
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
-void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
+void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding WXUNUSED_IN_UNICODE(encoding) )
 {
     Release() ;
     if (st.IsEmpty())
@@ -629,7 +630,7 @@ void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
     m_release = true ;
 }
 
-wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
+wxString wxMacCFStringHolder::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
 {
     if ( m_cfs == NULL )
         return wxEmptyString ;