New function. print_event_state, print_event): Use preprocessor macro to

2001-03-18  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
	print_event_state, print_event): Use preprocessor macro to make
	code more compact. Print also GDK_WINDOW_STATE events.
	(synthesize_crossing_events): Remove the old #ifdeffed-out code.

	* gtk/gtk.def
	* gtk/makefile.mingw.in: Update.

	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
	to catch also Cygwin.

11 files changed, 189 insertions, 179 deletions

diff --git a/ChangeLog b/ChangeLog
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 45b07c3347..48a4736fe4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2001-03-18  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkevents-win32.c (print_window_state): New function.
+	print_event_state, print_event): Use preprocessor macro to make
+	code more compact. Print also GDK_WINDOW_STATE events.
+	(synthesize_crossing_events): Remove the old #ifdeffed-out code.
+	
+	* gtk/gtk.def
+	* gtk/makefile.mingw.in: Update.
+
+	* gtk/gtkmain.h: Check for G_PLATFORM_WIN32, not only G_OS_WIN32,
+	to catch also Cygwin.
+
 Sun Mar 18 01:15:30 2001  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkspinbutton.[hc]: added rc-style argument
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 6973226c2b..79a414f11d 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1001,20 +1001,26 @@ build_keyrelease_event (GdkWindowImplWin32 *impl,
 static void
 print_event_state (gint state)
 {
-  if (state & GDK_SHIFT_MASK)
-    g_print ("SHIFT ");
-  if (state & GDK_LOCK_MASK)
-    g_print ("LOCK ");
-  if (state & GDK_CONTROL_MASK)
-    g_print ("CONTROL ");
-  if (state & GDK_MOD1_MASK)
-    g_print ("MOD1 ");
-  if (state & GDK_BUTTON1_MASK)
-    g_print ("BUTTON1 ");
-  if (state & GDK_BUTTON2_MASK)
-    g_print ("BUTTON2 ");
-  if (state & GDK_BUTTON3_MASK)
-    g_print ("BUTTON3 ");
+#define CASE(bit) if (state & GDK_ ## bit ## _MASK) g_print (#bit " ");
+  CASE (SHIFT);
+  CASE (LOCK);
+  CASE (CONTROL);
+  CASE (MOD1);
+  CASE (BUTTON1);
+  CASE (BUTTON2);
+  CASE (BUTTON3);
+#undef CASE
+}
+
+static void
+print_window_state (GdkWindowState state)
+{
+#define CASE(bit) if (state & GDK_WINDOW_STATE_ ## bit ) g_print (#bit " ");
+  CASE (WITHDRAWN);
+  CASE (ICONIFIED);
+  CASE (MAXIMIZED);
+  CASE (STICKY);
+#undef CASE
 }
 
 static void
@@ -1024,39 +1030,42 @@ print_event (GdkEvent *event)
 
   switch (event->any.type)
     {
-    case GDK_NOTHING: g_print ("GDK_NOTHING "); break;
-    case GDK_DELETE: g_print ("GDK_DELETE "); break;
-    case GDK_DESTROY: g_print ("GDK_DESTROY "); break;
-    case GDK_EXPOSE: g_print ("GDK_EXPOSE "); break;
-    case GDK_MOTION_NOTIFY: g_print ("GDK_MOTION_NOTIFY "); break;
-    case GDK_BUTTON_PRESS: g_print ("GDK_BUTTON_PRESS "); break;
-    case GDK_2BUTTON_PRESS: g_print ("GDK_2BUTTON_PRESS "); break;
-    case GDK_3BUTTON_PRESS: g_print ("GDK_3BUTTON_PRESS "); break;
-    case GDK_BUTTON_RELEASE: g_print ("GDK_BUTTON_RELEASE "); break;
-    case GDK_KEY_PRESS: g_print ("GDK_KEY_PRESS "); break;
-    case GDK_KEY_RELEASE: g_print ("GDK_KEY_RELEASE "); break;
-    case GDK_ENTER_NOTIFY: g_print ("GDK_ENTER_NOTIFY "); break;
-    case GDK_LEAVE_NOTIFY: g_print ("GDK_LEAVE_NOTIFY "); break;
-    case GDK_FOCUS_CHANGE: g_print ("GDK_FOCUS_CHANGE "); break;
-    case GDK_CONFIGURE: g_print ("GDK_CONFIGURE "); break;
-    case GDK_MAP: g_print ("GDK_MAP "); break;
-    case GDK_UNMAP: g_print ("GDK_UNMAP "); break;
-    case GDK_PROPERTY_NOTIFY: g_print ("GDK_PROPERTY_NOTIFY "); break;
-    case GDK_SELECTION_CLEAR: g_print ("GDK_SELECTION_CLEAR "); break;
-    case GDK_SELECTION_REQUEST: g_print ("GDK_SELECTION_REQUEST "); break;
-    case GDK_SELECTION_NOTIFY: g_print ("GDK_SELECTION_NOTIFY "); break;
-    case GDK_PROXIMITY_IN: g_print ("GDK_PROXIMITY_IN "); break;
-    case GDK_PROXIMITY_OUT: g_print ("GDK_PROXIMITY_OUT "); break;
-    case GDK_DRAG_ENTER: g_print ("GDK_DRAG_ENTER "); break;
-    case GDK_DRAG_LEAVE: g_print ("GDK_DRAG_LEAVE "); break;
-    case GDK_DRAG_MOTION: g_print ("GDK_DRAG_MOTION "); break;
-    case GDK_DRAG_STATUS: g_print ("GDK_DRAG_STATUS "); break;
-    case GDK_DROP_START: g_print ("GDK_DROP_START "); break;
-    case GDK_DROP_FINISHED: g_print ("GDK_DROP_FINISHED "); break;
-    case GDK_CLIENT_EVENT: g_print ("GDK_CLIENT_EVENT "); break;
-    case GDK_VISIBILITY_NOTIFY: g_print ("GDK_VISIBILITY_NOTIFY "); break;
-    case GDK_NO_EXPOSE: g_print ("GDK_NO_EXPOSE "); break;
-    case GDK_SCROLL: g_print ("GDK_SCROLL "); break;
+#define CASE(x) case x: g_print ( #x " "); break;
+    CASE (GDK_NOTHING);
+    CASE (GDK_DELETE);
+    CASE (GDK_DESTROY);
+    CASE (GDK_EXPOSE);
+    CASE (GDK_MOTION_NOTIFY);
+    CASE (GDK_BUTTON_PRESS);
+    CASE (GDK_2BUTTON_PRESS);
+    CASE (GDK_3BUTTON_PRESS);
+    CASE (GDK_BUTTON_RELEASE);
+    CASE (GDK_KEY_PRESS);
+    CASE (GDK_KEY_RELEASE);
+    CASE (GDK_ENTER_NOTIFY);
+    CASE (GDK_LEAVE_NOTIFY);
+    CASE (GDK_FOCUS_CHANGE);
+    CASE (GDK_CONFIGURE);
+    CASE (GDK_MAP);
+    CASE (GDK_UNMAP);
+    CASE (GDK_PROPERTY_NOTIFY);
+    CASE (GDK_SELECTION_CLEAR);
+    CASE (GDK_SELECTION_REQUEST);
+    CASE (GDK_SELECTION_NOTIFY);
+    CASE (GDK_PROXIMITY_IN);
+    CASE (GDK_PROXIMITY_OUT);
+    CASE (GDK_DRAG_ENTER);
+    CASE (GDK_DRAG_LEAVE);
+    CASE (GDK_DRAG_MOTION);
+    CASE (GDK_DRAG_STATUS);
+    CASE (GDK_DROP_START);
+    CASE (GDK_DROP_FINISHED);
+    CASE (GDK_CLIENT_EVENT);
+    CASE (GDK_VISIBILITY_NOTIFY);
+    CASE (GDK_NO_EXPOSE);
+    CASE (GDK_SCROLL);
+    CASE (GDK_WINDOW_STATE);
+#undef CASE
     }
   g_print ("%#lx ", (gulong) GDK_WINDOW_HWND (event->any.window));
 
@@ -1116,6 +1125,9 @@ print_event (GdkEvent *event)
 		   "???")))));
       print_event_state (event->scroll.state);
       break;
