Index: base/message_pump_x.h |
diff --git a/base/message_pump_x.h b/base/message_pump_x.h |
index c13f323a64676396152404220838e2be03142862..cf41f8591bd4331a79f0738b00d5b340c448ce71 100644 |
--- a/base/message_pump_x.h |
+++ b/base/message_pump_x.h |
@@ -11,7 +11,6 @@ |
#include <bitset> |
#include <glib.h> |
-#include <gtk/gtk.h> |
typedef union _XEvent XEvent; |
typedef struct _XDisplay Display; |
@@ -82,6 +81,7 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { |
static bool HasXInput2(); |
private: |
+#if 0 |
// Some XEvent's can't be directly read from X event queue and will go |
// through GDK's dispatching process and may get discarded. This function |
// sets up a filter to intercept those XEvent's we are interested in |
@@ -91,6 +91,7 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { |
gpointer data); |
static void EventDispatcherX(GdkEvent* event, gpointer data); |
+#endif |
// Decides whether we are interested in processing this XEvent. |
bool ShouldCaptureXEvent(XEvent* event); |
@@ -123,12 +124,14 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { |
// was captured and being processed by GDK (when |false|). |
bool dispatching_event_; |
+#if 0 |
#if ! GTK_CHECK_VERSION(2,18,0) |
// GDK_EVENT_LAST was introduced in GTK+ 2.18.0. For earlier versions, we pick a |
// large enough value (the value of GDK_EVENT_LAST in 2.18.0) so that it works |
// for all versions. |
#define GDK_EVENT_LAST 37 |
#endif |
+#endif |
// Ideally we would #include X.h for LASTEvent, but it brings in a lot of stupid |
// stuff (like Time, CurrentTime etc.) that messes up a lot of things. So define |
@@ -139,7 +142,7 @@ class BASE_EXPORT MessagePumpX : public MessagePumpGlib { |
// table to quickly check if a particular event should be handled by us or if |
// it should be passed on to the default GDK handler. |
std::bitset<XLASTEvent> capture_x_events_; |
- std::bitset<GDK_EVENT_LAST> capture_gdk_events_; |
+// std::bitset<GDK_EVENT_LAST> capture_gdk_events_; |
DISALLOW_COPY_AND_ASSIGN(MessagePumpX); |
}; |