GNOME.org
 

[gtkmm] gtkmm: Regenerate some .defs files.

commit c8bd6a3c29d8bbd82f0ce2c58302a74b27ecb038
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 19 10:38:49 2011 +0200

    gtkmm: Regenerate some .defs files.
    
    * gtk/src/gtk_enums.defs: Regenerated with enums.pl.
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * tools/m4/convert_gdk.m4: Added a conversion because
    gtk_widget_queue_draw_region()'s parameter is now const.

 ChangeLog                |    9 ++
 gtk/src/gtk_enums.defs   |   16 ++-
 gtk/src/gtk_methods.defs |  348 +++++++++++++++++++++++++++++++++++++++++-----
 tools/m4/convert_gdk.m4  |    1 +
 4 files changed, 338 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f8daf48..8f9e1ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-07-19  Murray Cumming  <murrayc murrayc com>
+
+	gtkmm: Regenerate some .defs files.
+
+	* gtk/src/gtk_enums.defs: Regenerated with enums.pl.
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* tools/m4/convert_gdk.m4: Added a conversion because 
+	gtk_widget_queue_draw_region()'s parameter is now const.
+
 3.1.8:
 
 2011-06-29  Murray Cumming  <murrayc murrayc com>
diff --git a/gtk/src/gtk_enums.defs b/gtk/src/gtk_enums.defs
index 72422eb..adc20e0 100644
--- a/gtk/src/gtk_enums.defs
+++ b/gtk/src/gtk_enums.defs
@@ -201,7 +201,12 @@
 ;; Original typedef:
 ;; typedef enum
 ;; {
-;;   GTK_CSS_PROVIDER_ERROR_FAILED
+;;   GTK_CSS_PROVIDER_ERROR_FAILED,
+;;   GTK_CSS_PROVIDER_ERROR_SYNTAX,
+;;   GTK_CSS_PROVIDER_ERROR_IMPORT,
+;;   GTK_CSS_PROVIDER_ERROR_NAME,
+;;   GTK_CSS_PROVIDER_ERROR_DEPRECATED,
+;;   GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE
 ;; } GtkCssProviderError;
 
 (define-enum-extended CssProviderError
@@ -209,6 +214,11 @@
   (c-name "GtkCssProviderError")
   (values
     '("failed" "GTK_CSS_PROVIDER_ERROR_FAILED" "0")
+    '("syntax" "GTK_CSS_PROVIDER_ERROR_SYNTAX" "1")
+    '("import" "GTK_CSS_PROVIDER_ERROR_IMPORT" "2")
+    '("name" "GTK_CSS_PROVIDER_ERROR_NAME" "3")
+    '("deprecated" "GTK_CSS_PROVIDER_ERROR_DEPRECATED" "4")
+    '("unknown-value" "GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE" "5")
   )
 )
 
@@ -1339,7 +1349,8 @@
 ;; typedef enum
 ;; {
 ;;   GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH = 0,
-;;   GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT
+;;   GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT,
+;;   GTK_SIZE_REQUEST_CONSTANT_SIZE
 ;; } GtkSizeRequestMode;
 
 (define-enum-extended SizeRequestMode
@@ -1348,6 +1359,7 @@
   (values
     '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH" "0")
     '("width-for-height" "GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT" "1")
+    '("constant-size" "GTK_SIZE_REQUEST_CONSTANT_SIZE" "2")
   )
 )
 
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 7e04bd1..a805ca5 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -862,6 +862,13 @@
   (gtype-id "GTK_TYPE_SCROLLED_WINDOW")
 )
 
+(define-object Overlay
+  (in-module "Gtk")
+  (parent "GtkBin")
+  (c-name "GtkOverlay")
+  (gtype-id "GTK_TYPE_OVERLAY")
+)
+
 (define-object MenuItem
   (in-module "Gtk")
   (parent "GtkBin")
@@ -988,6 +995,13 @@
   (gtype-id "GTK_TYPE_VOLUME_BUTTON")
 )
 
