[gtkmm] Fix the build with latest GTK, removing Widget::hide_all().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Fix the build with latest GTK, removing Widget::hide_all().
- Date: Wed, 20 Oct 2010 08:38:42 +0000 (UTC)
commit 8b09378c79e3ef2248eff7ff05b9f17906e0f9f6
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 20 10:38:23 2010 +0200
Fix the build with latest GTK, removing Widget::hide_all().
* gdk/src/device.hg: get_history(): Change a parameter from guint* to
int* to match a change in GTK+.
* gdk/src/gdk_methods.defs: Remove gtk_widget_hide_all().
* gtk/src/gtk_vfuncs.defs: Remove GtkWidget::hide_all().
* gtk/src/widget.hg: Remove hide_all(), because it was removed from
GTK+.
ChangeLog | 11 +++++++++++
gdk/src/device.hg | 10 +++++-----
gdk/src/gdk_methods.defs | 4 +---
gtk/src/gtk_vfuncs.defs | 5 -----
gtk/src/widget.hg | 4 +---
5 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 49f19df..4f90368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-20 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with latest GTK, removing Widget::hide_all().
+
+ * gdk/src/device.hg: get_history(): Change a parameter from guint* to
+ int* to match a change in GTK+.
+ * gdk/src/gdk_methods.defs: Remove gtk_widget_hide_all().
+ * gtk/src/gtk_vfuncs.defs: Remove GtkWidget::hide_all().
+ * gtk/src/widget.hg: Remove hide_all(), because it was removed from
+ GTK+.
+
2010-10-19 Murray Cumming <murrayc murrayc com>
Fix the build with latest GTK+ from git master.
diff --git a/gdk/src/device.hg b/gdk/src/device.hg
index 3cd0f0e..86f4271 100644
--- a/gdk/src/device.hg
+++ b/gdk/src/device.hg
@@ -62,22 +62,22 @@ public:
_WRAP_METHOD(void get_state(const Glib::RefPtr<Window>& window, double& axes, ModifierType& mask), gdk_device_get_state)
//TODO: Return a list instead because this is ugly and C-like:
- _WRAP_METHOD(bool get_history(const Glib::RefPtr<Window>& window, guint32 start, guint32 stop, GdkTimeCoord**& events, guint& n_events), gdk_device_get_history)
+ _WRAP_METHOD(bool get_history(const Glib::RefPtr<Window>& window, guint32 start, guint32 stop, GdkTimeCoord**& events, int& n_events), gdk_device_get_history)
_WRAP_METHOD(guint get_n_axes() const, gdk_device_get_n_axes)
//TODO: A list of GdkAtom, which we should show as strings: _WRAP_METHOD(GList * gdk_device_list_axes () const, gdk_device_list_axes)
-
+
//TODO: Use a string instead of a GdkAtom:
_WRAP_METHOD(bool get_axis_value(double& axes, GdkAtom axis_label, double& value) const, gdk_device_get_axis_value )
-
+
_WRAP_METHOD(bool get_axis(double& axes, AxisUse use, double& value) const, gdk_device_get_axis)
-
+
_WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_device_get_display, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_device_get_display, refreturn, constversion)
_WRAP_METHOD(Glib::RefPtr<Device> get_associated_device(), gdk_device_get_associated_device, refreturn)
_WRAP_METHOD(Glib::RefPtr<const Device> get_associated_device() const, gdk_device_get_associated_device, refreturn, constversion)
-
+
_WRAP_METHOD(DeviceType get_device_type() const, gdk_device_get_device_type)
_WRAP_METHOD(GdkGrabStatus grab(const Glib::RefPtr<Window>& window, GrabOwnership grab_ownership, bool owner_events, EventMask event_mask, const Cursor& cursor, guint32 time_), gdk_device_grab)
diff --git a/gdk/src/gdk_methods.defs b/gdk/src/gdk_methods.defs
index f9c7290..5b34844 100644
--- a/gdk/src/gdk_methods.defs
+++ b/gdk/src/gdk_methods.defs
@@ -963,7 +963,7 @@
'("guint32" "start")
'("guint32" "stop")
'("GdkTimeCoord***" "events")
- '("guint*" "n_events")
+ '("gint*" "n_events")
)
)
@@ -5027,5 +5027,3 @@
'("gint" "n_events")
)
)
-
-
diff --git a/gtk/src/gtk_vfuncs.defs b/gtk/src/gtk_vfuncs.defs
index 4c4b862..80c4f09 100644
--- a/gtk/src/gtk_vfuncs.defs
+++ b/gtk/src/gtk_vfuncs.defs
@@ -998,11 +998,6 @@
(return-type "none")
)
-(define-vfunc hide_all
- (of-object "GtkWidget")
- (return-type "none")
-)
-
(define-vfunc get_accessible
(of-object "GtkWidget")
(return-type "AtkObject*")
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index c4b4d1b..1cb6410 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -122,7 +122,7 @@ public:
_WRAP_METHOD(void show_all(), gtk_widget_show_all)
- _WRAP_METHOD(void hide_all(), gtk_widget_hide_all)
+ _IGNORE(gtk_widget_hide_all) //deprecated
/* QUEUE DRAWS */
@@ -906,8 +906,6 @@ protected:
_WRAP_VFUNC(void dispatch_child_properties_changed(guint, GParamSpec**), "dispatch_child_properties_changed")
_WRAP_VFUNC(void show_all(), "show_all")
- _WRAP_VFUNC(void hide_all(), "hide_all")
-
_WRAP_VFUNC(Glib::RefPtr<Atk::Object> get_accessible(), "get_accessible", refreturn, ifdef GTKMM_ATKMM_ENABLED)
protected:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]