diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-02-17 22:11:56 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-02-21 00:51:03 -0500 |
| commit | b1eaa502dfda1dd727e938ce710c3861f1cad8fe (patch) | |
| tree | 3cb71e60ccf5c6fdae527c9c4ef2e9bee8f0cd15 /gtk/gtkcellarea.c | |
| parent | f1cf0eb3fc95c94d5594aa700cbcb12bc32ebc43 (diff) | |
| download | gtk+-b1eaa502dfda1dd727e938ce710c3861f1cad8fe.tar.gz | |
events: reorganize getters
Restructure the getters for event fields to
be more targeted at particular event types.
Update all callers, and replace all direct
event struct access with getters.
As a side-effect, this drops some unused getters.
Diffstat (limited to 'gtk/gtkcellarea.c')
| -rw-r--r-- | gtk/gtkcellarea.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index b8945d6544..e9b10bd355 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -1024,12 +1024,9 @@ gtk_cell_area_real_event (GtkCellArea *area, if (event_type == GDK_KEY_PRESS && (flags & GTK_CELL_RENDERER_FOCUSED) != 0) { - guint keyval; - /* Cancel any edits in progress */ if (priv->edited_cell && - gdk_event_get_keyval (event, &keyval) && - keyval == GDK_KEY_Escape) + gdk_key_event_get_keyval (event) == GDK_KEY_Escape) { gtk_cell_area_stop_editing (area, TRUE); retval = TRUE; @@ -1039,7 +1036,8 @@ gtk_cell_area_real_event (GtkCellArea *area, { guint button; - if (gdk_event_get_button (event, &button) && button == GDK_BUTTON_PRIMARY) + button = gdk_button_event_get_button (event); + if (button == GDK_BUTTON_PRIMARY) { GtkCellRenderer *renderer = NULL; GtkCellRenderer *focus_renderer; @@ -1048,7 +1046,7 @@ gtk_cell_area_real_event (GtkCellArea *area, /* We may need some semantics to tell us the offset of the event * window we are handling events for (i.e. GtkTreeView has a bin_window) */ - gdk_event_get_coords (event, &event_x, &event_y); + gdk_event_get_position (event, &event_x, &event_y); /* Dont try to search for an event coordinate that is not in the area, that will * trigger a runtime warning. |