X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/020eeaa8d98126909c23490c65bc5c353f0648dd..f4cbd74e8ceca362a3ccedd809dfb7b1470215be:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 3ef53d3580..e1bb654093 100644 --- 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__) @@ -276,7 +276,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxFontList*) wxTheFontList; +extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; #endif // _WX_FONT_H_BASE_