Applied patch [ 608370 ] fix for static text sizing behaviour

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index ba1e84d5791a126d156f99f61f5c70d160c36f52..7b4b2255f3ce93ef961f71ad73e270a0b7274497 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXSTRCONVH__
 #define _WX_WXSTRCONVH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma interface "strconv.h"
 #endif
 
@@ -170,7 +170,7 @@ public:
     const char* cWX2MB(const char *psz) const { return psz; }
 };
 
-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal;
 WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 
 #define wxFNCONV(name) name