+(define-object LockButton
+  (in-module "Gtk")
+  (parent "GtkButton")
+  (c-name "GtkLockButton")
+  (gtype-id "GTK_TYPE_LOCK_BUTTON")
+)
+
 (define-object LinkButton
   (in-module "Gtk")
   (parent "GtkButton")
@@ -1044,34 +1058,27 @@
   (gtype-id "GTK_TYPE_VBOX")
 )
 
-(define-object ColorSelection
-  (in-module "Gtk")
-  (parent "GtkVBox")
-  (c-name "GtkColorSelection")
-  (gtype-id "GTK_TYPE_COLOR_SELECTION")
-)
-
-(define-object FileChooserWidget
-  (in-module "Gtk")
-  (parent "GtkVBox")
-  (c-name "GtkFileChooserWidget")
-  (gtype-id "GTK_TYPE_FILE_CHOOSER_WIDGET")
-)
-
-(define-object FontSelection
+(define-object Statusbar
   (in-module "Gtk")
-  (parent "GtkVBox")
-  (c-name "GtkFontSelection")
-  (gtype-id "GTK_TYPE_FONT_SELECTION")
+  (parent "GtkBox")
+  (c-name "GtkStatusbar")
+  (gtype-id "GTK_TYPE_STATUSBAR")
 )
 
 (define-object RecentChooserWidget
   (in-module "Gtk")
-  (parent "GtkVBox")
+  (parent "GtkBox")
   (c-name "GtkRecentChooserWidget")
   (gtype-id "GTK_TYPE_RECENT_CHOOSER_WIDGET")
 )
 
+(define-object InfoBar
+  (in-module "Gtk")
+  (parent "GtkBox")
+  (c-name "GtkInfoBar")
+  (gtype-id "GTK_TYPE_INFO_BAR")
+)
+
 (define-object HBox
   (in-module "Gtk")
   (parent "GtkBox")
@@ -1079,23 +1086,23 @@
   (gtype-id "GTK_TYPE_HBOX")
 )
 
-(define-object Statusbar
+(define-object FontSelection
   (in-module "Gtk")
-  (parent "GtkHBox")
-  (c-name "GtkStatusbar")
-  (gtype-id "GTK_TYPE_STATUSBAR")
+  (parent "GtkBox")
+  (c-name "GtkFontSelection")
+  (gtype-id "GTK_TYPE_FONT_SELECTION")
 )
 
-(define-object InfoBar
+(define-object FileChooserWidget
   (in-module "Gtk")
-  (parent "GtkHBox")
-  (c-name "GtkInfoBar")
-  (gtype-id "GTK_TYPE_INFO_BAR")
+  (parent "GtkBox")
+  (c-name "GtkFileChooserWidget")
+  (gtype-id "GTK_TYPE_FILE_CHOOSER_WIDGET")
 )
 
 (define-object FileChooserButton
   (in-module "Gtk")
-  (parent "GtkHBox")
+  (parent "GtkBox")
   (c-name "GtkFileChooserButton")
   (gtype-id "GTK_TYPE_FILE_CHOOSER_BUTTON")
 )
@@ -1128,6 +1135,13 @@
   (gtype-id "GTK_TYPE_HBUTTON_BOX")
 )
 
+(define-object ColorSelection
+  (in-module "Gtk")
+  (parent "GtkBox")
+  (c-name "GtkColorSelection")
+  (gtype-id "GTK_TYPE_COLOR_SELECTION")
+)
+
 (define-object CellView
   (in-module "Gtk")
   (parent "GtkWidget")
@@ -1361,6 +1375,11 @@
   (gtype-id "GTK_TYPE_CSS_PROVIDER_ERROR")
   (values
     '("failed" "GTK_CSS_PROVIDER_ERROR_FAILED")
+    '("syntax" "GTK_CSS_PROVIDER_ERROR_SYNTAX")
+    '("import" "GTK_CSS_PROVIDER_ERROR_IMPORT")
+    '("name" "GTK_CSS_PROVIDER_ERROR_NAME")
+    '("deprecated" "GTK_CSS_PROVIDER_ERROR_DEPRECATED")
+    '("unknown-value" "GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE")
   )
 )
 
@@ -2032,6 +2051,7 @@
   (values
     '("height-for-width" "GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH")
     '("width-for-height" "GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT")
+    '("constant-size" "GTK_SIZE_REQUEST_CONSTANT_SIZE")
   )
 )
 
@@ -3932,6 +3952,12 @@
   )
 )
 