+    case GDK_WINDOW_STATE:
+      print_window_state (event->window_state.changed_mask);
+      print_window_state (event->window_state.new_window_state);
     default:
       /* Nothing */
       break;
@@ -1123,108 +1135,6 @@ print_event (GdkEvent *event)
   g_print ("\n");
 }
 
-#if 0
-
-/* Old implementation */
-
-static void
-synthesize_crossing_events (GdkWindow *window,
-			    MSG       *msg)
-{
-  GdkEvent *event;
-  
-  /* If we are not using TrackMouseEvent, generate a leave notify
-   * event if necessary
-   */
-  if (track_mouse_event == NULL
-      && current_window
-      && (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (current_window)->impl)->event_mask & GDK_LEAVE_NOTIFY_MASK))
-    {
-      GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
-
-      event = gdk_event_new ();
-      event->crossing.type = GDK_LEAVE_NOTIFY;
-      event->crossing.window = current_window;
-      gdk_drawable_ref (event->crossing.window);
-      event->crossing.subwindow = NULL;
-      event->crossing.time = msg->time;
-      event->crossing.x = current_x;
-      event->crossing.y = current_y;
-      event->crossing.x_root = current_x_root;
-      event->crossing.y_root = current_y_root;
-      event->crossing.mode = GDK_CROSSING_NORMAL;
-      if (IsChild (GDK_WINDOW_HWND (current_window), GDK_WINDOW_HWND (window)))
-	event->crossing.detail = GDK_NOTIFY_INFERIOR;
-      else if (IsChild (GDK_WINDOW_HWND (window), GDK_WINDOW_HWND (current_window)))
-	event->crossing.detail = GDK_NOTIFY_ANCESTOR;
-      else
-	event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-
-      event->crossing.focus = TRUE; /* ??? */
-      event->crossing.state = 0; /* ??? */
-
-      gdk_event_queue_append (event);
-      GDK_NOTE (EVENTS, print_event (event));
-    }
-
-  if (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->event_mask & GDK_ENTER_NOTIFY_MASK)
-    {
-      GDK_NOTE (EVENTS, g_print ("synthesizing ENTER_NOTIFY event\n"));
-      
-      event = gdk_event_new ();
-      event->crossing.type = GDK_ENTER_NOTIFY;
-      event->crossing.window = window;
-      gdk_drawable_ref (event->crossing.window);
-      event->crossing.subwindow = NULL;
-      event->crossing.time = msg->time;
-      event->crossing.x = LOWORD (msg->lParam);
-      event->crossing.y = HIWORD (msg->lParam);
-      event->crossing.x_root = (gfloat) msg->pt.x;
-      event->crossing.y_root = (gfloat) msg->pt.y;
-      event->crossing.mode = GDK_CROSSING_NORMAL;
-      if (current_window
-	  && IsChild (GDK_WINDOW_HWND (current_window), GDK_WINDOW_HWND (window)))
-	event->crossing.detail = GDK_NOTIFY_ANCESTOR;
-      else if (current_window
-	       && IsChild (GDK_WINDOW_HWND (window), GDK_WINDOW_HWND (current_window)))
-	event->crossing.detail = GDK_NOTIFY_INFERIOR;
-      else
-	event->crossing.detail = GDK_NOTIFY_NONLINEAR;
-      
-      event->crossing.focus = TRUE; /* ??? */
-      event->crossing.state = 0; /* ??? */
-      
-      gdk_event_queue_append (event);
-
-      GDK_NOTE (EVENTS, print_event (event));
-
-      if (GDK_WINDOW_OBJECT (window)->extension_events != 0)
-	_gdk_input_enter_event (&event->crossing, window);
-    }
-  
-  if (current_window)
-    gdk_drawable_unref (current_window);
-  current_window = window;
-  gdk_drawable_ref (current_window);
-#ifdef USE_TRACKMOUSEEVENT
-  if (track_mouse_event != NULL)
-    {
-      TRACKMOUSEEVENT tme;
-
-      tme.cbSize = sizeof (TRACKMOUSEEVENT);
-      tme.dwFlags = TME_LEAVE;
-      tme.hwndTrack = GDK_WINDOW_HWND (current_window);
-      tme.dwHoverTime = HOVER_DEFAULT;
-      
-      (*track_mouse_event) (&tme);
-    }
-#endif
-}
-
-#else
-
-/* New, improved implementation. */
-
 static gboolean
 gdk_window_is_child (GdkWindow *parent,
 		     GdkWindow *window)
