access TLS cache variable directly and not via a helper function when using compiler...

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

diff --git a/include/wx/font.h b/include/wx/font.h
index 744e4fefeb5447d8a50bc3622021d258ce8eb36c..e1bb6540933447e50d2cb9dffac164aa62fbc171 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -108,7 +108,7 @@ enum
 
 class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 
-class WXDLLEXPORT wxFontBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
 {
 public:
     // creator function
@@ -243,7 +243,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
 #elif defined(__WXDFB__)
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/font.h"
+    #include "wx/osx/font.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)
@@ -260,13 +260,23 @@ public:
                              bool underline = false,
                              const wxString& face = wxEmptyString,
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+                              bool underline = false,
+                              const wxString& face = wxEmptyString,
+                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+        { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
+                                  (wxFontWeight)weight, underline, face, encoding); }
+#endif
+
 #if WXWIN_COMPATIBILITY_2_6
     wxDEPRECATED( void AddFont(wxFont*) );
     wxDEPRECATED( void RemoveFont(wxFont*) );
 #endif
 };
 
-extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
+extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
 
 #endif
     // _WX_FONT_H_BASE_