diff options
author | Tor Lillqvist <tml@iki.fi> | 2009-11-15 02:51:44 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2009-12-16 13:10:18 +0200 |
commit | 1bf9a2fa4197986d7bb055b703df4121e42c58a5 (patch) | |
tree | 3ffafd3a365b8da83babbf0a33f7f62a9ff8af41 /gdk | |
parent | 9647285441e0aaa9243555bc45c46a4dcd507f01 (diff) | |
download | gtk+-1bf9a2fa4197986d7bb055b703df4121e42c58a5.tar.gz |
Remove unused functions and variables
Diffstat (limited to 'gdk')
-rw-r--r-- | gdk/win32/gdkevents-win32.c | 71 | ||||
-rw-r--r-- | gdk/win32/gdkinput.c | 10 |
2 files changed, 8 insertions, 73 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 9a3c9190b5..2a7f090048 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -102,9 +102,6 @@ static gboolean is_modally_blocked (GdkWindow *window); static GList *client_filters; /* Filters for client messages */ -static gboolean p_grab_automatic; -static GdkEventMask p_grab_mask; -static gboolean p_grab_owner_events, k_grab_owner_events; static HCURSOR p_grab_cursor; static GSourceFuncs event_funcs = { @@ -429,6 +426,8 @@ gdk_event_get_graphics_expose (GdkWindow *window) return NULL; } +#if 0 /* Unused, but might be useful to re-introduce in some debugging output? */ + static char * event_mask_string (GdkEventMask mask) { @@ -465,6 +464,8 @@ event_mask_string (GdkEventMask mask) return bfr; } +#endif + GdkGrabStatus _gdk_windowing_pointer_grab (GdkWindow *window, GdkWindow *native_window, @@ -1202,17 +1203,6 @@ do_show_window (GdkWindow *window, gboolean hide_window) } } -static gboolean -gdk_window_is_ancestor (GdkWindow *ancestor, - GdkWindow *window) -{ - if (ancestor == NULL || window == NULL) - return FALSE; - - return (gdk_window_get_parent (window) == ancestor || - gdk_window_is_ancestor (ancestor, gdk_window_get_parent (window))); -} - static void synthesize_enter_or_leave_event (GdkWindow *window, MSG *msg, @@ -1342,20 +1332,6 @@ update_colors (GdkWindow *window, GDK_NOTE (COLORMAP, (top ? g_print ("\n") : (void) 0)); } -static void -translate_mouse_coords (GdkWindow *window1, - GdkWindow *window2, - MSG *msg) -{ - POINT pt; - - pt.x = GET_X_LPARAM (msg->lParam); - pt.y = GET_Y_LPARAM (msg->lParam); - ClientToScreen (GDK_WINDOW_HWND (window1), &pt); - ScreenToClient (GDK_WINDOW_HWND (window2), &pt); - msg->lParam = MAKELPARAM (pt.x, pt.y); -} - /* The check_extended flag controls whether to check if the windows want * events from extended input devices and if the message should be skipped * because an extended input device is active @@ -1475,43 +1451,6 @@ doesnt_want_char (gint mask, return !(mask & (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)); } -static gboolean -doesnt_want_button_press (gint mask, - MSG *msg) -{ - return !(mask & GDK_BUTTON_PRESS_MASK); -} - -static gboolean -doesnt_want_button_release (gint mask, - MSG *msg) -{ - return !(mask & GDK_BUTTON_RELEASE_MASK); -} - -static gboolean -doesnt_want_button_motion (gint mask, - MSG *msg) -{ - return !((mask & GDK_POINTER_MOTION_MASK) || - ((msg->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON)) && (mask & GDK_BUTTON_MOTION_MASK)) || - ((msg->wParam & MK_LBUTTON) && (mask & GDK_BUTTON1_MOTION_MASK)) || - ((msg->wParam & MK_MBUTTON) && (mask & GDK_BUTTON2_MOTION_MASK)) || - ((msg->wParam & MK_RBUTTON) && (mask & GDK_BUTTON3_MOTION_MASK))); -} - -static gboolean -doesnt_want_scroll (gint mask, - MSG *msg) -{ - /* As there are no separate scroll events in X11, button press - * events are used, so higher level code might be selecting for - * either GDK_BUTTON_PRESS_MASK or GDK_SCROLL_MASK when it wants GDK - * scroll events. Make sure this works in the Win32 backend, too. - */ - return !(mask & (GDK_SCROLL_MASK|GDK_BUTTON_PRESS_MASK)); -} - static void handle_configure_event (MSG *msg, GdkWindow *window) @@ -1918,8 +1857,6 @@ gdk_event_translate (MSG *msg, GdkPointerGrabInfo *grab = NULL; GdkWindow *grab_window = NULL; - guint grab_mask = 0; - gboolean grab_owner_events = FALSE; static gint update_colors_counter = 0; gint button; diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c index 87862f1915..ca8b33a494 100644 --- a/gdk/win32/gdkinput.c +++ b/gdk/win32/gdkinput.c @@ -314,14 +314,12 @@ void _gdk_input_crossing_event (GdkWindow *window, gboolean enter) { - GdkWindowObject *priv = (GdkWindowObject *)window; - GdkInputWindow *input_window; - gint root_x, root_y; - if (enter) { -#if 0 - /* No idea what to do... */ +#if 0 /* No idea what to do... */ + GdkWindowObject *priv = (GdkWindowObject *)window; + GdkInputWindow *input_window; + gint root_x, root_y; #if 0 gdk_input_check_proximity(display); #endif |