activating DrawRectangle optimization

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

diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index cef2cd16652abf903ff5ef65870fea8800c712d8..0a7cae44665f2d5c161501fca03e4ec14fbfe491 100644 (file)
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -12,16 +12,14 @@
 #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() {}
 {
 public:
     wxFontButton() {}


@@ -37,11 +35,6 @@ 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,
                 const wxFont& initial = wxNullFont,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxFont& initial = wxNullFont,


@@ -51,13 +44,15 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxFontPickerWidgetNameStr);
 

+    virtual ~wxFontButton();
+

 protected:
     void UpdateFont();
 
 
 public:     // used by the GTK callback only
 
 protected:
     void UpdateFont();
 
 
 public:     // used by the GTK callback only
 

-    void SetNativeFontInfo(const gchar *gtkdescription)
+    void SetNativeFontInfo(const char *gtkdescription)

         { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
 
 private:
         { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
 
 private: