GNOME.org
 

[gtkmm] Quickly fix the build with latest Gtk+.

commit ade3c67b35873364c0e6aa2e0a17131d966439ff
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Tue Jan 4 23:22:10 2011 +0100

    Quickly fix the build with latest Gtk+.
    
    * gtk/src/gtk_methods.defs: Regenerated with h2def.py.
    * gtk/src/aboutdialog.hg: Changed the conversion.
    * gtk/src/cellview.hg: For now commented the deleted methods.
    * gtk/src/filechooserbutton.hg:
    * gtk/src/image.hg:
    * gtk/src/texttag.hg:
    * gtk/src/toolbar.hg:
    * gtk/src/window.hg: Gmmproc is complaining about failed lookup for
    some properties, so they are commented out.

 ChangeLog                    |   14 +++
 gtk/src/aboutdialog.hg       |    2 +-
 gtk/src/cellview.hg          |    4 +-
 gtk/src/filechooserbutton.hg |    2 +-
 gtk/src/gtk_methods.defs     |  240 ++++++++++++++++++-----------------------
 gtk/src/image.hg             |    4 +-
 gtk/src/texttag.hg           |    8 +-
 gtk/src/toolbar.hg           |    4 +-
 gtk/src/window.hg            |    4 +-
 9 files changed, 133 insertions(+), 149 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4f1108c..46dcc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-01-04  Krzesimir Nowak  <qdlacz gmail com>
 
+	Quickly fix the build with latest Gtk+.
+
+	gtk/src/gtk_methods.defs: Regenerated with h2def.py.
+	gtk/src/aboutdialog.hg: Changed the conversion.
+	gtk/src/cellview.hg: For now commented the deleted methods.
+	gtk/src/filechooserbutton.hg:
+	gtk/src/image.hg:
+	gtk/src/texttag.hg:
+	gtk/src/toolbar.hg:
+	gtk/src/window.hg: Gmmproc is complaining about failed lookup for
+	some properties, so they are commented out.
+
+2011-01-04  Krzesimir Nowak  <qdlacz gmail com>
+
 	Device: Added grab() overload.
 
 	* gdk/src/device.[hg|ccg]: Added an overload of grab() method, which
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index 054198a..e1dfd36 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -72,7 +72,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/cellview.hg b/gtk/src/cellview.hg
index 3599d49..1b85597 100644
--- a/gtk/src/cellview.hg
+++ b/gtk/src/cellview.hg
@@ -85,8 +85,8 @@ public:
   _WRAP_METHOD(TreeModel::Path get_displayed_row() const, gtk_cell_view_get_displayed_row)
   _IGNORE(gtk_cell_view_get_size_of_row) //deprecated
 
-  _WRAP_METHOD(void get_desired_width_of_row(const TreeModel::Path& path, int& minimum_size, int& natural_size), gtk_cell_view_get_desired_width_of_row)
-  _WRAP_METHOD(void get_desired_height_for_width_of_row(const TreeModel::Path& path, int avail_size,  int& minimum_size,  int& natural_size), gtk_cell_view_get_desired_height_for_width_of_row)
+  //_WRAP_METHOD(void get_desired_width_of_row(const TreeModel::Path& path, int& minimum_size, int& natural_size), gtk_cell_view_get_desired_width_of_row)
+  //_WRAP_METHOD(void get_desired_height_for_width_of_row(const TreeModel::Path& path, int avail_size,  int& minimum_size,  int& natural_size), gtk_cell_view_get_desired_height_for_width_of_row)
 
   _WRAP_METHOD(void set_background_color(const Gdk::Color& color), gtk_cell_view_set_background_color)
   _WRAP_METHOD(void set_background_rgba(const Gdk::RGBA& rgba), gtk_cell_view_set_background_rgba)
diff --git a/gtk/src/filechooserbutton.hg b/gtk/src/filechooserbutton.hg
index 2b42c9c..1122c48 100644
--- a/gtk/src/filechooserbutton.hg
+++ b/gtk/src/filechooserbutton.hg
@@ -85,7 +85,7 @@ public:
   //See http://bugzilla.gnome.org/show_bug.cgi?id=353196
   _WRAP_SIGNAL(void file_set(), "file-set")
 
