summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-07-15 07:29:30 -0400
committerMatthias Clasen <mclasen@redhat.com>2018-07-15 08:13:12 -0400
commitc71757dd704949902c4b3d983c36c80afdb02681 (patch)
tree92edcd1b501b9d0126b7958d87d5c3242638502d
parent8aeef172e827b017b7c34d77b206899140d185bc (diff)
downloadgtk+-wip/matthiasc/kill-configure-event.tar.gz
gdk: Drop GdkEventConfigurewip/matthiasc/kill-configure-event
This is no longer used.
-rw-r--r--gdk/gdkevents.c10
-rw-r--r--gdk/gdkevents.h4
-rw-r--r--gdk/gdkeventsprivate.h22
-rw-r--r--gdk/gdksurface.c1
-rw-r--r--gtk/gtkmain.c3
-rw-r--r--gtk/gtkwidget.c1
6 files changed, 0 insertions, 41 deletions
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index e648110212..d97b05771b 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -827,7 +827,6 @@ gdk_event_get_time (const GdkEvent *event)
return event->pad_axis.time;
case GDK_PAD_GROUP_MODE:
return event->pad_group_mode.time;
- case GDK_CONFIGURE:
case GDK_FOCUS_CHANGE:
case GDK_NOTHING:
case GDK_DELETE:
@@ -897,7 +896,6 @@ gdk_event_get_state (const GdkEvent *event,
case GDK_LEAVE_NOTIFY:
*state = event->crossing.state;
return TRUE;
- case GDK_CONFIGURE:
case GDK_FOCUS_CHANGE:
case GDK_PROXIMITY_IN:
case GDK_PROXIMITY_OUT:
@@ -949,10 +947,6 @@ gdk_event_get_coords (const GdkEvent *event,
switch ((guint) event->any.type)
{
- case GDK_CONFIGURE:
- x = event->configure.x;
- y = event->configure.y;
- break;
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
x = event->crossing.x;
@@ -1083,10 +1077,6 @@ gdk_event_set_coords (GdkEvent *event,
switch ((guint) event->any.type)
{
- case GDK_CONFIGURE:
- event->configure.x = x;
- event->configure.y = y;
- break;
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
event->crossing.x = x;
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index f496502ad2..b1ef21fc5f 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -112,7 +112,6 @@ typedef struct _GdkEventScroll GdkEventScroll;
typedef struct _GdkEventKey GdkEventKey;
typedef struct _GdkEventFocus GdkEventFocus;
typedef struct _GdkEventCrossing GdkEventCrossing;
-typedef struct _GdkEventConfigure GdkEventConfigure;
typedef struct _GdkEventProximity GdkEventProximity;
typedef struct _GdkEventDND GdkEventDND;
typedef struct _GdkEventSetting GdkEventSetting;
@@ -155,8 +154,6 @@ typedef void (*GdkEventFunc) (GdkEvent *event,
* @GDK_ENTER_NOTIFY: the pointer has entered the surface.
* @GDK_LEAVE_NOTIFY: the pointer has left the surface.
* @GDK_FOCUS_CHANGE: the keyboard focus has entered or left the surface.
- * @GDK_CONFIGURE: the size, position or stacking order of the surface has changed.
- * Note that GTK+ discards these events for %GDK_SURFACE_CHILD surfaces.
* @GDK_MAP: the surface has been mapped.
* @GDK_UNMAP: the surface has been unmapped.
* @GDK_PROXIMITY_IN: an input device has moved into contact with a sensing
@@ -215,7 +212,6 @@ typedef enum
GDK_ENTER_NOTIFY,
GDK_LEAVE_NOTIFY,
GDK_FOCUS_CHANGE,
- GDK_CONFIGURE,
GDK_MAP,
GDK_UNMAP,
GDK_PROXIMITY_IN,
diff --git a/gdk/gdkeventsprivate.h b/gdk/gdkeventsprivate.h
index a7ab6a88ab..ee3beace23 100644
--- a/gdk/gdkeventsprivate.h
+++ b/gdk/gdkeventsprivate.h
@@ -352,26 +352,6 @@ struct _GdkEventFocus
};
/*
- * GdkEventConfigure:
- * @type: the type of the event (%GDK_CONFIGURE).
- * @surface: the surface which received the event.
- * @send_event: %TRUE if the event was sent explicitly.
- * @x: the new x coordinate of the surface, relative to its parent.
- * @y: the new y coordinate of the surface, relative to its parent.
- * @width: the new width of the surface.
- * @height: the new height of the surface.
- *
- * Generated when a surface size or position has changed.
- */
-struct _GdkEventConfigure
-{
- GdkEventAny any;
- gint x, y;
- gint width;
- gint height;
-};
-
-/*
* GdkEventProximity:
* @type: the type of the event (%GDK_PROXIMITY_IN or %GDK_PROXIMITY_OUT).
* @surface: the surface which received the event.
@@ -601,7 +581,6 @@ struct _GdkEventPadGroupMode {
* @key: a #GdkEventKey
* @crossing: a #GdkEventCrossing
* @focus_change: a #GdkEventFocus
- * @configure: a #GdkEventConfigure
* @proximity: a #GdkEventProximity
* @dnd: a #GdkEventDND
* @grab_broken: a #GdkEventGrabBroken
@@ -653,7 +632,6 @@ union _GdkEvent
GdkEventKey key;
GdkEventCrossing crossing;
GdkEventFocus focus_change;
- GdkEventConfigure configure;
GdkEventProximity proximity;
GdkEventDND dnd;
GdkEventGrabBroken grab_broken;
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index 9d5988996b..e76a13555b 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -3954,7 +3954,6 @@ _gdk_make_event (GdkSurface *surface,
break;
case GDK_FOCUS_CHANGE:
- case GDK_CONFIGURE:
case GDK_MAP:
case GDK_UNMAP:
case GDK_DELETE:
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 7f4ff811f7..371a67f18f 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1846,9 +1846,6 @@ gtk_main_do_event (GdkEvent *event)
}
break;
- case GDK_CONFIGURE:
- break;
-
case GDK_FOCUS_CHANGE:
case GDK_UNMAP:
case GDK_GRAB_BROKEN:
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c929701d94..e133f7037d 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5288,7 +5288,6 @@ gtk_widget_event_internal (GtkWidget *widget,
case GDK_NOTHING:
case GDK_DELETE:
case GDK_DESTROY:
- case GDK_CONFIGURE:
case GDK_MAP:
case GDK_UNMAP:
return gtk_widget_emit_event_signals (widget, event);