+(define-method get_minimum_increment
+  (of-object "GtkAdjustment")
+  (c-name "gtk_adjustment_get_minimum_increment")
+  (return-type "gdouble")
+)
+
 
 
 ;; From gtkalignment.h
@@ -4440,6 +4466,15 @@
   )
 )
 
+(define-function gtk_asssistant_remove_page
+  (c-name "gtk_asssistant_remove_page")
+  (return-type "none")
+  (parameters
+    '("GtkAssistant*" "assistant")
+    '("gint" "page_num")
+  )
+)
+
 (define-method set_forward_page_func
   (of-object "GtkAssistant")
   (c-name "gtk_assistant_set_forward_page_func")
@@ -4628,6 +4663,25 @@
   )
 )
 
+(define-method get_child_non_homogeneous
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_get_child_non_homogeneous")
+  (return-type "gboolean")
+  (parameters
+    '("GtkWidget*" "child")
+  )
+)
+
+(define-method set_child_non_homogeneous
+  (of-object "GtkButtonBox")
+  (c-name "gtk_button_box_set_child_non_homogeneous")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "child")
+    '("gboolean" "non_homogeneous")
+  )
+)
+
 
 
 ;; From gtkbindings.h
@@ -7977,7 +8031,7 @@
 (define-method set_active_id
   (of-object "GtkComboBox")
   (c-name "gtk_combo_box_set_active_id")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("const-gchar*" "active_id")
   )
@@ -8367,6 +8421,16 @@
   )
 )
 
+(define-method child_notify
+  (of-object "GtkContainer")
+  (c-name "gtk_container_child_notify")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "child")
+    '("const-gchar*" "child_property")
+  )
+)
+
 (define-method forall
   (of-object "GtkContainer")
   (c-name "gtk_container_forall")
@@ -8412,6 +8476,12 @@
   (return-type "GtkCssProvider*")
 )
 
+(define-method to_string
+  (of-object "GtkCssProvider")
+  (c-name "gtk_css_provider_to_string")
+  (return-type "char*")
+)
+
 (define-method load_from_data
   (of-object "GtkCssProvider")
   (c-name "gtk_css_provider_load_from_data")
@@ -8860,6 +8930,15 @@
   )
 )
 
+(define-function gtk_drag_source_set_icon_gicon
+  (c-name "gtk_drag_source_set_icon_gicon")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("GIcon*" "icon")
+  )
+)
+
 (define-function gtk_drag_begin
   (c-name "gtk_drag_begin")
   (return-type "GdkDragContext*")
@@ -8925,6 +9004,17 @@
   )
 )
 
+(define-function gtk_drag_set_icon_gicon
+  (c-name "gtk_drag_set_icon_gicon")
+  (return-type "none")
+  (parameters
+    '("GdkDragContext*" "context")
+    '("GIcon*" "icon")
+    '("gint" "hot_x")
+    '("gint" "hot_y")
+  )
+)
+
 (define-function gtk_drag_set_icon_default
   (c-name "gtk_drag_set_icon_default")
   (return-type "none")
@@ -9694,6 +9784,21 @@
   (return-type "none")
 )
 