-  _WRAP_PROPERTY("dialog", FileChooserDialog*)
+  //_WRAP_PROPERTY("dialog", FileChooserDialog*)
   _WRAP_PROPERTY("focus-on-click", bool)
   _WRAP_PROPERTY("title", Glib::ustring)
   _WRAP_PROPERTY("width-chars", int)
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 26ad8c7..f6bc6f3 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -2047,6 +2047,7 @@
   (c-name "GtkStateFlags")
   (gtype-id "GTK_TYPE_STATE_FLAGS")
   (values
+    '("normal" "GTK_STATE_FLAG_NORMAL")
     '("active" "GTK_STATE_FLAG_ACTIVE")
     '("prelight" "GTK_STATE_FLAG_PRELIGHT")
     '("selected" "GTK_STATE_FLAG_SELECTED")
@@ -2721,7 +2722,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
@@ -2736,7 +2737,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
@@ -2751,7 +2752,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
@@ -2999,10 +3000,6 @@
 
 
 
-;; From gtkaccelgroupprivate.h
-
-
-
 ;; From gtkaccellabel.h
 
 (define-function gtk_accel_label_get_type
@@ -6814,6 +6811,15 @@
   (return-type "GtkWidget*")
 )
 
+(define-function gtk_cell_view_new_with_context
+  (c-name "gtk_cell_view_new_with_context")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkCellArea*" "area")
+    '("GtkCellAreaContext*" "context")
+  )
+)
+
 (define-function gtk_cell_view_new_with_text
   (c-name "gtk_cell_view_new_with_text")
   (return-type "GtkWidget*")
@@ -6868,54 +6874,61 @@
   (return-type "GtkTreePath*")
 )
 
-(define-method get_size_of_row
+(define-method set_background_color
   (of-object "GtkCellView")
-  (c-name "gtk_cell_view_get_size_of_row")
-  (return-type "gboolean")
+  (c-name "gtk_cell_view_set_background_color")
+  (return-type "none")
   (parameters
-    '("GtkTreePath*" "path")
-    '("GtkRequisition*" "requisition")
+    '("const-GdkColor*" "color")
   )
 )
 
-(define-method get_desired_width_of_row
+(define-method set_background_rgba
   (of-object "GtkCellView")
-  (c-name "gtk_cell_view_get_desired_width_of_row")
+  (c-name "gtk_cell_view_set_background_rgba")
   (return-type "none")
   (parameters
-    '("GtkTreePath*" "path")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
+    '("const-GdkRGBA*" "rgba")
   )
 )
 
-(define-method get_desired_height_for_width_of_row
+(define-method get_draw_sensitive
   (of-object "GtkCellView")
-  (c-name "gtk_cell_view_get_desired_height_for_width_of_row")
+  (c-name "gtk_cell_view_get_draw_sensitive")
+  (return-type "gboolean")
+)
+
+(define-method set_draw_sensitive
+  (of-object "GtkCellView")
+  (c-name "gtk_cell_view_set_draw_sensitive")
   (return-type "none")
   (parameters
-    '("GtkTreePath*" "path")
-    '("gint" "avail_size")
-    '("gint*" "minimum_size")
-    '("gint*" "natural_size")
+    '("gboolean" "draw_sensitive")
   )
 )
 
-(define-method set_background_color
+(define-method get_fit_model
   (of-object "GtkCellView")
-  (c-name "gtk_cell_view_set_background_color")
+  (c-name "gtk_cell_view_get_fit_model")
+  (return-type "gboolean")
+)
+
+(define-method set_fit_model
+  (of-object "GtkCellView")
+  (c-name "gtk_cell_view_set_fit_model")
   (return-type "none")
   (parameters
-    '("const-GdkColor*" "color")
+    '("gboolean" "fit_model")
   )
 )
 
-(define-method set_background_rgba
+(define-method get_size_of_row
   (of-object "GtkCellView")
-  (c-name "gtk_cell_view_set_background_rgba")
-  (return-type "none")
+  (c-name "gtk_cell_view_get_size_of_row")
+  (return-type "gboolean")
   (parameters
-    '("const-GdkRGBA*" "rgba")
+    '("GtkTreePath*" "path")
+    '("GtkRequisition*" "requisition")
   )
 )
 
@@ -7614,6 +7627,22 @@
   (return-type "GtkWidget*")
 )
 
+(define-function gtk_combo_box_new_with_area
+  (c-name "gtk_combo_box_new_with_area")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkCellArea*" "area")
+  )
+)
+
+(define-function gtk_combo_box_new_with_area_and_entry
+  (c-name "gtk_combo_box_new_with_area_and_entry")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkCellArea*" "area")
+  )
+)
+
 (define-function gtk_combo_box_new_with_entry
   (c-name "gtk_combo_box_new_with_entry")
   (return-type "GtkWidget*")
@@ -14212,53 +14241,6 @@
   )
 )
 
-(define-function gtk_quit_add_destroy
-  (c-name "gtk_quit_add_destroy")
-  (return-type "none")
-  (parameters
-    '("guint" "main_level")
-    '("GtkWidget*" "object")
-  )
-)
-
-(define-function gtk_quit_add
-  (c-name "gtk_quit_add")
-  (return-type "guint")
-  (parameters
-    '("guint" "main_level")
-    '("GtkFunction" "function")
-    '("gpointer" "data")
-  )
-)
-
-(define-function gtk_quit_add_full
-  (c-name "gtk_quit_add_full")
-  (return-type "guint")
-  (parameters
-    '("guint" "main_level")
-    '("GtkFunction" "function")
-    '("GtkCallbackMarshal" "marshal")
-    '("gpointer" "data")
-    '("GDestroyNotify" "destroy")
-  )
-)
-
-(define-function gtk_quit_remove
-  (c-name "gtk_quit_remove")
-  (return-type "none")
-  (parameters
-    '("guint" "quit_handler_id")
-  )
-)
-
-(define-function gtk_quit_remove_by_data
-  (c-name "gtk_quit_remove_by_data")
-  (return-type "none")
-  (parameters
-    '("gpointer" "data")
-  )
-)
-
 (define-function gtk_key_snooper_install
   (c-name "gtk_key_snooper_install")
   (return-type "guint")
@@ -14727,6 +14709,21 @@
   (return-type "gboolean")
 )
 
+(define-method set_reserve_indicator
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_set_reserve_indicator")
+  (return-type "none")
+  (parameters
+    '("gboolean" "reserve")
+  )
+)
+
+(define-method get_reserve_indicator
+  (of-object "GtkMenuItem")
+  (c-name "gtk_menu_item_get_reserve_indicator")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkmenushell.h
@@ -14825,6 +14822,18 @@
   )
 )
 
