X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..859906241dff9079dbfe73a39abda5c9aed2f150:/include/wx/gtk/fontdlg.h diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h index d6f157bc71..901f458fa2 100644 --- a/include/wx/gtk/fontdlg.h +++ b/include/wx/gtk/fontdlg.h @@ -11,37 +11,35 @@ #ifndef __GTK_FONTDLGH__ #define __GTK_FONTDLGH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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 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(); + + // implementation only + void SetChosenFont(const char *name); - wxFontData& GetFontData() { return m_fontData; } + // deprecated interface, don't use + wxFontDialog(wxWindow *parent, const wxFontData *data) + : wxFontDialogBase(parent, data) { Create(parent, data); } -//protected: - wxFontData m_fontData; +protected: + // create the GTK dialog + virtual bool DoCreate(wxWindow *parent); private: DECLARE_DYNAMIC_CLASS(wxFontDialog)