+(define-method get_placeholder_text
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_get_placeholder_text")
+  (return-type "const-gchar*")
+)
+
+(define-method set_placeholder_text
+  (of-object "GtkEntry")
+  (c-name "gtk_entry_set_placeholder_text")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
+
 (define-method set_icon_from_pixbuf
   (of-object "GtkEntry")
   (c-name "gtk_entry_set_icon_from_pixbuf")
@@ -10087,6 +10192,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_resize_toplevel
+  (of-object "GtkExpander")
+  (c-name "gtk_expander_set_resize_toplevel")
+  (return-type "none")
+  (parameters
+    '("gboolean" "resize_toplevel")
+  )
+)
+
+(define-method get_resize_toplevel
+  (of-object "GtkExpander")
+  (c-name "gtk_expander_get_resize_toplevel")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkfilechooserbutton.h
@@ -11192,6 +11312,12 @@
   )
 )
 
+(define-method to_string
+  (of-object "GtkGradient")
+  (c-name "gtk_gradient_to_string")
+  (return-type "char*")
+)
+
 
 
 ;; From gtkgrid.h
@@ -12145,10 +12271,10 @@
   (c-name "gtk_icon_info_load_symbolic")
   (return-type "GdkPixbuf*")
   (parameters
-    '("GdkRGBA*" "fg")
-    '("GdkRGBA*" "success_color")
-    '("GdkRGBA*" "warning_color")
-    '("GdkRGBA*" "error_color")
+    '("const-GdkRGBA*" "fg")
+    '("const-GdkRGBA*" "success_color")
+    '("const-GdkRGBA*" "warning_color")
+    '("const-GdkRGBA*" "error_color")
     '("gboolean*" "was_symbolic")
     '("GError**" "error")
   )
@@ -14095,6 +14221,39 @@
 
 
 
+;; From gtklockbutton.h
+
+(define-function gtk_lock_button_get_type
+  (c-name "gtk_lock_button_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_lock_button_new
+  (c-name "gtk_lock_button_new")
+  (is-constructor-of "GtkLockButton")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GPermission*" "permission")
+  )
+)
+
+(define-method get_permission
+  (of-object "GtkLockButton")
+  (c-name "gtk_lock_button_get_permission")
+  (return-type "GPermission*")
+)
+
+(define-method set_permission
+  (of-object "GtkLockButton")
+  (c-name "gtk_lock_button_set_permission")
+  (return-type "none")
+  (parameters
+    '("GPermission*" "permission")
+  )
+)
+
+
+
 ;; From gtkmain.h
 
 (define-function gtk_get_major_version
@@ -15688,6 +15847,30 @@
 
 
 
+;; From gtkoverlay.h
+
+(define-function gtk_overlay_get_type
+  (c-name "gtk_overlay_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_overlay_new
+  (c-name "gtk_overlay_new")
+  (is-constructor-of "GtkOverlay")
+  (return-type "GtkWidget*")
+)
+
+(define-method add_overlay
+  (of-object "GtkOverlay")
+  (c-name "gtk_overlay_add_overlay")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+
+
 ;; From gtkpagesetup.h
 
 (define-function gtk_page_setup_get_type
@@ -21312,6 +21495,18 @@
   )
 )
 
+(define-function gtk_render_icon
+  (c-name "gtk_render_icon")
+  (return-type "none")
+  (parameters
+    '("GtkStyleContext*" "context")
+    '("cairo_t*" "cr")
+    '("GdkPixbuf*" "pixbuf")
+    '("gdouble" "x")
+    '("gdouble" "y")
+  )
+)
+
 
 
 ;; From gtkstyle.h
@@ -22076,6 +22271,12 @@
   (return-type "none")
 )
 
+(define-method to_string
+  (of-object "GtkSymbolicColor")
+  (c-name "gtk_symbolic_color_to_string")
+  (return-type "char*")
+)
+
 (define-method resolve
   (of-object "GtkSymbolicColor")
   (c-name "gtk_symbolic_color_resolve")
@@ -27796,6 +27997,12 @@
   (return-type "GtkTreeViewColumnSizing")
 )
 
+(define-method get_x_offset
+  (of-object "GtkTreeViewColumn")
+  (c-name "gtk_tree_view_column_get_x_offset")
+  (return-type "gint")
+)
+
 (define-method get_width
   (of-object "GtkTreeViewColumn")
   (c-name "gtk_tree_view_column_get_width")
@@ -29938,7 +30145,7 @@
   (c-name "gtk_widget_queue_draw_region")
   (return-type "none")
   (parameters
-    '("cairo_region_t*" "region")
+    '("const-cairo_region_t*" "region")
   )
 )
 
@@ -30815,6 +31022,24 @@
   )
 )
 