+(define-method get_selected_item
+  (of-object "GtkMenuShell")
+  (c-name "gtk_menu_shell_get_selected_item")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_parent_shell
+  (of-object "GtkMenuShell")
+  (c-name "gtk_menu_shell_get_parent_shell")
+  (return-type "GtkWidget*")
+)
+
 
 
 ;; From gtkmenutoolbutton.h
@@ -19323,6 +19332,15 @@
   (return-type "gint")
 )
 
+(define-method get_data_with_length
+  (of-object "GtkSelectionData")
+  (c-name "gtk_selection_data_get_data_with_length")
+  (return-type "const-guchar*")
+  (parameters
+    '("gint*" "length")
+  )
+)
+
 (define-method get_display
   (of-object "GtkSelectionData")
   (c-name "gtk_selection_data_get_display")
@@ -24105,6 +24123,16 @@
   (return-type "GType")
 )
 
+(define-function gtk_text_mark_new
+  (c-name "gtk_text_mark_new")
+  (is-constructor-of "GtkTextMark")
+  (return-type "GtkTextMark*")
+  (parameters
+    '("const-gchar*" "name")
+    '("gboolean" "left_gravity")
+  )
+)
+
 (define-method set_visible
   (of-object "GtkTextMark")
   (c-name "gtk_text_mark_set_visible")
@@ -24120,16 +24148,6 @@
   (return-type "gboolean")
 )
 
