routing native events first to the wx class and only if skipped call native handler

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

diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index 06ba2ed99f47bcdf7e4d72b61ee72febf608ef38..80376e5de80cf4ec874dbd8db72e13bafa189ba5 100644 (file)
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -12,22 +12,20 @@
 #ifndef _WX_GTK_FONTPICKER_H_
 #define _WX_GTK_FONTPICKER_H_
 
 #ifndef _WX_GTK_FONTPICKER_H_
 #define _WX_GTK_FONTPICKER_H_
 

-// since GtkFontButton is available only for GTK+ >= 2.4,
-// we need to use generic version if we detect (at runtime)
-// that GTK+ < 2.4
-#include "wx/generic/fontpickerg.h"
+#include "wx/button.h"

 
 //-----------------------------------------------------------------------------
 // wxFontButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxFontButton
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxFontButton : public wxGenericFontButton
+class WXDLLIMPEXP_CORE wxFontButton : public wxButton,
+                                      public wxFontPickerWidgetBase

 {
 public:
     wxFontButton() {}
     wxFontButton(wxWindow *parent,
                  wxWindowID id,
 {
 public:
     wxFontButton() {}
     wxFontButton(wxWindow *parent,
                  wxWindowID id,

-                 const wxFont& initial = *wxNORMAL_FONT,
+                 const wxFont& initial = wxNullFont,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxFONTBTN_DEFAULT_STYLE,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxFONTBTN_DEFAULT_STYLE,


@@ -37,20 +35,17 @@ public:
        Create(parent, id, initial, pos, size, style, validator, name);
     }
 
        Create(parent, id, initial, pos, size, style, validator, name);
     }
 

-    virtual ~wxFontButton();
-
-
-public:     // overrides
-

     bool Create(wxWindow *parent,
                 wxWindowID id,
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxFont& initial = *wxNORMAL_FONT,
+                const wxFont& initial = wxNullFont,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFONTBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFONTBTN_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 

+    virtual ~wxFontButton();
+

 protected:
     void UpdateFont();
 
 protected:
     void UpdateFont();
 


@@ -60,8 +55,6 @@ public:     // used by the GTK callback only
     void SetNativeFontInfo(const gchar *gtkdescription)
         { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
 
     void SetNativeFontInfo(const gchar *gtkdescription)
         { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
 

-    wxWindow *m_topParent;
-

 private:
     DECLARE_DYNAMIC_CLASS(wxFontButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxFontButton)
 };