Better backward compatibility and deprecation markup for interface deprecated in comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user