GNOME.org
 

[gtkmm/gtkmm-2-24] Regenerated function defs.

commit eba100e411a292fcc047d27ad77304fdb57a2cd0
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 14 10:31:12 2011 +0100

    Regenerated function defs.
    
    * gdk/src/gdk_methods.defs:
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
    * gtk/src/aboutdialog.hg: Use the changed conversion from gtkmm 3.0 which
    avoids the need to edit the generated .defs file.

 ChangeLog                |    9 ++
 gdk/src/gdk_methods.defs |  241 +++++++++++++++++++++++++++++++++++-------
 gtk/src/aboutdialog.hg   |    2 +-
 gtk/src/gtk_methods.defs |  267 ++++++++++++++++++++++++++++++++++++----------
 4 files changed, 420 insertions(+), 99 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d0783f7..b224aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Murray Cumming  <murrayc murrayc com>
+
+	Regenerated function defs.
+
+	* gdk/src/gdk_methods.defs:
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py.
+	* gtk/src/aboutdialog.hg: Use the changed conversion from gtkmm 3.0 which 
+	avoids the need to edit the generated .defs file.
+	
 2011-01-11  Kjell Ahlstedt  <kjell ahlstedt bredband net>
 
   Widget::set_window(): Increase the ref count of the Gdk::Window.
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index 3aa2a69..327ab3c 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -865,6 +865,17 @@
   )
 )
 
+(define-function gdk_cairo_set_source_window
+  (c-name "gdk_cairo_set_source_window")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("GdkWindow*" "window")
+    '("double" "x")
+    '("double" "y")
+  )
+)
+
 (define-function gdk_cairo_rectangle
   (c-name "gdk_cairo_rectangle")
   (return-type "none")
@@ -1573,6 +1584,18 @@
   (return-type "GdkWindow*")
 )
 
+(define-method get_dest_window
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_context_get_dest_window")
+  (return-type "GdkWindow*")
+)
+
+(define-method get_protocol
+  (of-object "GdkDragContext")
+  (c-name "gdk_drag_context_get_protocol")
+  (return-type "GdkDragProtocol")
+)
+
 (define-method ref
   (of-object "GdkDragContext")
   (c-name "gdk_drag_context_ref")
@@ -1748,16 +1771,6 @@
   )
 )
 
-(define-method get_size
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_size")
-  (return-type "none")
-  (parameters
-    '("gint*" "width")
-    '("gint*" "height")
-  )
-)
-
 (define-method set_colormap
   (of-object "GdkDrawable")
   (c-name "gdk_drawable_set_colormap")
@@ -1773,18 +1786,28 @@
   (return-type "GdkColormap*")
 )
 
-(define-method get_visual
-  (of-object "GdkDrawable")
-  (c-name "gdk_drawable_get_visual")
-  (return-type "GdkVisual*")
-)
-
 (define-method get_depth
   (of-object "GdkDrawable")
   (c-name "gdk_drawable_get_depth")
   (return-type "gint")
 )
 
+(define-method get_size
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_get_size")
+  (return-type "none")
+  (parameters
+    '("gint*" "width")
+    '("gint*" "height")
+  )
+)
+
+(define-method get_visual
+  (of-object "GdkDrawable")
+  (c-name "gdk_drawable_get_visual")
+  (return-type "GdkVisual*")
+)
+
 (define-method get_screen
   (of-object "GdkDrawable")
   (c-name "gdk_drawable_get_screen")
@@ -3659,6 +3682,12 @@
   )
 )
 
+(define-method get_n_keys
+  (of-object "GdkDevice")
+  (c-name "gdk_device_get_n_keys")
+  (return-type "gint")
+)
+
 (define-method get_n_axes
   (of-object "GdkDevice")
   (c-name "gdk_device_get_n_axes")
@@ -3944,6 +3973,10 @@
 
 
 
+;; From gdkkeysyms-compat.h
+
+
+
 ;; From gdkkeysyms.h
 
 
@@ -4289,6 +4322,16 @@
   )
 )
 
