don't return & in strings returned by GetLabelTop() (closes 687905)

[wxWidgets.git] / src / msw / fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index b05fabe17c5a25de5309d3d5f52c4d2fa8dcca33..8f9844def70b4eeb133814bfbc1545c35e65e542 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontutil.h"
 #endif
 
@@ -32,6 +32,7 @@
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/encinfo.h"
 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -118,7 +119,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         encoding = wxFont::GetDefaultEncoding();
     }
 
-    extern WXDLLEXPORT_BASE long wxEncodingToCharset(wxFontEncoding encoding);
+    extern WXDLLIMPEXP_BASE long wxEncodingToCharset(wxFontEncoding encoding);
     info->charset = wxEncodingToCharset(encoding);
     if ( info->charset == -1 )
         return FALSE;