GNOME.org
 

[gtkmm/gtkmm-2-14] Fix the build with GTK+ 2.17.x

commit 90f4bb5b59a2830d88351f9af3557ed4f75f8a9d
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 14 18:49:26 2009 +0200

    Fix the build with GTK+ 2.17.x
    
    * gtk/src/gtk_methods.defs: Regenerated with h2defs.py
    * tools/m4/convert_gtk.m4: Add a conversion because a
    gtk_recent_info_get_application_info() parameter's constness has changed.

 ChangeLog                |   10 ++
 NEWS                     |   28 +++++
 configure.in             |    2 +-
 gtk/src/gtk_methods.defs |  258 ++++++++++++++++++++++++++++++++++++++++++----
 tools/m4/convert_gtk.m4  |    1 +
 5 files changed, 279 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 70fd8ed..b31d78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2.14.4:
+
+2009-06-19  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with GTK+ 2.17.x
+	
+	* gtk/src/gtk_methods.defs: Regenerated with h2defs.py
+	* tools/m4/convert_gtk.m4: Add a conversion because a 
+	gtk_recent_info_get_application_info() parameter's constness has changed.
+	
 2008-03-08  Murray Cumming  <murrayc murrayc com>
 
 	* gtk/src/container.ccg: remove_callback(): When just calling the C 
diff --git a/NEWS b/NEWS
index 7fdd8ba..58b69a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+2.14.4 (stable):
+
+Gtk:
+* Builder:
+  -  get_widget_derived(): Reference-counting correction.
+  - create_from_file(), add_from_file(), create_from_string(), 
+  add_from_string(): Add method overloads that take a char* for the object ID, 
+  to avoid ambiguity so these can actually be used.
+* Container: Avoid unnecessary warnings about an unimplemented remove vfunc 
+  in custom container widget classes.
+  (Daniel Elstner)
+* Printer::enumerate_printers(): Fix a refcounting problem found by Tor Krill.
+  (Armin Burgmeier)
+* Stock: ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE, 
+  ORIENTATION_REVERSE_LANDSCAPE, and ORIENTATION_REVERSE_PORTRAIT, 
+  avoiding undefined reference errors when trying to use these.
+  (Murray Cumming) Bug #568416 (Tao Wang).
+* StockID: Actually implement operator bool.
+* TextBuffer: Actually implement the const get_text(bool).
+
+Build:
+* Fixed the build without exceptions.
+  (Murray Cumming, Daniel Elstner)
+* Reduce the pangomm dependency because we don't really need a newer one.
+  (Murray Cumming)
+* Update the Maemo-specific API for Maemo Fremantle.
+  (Daniel Elstner)
+
 2.14.3 (stable):
 
 * Restored Gtk::HandleBox::signal_child_attached() and 
diff --git a/configure.in b/configure.in
index 62dca45..286161d 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@
 #We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT:
 pushdef([GTKMM_MAJOR_VERSION],     [2])
 pushdef([GTKMM_MINOR_VERSION],     [14])
-pushdef([GTKMM_MICRO_VERSION],     [3])
+pushdef([GTKMM_MICRO_VERSION],     [4])
 pushdef([GTKMM_EXTRA_VERSION],     [])
 pushdef([GTKMM_VERSION], GTKMM_MAJOR_VERSION.GTKMM_MINOR_VERSION.GTKMM_MICRO_VERSION[]GTKMM_EXTRA_VERSION)
 AC_INIT([gtkmm], GTKMM_VERSION, [gtkmm-list gnome org])
diff --git a/gtk/src/gtk_methods.defs b/gtk/src/gtk_methods.defs
index 1d53877..0c029cf 100644
--- a/gtk/src/gtk_methods.defs
+++ b/gtk/src/gtk_methods.defs
@@ -645,6 +645,13 @@
   (gtype-id "GTK_TYPE_LABEL")
 )
 
+(define-object TipsQuery
+  (in-module "Gtk")
+  (parent "GtkLabel")
+  (c-name "GtkTipsQuery")
+  (gtype-id "GTK_TYPE_TIPS_QUERY")
+)
+
 (define-object AccelLabel
   (in-module "Gtk")
   (parent "GtkLabel")
@@ -1149,6 +1156,13 @@
   (gtype-id "GTK_TYPE_PRINTER_OPTION_WIDGET")
 )
 
