X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca3e85cfa8bec43f148eb1db520ab125947bf1e7..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/generic/fontdlgg.h diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index 485b99fdd3..4c9cd6e8b1 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -12,15 +12,12 @@ #ifndef _WX_GENERIC_FONTDLGG_H #define _WX_GENERIC_FONTDLGG_H -#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/font.h" -#include "wx/dialog.h" -#include "wx/cmndata.h" #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 +26,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,10 +41,12 @@ enum wxID_FONT_SIZE }; -class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase +class WXDLLIMPEXP_CORE wxGenericFontDialog : public wxFontDialogBase { public: wxGenericFontDialog() { Init(); } + wxGenericFontDialog(wxWindow *parent) + : wxFontDialogBase(parent) { Init(); } wxGenericFontDialog(wxWindow *parent, const wxFontData& data) : wxFontDialogBase(parent, data) { Init(); } virtual ~wxGenericFontDialog(); @@ -102,13 +101,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)