+(define-method set_accessible_type
+  (of-object "GtkWidgetClass")
+  (c-name "gtk_widget_class_set_accessible_type")
+  (return-type "none")
+  (parameters
+    '("GType" "type")
+  )
+)
+
+(define-method set_accessible_role
+  (of-object "GtkWidgetClass")
+  (c-name "gtk_widget_class_set_accessible_role")
+  (return-type "none")
+  (parameters
+    '("AtkRole" "role")
+  )
+)
+
 (define-method get_accessible
   (of-object "GtkWidget")
   (c-name "gtk_widget_get_accessible")
@@ -31516,12 +31741,30 @@
   (return-type "GtkWidgetPath*")
 )
 
+(define-method ref
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_ref")
+  (return-type "GtkWidgetPath*")
+)
+
+(define-method unref
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_unref")
+  (return-type "none")
+)
+
 (define-method free
   (of-object "GtkWidgetPath")
   (c-name "gtk_widget_path_free")
   (return-type "none")
 )
 
+(define-method to_string
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_to_string")
+  (return-type "char*")
+)
+
 (define-method length
   (of-object "GtkWidgetPath")
   (c-name "gtk_widget_path_length")
@@ -31546,6 +31789,25 @@
   )
 )
 
+(define-method append_with_siblings
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_append_with_siblings")
+  (return-type "gint")
+  (parameters
+    '("GtkWidgetPath*" "siblings")
+    '("guint" "sibling_index")
+  )
+)
+
+(define-method append_for_widget
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_append_for_widget")
+  (return-type "gint")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
 (define-method iter_get_object_type
   (of-object "GtkWidgetPath")
   (c-name "gtk_widget_path_iter_get_object_type")
@@ -31565,6 +31827,24 @@
   )
 )
 
+(define-method iter_get_siblings
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_iter_get_siblings")
+  (return-type "const-GtkWidgetPath*")
+  (parameters
+    '("gint" "pos")
+  )
+)
+
+(define-method iter_get_sibling_index
+  (of-object "GtkWidgetPath")
+  (c-name "gtk_widget_path_iter_get_sibling_index")
+  (return-type "guint")
+  (parameters
+    '("gint" "pos")
+  )
+)
+
 (define-method iter_get_name
   (of-object "GtkWidgetPath")
   (c-name "gtk_widget_path_iter_get_name")
diff --git a/tools/m4/convert_gdk.m4 b/tools/m4/convert_gdk.m4
index 8d39d3d..7209f20 100644
--- a/tools/m4/convert_gdk.m4
+++ b/tools/m4/convert_gdk.m4
@@ -104,6 +104,7 @@ _CONVERSION(`const Gdk::Rectangle&',`const GdkRectangle*',($3).gobj())
 _CONVERSION(`Font&',`GdkFont*',($3).gobj())
 _CONVERSION(`const Cairo::RefPtr<Cairo::Region>&',`const cairo_region_t*',`(($3) ? ($3)->cobj() : 0)')
 _CONVERSION(`const Cairo::RefPtr<const Cairo::Region>&',`cairo_region_t*',`const_cast<cairo_region_t*>(($3) ? ($3)->cobj() : 0)')
+_CONVERSION(`const Cairo::RefPtr<const Cairo::Region>&',`const cairo_region_t*',`(($3) ? ($3)->cobj() : 0)')
 
 _CONVERSION(`const Glib::RefPtr<Cursor>&',`GdkCursor*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<const Cursor>&',`GdkCursor*',__CONVERT_CONST_REFPTR_TO_P)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]