No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index 2bb9c8e1037328cba6e4ca0ec3981b9c0a01d8ef..65bb5c95933a78e319b3a2c70de0c3a137181c23 100644 (file)
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -5,13 +5,14 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi

-// RCS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_FONTPICKER_H_
 #define _WX_GTK_FONTPICKER_H_
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_FONTPICKER_H_
 #define _WX_GTK_FONTPICKER_H_
 

+#include "wx/button.h"
+

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


@@ -50,7 +51,7 @@ protected:
 
 public:     // used by the GTK callback only
 
 
 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: