GNOME.org
 

[gtkmm] 3.1.90

commit 02511249386084ba74be739a2a12b3de66e6ebda
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Sep 14 10:08:53 2011 +0200

    3.1.90
    
    FontChooser, FontChooserWidget, FontChooserDialog API changes.
    
      * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
      * gtk/src/filelist.am:
    	* gtk/src/fontchooser.[hg|ccg]: this is now an interface, like AppChooser and
    	RecentChooser.
    	* gtk/src/fontchooserdialog.[hg|ccg]: Derive from FontChooser, removing
    	some methods.
    	* gtk/src/fontchooserwidget.[hg|ccg]: A new widget derived from FontChooser.
    	* gtk/src/fontbutton.[hg|ccg]: This should now derive from FontChooser but
    	we cannot do that without breaking ABI because FontButton was in gktmm 3.0.

 ChangeLog                     |   16 +++++
 NEWS                          |   14 +++++
 configure.ac                  |    4 +-
 gtk/src/appchooserbutton.hg   |    4 +
 gtk/src/filelist.am           |    3 +-
 gtk/src/fontbutton.hg         |    7 ++-
 gtk/src/fontchooser.hg        |   60 ++++++++++++-------
 gtk/src/fontchooserdialog.hg  |   19 ++----
 gtk/src/fontchooserwidget.ccg |   23 +++++++
 gtk/src/fontchooserwidget.hg  |   51 ++++++++++++++++
 gtk/src/gtk_methods.defs      |  127 +++++++++++++++++++++-------------------
 11 files changed, 229 insertions(+), 99 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6a858a4..1940d04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+3.1.90:
+
+2011-09-14  Murray Cumming  <murrayc murrayc com>
+
+	FontChooser, FontChooserWidget, FontChooserDialog API changes. 
+
+  * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+  * gtk/src/filelist.am:
+	* gtk/src/fontchooser.[hg|ccg]: this is now an interface, like AppChooser and
+	RecentChooser.
+	* gtk/src/fontchooserdialog.[hg|ccg]: Derive from FontChooser, removing 
+	some methods.
+	* gtk/src/fontchooserwidget.[hg|ccg]: A new widget derived from FontChooser.
+	* gtk/src/fontbutton.[hg|ccg]: This should now derive from FontChooser but 
+	we cannot do that without breaking ABI because FontButton was in gktmm 3.0.
+
 2011-09-09  Murray Cumming  <murrayc murrayc com>
 
 	Widget::get_allocation(): Add the newer documentation from the C docs.
diff --git a/NEWS b/NEWS
index d60b0c3..0db0ecd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+3.1.90 (unstable):
+
+Gtk:
+* FontChooser is now an interface, like AppChooser and
+* FontChooserDialog: Derive from FontChooser, removing some methods.
+* FontChooserWidget: A new widget derived from FontChooser.
+* FontButton: This should now derive from FontChooser but 
+	we cannot do that without breaking ABI because FontButton was in gktmm 3.0.
+  (Murray Cumming)
+* TreeView: Make append_column_numeric_editable() work for [unsigned] short.
+  (Kjell Ahlstedt) Bug #655416 (Morpheus)
+* Widget::get_allocation(): Add the newer documentation from the C docs.
+  (Murray Cumming)
+
 3.1.18 (unstable):
 
 Gtk:
