X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/873fd4af5f9ed1f078636af1ae9ea21bbed06b5a..d5cbee178f213c1bae361abca0113646bf323584:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 4011aea371..9b87cafd11 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -24,9 +24,10 @@ // forward declarations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontBase; -class WXDLLEXPORT wxFont; -class WXDLLEXPORT wxSize; +class WXDLLIMPEXP_FWD_CORE wxFontData; +class WXDLLIMPEXP_FWD_CORE wxFontBase; +class WXDLLIMPEXP_FWD_CORE wxFont; +class WXDLLIMPEXP_FWD_CORE wxSize; // ---------------------------------------------------------------------------- // font constants @@ -104,8 +105,7 @@ enum // wxFontBase represents a font object // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFontRefData; -class WXDLLEXPORT wxNativeFontInfo; +class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo; class WXDLLEXPORT wxFontBase : public wxGDIObject { @@ -222,6 +222,12 @@ private: static wxFontEncoding ms_encodingDefault; }; +// wxFontBase <-> wxString utilities, used by wxConfig +WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font); +WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font); + + + // include the real class declaration #if defined(__WXPALMOS__) #include "wx/palmos/font.h"