X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..26dd7154d5b4ab79db3cf4a6dc07c6404e6e14d8:/include/wx/gtk/fontdlg.h diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index 87662f028b..e1ec055711 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlgg.h +// Name: wx/gtk/fontdlgg.h // Purpose: wxFontDialog // Author: Robert Roebling // Created: @@ -11,10 +11,6 @@ #ifndef __GTK_FONTDLGH__ #define __GTK_FONTDLGH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "fontdlg.h" -#endif - //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- @@ -33,9 +29,10 @@ public: // implementation only void SetChosenFont(const char *name); +#if WXWIN_COMPATIBILITY_2_6 // deprecated interface, don't use - wxFontDialog(wxWindow *parent, const wxFontData *data) - : wxFontDialogBase(parent, data) { Create(parent, data); } + wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: // create the GTK dialog @@ -45,4 +42,10 @@ private: DECLARE_DYNAMIC_CLASS(wxFontDialog) }; +#if WXWIN_COMPATIBILITY_2_6 + // deprecated interface, don't use +inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data) + : wxFontDialogBase(parent) { InitFontData(data); Create(parent); } +#endif // WXWIN_COMPATIBILITY_2_6 + #endif