+(define-method get_size
+  (of-object "GdkPixmap")
+  (c-name "gdk_pixmap_get_size")
+  (return-type "none")
+  (parameters
+    '("gint*" "width")
+    '("gint*" "height")
+  )
+)
+
 (define-function gdk_pixmap_foreign_new
   (c-name "gdk_pixmap_foreign_new")
   (is-constructor-of "GdkPixmapForeign")
@@ -4435,18 +4478,6 @@
   )
 )
 
-(define-function gdk_text_property_to_utf8_list
-  (c-name "gdk_text_property_to_utf8_list")
-  (return-type "gint")
-  (parameters
-    '("GdkAtom" "encoding")
-    '("gint" "format")
-    '("const-guchar*" "text")
-    '("gint" "length")
-    '("gchar***" "list")
-  )
-)
-
 (define-function gdk_utf8_to_compound_text
   (c-name "gdk_utf8_to_compound_text")
   (return-type "gboolean")
@@ -4471,11 +4502,10 @@
   )
 )
 
-(define-function gdk_text_property_to_text_list_for_display
-  (c-name "gdk_text_property_to_text_list_for_display")
+(define-function gdk_text_property_to_utf8_list
+  (c-name "gdk_text_property_to_utf8_list")
   (return-type "gint")
   (parameters
-    '("GdkDisplay*" "display")
     '("GdkAtom" "encoding")
     '("gint" "format")
     '("const-guchar*" "text")
@@ -4505,6 +4535,19 @@
   )
 )
 
+(define-function gdk_text_property_to_text_list_for_display
+  (c-name "gdk_text_property_to_text_list_for_display")
+  (return-type "gint")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("GdkAtom" "encoding")
+    '("gint" "format")
+    '("const-guchar*" "text")
+    '("gint" "length")
+    '("gchar***" "list")
+  )
+)
+
 (define-function gdk_string_to_compound_text_for_display
   (c-name "gdk_string_to_compound_text_for_display")
   (return-type "gint")
@@ -5560,6 +5603,36 @@
   (return-type "gboolean")
 )
 
+(define-method get_screen
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_screen")
+  (return-type "GdkScreen*")
+)
+
+(define-method get_display
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_display")
+  (return-type "GdkDisplay*")
+)
+
+(define-method get_visual
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_visual")
+  (return-type "GdkVisual*")
+)
+
+(define-method get_width
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_width")
+  (return-type "int")
+)
+
+(define-method get_height
+  (of-object "GdkWindow")
+  (c-name "gdk_window_get_height")
+  (return-type "int")
+)
+
 (define-function gdk_window_at_pointer
   (c-name "gdk_window_at_pointer")
   (return-type "GdkWindow*")
@@ -6539,6 +6612,16 @@
   )
 )
 
+(define-method invalidate_maybe_recurse
+  (of-object "GdkWindow")
+  (c-name "gdk_window_invalidate_maybe_recurse")
+  (return-type "none")
+  (parameters
+    '("const-GdkRegion*" "region")
+    '("somepointer" "child_func")
+  )
+)
+
 (define-method get_update_area
   (of-object "GdkWindow")
   (c-name "gdk_window_get_update_area")
@@ -6627,14 +6710,6 @@
   (return-type "none")
 )
 
-(define-function gdk_set_pointer_hooks
-  (c-name "gdk_set_pointer_hooks")
-  (return-type "GdkPointerHooks*")
-  (parameters
-    '("const-GdkPointerHooks*" "new_hooks")
-  )
-)
-
 (define-function gdk_get_default_root_window
   (c-name "gdk_get_default_root_window")
   (return-type "GdkWindow*")
@@ -6692,6 +6767,14 @@
   (return-type "none")
 )
 
