X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/fontdlgg.h diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index beb004b4b9..9668f77676 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -12,20 +12,27 @@ #ifndef _WX_GENERIC_FONTDLGG_H #define _WX_GENERIC_FONTDLGG_H -#include "wx/setup.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 WXDLLIMPEXP_FWD_CORE wxSpinEvent; +#else +#define USE_SPINCTRL_FOR_POINT_SIZE 0 +#endif + /* * 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 { @@ -41,15 +48,18 @@ class WXDLLEXPORT wxGenericFontDialog : public wxFontDialogBase { public: wxGenericFontDialog() { Init(); } + wxGenericFontDialog(wxWindow *parent) + : wxFontDialogBase(parent) { Init(); } wxGenericFontDialog(wxWindow *parent, const wxFontData& data) : wxFontDialogBase(parent, data) { Init(); } virtual ~wxGenericFontDialog(); virtual int ShowModal(); +#if WXWIN_COMPATIBILITY_2_6 // deprecated, for backwards compatibility only - wxGenericFontDialog(wxWindow *parent, const wxFontData *data) - : wxFontDialogBase(parent, data) { Init(); } + wxDEPRECATED( wxGenericFontDialog(wxWindow *parent, const wxFontData *data) ); +#endif // WXWIN_COMPATIBILITY_2_6 // Internal functions void OnCloseWindow(wxCloseEvent& event); @@ -59,20 +69,32 @@ public: void OnChangeFont(wxCommandEvent& event); +#if USE_SPINCTRL_FOR_POINT_SIZE + void OnChangeSize(wxSpinEvent& event); +#endif + protected: + + virtual bool DoCreate(wxWindow *parent); + +private: + // common part of all ctors void Init(); - virtual bool DoCreate(wxWindow *parent); + void DoChangeFont(); + + wxFont m_dialogFont; - wxFont dialogFont; + wxChoice *m_familyChoice; + wxChoice *m_styleChoice; + wxChoice *m_weightChoice; + wxChoice *m_colourChoice; + wxCheckBox *m_underLineCheckBox; - wxChoice *familyChoice; - wxChoice *styleChoice; - wxChoice *weightChoice; - wxChoice *colourChoice; - wxCheckBox *underLineCheckBox; - wxChoice *pointSizeChoice; +#if !USE_SPINCTRL_FOR_POINT_SIZE + wxChoice *m_pointSizeChoice; +#endif wxFontPreviewer *m_previewer; bool m_useEvents; @@ -82,12 +104,10 @@ protected: 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) + :wxFontDialogBase(parent) { Init(); InitFontData(data); Create(parent); } +#endif // WXWIN_COMPATIBILITY_2_6 #endif // _WX_GENERIC_FONTDLGG_H -