X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/fontdlg.h?ds=sidebyside diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h index d6f157bc71..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,40 +10,41 @@ #ifndef __GTK_FONTDLGH__ #define __GTK_FONTDLGH__ -#ifdef __GNUG__ -#pragma interface "fontdlg.h" -#endif - -#include "wx/setup.h" -#include "wx/gdicmn.h" -#include "wx/font.h" -#include "wx/dialog.h" -#include "wx/cmndata.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxFontDialog; - //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- -class wxFontDialog: public wxDialog +class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase { public: - wxFontDialog() {} - wxFontDialog( wxWindow *parent, wxFontData *data = (wxFontData *) NULL ); - ~wxFontDialog(); + wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } + wxFontDialog(wxWindow *parent) + : wxFontDialogBase(parent) { Create(parent); } + wxFontDialog(wxWindow *parent, const wxFontData& data) + : wxFontDialogBase(parent, data) { Create(parent, data); } + + virtual ~wxFontDialog(); - wxFontData& GetFontData() { return m_fontData; } + // implementation only + void SetChosenFont(const char *name); -//protected: - wxFontData m_fontData; +#if WXWIN_COMPATIBILITY_2_6 + // deprecated interface, don't use + wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); +#endif // WXWIN_COMPATIBILITY_2_6 + +protected: + // create the GTK dialog + virtual bool DoCreate(wxWindow *parent); 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