+(define-function gdk_set_pointer_hooks
+  (c-name "gdk_set_pointer_hooks")
+  (return-type "GdkPointerHooks*")
+  (parameters
+    '("const-GdkPointerHooks*" "new_hooks")
+  )
+)
+
 
 
 ;; From gdkx.h
@@ -7122,5 +7205,85 @@
   )
 )
 
+(define-function gdk_x11_set_sm_client_id
+  (c-name "gdk_x11_set_sm_client_id")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "sm_client_id")
+  )
+)
+
+(define-function gdk_x11_window_foreign_new_for_display
+  (c-name "gdk_x11_window_foreign_new_for_display")
+  (return-type "GdkWindow*")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("Window" "window")
+  )
+)
+
+(define-function gdk_x11_window_lookup_for_display
+  (c-name "gdk_x11_window_lookup_for_display")
+  (return-type "GdkWindow*")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("Window" "window")
+  )
+)
+
+(define-function gdk_x11_display_text_property_to_text_list
+  (c-name "gdk_x11_display_text_property_to_text_list")
+  (return-type "gint")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("GdkAtom" "encoding")
+    '("gint" "format")
+    '("const-guchar*" "text")
+    '("gint" "length")
+    '("gchar***" "list")
+  )
+)
+
+(define-function gdk_x11_free_text_list
+  (c-name "gdk_x11_free_text_list")
+  (return-type "none")
+  (parameters
+    '("gchar**" "list")
+  )
+)
+
+(define-function gdk_x11_display_string_to_compound_text
+  (c-name "gdk_x11_display_string_to_compound_text")
+  (return-type "gint")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("const-gchar*" "str")
+    '("GdkAtom*" "encoding")
+    '("gint*" "format")
+    '("guchar**" "ctext")
+    '("gint*" "length")
+  )
+)
+
+(define-function gdk_x11_display_utf8_to_compound_text
+  (c-name "gdk_x11_display_utf8_to_compound_text")
+  (return-type "gboolean")
+  (parameters
+    '("GdkDisplay*" "display")
+    '("const-gchar*" "str")
+    '("GdkAtom*" "encoding")
+    '("gint*" "format")
+    '("guchar**" "ctext")
+    '("gint*" "length")
+  )
+)
+
+(define-function gdk_x11_free_compound_text
+  (c-name "gdk_x11_free_compound_text")
+  (return-type "none")
+  (parameters
+    '("guchar*" "ctext")
+  )
+)
 
 
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 42d0b81..f8aa950 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -71,7 +71,7 @@ public:
   _WRAP_METHOD(Glib::ustring get_website_label() const, gtk_about_dialog_get_website_label)
   _WRAP_METHOD(void set_website_label(const Glib::ustring& website_label), gtk_about_dialog_set_website_label)
 
-  #m4 _CONVERSION(`gchar const * const *',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
+  #m4 _CONVERSION(`const gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
 
   _WRAP_METHOD(Glib::StringArrayHandle get_authors() const, gtk_about_dialog_get_authors)
 
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index a6ce33b..ea3bf26 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -211,6 +211,13 @@
   (gtype-id "GTK_TYPE_ORIENTABLE")
 )
 
+(define-object PrintJob
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkPrintJob")
+  (gtype-id "GTK_TYPE_PRINT_JOB")
+)
+
 (define-object PrintOperation
   (in-module "Gtk")
   (parent "GObject")
@@ -224,6 +231,13 @@
   (gtype-id "GTK_TYPE_PRINT_OPERATION_PREVIEW")
 )
 
+(define-object Printer
+  (in-module "Gtk")
+  (parent "GObject")
+  (c-name "GtkPrinter")
+  (gtype-id "GTK_TYPE_PRINTER")
+)
+
 (define-object RcStyle
   (in-module "Gtk")
   (parent "GObject")
@@ -1219,6 +1233,20 @@
   (gtype-id "GTK_TYPE_RECENT_CHOOSER_DIALOG")
 )
 
