Fixed bug #1022383: 'several ComboBoxes appear selected'

[wxWidgets.git] / include / wx / gtk / fontdlg.h

diff --git a/include/wx/gtk/fontdlg.h b/include/wx/gtk/fontdlg.h
index d6f157bc71cb7bae20ae71a6a50ff55db3434cf1..901f458fa2cda19a8227a7777e9051ff17181d74 100644 (file)
--- a/include/wx/gtk/fontdlg.h
+++ b/include/wx/gtk/fontdlg.h
@@ -11,37 +11,35 @@
 #ifndef __GTK_FONTDLGH__
 #define __GTK_FONTDLGH__
 
 #ifndef __GTK_FONTDLGH__
 #define __GTK_FONTDLGH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "fontdlg.h"
 #endif
 
 #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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxFontDialog
 //-----------------------------------------------------------------------------
 

-class wxFontDialog: public wxDialog
+class wxFontDialog : public wxFontDialogBase

 {
 public:
 {
 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)