summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-08-28 19:05:31 -0400
committerMatthias Clasen <mclasen@redhat.com>2017-08-28 19:05:31 -0400
commitb97e8f6214ee1551e7e8300a6bb94815ac2b0400 (patch)
tree2f3f831fd1c37ea5e74c00ad72c356117e98454d
parenta1fe559f0179968f5781afe32ad92c9b58a6bd7b (diff)
downloadgtk+-b97e8f6214ee1551e7e8300a6bb94815ac2b0400.tar.gz
examples: Use GdkEvent API
-rw-r--r--examples/drawing.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/examples/drawing.c b/examples/drawing.c
index dfd7dbc863..59d8bea026 100644
--- a/examples/drawing.c
+++ b/examples/drawing.c
@@ -82,15 +82,21 @@ button_press_event_cb (GtkWidget *widget,
GdkEventButton *event,
gpointer data)
{
+ guint button;
+ double x, y;
+
/* paranoia check, in case we haven't gotten a configure event */
if (surface == NULL)
return FALSE;
- if (event->button == GDK_BUTTON_PRIMARY)
+ gdk_event_get_button ((GdkEvent *)event, &button);
+ gdk_event_get_coords ((GdkEvent *)event, &x, &y);
+
+ if (button == GDK_BUTTON_PRIMARY)
{
- draw_brush (widget, event->x, event->y);
+ draw_brush (widget, x, y);
}
- else if (event->button == GDK_BUTTON_SECONDARY)
+ else if (button == GDK_BUTTON_SECONDARY)
{
clear_surface ();
gtk_widget_queue_draw (widget);
@@ -109,12 +115,18 @@ motion_notify_event_cb (GtkWidget *widget,
GdkEventMotion *event,
gpointer data)
{
+ double x, y;
+ GdkModifierType state;
+
/* paranoia check, in case we haven't gotten a configure event */
if (surface == NULL)
return FALSE;
- if (event->state & GDK_BUTTON1_MASK)
- draw_brush (widget, event->x, event->y);
+ gdk_event_get_state ((GdkEvent *)event, &state);
+ gdk_event_get_coords ((GdkEvent *)event, &x, &y);
+
+ if (state & GDK_BUTTON1_MASK)
+ draw_brush (widget, x, y);
/* We've handled it, stop processing */
return TRUE;