X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/fontdlg.h diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h index 87662f028b..bb82bf8d9a 100644 --- a/include/wx/gtk1/fontdlg.h +++ b/include/wx/gtk1/fontdlg.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlgg.h +// Name: wx/gtk1/fontdlg.h // Purpose: wxFontDialog // Author: Robert Roebling // Created: -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,10 +10,6 @@ #ifndef __GTK_FONTDLGH__ #define __GTK_FONTDLGH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "fontdlg.h" -#endif - //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- @@ -33,9 +28,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 +41,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