[gtkmm] Fix the build with the lastest GTK+ from git master.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix the build with the lastest GTK+ from git master.
- Date: Thu, 7 Mar 2013 12:03:10 +0000 (UTC)
commit 1c3e844a2e2369f73e8afc99a99003da5abbd258
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 7 13:03:02 2013 +0100
Fix the build with the lastest GTK+ from git master.
* gtk/src/gtk_signals.defs: Update this with
tools/gen_scripts/gtk_generate_extra_defs.sh .
* gtk/src/entry.hg:
* gtk/src/textview.hg: Add _CONVERSION lines to cope with the slightly-changed
GTK+ API caused by this commit:
https://git.gnome.org/browse/gtk+/commit/?id=88623b98a7ca0afca08ac21bc3aa662c6ed3ab7f
Bug #695305 (Cosimo Cecchi, mussadek)
ChangeLog | 13 +++++++++++++
gtk/src/entry.hg | 4 ++++
gtk/src/gtk_signals.defs | 22 ++++++++++++++++++++--
gtk/src/textview.hg | 4 ++++
4 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 13c1181..f11f6a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-03-07 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with the lastest GTK+ from git master.
+
+ * gtk/src/gtk_signals.defs: Update this with
+ tools/gen_scripts/gtk_generate_extra_defs.sh .
+ * gtk/src/entry.hg:
+ * gtk/src/textview.hg: Add _CONVERSION lines to cope with the slightly-changed
+ GTK+ API caused by this commit:
+ https://git.gnome.org/browse/gtk+/commit/?id=88623b98a7ca0afca08ac21bc3aa662c6ed3ab7f
+
+ Bug #695305 (Cosimo Cecchi, mussadek)
+
2013-03-01 Kjell Ahlstedt <kjell ahlstedt bredband net>
Gdk::EventType, Gtk::MenuButton, Window: Adapt to the updated .defs files.
diff --git a/gtk/src/entry.hg b/gtk/src/entry.hg
index 2e7ca08..7afab64 100644
--- a/gtk/src/entry.hg
+++ b/gtk/src/entry.hg
@@ -219,6 +219,10 @@ public:
_WRAP_METHOD(void set_input_hints(InputHints hints), gtk_entry_set_input_hints)
_WRAP_METHOD(InputHints get_input_hints() const, gtk_entry_get_input_hints)
+ //TODO: This signal now takes a GtkWidget* instead of just a GtkMenu*,
+ //so change that when we can break ABI.
+ //See https://git.gnome.org/browse/gtk+/commit/?id=88623b98a7ca0afca08ac21bc3aa662c6ed3ab7f
+#m4 _CONVERSION(`Menu*',`GtkWidget*',`GTK_WIDGET(($3)->gobj())')
_WRAP_SIGNAL(void populate_popup(Menu* menu), "populate_popup")
#m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
diff --git a/gtk/src/gtk_signals.defs b/gtk/src/gtk_signals.defs
index 0227efa..589bdee 100644
--- a/gtk/src/gtk_signals.defs
+++ b/gtk/src/gtk_signals.defs
@@ -3089,7 +3089,7 @@
(return-type "void")
(when "last")
(parameters
- '("GtkMenu*" "p0")
+ '("GtkWidget*" "p0")
)
)
@@ -3536,6 +3536,15 @@
(construct-only #f)
)
+(define-property populate-all
+ (of-object "GtkEntry")
+ (prop-type "GParamBoolean")
+ (docs "Whether to emit ::populate-popup for touch popups")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkEntryCompletion
(define-signal insert-prefix
@@ -9340,7 +9349,7 @@
(return-type "void")
(when "last")
(parameters
- '("GtkMenu*" "p0")
+ '("GtkWidget*" "p0")
)
)
@@ -9512,6 +9521,15 @@
(construct-only #f)
)
+(define-property populate-all
+ (of-object "GtkTextView")
+ (prop-type "GParamBoolean")
+ (docs "Whether to emit ::populate-popup for touch popups")
+ (readable #t)
+ (writable #t)
+ (construct-only #f)
+)
+
;; From GtkToggleAction
(define-signal toggled
diff --git a/gtk/src/textview.hg b/gtk/src/textview.hg
index 9cd880a..c80fec6 100644
--- a/gtk/src/textview.hg
+++ b/gtk/src/textview.hg
@@ -198,6 +198,10 @@ public:
_WRAP_METHOD(void set_input_hints(InputHints hints), gtk_text_view_set_input_hints)
_WRAP_METHOD(InputHints get_input_hints() const, gtk_text_view_get_input_hints)
+ //TODO: This signal now takes a GtkWidget* instead of just a GtkMenu*,
+ //so change that when we can break ABI.
+ //See https://git.gnome.org/browse/gtk+/commit/?id=88623b98a7ca0afca08ac21bc3aa662c6ed3ab7f
+#m4 _CONVERSION(`Menu*',`GtkWidget*',`GTK_WIDGET(($3)->gobj())')
_WRAP_SIGNAL(void populate_popup(Menu* menu), "populate_popup")
_WRAP_SIGNAL(void set_anchor(), "set_anchor")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]