gdk/gdkevents.c gdk/gdkinternals.h gdk/x11/gdkevents-x11.c Move the

2002-08-25  Tor Lillqvist  <tml@iki.fi>

	* gdk/gdkevents.c
	* gdk/gdkinternals.h
	* gdk/x11/gdkevents-x11.c
	* gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
	GdkEventFlags definitions from gdkevents.c to
	gdkinternals.h. Remove the duplicated definitions in
	gdkevents-x11.c and gdkevents-win32.c. (#89771)

diff --git a/ChangeLog b/ChangeLog
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4c26ef14deaca1c39bc5d611500e967812ea09f1..0cbe8c4c4139ac807261e12c98c430bb758c6f3a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2002-08-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/gdkevents.c
+       * gdk/gdkinternals.h
+       * gdk/x11/gdkevents-x11.c
+       * gdk/win32/gdkevents-win32.c: Move the GdkEventPrivate and
+       GdkEventFlags definitions from gdkevents.c to
+       gdkinternals.h. Remove the duplicated definitions in
+       gdkevents-x11.c and gdkevents-win32.c. (#89771)
+
 2002-08-24  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_event_translate): Let the

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index c297e476b90ad7d9fcfb6340bfc0dac49bbd3b97..29e41850c3e23e2fd0a0d45017ac20bfb981e0ca 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -28,15 +28,6 @@
 #include "gdkinternals.h"
 
 typedef struct _GdkIOClosure GdkIOClosure;
-typedef struct _GdkEventPrivate GdkEventPrivate;
-
-typedef enum
-{
-  /* Following flag is set for events on the event queue during
-   * translation and cleared afterwards.
-   */
-  GDK_EVENT_PENDING = 1 << 0
-} GdkEventFlags;
 
 struct _GdkIOClosure
 {
@@ -46,12 +37,6 @@ struct _GdkIOClosure
   gpointer data;
 };
 
-struct _GdkEventPrivate
-{
-  GdkEvent event;
-  guint    flags;
-};
-
 /* Private variable declarations
  */
 

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 632c13096925a292df303f3e5a067e7c0b256232..a8703d3326a55658af743c234168a5e7b91002e1 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -143,6 +143,22 @@ struct _GdkArgDesc
 
 /* Event handling */
 
+typedef struct _GdkEventPrivate GdkEventPrivate;
+
+typedef enum
+{
+  /* Following flag is set for events on the event queue during
+   * translation and cleared afterwards.
+   */
+  GDK_EVENT_PENDING = 1 << 0
+} GdkEventFlags;
+
+struct _GdkEventPrivate
+{
+  GdkEvent event;
+  guint    flags;
+};
+
 extern GdkEventFunc   _gdk_event_func;    /* Callback for events */
 extern gpointer       _gdk_event_data;
 extern GDestroyNotify _gdk_event_notify;

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b28c2f5ddfc70b8f6b6b1561c324602e238b1e74..45acf299d37a29cf03332b3832992dc6cb80baab 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -63,23 +63,6 @@
 #include <dimm.h>
 #endif
 
-
-typedef struct _GdkEventPrivate GdkEventPrivate;
-
-typedef enum
-{
-  /* Following flag is set for events on the event queue during
-   * translation and cleared afterwards.
-   */
-  GDK_EVENT_PENDING = 1 << 0
-} GdkEventFlags;
-
-struct _GdkEventPrivate
-{
-  GdkEvent event;
-  guint    flags;
-};
-
 /* 
  * Private function declarations
  */

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 89f3176d12c0a3a7f1811e7b54c7e2acdc756eff..0c278112cb2b9251295168150dcc99d33e363cbe 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -51,7 +51,6 @@
 #include <X11/Xatom.h>
 
 typedef struct _GdkIOClosure GdkIOClosure;
-typedef struct _GdkEventPrivate GdkEventPrivate;
 typedef struct _GdkDisplaySource GdkDisplaySource;
 
 #define DOUBLE_CLICK_TIME      250
@@ -59,14 +58,6 @@ typedef struct _GdkDisplaySource GdkDisplaySource;
 #define DOUBLE_CLICK_DIST      5
 #define TRIPLE_CLICK_DIST      5
 
-typedef enum
-{
-  /* Following flag is set for events on the event queue during
-   * translation and cleared afterwards.
-   */
-  GDK_EVENT_PENDING = 1 << 0
-} GdkEventFlags;
-
 struct _GdkIOClosure
 {
   GdkInputFunction function;
@@ -75,12 +66,6 @@ struct _GdkIOClosure
   gpointer data;
 };
 
-struct _GdkEventPrivate
-{
-  GdkEvent event;
-  guint    flags;
-};
-
 struct _GdkDisplaySource
 {
   GSource source;