diff --git a/configure.ac b/configure.ac
index 10f0caa..67906d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gtkmm], [3.1.18],
+AC_INIT([gtkmm], [3.1.90],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
         [gtkmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -60,7 +60,7 @@ AS_IF([test "x$enable_static" = xyes],
 # gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+.
 # The extra cairomm-1.0 check is because gdkmm requires a newer cairomm than pangomm requires.
 # The extra gdk-pixbuf-2.0 check is because gdkmm requires a newer gdk-pixbuf than gtk+-3.0 requires.
-AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.27.93 pangomm-1.4 >= 2.27.1 gtk+-3.0 >= 3.1.18 cairomm-1.0 >= 1.9.2 gdk-pixbuf-2.0 >= 2.22.1'])
+AC_SUBST([GDKMM_MODULES], ['giomm-2.4 >= 2.27.93 pangomm-1.4 >= 2.27.1 gtk+-3.0 >= 3.1.90 cairomm-1.0 >= 1.9.2 gdk-pixbuf-2.0 >= 2.22.1'])
 
 AS_IF([test "x$gtkmm_host_windows" = xyes],
       [GTKMM_MODULES=$GDKMM_MODULES],
diff --git a/gtk/src/appchooserbutton.hg b/gtk/src/appchooserbutton.hg
index 1a4dfad..8b888f7 100644
--- a/gtk/src/appchooserbutton.hg
+++ b/gtk/src/appchooserbutton.hg
@@ -58,11 +58,15 @@ public:
   _WRAP_METHOD(bool get_show_dialog_item() const, gtk_app_chooser_button_get_show_dialog_item)
   _WRAP_METHOD(void set_heading(const Glib::ustring& heading), gtk_app_chooser_button_set_heading)
   _WRAP_METHOD(Glib::ustring get_heading() const, gtk_app_chooser_button_get_heading)
+  _WRAP_METHOD(void set_show_default_item(bool setting = true), gtk_app_chooser_button_set_show_default_item)
+  _WRAP_METHOD(bool get_show_default_item() const, gtk_app_chooser_button_get_show_default_item)
+
 
   _WRAP_SIGNAL(void custom_item_activated(const Glib::ustring& item_name), "custom-item-activated")
 
   _WRAP_PROPERTY("show-dialog-item", bool)
   _WRAP_PROPERTY("heading", Glib::ustring)
+  _WRAP_PROPERTY("show-default-item", bool)
 };
 
 
diff --git a/gtk/src/filelist.am b/gtk/src/filelist.am
index bcdc3e8..52c4c8e 100644
--- a/gtk/src/filelist.am
+++ b/gtk/src/filelist.am
@@ -79,7 +79,8 @@ gtkmm_files_any_hg =		\
 	fixed.hg		\
 	fontbutton.hg		\
 	fontchooser.hg	\
-	fontchooserdialog.hg	\	
+	fontchooserdialog.hg	\
+	fontchooserwidget.hg	\
 	frame.hg		\
 	grid.hg \
 	handlebox.hg		\
diff --git a/gtk/src/fontbutton.hg b/gtk/src/fontbutton.hg
index 3a7262f..276dbbb 100644
--- a/gtk/src/fontbutton.hg
+++ b/gtk/src/fontbutton.hg
@@ -20,6 +20,8 @@
  */
 
 #include <gtkmm/button.h>
+//TODO: When we can break ABI:    #include <gtkmm/fontchooser.h>
+
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/button_p.h)
 
@@ -38,9 +40,12 @@ namespace Gtk
  *
  * @ingroup Widgets
  */
-class FontButton : public Button
+class FontButton
+  : public Button
+  //TODO: When we can break ABI:    public FontChooser
 {
   _CLASS_GTKOBJECT(FontButton, GtkFontButton, GTK_FONT_BUTTON, Gtk::Button, GtkButton)
+  //TODO: When we can break ABI: _IMPLEMENTS_INTERFACE(FontChooser)
 public:
   _CTOR_DEFAULT()
   _WRAP_CTOR(FontButton(const Glib::ustring& font_name), gtk_font_button_new_with_font)
diff --git a/gtk/src/fontchooser.hg b/gtk/src/fontchooser.hg
index 5b8173d..a9fb997 100644
--- a/gtk/src/fontchooser.hg
+++ b/gtk/src/fontchooser.hg
@@ -16,21 +16,27 @@
  */
 
 _DEFS(gtkmm,gtk)
-_PINCLUDE(gtkmm/private/box_p.h)
+_PINCLUDE(glibmm/private/interface_p.h)
 
+#include <glibmm/interface.h>
+#include <pangomm/fontface.h>
+#include <pangomm/fontdescription.h>
+#include <pangomm/fontfamily.h>
 
-#include <gtkmm/box.h>
-
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkFontChooserIface GtkFontChooserIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
 
-/** A widget for selecting fonts.
+/** An interface implemented by widgets displaying fonts.
  *
- * The Gtk::FontChooser widget lists the available fonts, styles and
- * sizes, allowing the user to select a font. It is used in the
- * Gtk::FontChooserDialog widget to provide a dialog box for selecting
- * fonts.
+ * FontChooser widgets list the available fonts, styles and
+ * sizes, allowing the user to select a font.
  *
  * To set the font which is initially selected, use set_font_name().
  *
@@ -38,35 +44,45 @@ namespace Gtk
  *
  * To change the text which is shown in the preview area, use set_preview_text().
  * 
- * @ingroup Widgets
+ * @ingroup FontChooser
  * @newin{3,2}
  */
-class FontChooser : public Box
+class FontChooser : public Glib::Interface
 {
-  _CLASS_GTKOBJECT(FontChooser, GtkFontChooser, GTK_FONT_CHOOSER, Gtk::Box, GtkBox)
-  _IGNORE(gtk_font_chooser_get_font) //deprecated
+  _CLASS_INTERFACE(FontChooser, GtkFontChooser, GTK_FONT_CHOOSER, GtkFontChooserIface)
 public:
-  _CTOR_DEFAULT()
 
-  _WRAP_METHOD(Glib::RefPtr<Pango::FontFamily> get_family(), gtk_font_chooser_get_family, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Pango::FontFamily> get_family() const, gtk_font_chooser_get_family, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Pango::FontFamily> get_font_family(), gtk_font_chooser_get_font_family, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Pango::FontFamily> get_font_family() const, gtk_font_chooser_get_font_family, refreturn, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<Pango::FontFace> get_face(), gtk_font_chooser_get_face, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Pango::FontFace> get_face() const, gtk_font_chooser_get_face, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Pango::FontFace> get_font_face(), gtk_font_chooser_get_font_face, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Pango::FontFace> get_font_face() const, gtk_font_chooser_get_font_face, refreturn, constversion)
 
-  _WRAP_METHOD(int get_size() const, gtk_font_chooser_get_size)
+  _WRAP_METHOD(int get_font_size() const, gtk_font_chooser_get_font_size)
 
-  _WRAP_METHOD(Glib::ustring get_font_name() const, gtk_font_chooser_get_font_name)
-  _WRAP_METHOD(bool set_font_name(const Glib::ustring& fontname), gtk_font_chooser_set_font_name)
+#m4 _CONVERSION(`PangoFontDescription*',`Pango::FontDescription',`Glib::wrap(const_cast<PangoFontDescription*>($3), false)')
+  _WRAP_METHOD(Pango::FontDescription get_font_desc() const, gtk_font_chooser_get_font_desc)
+  _WRAP_METHOD(void set_font_desc(const Pango::FontDescription& font_desc), gtk_font_chooser_set_font_desc)
+                                                            
+  _WRAP_METHOD(Glib::ustring get_font() const, gtk_font_chooser_get_font)
+  _WRAP_METHOD(void set_font(const Glib::ustring& font), gtk_font_chooser_set_font)
   _WRAP_METHOD(Glib::ustring get_preview_text() const, gtk_font_chooser_get_preview_text)
   _WRAP_METHOD(void set_preview_text(const Glib::ustring& fontname),gtk_font_chooser_set_preview_text)
   
   _WRAP_METHOD(bool get_show_preview_entry() const, gtk_font_chooser_get_show_preview_entry)
   _WRAP_METHOD(void set_show_preview_entry(bool show_preview_entry = true), gtk_font_chooser_set_show_preview_entry)
 
+/* TODO:
+void             gtk_font_chooser_set_filter_func          (GtkFontChooser   *fontchooser,
+                                                            GtkFontFilterFunc filter,
+                                                            gpointer          user_data,
+                                                            GDestroyNotify    destroy);
+*/
+
+  _WRAP_SIGNAL(void font_activated(const Glib::ustring& fontname), "font-activated")
 
-  //Note: The GdkFont "font" property is deprecated, or should be.
-  _WRAP_PROPERTY("font_name", Glib::ustring)
+  _WRAP_PROPERTY("font", Glib::ustring)
+  _WRAP_PROPERTY("font-desc", Pango::FontDescription)
   _WRAP_PROPERTY("preview_text", Glib::ustring)
   _WRAP_PROPERTY("show-preview-entry", bool)
 };
diff --git a/gtk/src/fontchooserdialog.hg b/gtk/src/fontchooserdialog.hg
index a7f5639..3d19278 100644
--- a/gtk/src/fontchooserdialog.hg
+++ b/gtk/src/fontchooserdialog.hg
@@ -26,7 +26,7 @@ _PINCLUDE(gtkmm/private/dialog_p.h)
 namespace Gtk
 {
 
-/** A dialog box for selecting fonts.
+/** A dialog box for selecting fonts. It implements the #GtkFontChooser interface.
  *
  * To set the font which is initially selected, use set_font_name().
  *
@@ -35,28 +35,21 @@ namespace Gtk
  * To change the text which is shown in the preview area, use set_preview_text().
  *
  * @ingroup Dialogs
+ * @ingroup FontChooser
  * @newin{3,2}
  */
-class FontChooserDialog : public Dialog
+class FontChooserDialog
+  : public Dialog,
+    public FontChooser
 {
   _CLASS_GTKOBJECT(FontChooserDialog, GtkFontChooserDialog, GTK_FONT_CHOOSER_DIALOG, Gtk::Dialog, GtkDialog)
+  _IMPLEMENTS_INTERFACE(FontChooser)
 public:
   _CTOR_DEFAULT()
   explicit FontChooserDialog(const Glib::ustring& title);
   
   //Note: We renamed the parent parameter to transient_for because that is the property name.
   _WRAP_CTOR(FontChooserDialog(const Glib::ustring& title, Window& transient_for), gtk_font_chooser_dialog_new)
-
-
-#m4 _CONVERSION(`GtkWidget*',`FontChooser*',`Glib::wrap((GtkFontChooser*)($3))')
-#m4 _CONVERSION(`GtkWidget*',`const FontChooser*',`Glib::wrap((GtkFontChooser*)($3))')
-  _WRAP_METHOD(FontChooser* get_font_chooser(), gtk_font_chooser_dialog_get_font_chooser)
-  _WRAP_METHOD(const FontChooser* get_font_chooser() const, gtk_font_chooser_dialog_get_font_chooser, constversion)
-
-  _WRAP_METHOD(Glib::ustring get_font_name() const, gtk_font_chooser_dialog_get_font_name)
-  _WRAP_METHOD(bool set_font_name(const Glib::ustring& fontname), gtk_font_chooser_dialog_set_font_name)
-  _WRAP_METHOD(Glib::ustring get_preview_text() const, gtk_font_chooser_dialog_get_preview_text)
-  _WRAP_METHOD(void set_preview_text(const Glib::ustring& fontname),gtk_font_chooser_dialog_set_preview_text)
 };
 
 } // namespace Gtk
diff --git a/gtk/src/fontchooserwidget.ccg b/gtk/src/fontchooserwidget.ccg
new file mode 100644
index 0000000..0d6a90d
--- /dev/null
+++ b/gtk/src/fontchooserwidget.ccg
@@ -0,0 +1,23 @@
+/* Copyright 2011 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <gtk/gtk.h>
+
+namespace Gtk
+{
+
+} //namespace Gtk
diff --git a/gtk/src/fontchooserwidget.hg b/gtk/src/fontchooserwidget.hg
new file mode 100644
index 0000000..2e4751f
--- /dev/null
+++ b/gtk/src/fontchooserwidget.hg
@@ -0,0 +1,51 @@
+/* Copyright (C) 2011 The gtkmm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+_DEFS(gtkmm,gtk)
+_PINCLUDE(gtkmm/private/box_p.h)
+
+
+#include <gtkmm/box.h>
+#include <gtkmm/fontchooser.h>
+
+
+namespace Gtk
+{
+
+/** A dialog box for selecting fonts. It implements the #GtkFontChooser interface.
+ *
+ * To set the font which is initially selected, use set_font_name().
+ *
+ * To get the selected font use get_font_name().
+ *
+ * To change the text which is shown in the preview area, use set_preview_text().
+ *
+ * @ingroup Dialogs
+ * @ingroup Widgets
+ * @newin{3,2}
+ */
+class FontChooserWidget
+  : public Box,
+    public FontChooser
+{
+  _CLASS_GTKOBJECT(FontChooserWidget, GtkFontChooserWidget, GTK_FONT_CHOOSER_WIDGET, Gtk::Box, GtkBox)
+  _IMPLEMENTS_INTERFACE(FontChooser)
+public:
+  _CTOR_DEFAULT()
+};
+
+} // namespace Gtk
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index b57bccc..f9f9814 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -192,6 +192,12 @@
   (gtype-id "GTK_TYPE_ENTRY_COMPLETION")
 )
 
+(define-object FontChooser
+  (in-module "Gtk")
+  (c-name "GtkFontChooser")
+  (gtype-id "GTK_TYPE_FONT_CHOOSER")
+)
+
 (define-object IMContext
   (in-module "Gtk")
   (parent "GObject")
@@ -1093,11 +1099,11 @@
   (gtype-id "GTK_TYPE_FONT_SELECTION")
 )
 
-(define-object FontChooser
+(define-object FontChooserWidget
   (in-module "Gtk")
   (parent "GtkBox")
-  (c-name "GtkFontChooser")
-  (gtype-id "GTK_TYPE_FONT_CHOOSER")
+  (c-name "GtkFontChooserWidget")
+  (gtype-id "GTK_TYPE_FONT_CHOOSER_WIDGET")
 )
 
 (define-object FileChooserWidget
@@ -2862,8 +2868,6 @@
   )
 )
 
-
-
 ;; From gtkaccelgroup.h
 
 (define-function gtk_accel_group_get_type
@@ -4119,6 +4123,21 @@
   (return-type "const-gchar*")
 )
 
+(define-method set_show_default_item
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_set_show_default_item")
+  (return-type "none")
+  (parameters
+    '("gboolean" "setting")
+  )
+)
+
+(define-method get_show_default_item
+  (of-object "GtkAppChooserButton")
+  (c-name "gtk_app_chooser_button_get_show_default_item")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkappchooserdialog.h
@@ -11121,42 +11140,6 @@
   )
 )
 
