X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cececf4db53f743669f2b86dae1c8851f5ae58fc..fd587c7a5e2424a3a29012ac3efa6fff84dba035:/include/wx/generic/fontdlgg.h diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index e1a81c3d1a..485b99fdd3 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -54,9 +54,10 @@ public: 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); @@ -108,4 +109,10 @@ 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