X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/063d8a571cae245cb7c41b1e1aace91d7d3cf3da..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/generic/fontdlgg.h diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index b74be12272..892d840008 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -20,7 +20,7 @@ #ifdef __WXWINCE__ #define USE_SPINCTRL_FOR_POINT_SIZE 1 -class WXDLLEXPORT wxSpinEvent; +class WXDLLIMPEXP_FWD_CORE wxSpinEvent; #else #define USE_SPINCTRL_FOR_POINT_SIZE 0 #endif @@ -29,10 +29,10 @@ class WXDLLEXPORT wxSpinEvent; * FONT DIALOG */ -class WXDLLEXPORT wxChoice; -class WXDLLEXPORT wxText; -class WXDLLEXPORT wxCheckBox; -class WXDLLEXPORT wxFontPreviewer; +class WXDLLIMPEXP_FWD_CORE wxChoice; +class WXDLLIMPEXP_FWD_CORE wxText; +class WXDLLIMPEXP_FWD_CORE wxCheckBox; +class WXDLLIMPEXP_FWD_CORE wxFontPreviewer; enum { @@ -44,7 +44,7 @@ enum wxID_FONT_SIZE }; -class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase { public: wxGenericFontDialog() { Init(); } @@ -104,13 +104,6 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericFontDialog) }; -WXDLLEXPORT const wxChar *wxFontFamilyIntToString(int family); -WXDLLEXPORT const wxChar *wxFontWeightIntToString(int weight); -WXDLLEXPORT const wxChar *wxFontStyleIntToString(int style); -WXDLLEXPORT int wxFontFamilyStringToInt(wxChar *family); -WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight); -WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style); - #if WXWIN_COMPATIBILITY_2_6 // deprecated, for backwards compatibility only inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)