-(define-method get_font_chooser
-  (of-object "GtkFontChooserDialog")
-  (c-name "gtk_font_chooser_dialog_get_font_chooser")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_font_name
-  (of-object "GtkFontChooserDialog")
-  (c-name "gtk_font_chooser_dialog_get_font_name")
-  (return-type "gchar*")
-)
-
-(define-method set_font_name
-  (of-object "GtkFontChooserDialog")
-  (c-name "gtk_font_chooser_dialog_set_font_name")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "fontname")
-  )
-)
-
-(define-method get_preview_text
-  (of-object "GtkFontChooserDialog")
-  (c-name "gtk_font_chooser_dialog_get_preview_text")
-  (return-type "const-gchar*")
-)
-
-(define-method set_preview_text
-  (of-object "GtkFontChooserDialog")
-  (c-name "gtk_font_chooser_dialog_set_preview_text")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "text")
-  )
-)
-
 
 
 ;; From gtkfontchooser.h
@@ -11166,40 +11149,49 @@
   (return-type "GType")
 )
 
-(define-function gtk_font_chooser_new
-  (c-name "gtk_font_chooser_new")
-  (is-constructor-of "GtkFontChooser")
-  (return-type "GtkWidget*")
-)
-
-(define-method get_family
+(define-method get_font_family
   (of-object "GtkFontChooser")
-  (c-name "gtk_font_chooser_get_family")
+  (c-name "gtk_font_chooser_get_font_family")
   (return-type "PangoFontFamily*")
 )
 
-(define-method get_face
+(define-method get_font_face
   (of-object "GtkFontChooser")
-  (c-name "gtk_font_chooser_get_face")
+  (c-name "gtk_font_chooser_get_font_face")
   (return-type "PangoFontFace*")
 )
 
-(define-method get_size
+(define-method get_font_size
   (of-object "GtkFontChooser")
-  (c-name "gtk_font_chooser_get_size")
+  (c-name "gtk_font_chooser_get_font_size")
   (return-type "gint")
 )
 
-(define-method get_font_name
+(define-method get_font_desc
+  (of-object "GtkFontChooser")
+  (c-name "gtk_font_chooser_get_font_desc")
+  (return-type "PangoFontDescription*")
+)
+
+(define-method set_font_desc
+  (of-object "GtkFontChooser")
+  (c-name "gtk_font_chooser_set_font_desc")
+  (return-type "none")
+  (parameters
+    '("const-PangoFontDescription*" "font_desc")
+  )
+)
+
+(define-method get_font
   (of-object "GtkFontChooser")
-  (c-name "gtk_font_chooser_get_font_name")
+  (c-name "gtk_font_chooser_get_font")
   (return-type "gchar*")
 )
 
-(define-method set_font_name
+(define-method set_font
   (of-object "GtkFontChooser")
-  (c-name "gtk_font_chooser_set_font_name")
-  (return-type "gboolean")
+  (c-name "gtk_font_chooser_set_font")
+  (return-type "none")
   (parameters
     '("const-gchar*" "fontname")
   )
@@ -11208,7 +11200,7 @@
 (define-method get_preview_text
   (of-object "GtkFontChooser")
   (c-name "gtk_font_chooser_get_preview_text")
-  (return-type "const-gchar*")
+  (return-type "gchar*")
 )
 
 (define-method set_preview_text
@@ -11241,13 +11233,28 @@
   (return-type "none")
   (parameters
     '("GtkFontFilterFunc" "filter")
-    '("gpointer" "data")
+    '("gpointer" "user_data")
     '("GDestroyNotify" "destroy")
   )
 )
 
 
 
+;; From gtkfontchooserwidget.h
+
+(define-function gtk_font_chooser_widget_get_type
+  (c-name "gtk_font_chooser_widget_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_font_chooser_widget_new
+  (c-name "gtk_font_chooser_widget_new")
+  (is-constructor-of "GtkFontChooserWidget")
+  (return-type "GtkWidget*")
+)
+
+
+
 ;; From gtkfontsel.h
 
 (define-function gtk_font_selection_get_type
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]