@@ -1420,8 +1330,6 @@ synthesize_crossing_events (GdkWindow *window,
   gdk_window_ref (current_window);
 }
 
-#endif
-
 static void
 translate_mouse_coords (GdkWindow *window1,
 			GdkWindow *window2,
diff --git a/gtk/gtk.def b/gtk/gtk.def
index e61cf3ce48..d177b68434 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -45,9 +45,7 @@ EXPORTS
 	GTK_TYPE_GDK_GC_VALUES_MASK
 	GTK_TYPE_GDK_GRAB_STATUS
 	GTK_TYPE_GDK_GRAVITY
-	GTK_TYPE_GDK_IC_ATTRIBUTES_TYPE
 	GTK_TYPE_GDK_IMAGE_TYPE
-	GTK_TYPE_GDK_IM_STYLE
 	GTK_TYPE_GDK_INPUT_CONDITION
 	GTK_TYPE_GDK_INPUT_MODE
 	GTK_TYPE_GDK_INPUT_SOURCE
@@ -71,9 +69,12 @@ EXPORTS
 	GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE
 	GTK_TYPE_GDK_WINDOW_CLASS
 	GTK_TYPE_GDK_WINDOW_HINTS
+	GTK_TYPE_GDK_WINDOW_STATE
 	GTK_TYPE_GDK_WINDOW_TYPE
+	GTK_TYPE_GDK_WINDOW_TYPE_HINT
 	GTK_TYPE_GDK_WM_DECORATION
 	GTK_TYPE_GDK_WM_FUNCTION
+	GTK_TYPE_ICON_SIZE
 	GTK_TYPE_IMAGE_TYPE
 	GTK_TYPE_JUSTIFICATION
 	GTK_TYPE_MATCH_TYPE
@@ -125,7 +126,9 @@ EXPORTS
 	GTK_TYPE_TREE_MODEL_FLAGS
 	GTK_TYPE_TREE_PATH
 	GTK_TYPE_TREE_SELECTION_MODE
+	GTK_TYPE_TREE_SORT_ORDER
 	GTK_TYPE_TREE_VIEW_COLUMN_SIZING
+	GTK_TYPE_TREE_VIEW_DROP_POSITION
 	GTK_TYPE_TREE_VIEW_MODE
 	GTK_TYPE_TROUGH_TYPE
 	GTK_TYPE_UPDATE_TYPE
@@ -192,6 +195,7 @@ EXPORTS
 	gtk_binding_set_find
 	gtk_binding_set_new
 	gtk_bindings_activate
+	gtk_box_get_spacing
 	gtk_box_get_type
 	gtk_box_pack_end
 	gtk_box_pack_end_defaults
@@ -202,15 +206,14 @@ EXPORTS
 	gtk_box_set_child_packing
 	gtk_box_set_homogeneous
 	gtk_box_set_spacing
+	gtk_box_set_spacing
 	gtk_button_box_get_child_ipadding
 	gtk_button_box_get_child_size
 	gtk_button_box_get_layout
-	gtk_box_get_spacing
 	gtk_button_box_get_type
 	gtk_button_box_set_child_ipadding
 	gtk_button_box_set_child_size
 	gtk_button_box_set_layout
-	gtk_box_set_spacing
 	gtk_button_clicked
 	gtk_button_enter
 	gtk_button_get_relief
@@ -453,7 +456,6 @@ EXPORTS
 	gtk_curve_set_gamma
 	gtk_curve_set_range
 	gtk_curve_set_vector
-	gtk_data_get_type
 	gtk_debug_flags
 	gtk_decorated_window_calculate_frame_size
 	gtk_decorated_window_init
@@ -462,11 +464,13 @@ EXPORTS
 	gtk_dialog_add_action_widget
 	gtk_dialog_add_button
 	gtk_dialog_add_buttons
+	gtk_dialog_get_has_separator
 	gtk_dialog_get_type
 	gtk_dialog_new
 	gtk_dialog_new_with_buttons
 	gtk_dialog_response
 	gtk_dialog_run
+	gtk_dialog_set_has_separator
 	gtk_drag_begin
 	gtk_drag_dest_handle_event
 	gtk_drag_dest_set
@@ -515,6 +519,7 @@ EXPORTS
 	gtk_entry_new_with_max_length
 	gtk_entry_prepend_text
 	gtk_entry_select_region
+	gtk_entry_set_activates_default
 	gtk_entry_set_editable
 	gtk_entry_set_has_frame
 	gtk_entry_set_invisible_char
@@ -603,7 +608,6 @@ EXPORTS
 	gtk_image_get_storage_type
 	gtk_image_get_type
 	gtk_image_menu_item_new
-	gtk_image_menu_item_new
 	gtk_image_new
 	gtk_image_new_from_file
 	gtk_image_new_from_icon_set
@@ -728,7 +732,7 @@ EXPORTS
 	gtk_main_quit
 	gtk_major_version
 	gtk_marshal_BOOLEAN__BOXED
-	gtk_marshal_BOOLEAN__BOXED_INT_INT_UINT
+	gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT
 	gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED
 	gtk_marshal_BOOLEAN__VOID
 	gtk_marshal_ENUM__ENUM
@@ -737,11 +741,10 @@ EXPORTS
 	gtk_marshal_VOID__BOOLEAN
 	gtk_marshal_VOID__BOXED
 	gtk_marshal_VOID__BOXED_BOXED
-	gtk_marshal_VOID__BOXED_BOXED_UINT_UINT
-	gtk_marshal_VOID__BOXED_INT_INT_BOXED_UINT_UINT
 	gtk_marshal_VOID__BOXED_OBJECT
 	gtk_marshal_VOID__BOXED_STRING_INT
 	gtk_marshal_VOID__BOXED_UINT
+	gtk_marshal_VOID__BOXED_UINT_FLAGS
 	gtk_marshal_VOID__BOXED_UINT_UINT
 	gtk_marshal_VOID__ENUM
 	gtk_marshal_VOID__ENUM_FLOAT
@@ -749,15 +752,20 @@ EXPORTS
 	gtk_marshal_VOID__ENUM_INT
 	gtk_marshal_VOID__ENUM_INT_BOOLEAN
 	gtk_marshal_VOID__INT_INT
+	gtk_marshal_VOID__INT_INT_BOXED
 	gtk_marshal_VOID__INT_INT_INT
 	gtk_marshal_VOID__OBJECT_BOOLEAN
 	gtk_marshal_VOID__OBJECT_BOXED_BOXED
+	gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT
 	gtk_marshal_VOID__OBJECT_INT_INT
 	gtk_marshal_VOID__OBJECT_OBJECT
 	gtk_marshal_VOID__OBJECT_STRING_STRING
+	gtk_marshal_VOID__OBJECT_UINT
 	gtk_marshal_VOID__POINTER_INT
 	gtk_marshal_VOID__POINTER_POINTER_POINTER
 	gtk_marshal_VOID__POINTER_UINT
+	gtk_marshal_VOID__STRING_INT_POINTER
+	gtk_marshal_VOID__UINT_BOXED_UINT_FLAGS_FLAGS
 	gtk_marshal_VOID__UINT_STRING
 	gtk_menu_attach_to_widget
 	gtk_menu_bar_append
@@ -1012,6 +1020,9 @@ EXPORTS
 	gtk_rc_parse_priority
 	gtk_rc_parse_state
 	gtk_rc_parse_string
+	gtk_rc_property_parse_color
+	gtk_rc_property_parse_enum
+	gtk_rc_property_parse_flags
 	gtk_rc_reparse_all
 	gtk_rc_set_default_files
 	gtk_rc_set_image_loader
@@ -1056,7 +1067,13 @@ EXPORTS
 	gtk_selection_remove_all
 	gtk_selection_request
 	gtk_separator_get_type
+	gtk_separator_menu_item_get_type
+	gtk_separator_menu_item_new
 	gtk_set_locale
+	gtk_settings_get_global
+	gtk_settings_get_type
+	gtk_settings_install_property
+	gtk_settings_install_property_parser
 	gtk_signal_compat_matched
 	gtk_signal_connect_full
 	gtk_signal_connect_object_while_alive
@@ -1080,7 +1097,6 @@ EXPORTS
 	gtk_spin_button_set_adjustment
 	gtk_spin_button_set_digits
 	gtk_spin_button_set_numeric
-	gtk_spin_button_set_shadow_type
 	gtk_spin_button_set_snap_to_ticks
 	gtk_spin_button_set_update_policy
 	gtk_spin_button_set_value
@@ -1304,11 +1320,6 @@ EXPORTS
 	gtk_tree_item_remove_subtree
 	gtk_tree_item_select
 	gtk_tree_item_set_subtree
-;	gtk_tree_model_simple_changed
-;	gtk_tree_model_simple_child_toggled
-;	gtk_tree_model_simple_get_type
-;	gtk_tree_model_simple_inserted
-;	gtk_tree_model_simple_new
 	gtk_tree_model_sort_convert_path
 	gtk_tree_model_sort_get_type
 	gtk_tree_model_sort_new
@@ -1541,11 +1552,16 @@ EXPORTS
 	gtk_window_activate_focus
 	gtk_window_add_accel_group
 	gtk_window_add_embedded_xid
+	gtk_window_deiconify
 	gtk_window_get_default_accel_group
 	gtk_window_get_type
+	gtk_window_iconify
+	gtk_window_maximize
 	gtk_window_new
+	gtk_window_present
 	gtk_window_remove_accel_group
 	gtk_window_remove_embedded_xid
+	gtk_window_set_decorated
 	gtk_window_set_default
 	gtk_window_set_default_size
 	gtk_window_set_focus
@@ -1556,14 +1572,6 @@ EXPORTS
 	gtk_window_set_title
 	gtk_window_set_transient_for
 	gtk_window_set_wmclass
-	gtk_dialog_get_has_separator
-	gtk_dialog_set_has_separator
-	gtk_entry_set_activates_default
-	gtk_window_deiconify
-	gtk_window_iconify
-	gtk_window_maximize
-	gtk_window_present
-	gtk_window_set_decorated
 	gtk_window_stick
 	gtk_window_unmaximize
 	gtk_window_unstick
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 8f1c6ee9af..26d7a5b380 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -56,7 +56,7 @@ typedef gint	(*GtkKeySnoopFunc)	(GtkWidget	*grab_widget,
 
 /* Gtk version.
  */
-#ifdef G_OS_WIN32
+#ifdef G_PLATFORM_WIN32
 #ifdef GTK_COMPILATION
 #define GTKMAIN_C_VAR __declspec(dllexport)
 #else
@@ -84,7 +84,7 @@ void     gtk_init                 (int    *argc,
 
 gboolean gtk_init_check           (int    *argc,
                                    char ***argv);
-#ifdef G_OS_WIN32
+#ifdef G_PLATFORM_WIN32
 
 /* Variants that are used to check for correct struct packing
  * when building GTK+-using code.
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index d5c31d3adb..85891a00de 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -82,7 +82,6 @@ gtk_OBJECTS =			\
 	gtkcontainer.o		\
 	gtkctree.o		\
 	gtkcurve.o		\
-	gtkdata.o		\
 	gtkdialog.o		\
 	gtkdnd.o		\
 	gtkdrawingarea.o	\
@@ -106,6 +105,7 @@ gtk_OBJECTS =			\
 	gtkhsv.o		\
 	gtkiconfactory.o	\
 	gtkimage.o		\
+	gtkimagemenuitem.o	\
 	gtkimcontext.o		\
 	gtkimcontextsimple.o	\
 	gtkimmodule.o		\
@@ -148,6 +148,8 @@ gtk_OBJECTS =			\
 	gtkscrolledwindow.o	\
 	gtkselection.o		\
 	gtkseparator.o		\
+	gtkseparatormenuitem.o	\
+	gtksettings.o		\
 	gtksignal.o		\
 	gtksocket.o		\
 	gtkspinbutton.o		\
@@ -215,6 +217,7 @@ gtk_public_h_sources =		\
 	gtkcalendar.h		\
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
+	gtkseparatormenuitem.h	\
 	gtkclist.h		\
 	gtkclipboard.h		\
 	gtkcolorsel.h		\
@@ -228,7 +231,6 @@ gtk_public_h_sources =		\
 	gtkcellrenderertextpixbuf.h	\
 	gtkcellrenderertoggle.h	\
 	gtkcellrendererpixbuf.h	\
-	gtkdata.h		\
 	gtkdebug.h		\
 	gtkdialog.h		\
 	gtkdnd.h		\
@@ -254,6 +256,7 @@ gtk_public_h_sources =		\
 	gtkhsv.h		\
 	gtkiconfactory.h	\
 	gtkimage.h		\
+	gtkimagemenuitem.h	\
 	gtkimcontext.h		\
 	gtkimmodule.h		\
 	gtkimmulticontext.h	\
@@ -296,6 +299,7 @@ gtk_public_h_sources =		\
 	gtkscrolledwindow.h	\
 	gtkselection.h		\
 	gtkseparator.h		\
+	gtksettings.h		\
 	gtksignal.h		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
@@ -349,7 +353,6 @@ gdk_headers =			\
 	../gdk/gdkevents.h	\
 	../gdk/gdkfont.h	\
 	../gdk/gdkgc.h		\
-	../gdk/gdkim.h		\
 	../gdk/gdkimage.h	\
 	../gdk/gdkinput.h	\
 	../gdk/gdkpixmap.h	\