X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/020eeaa8d98126909c23490c65bc5c353f0648dd..0dc44cac21e2e00d033eeabb8a4d2dc8d6a4a19f:/include/wx/font.h?ds=sidebyside

diff --git a/include/wx/font.h b/include/wx/font.h
index 3ef53d3580..b93becbeca 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -70,7 +70,7 @@ enum wxFontWeight
 };
 
 // the font flag bits for the new font ctor accepting one combined flags word
-enum
+enum wxFontFlag
 {
     // no special flags: font with default weight/slant/anti-aliasing
     wxFONTFLAG_DEFAULT          = 0,
@@ -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__)
@@ -276,7 +276,7 @@ public:
 #endif
 };
 
-extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
+extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
 
 #endif
     // _WX_FONT_H_BASE_