+(define-object InfoBar
+  (in-module "Gtk")
+  (parent "GtkHBox")
+  (c-name "GtkInfoBar")
+  (gtype-id "GTK_TYPE_INFO_BAR")
+)
+
 (define-object Combo
   (in-module "Gtk")
   (parent "GtkHBox")
@@ -1370,6 +1384,7 @@
     '("missing-property-value" "GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE")
     '("invalid-value" "GTK_BUILDER_ERROR_INVALID_VALUE")
     '("version-mismatch" "GTK_BUILDER_ERROR_VERSION_MISMATCH")
+    '("duplicate-id" "GTK_BUILDER_ERROR_DUPLICATE_ID")
   )
 )
 
@@ -1784,6 +1799,19 @@
   )
 )
 
+(define-enum MessageType
+  (in-module "Gtk")
+  (c-name "GtkMessageType")
+  (gtype-id "GTK_TYPE_MESSAGE_TYPE")
+  (values
+    '("info" "GTK_MESSAGE_INFO")
+    '("warning" "GTK_MESSAGE_WARNING")
+    '("question" "GTK_MESSAGE_QUESTION")
+    '("error" "GTK_MESSAGE_ERROR")
+    '("other" "GTK_MESSAGE_OTHER")
+  )
+)
+
 (define-enum MetricType
   (in-module "Gtk")
   (c-name "GtkMetricType")
@@ -2157,6 +2185,7 @@
     '("all" "GTK_PRINT_PAGES_ALL")
     '("current" "GTK_PRINT_PAGES_CURRENT")
     '("ranges" "GTK_PRINT_PAGES_RANGES")
+    '("selection" "GTK_PRINT_PAGES_SELECTION")
   )
 )
 
@@ -2436,19 +2465,6 @@
   )
 )
 
-(define-enum MessageType
-  (in-module "Gtk")
-  (c-name "GtkMessageType")
-  (gtype-id "GTK_TYPE_MESSAGE_TYPE")
-  (values
-    '("info" "GTK_MESSAGE_INFO")
-    '("warning" "GTK_MESSAGE_WARNING")
-    '("question" "GTK_MESSAGE_QUESTION")
-    '("error" "GTK_MESSAGE_ERROR")
-    '("other" "GTK_MESSAGE_OTHER")
-  )
-)
-
 (define-enum ButtonsType
   (in-module "Gtk")
   (c-name "GtkButtonsType")
@@ -13201,6 +13217,115 @@
 
 
 
+;; From gtkinfobar.h
+
+(define-function gtk_info_bar_get_type
+  (c-name "gtk_info_bar_get_type")
+  (return-type "GType")
+)
+
+(define-function gtk_info_bar_new
+  (c-name "gtk_info_bar_new")
+  (is-constructor-of "GtkInfoBar")
+  (return-type "GtkWidget*")
+)
+
+(define-function gtk_info_bar_new_with_buttons
+  (c-name "gtk_info_bar_new_with_buttons")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-gchar*" "first_button_text")
+  )
+  (varargs #t)
+)
+
+(define-method get_action_area
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_get_action_area")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_content_area
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_get_content_area")
+  (return-type "GtkWidget*")
+)
+
+(define-method add_action_widget
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_add_action_widget")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "child")
+    '("gint" "response_id")
+  )
+)
+
+(define-method add_button
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_add_button")
+  (return-type "GtkWidget*")
+  (parameters
+    '("const-gchar*" "button_text")
+    '("gint" "response_id")
+  )
+)
+
+(define-method add_buttons
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_add_buttons")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "first_button_text")
+  )
+  (varargs #t)
+)
+
+(define-method set_response_sensitive
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_set_response_sensitive")
+  (return-type "none")
+  (parameters
+    '("gint" "response_id")
+    '("gboolean" "setting")
+  )
+)
+
+(define-method set_default_response
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_set_default_response")
+  (return-type "none")
+  (parameters
+    '("gint" "response_id")
+  )
+)
+
+(define-method response
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_response")
+  (return-type "none")
+  (parameters
+    '("gint" "response_id")
+  )
+)
+
+(define-method set_message_type
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_set_message_type")
+  (return-type "none")
+  (parameters
+    '("GtkMessageType" "message_type")
+  )
+)
+
+(define-method get_message_type
+  (of-object "GtkInfoBar")
+  (c-name "gtk_info_bar_get_message_type")
+  (return-type "GtkMessageType")
+)
+
+
+
 ;; From gtkinputdialog.h
 
 (define-function gtk_input_dialog_get_type
@@ -13850,6 +13975,12 @@
   (return-type "gboolean")
 )
 
