X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2478fde622a16d25c66690af353dfdc37e7b582..ae8c4b33a3272fba39c405542141e7c486b75136:/include/wx/fontmap.h diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h index a997e952ef..0af055a93e 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -12,10 +12,6 @@ #ifndef _WX_FONTMAPPER_H_ #define _WX_FONTMAPPER_H_ -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "fontmap.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -29,13 +25,13 @@ #endif // wxUSE_GUI #if wxUSE_CONFIG - class WXDLLEXPORT wxConfigBase; + class WXDLLIMPEXP_BASE wxConfigBase; #endif // wxUSE_CONFIG -class WXDLLEXPORT wxFontMapper; +class WXDLLIMPEXP_BASE wxFontMapper; #if wxUSE_GUI - class WXDLLEXPORT wxWindow; + class WXDLLIMPEXP_CORE wxWindow; #endif // wxUSE_GUI // ============================================================================ @@ -51,7 +47,7 @@ class WXDLLEXPORT wxFontMapper; // in knowledge of the encodings equivalence // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontMapperBase +class WXDLLIMPEXP_BASE wxFontMapperBase { public: // constructtor and such @@ -171,7 +167,7 @@ private: #if wxUSE_GUI -class WXDLLEXPORT wxFontMapper : public wxFontMapperBase +class WXDLLIMPEXP_CORE wxFontMapper : public wxFontMapperBase { public: // default ctor @@ -244,7 +240,7 @@ private: #else // !wxUSE_GUI -class WXDLLEXPORT wxFontMapper : public wxFontMapperBase +class WXDLLIMPEXP_BASE wxFontMapper : public wxFontMapperBase { };