-(define-function gtk_text_mark_new
-  (c-name "gtk_text_mark_new")
-  (is-constructor-of "GtkTextMark")
-  (return-type "GtkTextMark*")
-  (parameters
-    '("const-gchar*" "name")
-    '("gboolean" "left_gravity")
-  )
-)
-
 (define-method get_name
   (of-object "GtkTextMark")
   (c-name "gtk_text_mark_get_name")
@@ -29203,15 +29221,6 @@
 
 
 
-;; From gtktypeutils.h
-
-(define-function gtk_identifier_get_type
-  (c-name "gtk_identifier_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From gtkuimanager.h
 
 (define-function gtk_ui_manager_get_type
@@ -31845,45 +31854,6 @@
   (return-type "gboolean")
 )
 
-(define-method set_has_frame
-  (of-object "GtkWindow")
-  (c-name "gtk_window_set_has_frame")
-  (return-type "none")
-  (parameters
-    '("gboolean" "setting")
-  )
-)
-
-(define-method get_has_frame
-  (of-object "GtkWindow")
-  (c-name "gtk_window_get_has_frame")
-  (return-type "gboolean")
-)
-
-(define-method set_frame_dimensions
-  (of-object "GtkWindow")
-  (c-name "gtk_window_set_frame_dimensions")
-  (return-type "none")
-  (parameters
-    '("gint" "left")
-    '("gint" "top")
-    '("gint" "right")
-    '("gint" "bottom")
-  )
-)
-
-(define-method get_frame_dimensions
-  (of-object "GtkWindow")
-  (c-name "gtk_window_get_frame_dimensions")
-  (return-type "none")
-  (parameters
-    '("gint*" "left")
-    '("gint*" "top")
-    '("gint*" "right")
-    '("gint*" "bottom")
-  )
-)
-
 (define-method set_decorated
   (of-object "GtkWindow")
   (c-name "gtk_window_set_decorated")
diff --git a/gtk/src/image.hg b/gtk/src/image.hg
index d78f4fb..2d4bf94 100644
--- a/gtk/src/image.hg
+++ b/gtk/src/image.hg
@@ -148,8 +148,8 @@ public:
  _WRAP_METHOD(void set_pixel_size(int pixel_size), gtk_image_set_pixel_size)
 
   _WRAP_PROPERTY("pixbuf", Glib::RefPtr<Gdk::Pixbuf>)
-  _WRAP_PROPERTY("pixmap", Glib::RefPtr<Gdk::Pixmap>)
-  _WRAP_PROPERTY("mask", Glib::RefPtr<Gdk::Pixmap>)
+  //_WRAP_PROPERTY("pixmap", Glib::RefPtr<Gdk::Pixmap>)
+  //_WRAP_PROPERTY("mask", Glib::RefPtr<Gdk::Pixmap>)
   _WRAP_PROPERTY("file", Glib::ustring)
   _WRAP_PROPERTY("stock", Glib::ustring)
   _WRAP_PROPERTY("icon-set", Gtk::IconSet)
diff --git a/gtk/src/texttag.hg b/gtk/src/texttag.hg
index 747f9b5..03ff901 100644
--- a/gtk/src/texttag.hg
+++ b/gtk/src/texttag.hg
@@ -77,8 +77,8 @@ public:
   _WRAP_PROPERTY("foreground", Glib::ustring)
   _WRAP_PROPERTY("background-gdk", Gdk::Color)
   _WRAP_PROPERTY("foreground-gdk", Gdk::Color)
-  _WRAP_PROPERTY("background-stipple", Glib::RefPtr<Gdk::Bitmap>)
-  _WRAP_PROPERTY("foreground-stipple", Glib::RefPtr<Gdk::Bitmap>)
+  //_WRAP_PROPERTY("background-stipple", Glib::RefPtr<Gdk::Bitmap>)
+  //_WRAP_PROPERTY("foreground-stipple", Glib::RefPtr<Gdk::Bitmap>)
   _WRAP_PROPERTY("font", Glib::ustring)
   _WRAP_PROPERTY("font-desc", Pango::FontDescription)
   _WRAP_PROPERTY("family", Glib::ustring)
@@ -111,8 +111,8 @@ public:
   _WRAP_PROPERTY("accumulative-margin", bool)
   _WRAP_PROPERTY("background-set", bool)
   _WRAP_PROPERTY("foreground-set", bool)
-  _WRAP_PROPERTY("background-stipple-set", bool)
-  _WRAP_PROPERTY("foreground-stipple-set", bool)
+  //_WRAP_PROPERTY("background-stipple-set", bool)
+  //_WRAP_PROPERTY("foreground-stipple-set", bool)
   _WRAP_PROPERTY("family-set", bool)
   _WRAP_PROPERTY("style-set", bool)
   _WRAP_PROPERTY("variant-set", bool)
diff --git a/gtk/src/toolbar.hg b/gtk/src/toolbar.hg
index 8692bd1..28fe038 100644
--- a/gtk/src/toolbar.hg
+++ b/gtk/src/toolbar.hg
@@ -109,7 +109,7 @@ public:
    * to display a context menu on the toolbar. The context-menu should
    * appear at the coordinates given by @a x and @a y. The mouse button
    * number is given by the @a button parameter. If the menu was popped
-   * up using the keybaord, @a button is -1.
+   * up using the keyboard, @a button is -1.
    *
    * @param x The x coordinate of the point where the menu should appear.
    * @param y The y coordinate of the point where the menu should appear.
@@ -130,7 +130,7 @@ public:
   _WRAP_PROPERTY("orientation", Orientation)
   _WRAP_PROPERTY("toolbar_style", ToolbarStyle)
   _WRAP_PROPERTY("show_arrow", bool)
-  _WRAP_PROPERTY("tooltips", bool)
+  //_WRAP_PROPERTY("tooltips", bool)
   _WRAP_PROPERTY("icon-size", IconSize)
   _WRAP_PROPERTY("icon-size-set", bool)
 };
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index 2f157ed..277ca33 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -70,8 +70,8 @@ public:
   _WRAP_PROPERTY("type", WindowType)
   _WRAP_PROPERTY("title", Glib::ustring)
   _WRAP_PROPERTY("startup-id", Glib::ustring)
-  _WRAP_PROPERTY("allow_shrink", bool)
-  _WRAP_PROPERTY("allow_grow", bool)
+  //_WRAP_PROPERTY("allow_shrink", bool)
+  //_WRAP_PROPERTY("allow_grow", bool)
   _WRAP_PROPERTY("resizable", bool)
   _WRAP_PROPERTY("modal", bool)
   _WRAP_PROPERTY("window_position", WindowPosition)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]