+(define-object PrintUnixDialog
+  (in-module "Gtk")
+  (parent "GtkDialog")
+  (c-name "GtkPrintUnixDialog")
+  (gtype-id "GTK_TYPE_PRINT_UNIX_DIALOG")
+)
+
+(define-object PageSetupUnixDialog
+  (in-module "Gtk")
+  (parent "GtkDialog")
+  (c-name "GtkPageSetupUnixDialog")
+  (gtype-id "GTK_TYPE_PAGE_SETUP_UNIX_DIALOG")
+)
+
 (define-object MessageDialog
   (in-module "Gtk")
   (parent "GtkDialog")
@@ -2809,6 +2837,24 @@
   )
 )
 
+(define-flags PrintCapabilities
+  (in-module "Gtk")
+  (c-name "GtkPrintCapabilities")
+  (gtype-id "GTK_TYPE_PRINT_CAPABILITIES")
+  (values
+    '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET")
+    '("copies" "GTK_PRINT_CAPABILITY_COPIES")
+    '("collate" "GTK_PRINT_CAPABILITY_COLLATE")
+    '("reverse" "GTK_PRINT_CAPABILITY_REVERSE")
+    '("scale" "GTK_PRINT_CAPABILITY_SCALE")
+    '("generate-pdf" "GTK_PRINT_CAPABILITY_GENERATE_PDF")
+    '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS")
+    '("preview" "GTK_PRINT_CAPABILITY_PREVIEW")
+    '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP")
+    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT")
+  )
+)
+
 
 ;; From gtkaboutdialog.h
 
@@ -2971,7 +3017,7 @@
 (define-method get_authors
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_authors")
-  (return-type "gchar-const-*-const-*")
+  (return-type "const-gchar**")
 )
 
 (define-method set_authors
@@ -2986,7 +3032,7 @@
 (define-method get_documenters
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_documenters")
-  (return-type "gchar-const-*-const-*")
+  (return-type "const-gchar**")
 )
 
 (define-method set_documenters
@@ -3001,7 +3047,7 @@
 (define-method get_artists
   (of-object "GtkAboutDialog")
   (c-name "gtk_about_dialog_get_artists")
-  (return-type "gchar-const-*-const-*")
+  (return-type "const-gchar**")
 )
 
 (define-method set_artists
@@ -15461,16 +15507,16 @@
   )
 )
 
-(define-function gtk_disable_setlocale
-  (c-name "gtk_disable_setlocale")
-  (return-type "none")
-)
-
 (define-function gtk_set_locale
   (c-name "gtk_set_locale")
   (return-type "gchar*")
 )
 
+(define-function gtk_disable_setlocale
+  (c-name "gtk_disable_setlocale")
+  (return-type "none")
+)
+
 (define-function gtk_get_default_language
   (c-name "gtk_get_default_language")
   (return-type "PangoLanguage*")
@@ -34283,55 +34329,6 @@
   (return-type "GtkWidget*")
 )
 
-;; -*- scheme -*-
-; object definitions ...
-(define-object PageSetupUnixDialog
-  (in-module "Gtk")
-  (parent "GtkDialog")
-  (c-name "GtkPageSetupUnixDialog")
-  (gtype-id "GTK_TYPE_PAGE_SETUP_UNIX_DIALOG")
-)
-
-(define-object PrintJob
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkPrintJob")
-  (gtype-id "GTK_TYPE_PRINT_JOB")
-)
-
-(define-object PrintUnixDialog
-  (in-module "Gtk")
-  (parent "GtkDialog")
-  (c-name "GtkPrintUnixDialog")
-  (gtype-id "GTK_TYPE_PRINT_UNIX_DIALOG")
-)
-
-(define-object Printer
-  (in-module "Gtk")
-  (parent "GObject")
-  (c-name "GtkPrinter")
-  (gtype-id "GTK_TYPE_PRINTER")
-)
-
-;; Enumerations and flags ...
-
-(define-flags PrintCapabilities
-  (in-module "Gtk")
-  (c-name "GtkPrintCapabilities")
-  (gtype-id "GTK_TYPE_PRINT_CAPABILITIES")
-  (values
-    '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET")
-    '("copies" "GTK_PRINT_CAPABILITY_COPIES")
-    '("collate" "GTK_PRINT_CAPABILITY_COLLATE")
-    '("reverse" "GTK_PRINT_CAPABILITY_REVERSE")
-    '("scale" "GTK_PRINT_CAPABILITY_SCALE")
-    '("generate-pdf" "GTK_PRINT_CAPABILITY_GENERATE_PDF")
-    '("generate-ps" "GTK_PRINT_CAPABILITY_GENERATE_PS")
-    '("preview" "GTK_PRINT_CAPABILITY_PREVIEW")
-    '("number-up" "GTK_PRINT_CAPABILITY_NUMBER_UP")
-    '("number-up-layout" "GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT")
-  )
-)
 
 
 ;; From gtkpagesetupunixdialog.h
@@ -34642,6 +34639,160 @@
   )
 )
 
