New function, copied from X11 version.

2001-02-11  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkcolor-win32.c (gdk_colormap_query_color): New
	function, copied from X11 version.

	* gdk/win32/gdkwindow-win32.c (gdk_window_set_cursor): Eliminate
	DestroyCursor failures. The reason for the problem (despite the
	inconsistent messages from GetLastError()) was that
	DestroyCursor() cannot be called while a cursor is set in a
	window. Set the new cursor first and then destroy the old one.
	Thanks to jpe@archaeopteryx.com.

	* gdk/win32/gdkcc-win32.c: Removed.

	* gdk/gdk.def
	* gdk/makefile.mingw.in: Update. Godbye GdkColorContext.

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

2 files changed, 11 insertions, 9 deletions

diff --git a/gtk/gtk.def b/gtk/gtk.def
index a73b96fff..0d02520d2 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -28,7 +28,6 @@ EXPORTS
 	GTK_TYPE_GDK_BYTE_ORDER
 	GTK_TYPE_GDK_CAP_STYLE
 	GTK_TYPE_GDK_COLOR
-	GTK_TYPE_GDK_COLOR_CONTEXT_MODE
 	GTK_TYPE_GDK_CROSSING_MODE
 	GTK_TYPE_GDK_CURSOR_TYPE
 	GTK_TYPE_GDK_DRAG_ACTION
@@ -250,8 +249,6 @@ EXPORTS
 	gtk_cell_renderer_text_new
 	gtk_cell_renderer_text_pixbuf_get_type
 	gtk_cell_renderer_text_pixbuf_new
-	gtk_cell_renderer_toggle_get_active
-	gtk_cell_renderer_toggle_set_active
 	gtk_check_button_get_type
 	gtk_check_button_new
 	gtk_check_button_new_with_label
@@ -522,6 +519,7 @@ EXPORTS
 	gtk_entry_prepend_text
 	gtk_entry_select_region
 	gtk_entry_set_editable
+	gtk_entry_set_has_frame
 	gtk_entry_set_invisible_char
 	gtk_entry_set_max_length
 	gtk_entry_set_position
@@ -1067,7 +1065,9 @@ EXPORTS
 	gtk_selection_convert
 	gtk_selection_data_copy
 	gtk_selection_data_free
+	gtk_selection_data_get_tree_row
 	gtk_selection_data_set
+	gtk_selection_data_set_tree_row
 	gtk_selection_incr_event
 	gtk_selection_notify
 	gtk_selection_owner_set
@@ -1305,6 +1305,11 @@ EXPORTS
 	gtk_tree_append
 	gtk_tree_child_position
 	gtk_tree_clear_items
+	gtk_tree_drag_dest_drag_data_received
+	gtk_tree_drag_dest_get_type
+	gtk_tree_drag_dest_row_drop_possible
+	gtk_tree_drag_source_drag_data_get
+	gtk_tree_drag_source_get_type
 	gtk_tree_get_type
 	gtk_tree_insert
 	gtk_tree_item_collapse
@@ -1388,7 +1393,6 @@ EXPORTS
 	gtk_tree_view_column_set_cell_data
 	gtk_tree_view_column_set_cell_renderer
 	gtk_tree_view_column_set_clickable
-	gtk_tree_view_column_set_justification
 	gtk_tree_view_column_set_max_width
 	gtk_tree_view_column_set_min_width
 	gtk_tree_view_column_set_sizing
@@ -1408,7 +1412,6 @@ EXPORTS
 	gtk_tree_view_get_type
 	gtk_tree_view_get_vadjustment
 	gtk_tree_view_insert_column
-	gtk_tree_view_move_to
 	gtk_tree_view_new
 	gtk_tree_view_new_with_model
 	gtk_tree_view_remove_column
diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 957e5f744..cb77bf103 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -54,7 +54,6 @@ all :				\
 
 gtk_OBJECTS =			\
 	fnmatch.o		\
-	gdk-pixbuf-loader.o	\
 	gtkaccelgroup.o		\
 	gtkaccellabel.o		\
 	gtkadjustment.o		\
@@ -178,6 +177,7 @@ gtk_OBJECTS =			\
 	gtktree.o		\
 	gtktreeitem.o		\
 	gtktreedatalist.o	\
+	gtktreednd.o		\
 	gtktreemodel.o		\
 	gtktreemodelsimple.o	\
 	gtktreemodelsort.o	\
@@ -221,7 +221,6 @@ gtk_public_h_sources =		\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
 	gtkcombo.h		\
-	gtkcompat.h		\
 	gtkcontainer.h		\
 	gtkctree.h		\
 	gtkcurve.h		\
@@ -282,7 +281,6 @@ gtk_public_h_sources =		\
 	gtkoptionmenu.h		\
 	gtkpacker.h		\
 	gtkpaned.h		\
-	gdk-pixbuf-loader.h	\
 	gtkpixmap.h		\
 	gtkplug.h		\
 	gtkpreview.h		\
@@ -322,11 +320,13 @@ gtk_public_h_sources =		\
 	gtktoolbar.h		\
 	gtktooltips.h		\
 	gtktree.h		\
+	gtktreednd.h		\
 	gtktreeitem.h		\
 	gtktreemodel.h		\
 	gtktreemodelsimple.h	\
 	gtktreemodelsort.h	\
 	gtktreeselection.h	\
+	gtktreesortable.h	\
 	gtktreestore.h		\
 	gtktreeview.h		\
 	gtktreeviewcolumn.h	\
@@ -344,7 +344,6 @@ gtk_public_h_sources =		\
 
 # More headers to use when autogenerating.
 gdk_headers =			\
-	../gdk/gdkcc.h		\
 	../gdk/gdkcolor.h	\
 	../gdk/gdkcursor.h	\
 	../gdk/gdkdnd.h		\