+(define-method get_current_uri
+  (of-object "GtkLabel")
+  (c-name "gtk_label_get_current_uri")
+  (return-type "const-gchar*")
+)
+
 (define-method get
   (of-object "GtkLabel")
   (c-name "gtk_label_get")
@@ -17207,6 +17338,17 @@
   (return-type "none")
 )
 
+(define-method set_password
+  (of-object "GtkPrintBackend")
+  (c-name "gtk_print_backend_set_password")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "hostname")
+    '("const-gchar*" "username")
+    '("const-gchar*" "password")
+  )
+)
+
 (define-method add_printer
   (of-object "GtkPrintBackend")
   (c-name "gtk_print_backend_add_printer")
@@ -18066,6 +18208,48 @@
   (return-type "none")
 )
 
+(define-method draw_page_finish
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_draw_page_finish")
+  (return-type "none")
+)
+
+(define-method set_defer_drawing
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_set_defer_drawing")
+  (return-type "none")
+)
+
+(define-method set_support_selection
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_set_support_selection")
+  (return-type "none")
+  (parameters
+    '("gboolean" "support_selection")
+  )
+)
+
+(define-method get_support_selection
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_get_support_selection")
+  (return-type "gboolean")
+)
+
+(define-method set_has_selection
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_set_has_selection")
+  (return-type "none")
+  (parameters
+    '("gboolean" "has_selection")
+  )
+)
+
+(define-method get_has_selection
+  (of-object "GtkPrintOperation")
+  (c-name "gtk_print_operation_get_has_selection")
+  (return-type "gboolean")
+)
+
 (define-function gtk_print_run_page_setup_dialog
   (c-name "gtk_print_run_page_setup_dialog")
   (return-type "GtkPageSetup*")
@@ -18797,6 +18981,42 @@
   )
 )
 
+(define-method get_manual_capabilities
+  (of-object "GtkPrintUnixDialog")
+  (c-name "gtk_print_unix_dialog_get_manual_capabilities")
+  (return-type "GtkPrintCapabilities")
+)
+
+(define-method set_support_selection
+  (of-object "GtkPrintUnixDialog")
+  (c-name "gtk_print_unix_dialog_set_support_selection")
+  (return-type "none")
+  (parameters
+    '("gboolean" "support_selection")
+  )
+)
+
+(define-method get_support_selection
+  (of-object "GtkPrintUnixDialog")
+  (c-name "gtk_print_unix_dialog_get_support_selection")
+  (return-type "gboolean")
+)
+
+(define-method set_has_selection
+  (of-object "GtkPrintUnixDialog")
+  (c-name "gtk_print_unix_dialog_set_has_selection")
+  (return-type "none")
+  (parameters
+    '("gboolean" "has_selection")
+  )
+)
+
+(define-method get_has_selection
+  (of-object "GtkPrintUnixDialog")
+  (c-name "gtk_print_unix_dialog_get_has_selection")
+  (return-type "gboolean")
+)
+
 
 
 ;; From gtkprintutils.h
@@ -20499,7 +20719,7 @@
   (return-type "gboolean")
   (parameters
     '("const-gchar*" "app_name")
-    '("gchar**" "app_exec")
+    '("const-gchar**" "app_exec")
     '("guint*" "count")
     '("time_t*" "time_")
   )
@@ -30297,6 +30517,11 @@
   (return-type "GType")
 )
 
+(define-function gtk_message_type_get_type
+  (c-name "gtk_message_type_get_type")
+  (return-type "GType")
+)
+
 (define-function gtk_metric_type_get_type
   (c-name "gtk_metric_type_get_type")
   (return-type "GType")
@@ -30532,11 +30757,6 @@
   (return-type "GType")
 )
 
-(define-function gtk_message_type_get_type
-  (c-name "gtk_message_type_get_type")
-  (return-type "GType")
-)
-
 (define-function gtk_buttons_type_get_type
   (c-name "gtk_buttons_type_get_type")
   (return-type "GType")
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index fee1a62..6a544df 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -527,6 +527,7 @@ _CONVERSION(`const Glib::RefPtr<RecentInfo>&',`GtkRecentInfo*',__CONVERT_REFPTR_
 _CONVERSION(`const Glib::RefPtr<const RecentInfo>&',`GtkRecentInfo*',__CONVERT_CONST_REFPTR_TO_P_SUN(Gtk::RecentInfo))
 
 _CONVERSION(`Glib::StringArrayHandle&',`gchar**',`const_cast<gchar**>(($3).data())')
+_CONVERSION(`Glib::StringArrayHandle&',`const gchar**',`const_cast<const gchar**>(($3).data())')
 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3)')
 
 #RecentManager
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]