+(define-method get_pages
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_pages")
+  (return-type "GtkPrintPages")
+)
+
+(define-method set_pages
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_pages")
+  (return-type "none")
+  (parameters
+    '("GtkPrintPages" "pages")
+  )
+)
+
+(define-method get_page_ranges
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_page_ranges")
+  (return-type "GtkPageRange*")
+  (parameters
+    '("gint*" "n_ranges")
+  )
+)
+
+(define-method set_page_ranges
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_page_ranges")
+  (return-type "none")
+  (parameters
+    '("GtkPageRange*" "ranges")
+    '("gint" "n_ranges")
+  )
+)
+
+(define-method get_page_set
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_page_set")
+  (return-type "GtkPageSet")
+)
+
+(define-method set_page_set
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_page_set")
+  (return-type "none")
+  (parameters
+    '("GtkPageSet" "page_set")
+  )
+)
+
+(define-method get_num_copies
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_num_copies")
+  (return-type "gint")
+)
+
+(define-method set_num_copies
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_num_copies")
+  (return-type "none")
+  (parameters
+    '("gint" "num_copies")
+  )
+)
+
+(define-method get_scale
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_scale")
+  (return-type "gdouble")
+)
+
+(define-method set_scale
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_scale")
+  (return-type "none")
+  (parameters
+    '("gdouble" "scale")
+  )
+)
+
+(define-method get_n_up
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_n_up")
+  (return-type "guint")
+)
+
+(define-method set_n_up
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_n_up")
+  (return-type "none")
+  (parameters
+    '("guint" "n_up")
+  )
+)
+
+(define-method get_n_up_layout
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_n_up_layout")
+  (return-type "GtkNumberUpLayout")
+)
+
+(define-method set_n_up_layout
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_n_up_layout")
+  (return-type "none")
+  (parameters
+    '("GtkNumberUpLayout" "layout")
+  )
+)
+
+(define-method get_rotate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_rotate")
+  (return-type "gboolean")
+)
+
+(define-method set_rotate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_rotate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "rotate")
+  )
+)
+
+(define-method get_collate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_collate")
+  (return-type "gboolean")
+)
+
+(define-method set_collate
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_collate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "collate")
+  )
+)
+
+(define-method get_reverse
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_get_reverse")
+  (return-type "gboolean")
+)
+
+(define-method set_reverse
+  (of-object "GtkPrintJob")
+  (c-name "gtk_print_job_set_reverse")
+  (return-type "none")
+  (parameters
+    '("gboolean" "reverse")
+  )
+)
+
 
 
 ;; From gtkprintunixdialog.h
@@ -34793,5 +34944,3 @@
 ;; From gtkunixprint.h
 
 
-
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]