X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0a050e347b1ece07ad5f165ba1b1d16edbeae77..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/fontmap.h diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h index c8b5822ac7..98a799a12b 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -25,13 +25,13 @@ #endif // wxUSE_GUI #if wxUSE_CONFIG && wxUSE_FILECONFIG - class WXDLLIMPEXP_BASE wxConfigBase; + class WXDLLIMPEXP_FWD_BASE wxConfigBase; #endif // wxUSE_CONFIG -class WXDLLIMPEXP_CORE wxFontMapper; +class WXDLLIMPEXP_FWD_CORE wxFontMapper; #if wxUSE_GUI - class WXDLLIMPEXP_CORE wxWindow; + class WXDLLIMPEXP_FWD_CORE wxWindow; #endif // wxUSE_GUI // ============================================================================ @@ -122,7 +122,7 @@ public: void SetConfigPath(const wxString& prefix); // return default config path - static const wxChar *GetDefaultConfigPath(); + static const wxString& GetDefaultConfigPath(); #endif // wxUSE_CONFIG @@ -170,7 +170,7 @@ private: friend class wxFontMapperPathChanger; - DECLARE_NO_COPY_CLASS(wxFontMapperBase) + wxDECLARE_NO_COPY_CLASS(wxFontMapperBase); }; // ---------------------------------------------------------------------------- @@ -264,7 +264,7 @@ protected: wxWindow *m_windowParent; private: - DECLARE_NO_COPY_CLASS(wxFontMapper) + wxDECLARE_NO_COPY_CLASS(wxFontMapper); }; #endif // wxUSE_GUI