diff options
| author | Kristian Rietveld <kris@gtk.org> | 2011-07-25 22:33:02 +0200 |
|---|---|---|
| committer | Kristian Rietveld <kris@gtk.org> | 2011-07-30 23:01:38 +0200 |
| commit | 58ba8a7c7ff55251eabb7f4979faa300abc62e26 (patch) | |
| tree | f4cd7367f66fba6a55fa8a4007a4164309d9ce57 /gdk/quartz | |
| parent | a979e414fb4c242ae39f2f52d239499d6c5bac98 (diff) | |
| download | gtk+-58ba8a7c7ff55251eabb7f4979faa300abc62e26.tar.gz | |
quartz: use already existing current_button_state variable
Diffstat (limited to 'gdk/quartz')
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 51ec8eb4ea..9c4bcdfc9f 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -50,8 +50,7 @@ static GdkWindow *current_keyboard_window; /* This is the event mask and button state from the last event */ static GdkModifierType current_keyboard_modifiers; -static GdkModifierType current_mouse_modifiers; -static int current_button_state; +static GdkModifierType current_button_state; static void append_event (GdkEvent *event, gboolean windowing); @@ -1068,7 +1067,7 @@ _gdk_quartz_events_get_current_keyboard_modifiers (void) GdkModifierType _gdk_quartz_events_get_current_mouse_modifiers (void) { - return current_mouse_modifiers; + return current_button_state; } static gboolean @@ -1204,7 +1203,6 @@ gdk_event_translate (GdkEvent *event, } current_keyboard_modifiers = get_keyboard_modifiers_from_ns_event (nsevent); - current_mouse_modifiers = get_mouse_button_modifiers_from_ns_event (nsevent); return_val = TRUE; |