b=750961 disable motion hints to avoid gdk_event_request_motions unless on Maemo r=roc

--HG--
extra : rebase_source : 8f688b33d050a9d972da13aaf49607f300138f63
This commit is contained in:
Karl Tomlinson 2012-05-03 18:23:31 +12:00
parent 35fa8810bc
commit c733bc0e16
3 changed files with 4 additions and 9 deletions

View File

@ -272,7 +272,7 @@ moz_container_realize (GtkWidget *widget)
GDK_VISIBILITY_NOTIFY_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
#ifdef HAVE_GTK_MOTION_HINTS
#ifdef MOZ_PLATFORM_MAEMO
GDK_POINTER_MOTION_HINT_MASK |
#endif
GDK_POINTER_MOTION_MASK);

View File

@ -83,11 +83,6 @@ extern "C" {
#define IS_MOZ_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZ_CONTAINER_TYPE))
#define MOZ_CONAINTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZ_CONTAINER_TYPE, MozContainerClass))
#if (GTK_CHECK_VERSION(2, 12, 0) || \
(GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_MAEMO)))
#define HAVE_GTK_MOTION_HINTS
#endif
typedef struct _MozContainer MozContainer;
typedef struct _MozContainerClass MozContainerClass;

View File

@ -3367,7 +3367,7 @@ CreateGdkWindow(GdkWindow *parent, GtkWidget *widget)
GDK_VISIBILITY_NOTIFY_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
#ifdef HAVE_GTK_MOTION_HINTS
#ifdef MOZ_PLATFORM_MAEMO
GDK_POINTER_MOTION_HINT_MASK |
#endif
GDK_POINTER_MOTION_MASK);
@ -4458,7 +4458,7 @@ nsWindow::GrabPointer(guint32 aTime)
GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
#ifdef HAVE_GTK_MOTION_HINTS
#ifdef MOZ_PLATFORM_MAEMO
GDK_POINTER_MOTION_HINT_MASK |
#endif
GDK_POINTER_MOTION_MASK),
@ -5266,7 +5266,7 @@ motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event)
window->OnMotionNotifyEvent(widget, event);
#ifdef HAVE_GTK_MOTION_HINTS
#ifdef MOZ_PLATFORM_MAEMO
gdk_event_request_motions(event);
#endif
return TRUE;