put text after #endif in comment

[~andy/gtk] / gdk / gdkprivate.h

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index 781db81b1f7bfe9abe8f4b1713576f5e97e3db9a..6131cb55aee1e90dc136a27cf0474dda3495f03a 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -24,8 +24,6 @@
 #include <X11/Xutil.h>
 #include <gdk/gdktypes.h>
 
-#define DND_PROTOCOL_VERSION 0
-
 #define gdk_window_lookup(xid)    ((GdkWindow*) gdk_xid_table_lookup (xid))
 #define gdk_pixmap_lookup(xid)    ((GdkPixmap*) gdk_xid_table_lookup (xid))
 #define gdk_font_lookup(xid)      ((GdkFont*) gdk_xid_table_lookup (xid))
@@ -65,20 +63,6 @@ struct _GdkWindowPrivate
   guint8 window_type;
   guint ref_count;
   guint destroyed : 2;
-  guint dnd_drag_enabled : 1,
-    dnd_drag_datashow : 1,
-    dnd_drag_destructive_op : 1,
-    dnd_drag_accepted : 1,
-    dnd_drop_enabled : 1,
-    dnd_drop_destructive_op : 1;
-  GdkAtom dnd_drag_data_type, *dnd_drag_data_typesavail;
-  guint dnd_drag_data_numtypesavail;
-  /* We have to turn on MotionMask/EnterWindowMask/LeaveWindowMask
-     during drags, then set it back to what it was after */
-  glong dnd_drag_savedeventmask, dnd_drag_eventmask;
-  GdkAtom *dnd_drop_data_typesavail;
-  guint dnd_drop_data_numtypesavail;
-  /* need to allow custom drag/drop cursors */
 
   gint extension_events;
 
@@ -202,14 +186,15 @@ struct _GdkClientFilter {
 
 #ifdef USE_XIM
 
+typedef struct _GdkICPrivate GdkICPrivate;
+
 struct _GdkICPrivate
 {
   XIC xic;
-  GdkIMStyle style;
+  GdkICAttr *attr;
+  GdkICAttributesType mask;
 };
 
-typedef struct _GdkICPrivate GdkICPrivate;
-
 #endif /* USE_XIM */
 
 struct _GdkColorContextPrivate
@@ -298,6 +283,16 @@ extern gint              gdk_threads_pipe[2];
 extern gboolean          gdk_select_waiting;
 #endif
 
+#ifdef USE_XIM
+/* XIM support */
+gint   gdk_im_open              (void);
+void   gdk_im_close             (void);
+void   gdk_ic_cleanup           (void);
+
+extern GdkICPrivate *gdk_xim_ic;               /* currently using IC */
+extern GdkWindow *gdk_xim_window;              /* currently using Window */
+#endif /* USE_XIM */
+
 /* Debugging support */
 
 #ifdef G_ENABLE_DEBUG