Added wxBitmap::UseAlpha() stub.

[wxWidgets.git] / include / wx / strconv.h

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 5d93e872ce33748a9478deb2cb5654976d33a262..72423f8c771bc6602da17812d8e6d37b2b585819 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -210,7 +210,12 @@ private:
     bool m_deferred;
 };
 
     bool m_deferred;
 };
 

+#ifdef __WXOSX__
+#define wxConvFile wxConvUTF8
+#else

 #define wxConvFile wxConvLocal
 #define wxConvFile wxConvLocal

+#endif
+

 WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvLocal;
 WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvISO8859_1;
 WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;
 WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvLocal;
 WXDLLIMPEXP_DATA_BASE(extern wxCSConv&) wxConvISO8859_1;
 WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;


@@ -241,8 +246,12 @@ WXDLLIMPEXP_DATA_BASE(extern wxMBConv *) wxConvCurrent;
 #if wxMBFILES && wxUSE_UNICODE
     #define wxFNCONV(name) wxConvFile.cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #if wxMBFILES && wxUSE_UNICODE
     #define wxFNCONV(name) wxConvFile.cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST

+#else
+#if defined( __WXOSX__ ) && wxMBFILES
+    #define wxFNCONV(name) wxConvFile.cWC2MB( wxConvLocal.cWX2WC(name) )

 #else
     #define wxFNCONV(name) name
 #else
     #define wxFNCONV(name) name

+#endif

     #define wxFNSTRINGCAST WXSTRINGCAST
 #endif
 
     #define wxFNSTRINGCAST WXSTRINGCAST
 #endif