[gtk+/gtk-2-18] Bug 598881 - Unimplemented GdkWindowImplIface methods crash gimp on OSX
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-18] Bug 598881 - Unimplemented GdkWindowImplIface methods crash gimp on OSX
- Date: Fri, 12 Mar 2010 23:49:04 +0000 (UTC)
commit 2f66220326e3619e75fbad4ab8fdf8d90338a7ad
Author: Kristian Rietveld <kris gtk org>
Date: Fri Oct 23 13:53:57 2009 +0200
Bug 598881 - Unimplemented GdkWindowImplIface methods crash gimp on OSX
Add dummy for _gdk_input_window_crossing (). Set both input_window_destroy
and input_window_crossing pointers in the Impl struct.
Reported by John Ralls.
(cherry picked from commit 42ac2268773936a0a85b017e5ebac83c4b0b7557)
gdk/quartz/gdkinput.c | 6 ++++++
gdk/quartz/gdkinputprivate.h | 3 +++
gdk/quartz/gdkwindow-quartz.c | 3 +++
3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/gdk/quartz/gdkinput.c b/gdk/quartz/gdkinput.c
index 657d435..ea6cdca 100644
--- a/gdk/quartz/gdkinput.c
+++ b/gdk/quartz/gdkinput.c
@@ -385,3 +385,9 @@ gdk_device_get_axis (GdkDevice *device, gdouble *axes, GdkAxisUse use, gdouble *
return FALSE;
}
+
+void
+_gdk_input_window_crossing (GdkWindow *window,
+ gboolean enter)
+{
+}
diff --git a/gdk/quartz/gdkinputprivate.h b/gdk/quartz/gdkinputprivate.h
index 5ec4ee9..b8f13ac 100644
--- a/gdk/quartz/gdkinputprivate.h
+++ b/gdk/quartz/gdkinputprivate.h
@@ -147,6 +147,9 @@ gint _gdk_input_disable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
void _gdk_init_input_core (void);
+void _gdk_input_window_crossing (GdkWindow *window,
+ gboolean enter);
+
void _gdk_input_exit (void);
#endif /* __GDK_INPUTPRIVATE_H__ */
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 4764498..24057b5 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -25,6 +25,7 @@
#include "gdk.h"
#include "gdkwindowimpl.h"
#include "gdkprivate-quartz.h"
+#include "gdkinputprivate.h"
static gpointer parent_class;
@@ -3035,4 +3036,6 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface)
iface->queue_antiexpose = _gdk_quartz_window_queue_antiexpose;
iface->queue_translation = _gdk_quartz_window_queue_translation;
iface->destroy = _gdk_quartz_window_destroy;
+ iface->input_window_destroy = _gdk_input_window_destroy;
+ iface->input_window_crossing = _gdk_input_window_crossing;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]