new file to build it all ... added to EXTRA_DIST

2003-07-20 Hans Breuer <hans@breuer.org> * makefile.msc : new file to build it all * Makefile.am : ... added to EXTRA_DIST * gdk/makefile.msc gtk/stock-icons/makefile.msc gtk/makefile.msc.in tests/makefile.msc : updated * gdk/gdk.def gtk/gtk.def : export a bunch of new functions * gtk/gtkbbox.c : use g_return_val_if_fail() if there is a value to return * gtk/gtkfontsel.c gtk/gtkiconfactory.c : static correctness * gtk/gtkicontheme.c : ported to use GTimeVal instead of struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR * gtk/gtkicontheme.c : use HAVE_LC_MESSAGES * gtk/gtkimmulticontext.c : use gtkprivate.h * gtk/stock-icons/stock_color_picker_25.png gtk/stock-icons/stock_jump_to_rtl_16.png gtk/stock-icons/stock_jump_to_rtl_24.png gtk/stock-icons/stock_redo_rtl_16.png gtk/stock-icons/stock_redo_rtl_24.png gtk/stock-icons/stock_undelete_rtl_16.png gtk/stock-icons/stock_undelete_rtl_24.png gtk/stock-icons/stock_undo_rtl_16.png : gtk/stock-icons/stock_undo_rtl_24.png : readded as binary
author: Hans Breuer <hans@breuer.org> 2003-07-20 15:50:14 +0000
committer: Hans Breuer <hans@src.gnome.org> 2003-07-20 15:50:14 +0000
commit: 364272b5b9464085c6acc87c57fb1ddf8bd5f947 (patch)
tree: 4ec9a6a85d8ca5f5734e528d0cc01147bb163295
parent: c80e5e66e817417cbef53808ba07ca0575cbe448 (diff)
download: gdk-pixbuf-364272b5b9464085c6acc87c57fb1ddf8bd5f947.tar.gz
28 files changed, 496 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 35d69bac8..e2fe52f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2003-07-20  Hans Breuer  <hans@breuer.org>
+
+	* makefile.msc : new file to build it all
+	* Makefile.am : ... added to EXTRA_DIST
+
+	* gdk/makefile.msc gtk/stock-icons/makefile.msc 
+	  gtk/makefile.msc.in tests/makefile.msc : updated
+
+	* gdk/gdk.def gtk/gtk.def : export a bunch of new 
+	functions
+
+	* gtk/gtkbbox.c : use g_return_val_if_fail() if
+	there is a value to return
+
+	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
+	static correctness
+
+	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
+	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
+
+	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
+
+	* gtk/gtkimmulticontext.c : use gtkprivate.h
+
+	* gtk/stock-icons/stock_color_picker_25.png
+	  gtk/stock-icons/stock_jump_to_rtl_16.png
+	  gtk/stock-icons/stock_jump_to_rtl_24.png
+	  gtk/stock-icons/stock_redo_rtl_16.png
+	  gtk/stock-icons/stock_redo_rtl_24.png
+	  gtk/stock-icons/stock_undelete_rtl_16.png
+	  gtk/stock-icons/stock_undelete_rtl_24.png
+	  gtk/stock-icons/stock_undo_rtl_16.png :
+	  gtk/stock-icons/stock_undo_rtl_24.png :
+	readded as binary
+
 Sat Jul 19 22:39:24 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 35d69bac8..e2fe52f38 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,38 @@
+2003-07-20  Hans Breuer  <hans@breuer.org>
+
+	* makefile.msc : new file to build it all
+	* Makefile.am : ... added to EXTRA_DIST
+
+	* gdk/makefile.msc gtk/stock-icons/makefile.msc 
+	  gtk/makefile.msc.in tests/makefile.msc : updated
+
+	* gdk/gdk.def gtk/gtk.def : export a bunch of new 
+	functions
+
+	* gtk/gtkbbox.c : use g_return_val_if_fail() if
+	there is a value to return
+
+	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
+	static correctness
+
+	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
+	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
+
+	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
+
+	* gtk/gtkimmulticontext.c : use gtkprivate.h
+
+	* gtk/stock-icons/stock_color_picker_25.png
+	  gtk/stock-icons/stock_jump_to_rtl_16.png
+	  gtk/stock-icons/stock_jump_to_rtl_24.png
+	  gtk/stock-icons/stock_redo_rtl_16.png
+	  gtk/stock-icons/stock_redo_rtl_24.png
+	  gtk/stock-icons/stock_undelete_rtl_16.png
+	  gtk/stock-icons/stock_undelete_rtl_24.png
+	  gtk/stock-icons/stock_undo_rtl_16.png :
+	  gtk/stock-icons/stock_undo_rtl_24.png :
+	readded as binary
+
 Sat Jul 19 22:39:24 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 35d69bac8..e2fe52f38 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,38 @@
+2003-07-20  Hans Breuer  <hans@breuer.org>
+
+	* makefile.msc : new file to build it all
+	* Makefile.am : ... added to EXTRA_DIST
+
+	* gdk/makefile.msc gtk/stock-icons/makefile.msc 
+	  gtk/makefile.msc.in tests/makefile.msc : updated
+
+	* gdk/gdk.def gtk/gtk.def : export a bunch of new 
+	functions
+
+	* gtk/gtkbbox.c : use g_return_val_if_fail() if
+	there is a value to return
+
+	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
+	static correctness
+
+	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
+	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
+
+	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
+
+	* gtk/gtkimmulticontext.c : use gtkprivate.h
+
+	* gtk/stock-icons/stock_color_picker_25.png
+	  gtk/stock-icons/stock_jump_to_rtl_16.png
+	  gtk/stock-icons/stock_jump_to_rtl_24.png
+	  gtk/stock-icons/stock_redo_rtl_16.png
+	  gtk/stock-icons/stock_redo_rtl_24.png
+	  gtk/stock-icons/stock_undelete_rtl_16.png
+	  gtk/stock-icons/stock_undelete_rtl_24.png
+	  gtk/stock-icons/stock_undo_rtl_16.png :
+	  gtk/stock-icons/stock_undo_rtl_24.png :
+	readded as binary
+
 Sat Jul 19 22:39:24 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 35d69bac8..e2fe52f38 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,38 @@
+2003-07-20  Hans Breuer  <hans@breuer.org>
+
+	* makefile.msc : new file to build it all
+	* Makefile.am : ... added to EXTRA_DIST
+
+	* gdk/makefile.msc gtk/stock-icons/makefile.msc 
+	  gtk/makefile.msc.in tests/makefile.msc : updated
+
+	* gdk/gdk.def gtk/gtk.def : export a bunch of new 
+	functions
+
+	* gtk/gtkbbox.c : use g_return_val_if_fail() if
+	there is a value to return
+
+	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
+	static correctness
+
+	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
+	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
+
+	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
+
+	* gtk/gtkimmulticontext.c : use gtkprivate.h
+
+	* gtk/stock-icons/stock_color_picker_25.png
+	  gtk/stock-icons/stock_jump_to_rtl_16.png
+	  gtk/stock-icons/stock_jump_to_rtl_24.png
+	  gtk/stock-icons/stock_redo_rtl_16.png
+	  gtk/stock-icons/stock_redo_rtl_24.png
+	  gtk/stock-icons/stock_undelete_rtl_16.png
+	  gtk/stock-icons/stock_undelete_rtl_24.png
+	  gtk/stock-icons/stock_undo_rtl_16.png :
+	  gtk/stock-icons/stock_undo_rtl_24.png :
+	readded as binary
+
 Sat Jul 19 22:39:24 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 35d69bac8..e2fe52f38 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,38 @@
+2003-07-20  Hans Breuer  <hans@breuer.org>
+
+	* makefile.msc : new file to build it all
+	* Makefile.am : ... added to EXTRA_DIST
+
+	* gdk/makefile.msc gtk/stock-icons/makefile.msc 
+	  gtk/makefile.msc.in tests/makefile.msc : updated
+
+	* gdk/gdk.def gtk/gtk.def : export a bunch of new 
+	functions
+
+	* gtk/gtkbbox.c : use g_return_val_if_fail() if
+	there is a value to return
+
+	* gtk/gtkfontsel.c gtk/gtkiconfactory.c :
+	static correctness
+
+	* gtk/gtkicontheme.c : ported to use GTimeVal instead of
+	struct timeval and GTK_DATA_PREFIX instead of GTK_DATADIR
+
+	* gtk/gtkicontheme.c : use HAVE_LC_MESSAGES
+
+	* gtk/gtkimmulticontext.c : use gtkprivate.h
+
+	* gtk/stock-icons/stock_color_picker_25.png
+	  gtk/stock-icons/stock_jump_to_rtl_16.png
+	  gtk/stock-icons/stock_jump_to_rtl_24.png
+	  gtk/stock-icons/stock_redo_rtl_16.png
+	  gtk/stock-icons/stock_redo_rtl_24.png
+	  gtk/stock-icons/stock_undelete_rtl_16.png
+	  gtk/stock-icons/stock_undelete_rtl_24.png
+	  gtk/stock-icons/stock_undo_rtl_16.png :
+	  gtk/stock-icons/stock_undo_rtl_24.png :
+	readded as binary
+
 Sat Jul 19 22:39:24 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	* gtk/gtktoolitem.c (gtk_tool_item_size_request): remove
diff --git a/Makefile.am b/Makefile.am
index 077c32cb0..8284462ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST =			\
 	README.cvs-commits	\
 	README.win32		\
 	config.h.win32		\
+	makefile.msc	\
 	gtk-zip.sh.in		\
 	sanitize-la.sh		\
 	po/README.translators	\
diff --git a/gdk/gdk.def b/gdk/gdk.def
index 01ea9db72..6f0d61240 100644
--- a/gdk/gdk.def
+++ b/gdk/gdk.def
@@ -74,8 +74,8 @@ EXPORTS
 	gdk_display_keyboard_ungrab
 	gdk_display_list_devices
 	gdk_display_manager_get
-	gdk_display_manager_get_type
 	gdk_display_manager_get_default_display
+	gdk_display_manager_get_type
 	gdk_display_manager_list_displays
 	gdk_display_manager_set_default_display
 	gdk_display_open
@@ -411,6 +411,7 @@ EXPORTS
 	gdk_text_height
 	gdk_text_measure
 	gdk_text_property_to_text_list
+	gdk_text_property_to_text_list_for_display
 	gdk_text_property_to_utf8_list
 	gdk_text_property_to_utf8_list_for_display
 	gdk_text_width
@@ -544,3 +545,4 @@ EXPORTS
 	gdk_window_withdraw
 	gdk_wm_decoration_get_type
 	gdk_wm_function_get_type
+
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 43585424c..cf20dcf5f 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -6,7 +6,7 @@
 ## There is no install target, you have to decide where and 
 ## how to install for yourself.
 
-TOP = ../..
+TOP = ..\..
 !INCLUDE $(TOP)/glib/build/win32/make.msc
 
 # Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
@@ -44,7 +44,8 @@ CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
 		$(GLIB_CFLAGS) $(PANGO_CFLAGS) -I ../gdk-pixbuf \
 		$(G_DEBUGGING) -DHAVE_CONFIG_H -DGDK_ENABLE_BROKEN -DGDK_VERSION=\"$(GTK_VER)\"
 EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
-		..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib $(PANGOWIN32_LIBS)
+		..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
+		$(PANGOWIN32_LIBS) $(INTL_LIBS)
 
 gdk-win32-backend :
 	cd win32
@@ -56,8 +57,10 @@ all: \
 	gdkconfig.h \
 	gdkenumtypes.h \
 	gdkenumtypes.c \
+	gdkmarshalers.h \
+	gdkmarshalers.c \
 	gdk-win32-backend \
-	gdk-win32-$(GTK_VER).dll \
+	libgdk-win32-$(GTK_VER)-0.dll \
 	testgdk.exe \
 	gdk-win32-$(GTK_VER)s.lib \
 #	gdk-x11-$(GTK_VER).dll \
@@ -67,6 +70,8 @@ gdk_OBJECTS = \
 	gdkcolor.obj \
 	gdkcursor.obj \
 	gdkdisplay.obj \
+	gdkdisplaymanager.obj \
+	gdkdnd.obj \
 	gdkdraw.obj \
 	gdkenumtypes.obj \
 	gdkevents.obj \
@@ -74,6 +79,7 @@ gdk_OBJECTS = \
 	gdkgc.obj \
 	gdkglobals.obj \
 	gdkimage.obj \
+	gdkkeynames.obj \
 	gdkkeys.obj \
 	gdkkeyuni.obj \
 	gdkpango.obj \
@@ -114,6 +120,13 @@ gdk_public_h_sources = \
 	gdkvisual.h	\
 	gdkwindow.h	\
 
+# private marshalers
+gdkmarshalers.h : gdkmarshalers.list
+	$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --header >>gdkmarshalers.h
+
+gdkmarshalers.c : gdkmarshalers.list
+	$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
+
 gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
 	$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
 
@@ -126,8 +139,10 @@ gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
 gdkconfig.h : gdkconfig.h.win32
 	copy gdkconfig.h.win32 gdkconfig.h
 
-gdk-win32-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
-	$(CC) $(CFLAGS) -LD -Fegdk-win32-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
+libgdk-win32-$(GTK_VER)-0.dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
+	$(CC) $(CFLAGS) -LD -Fe$@ $(gdk_OBJECTS) win32\gdk-win32.lib $(EXTRALIBS) \
+	gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res \
+	$(LDFLAGS) /implib:gdk-win32-$(GTK_VER).lib /def:gdk.def
 
 gdk-win32-$(GTK_VER)s.lib : $(gdk_OBJECTS)
 	lib /out:gdk-win32-$(GTK_VER)s.lib $(gdk_OBJECTS) win32\gdk-win32.lib
@@ -137,13 +152,15 @@ gdk-x11-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def x11\gdk-x11.lib
 	$(PANGO)\pango\pangox-$(PANGO_VER).lib \
 	x11\gdk-x11.lib $(X11_LIBS) $(EXTRALIBS) user32.lib $(LDFLAGS) /def:gdk.def
 
-testgdk.exe : gdk-win32-$(GTK_VER).dll testgdk.obj
+testgdk.exe : libgdk-win32-$(GTK_VER)-0.dll testgdk.obj
 	$(CC) -Fetestgdk.exe testgdk.obj gdk-win32-$(GTK_VER).lib $(EXTRALIBS) $(LDFLAGS)
 
 .c.obj :
 	$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
 
 clean::
+	del gdkmarshalers.c
+	del gdkmarshalers.h
 	del *.dll
 	del *.obj
 	del *.lib
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 4838d0891..539139382 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -276,8 +276,10 @@ _gdk_events_init (void)
     LANG_LITHUANIAN,
     LANG_VIETNAMESE,
     LANG_AFRIKAANS,
-    LANG_FAEROESE,
-    LANG_SWAHILI
+    LANG_FAEROESE
+#ifdef LANG_SWAHILI
+   ,LANG_SWAHILI
+#endif
   };
 
   gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
diff --git a/gtk/gtk.def b/gtk/gtk.def
index ad42ae95a..6323da848 100755
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -45,9 +45,11 @@ EXPORTS
 	gtk_adjustment_new
 	gtk_adjustment_set_value
 	gtk_adjustment_value_changed
+	gtk_alignment_get_padding
 	gtk_alignment_get_type
 	gtk_alignment_new
 	gtk_alignment_set
+	gtk_alignment_set_padding
 	gtk_anchor_type_get_type
 	gtk_arg_flags_get_type
 	gtk_arrow_get_type
@@ -89,6 +91,7 @@ EXPORTS
 	gtk_box_set_spacing
 	gtk_button_action_get_type
 	gtk_button_box_get_child_ipadding
+	gtk_button_box_get_child_secondary
 	gtk_button_box_get_child_size
 	gtk_button_box_get_layout
 	gtk_button_box_get_type
@@ -99,6 +102,7 @@ EXPORTS
 	gtk_button_box_style_get_type
 	gtk_button_clicked
 	gtk_button_enter
+	gtk_button_get_focus_on_click
 	gtk_button_get_label
 	gtk_button_get_relief
 	gtk_button_get_type
@@ -111,6 +115,7 @@ EXPORTS
 	gtk_button_new_with_mnemonic
 	gtk_button_pressed
 	gtk_button_released
+	gtk_button_set_focus_on_click
 	gtk_button_set_label
 	gtk_button_set_relief
 	gtk_button_set_use_stock
@@ -121,17 +126,27 @@ EXPORTS
 	gtk_calendar_display_options_get_type
 	gtk_calendar_freeze
 	gtk_calendar_get_date
+	gtk_calendar_get_display_options
 	gtk_calendar_get_type
 	gtk_calendar_mark_day
 	gtk_calendar_new
 	gtk_calendar_select_day
 	gtk_calendar_select_month
+	gtk_calendar_set_display_options
 	gtk_calendar_thaw
 	gtk_calendar_unmark_day
 	gtk_cell_editable_editing_done
 	gtk_cell_editable_get_type
 	gtk_cell_editable_remove_widget
 	gtk_cell_editable_start_editing
+	gtk_cell_layout_add_attribute
+	gtk_cell_layout_clear
+	gtk_cell_layout_clear_attributes
+	gtk_cell_layout_get_type
+	gtk_cell_layout_pack_end
+	gtk_cell_layout_pack_start
+	gtk_cell_layout_set_attributes
+	gtk_cell_layout_set_cell_data_func
 	gtk_cell_renderer_activate
 	gtk_cell_renderer_get_fixed_size
 	gtk_cell_renderer_get_size
@@ -257,6 +272,17 @@ EXPORTS
 	gtk_clist_undo_selection
 	gtk_clist_unselect_all
 	gtk_clist_unselect_row
+	gtk_color_button_get_alpha
+	gtk_color_button_get_color
+	gtk_color_button_get_title
+	gtk_color_button_get_type
+	gtk_color_button_get_use_alpha
+	gtk_color_button_new
+	gtk_color_button_new_with_color
+	gtk_color_button_set_alpha
+	gtk_color_button_set_color
+	gtk_color_button_set_title
+	gtk_color_button_set_use_alpha
 	gtk_color_selection_dialog_get_type
 	gtk_color_selection_dialog_new
 	gtk_color_selection_get_color
@@ -492,7 +518,21 @@ EXPORTS
 	gtk_editable_set_editable
 	gtk_editable_set_position
 	gtk_entry_append_text
+	gtk_entry_completion_complete
+	gtk_entry_completion_delete_action
+	gtk_entry_completion_get_entry
+	gtk_entry_completion_get_minimum_key_length
+	gtk_entry_completion_get_model
+	gtk_entry_completion_get_type
+	gtk_entry_completion_insert_action_markup
+	gtk_entry_completion_insert_action_text
+	gtk_entry_completion_new
+	gtk_entry_completion_set_match_func
+	gtk_entry_completion_set_minimum_key_length
+	gtk_entry_completion_set_model
+	gtk_entry_completion_set_text_column
 	gtk_entry_get_activates_default
+	gtk_entry_get_completion
 	gtk_entry_get_has_frame
 	gtk_entry_get_invisible_char
 	gtk_entry_get_layout
@@ -508,6 +548,7 @@ EXPORTS
 	gtk_entry_prepend_text
 	gtk_entry_select_region
 	gtk_entry_set_activates_default
+	gtk_entry_set_completion
 	gtk_entry_set_editable
 	gtk_entry_set_has_frame
 	gtk_entry_set_invisible_char
@@ -521,6 +562,19 @@ EXPORTS
 	gtk_event_box_new
 	gtk_events_pending
 	gtk_exit
+	gtk_expander_get_expanded
+	gtk_expander_get_label
+	gtk_expander_get_label_widget
+	gtk_expander_get_spacing
+	gtk_expander_get_type
+	gtk_expander_get_use_underline
+	gtk_expander_new
+	gtk_expander_new_with_mnemonic
+	gtk_expander_set_expanded
+	gtk_expander_set_label
+	gtk_expander_set_label_widget
+	gtk_expander_set_spacing
+	gtk_expander_set_use_underline
 	gtk_expander_style_get_type
 	gtk_false
 	gtk_file_selection_complete
@@ -539,6 +593,21 @@ EXPORTS
 	gtk_fixed_new
 	gtk_fixed_put
 	gtk_fixed_set_has_window
+	gtk_font_button_get_font_name
+	gtk_font_button_get_show_size
+	gtk_font_button_get_show_style
+	gtk_font_button_get_title
+	gtk_font_button_get_type
+	gtk_font_button_get_use_font
+	gtk_font_button_get_use_size
+	gtk_font_button_new
+	gtk_font_button_new_with_font
+	gtk_font_button_set_font_name
+	gtk_font_button_set_show_size
+	gtk_font_button_set_show_style
+	gtk_font_button_set_title
+	gtk_font_button_set_use_font
+	gtk_font_button_set_use_size
 	gtk_font_selection_dialog_get_font
 	gtk_font_selection_dialog_get_font_name
 	gtk_font_selection_dialog_get_preview_text
@@ -576,6 +645,7 @@ EXPORTS
 	gtk_grab_get_current
 	gtk_grab_remove
 	gtk_handle_box_get_handle_position
+	gtk_handle_box_get_private
 	gtk_handle_box_get_shadow_type
 	gtk_handle_box_get_snap_edge
 	gtk_handle_box_get_type
@@ -617,6 +687,17 @@ EXPORTS
 	gtk_icon_factory_lookup_default
 	gtk_icon_factory_new
 	gtk_icon_factory_remove_default
+	gtk_icon_info_copy
+	gtk_icon_info_free
+	gtk_icon_info_get_attach_points
+	gtk_icon_info_get_base_size
+	gtk_icon_info_get_builtin_pixbuf
+	gtk_icon_info_get_display_name
+	gtk_icon_info_get_embedded_rect
+	gtk_icon_info_get_filename
+	gtk_icon_info_get_type
+	gtk_icon_info_load_icon
+	gtk_icon_info_set_raw_coordinates
 	gtk_icon_set_add_source
 	gtk_icon_set_copy
 	gtk_icon_set_get_sizes
@@ -638,6 +719,7 @@ EXPORTS
 	gtk_icon_source_get_direction
 	gtk_icon_source_get_direction_wildcarded
 	gtk_icon_source_get_filename
+	gtk_icon_source_get_icon_name
 	gtk_icon_source_get_pixbuf
 	gtk_icon_source_get_size
 	gtk_icon_source_get_size_wildcarded
@@ -648,11 +730,30 @@ EXPORTS
 	gtk_icon_source_set_direction
 	gtk_icon_source_set_direction_wildcarded
 	gtk_icon_source_set_filename
+	gtk_icon_source_set_icon_name
 	gtk_icon_source_set_pixbuf
 	gtk_icon_source_set_size
 	gtk_icon_source_set_size_wildcarded
 	gtk_icon_source_set_state
 	gtk_icon_source_set_state_wildcarded
+	gtk_icon_theme_add_builtin_icon
+	gtk_icon_theme_append_search_path
+	gtk_icon_theme_error_quark
+	gtk_icon_theme_get_default
+	gtk_icon_theme_get_example_icon_name
+	gtk_icon_theme_get_for_screen
+	gtk_icon_theme_get_search_path
+	gtk_icon_theme_get_type
+	gtk_icon_theme_has_icon
+	gtk_icon_theme_list_icons
+	gtk_icon_theme_load_icon
+	gtk_icon_theme_lookup_icon
+	gtk_icon_theme_new
+	gtk_icon_theme_prepend_search_path
+	gtk_icon_theme_rescan_if_needed
+	gtk_icon_theme_set_custom_theme
+	gtk_icon_theme_set_screen
+	gtk_icon_theme_set_search_path
 	gtk_identifier_get_type
 	gtk_idle_add
 	gtk_idle_add_full
@@ -678,6 +779,8 @@ EXPORTS
 	gtk_im_multicontext_append_menuitems
 	gtk_im_multicontext_get_type
 	gtk_im_multicontext_new
+	gtk_im_preedit_style_get_type
+	gtk_im_status_style_get_type
 	gtk_image_get
 	gtk_image_get_animation
 	gtk_image_get_icon_set
@@ -717,6 +820,7 @@ EXPORTS
 	gtk_init_check
 	gtk_init_check_abi_check
 	gtk_input_add_full
+	gtk_input_dialog_get_private
 	gtk_input_dialog_get_type
 	gtk_input_dialog_new
 	gtk_input_remove
@@ -893,6 +997,7 @@ EXPORTS
 	gtk_menu_get_accel_group
 	gtk_menu_get_active
 	gtk_menu_get_attach_widget
+	gtk_menu_get_private
 	gtk_menu_get_tearoff_state
 	gtk_menu_get_title
 	gtk_menu_get_type
@@ -933,6 +1038,7 @@ EXPORTS
 	gtk_menu_shell_select_item
 	gtk_message_dialog_get_type
 	gtk_message_dialog_new
+	gtk_message_dialog_new_with_markup
 	gtk_message_type_get_type
 	gtk_metric_type_get_type
 	gtk_micro_version
@@ -1050,6 +1156,7 @@ EXPORTS
 	gtk_paned_pack1
 	gtk_paned_pack2
 	gtk_paned_set_position
+	gtk_parse_args
 	gtk_path_priority_type_get_type
 	gtk_path_type_get_type
 	gtk_pixmap_get
@@ -1131,6 +1238,13 @@ EXPORTS
 	gtk_radio_menu_item_new_with_label
 	gtk_radio_menu_item_new_with_mnemonic
 	gtk_radio_menu_item_set_group
+	gtk_radio_tool_button_get_group
+	gtk_radio_tool_button_get_type
+	gtk_radio_tool_button_new
+	gtk_radio_tool_button_new_from_stock
+	gtk_radio_tool_button_new_from_widget
+	gtk_radio_tool_button_new_with_stock_from_widget
+	gtk_radio_tool_button_set_group
 	gtk_range_get_adjustment
 	gtk_range_get_inverted
 	gtk_range_get_type
@@ -1197,6 +1311,7 @@ EXPORTS
 	gtk_scale_set_digits
 	gtk_scale_set_draw_value
 	gtk_scale_set_value_pos
+	gtk_scroll_step_get_type
 	gtk_scroll_type_get_type
 	gtk_scrollbar_get_type
 	gtk_scrolled_window_add_with_viewport
@@ -1232,6 +1347,8 @@ EXPORTS
 	gtk_separator_get_type
 	gtk_separator_menu_item_get_type
 	gtk_separator_menu_item_new
+	gtk_separator_tool_item_get_type
+	gtk_separator_tool_item_new
 	gtk_set_locale
 	gtk_settings_get_default
 	gtk_settings_get_for_screen
@@ -1408,6 +1525,7 @@ EXPORTS
 	gtk_text_buffer_remove_selection_clipboard
 	gtk_text_buffer_remove_tag
 	gtk_text_buffer_remove_tag_by_name
+	gtk_text_buffer_select_range
 	gtk_text_buffer_set_modified
 	gtk_text_buffer_set_text
 	gtk_text_byte_begins_utf8_char
@@ -1592,6 +1710,7 @@ EXPORTS
 	gtk_text_view_get_left_margin
 	gtk_text_view_get_line_at_y
 	gtk_text_view_get_line_yrange
+	gtk_text_view_get_overwrite
 	gtk_text_view_get_pixels_above_lines
 	gtk_text_view_get_pixels_below_lines
 	gtk_text_view_get_pixels_inside_wrap
@@ -1618,6 +1737,7 @@ EXPORTS
 	gtk_text_view_set_indent
 	gtk_text_view_set_justification
 	gtk_text_view_set_left_margin
+	gtk_text_view_set_overwrite
 	gtk_text_view_set_pixels_above_lines
 	gtk_text_view_set_pixels_below_lines
 	gtk_text_view_set_pixels_inside_wrap
@@ -1650,16 +1770,64 @@ EXPORTS
 	gtk_toggle_button_set_inconsistent
 	gtk_toggle_button_set_mode
 	gtk_toggle_button_toggled
+	gtk_toggle_tool_button_get_active
+	gtk_toggle_tool_button_get_type
+	gtk_toggle_tool_button_new
+	gtk_toggle_tool_button_new_from_stock
+	gtk_toggle_tool_button_set_active
+	gtk_tool_button_get_icon_widget
+	gtk_tool_button_get_label
+	gtk_tool_button_get_label_widget
+	gtk_tool_button_get_stock_id
+	gtk_tool_button_get_type
+	gtk_tool_button_get_use_underline
+	gtk_tool_button_new
+	gtk_tool_button_new_from_stock
+	gtk_tool_button_set_icon_widget
+	gtk_tool_button_set_label
+	gtk_tool_button_set_label_widget
+	gtk_tool_button_set_stock_id
+	gtk_tool_button_set_use_underline
+	gtk_tool_item_get_expand
+	gtk_tool_item_get_homogeneous
+	gtk_tool_item_get_icon_size
+	gtk_tool_item_get_orientation
+	gtk_tool_item_get_pack_end
+	gtk_tool_item_get_proxy_menu_item
+	gtk_tool_item_get_relief_style
+	gtk_tool_item_get_toolbar_style
+	gtk_tool_item_get_type
+	gtk_tool_item_get_use_drag_window
+	gtk_tool_item_get_visible_horizontal
+	gtk_tool_item_get_visible_vertical
+	gtk_tool_item_new
+	gtk_tool_item_retrieve_proxy_menu_item
+	gtk_tool_item_set_expand
+	gtk_tool_item_set_homogeneous
+	gtk_tool_item_set_pack_end
+	gtk_tool_item_set_proxy_menu_item
+	gtk_tool_item_set_tooltip
+	gtk_tool_item_set_use_drag_window
+	gtk_tool_item_set_visible_horizontal
+	gtk_tool_item_set_visible_vertical
+	gtk_tool_item_toolbar_reconfigured
 	gtk_toolbar_append_element
 	gtk_toolbar_append_item
 	gtk_toolbar_append_space
 	gtk_toolbar_append_widget
 	gtk_toolbar_child_type_get_type
+	gtk_toolbar_get_drop_index
 	gtk_toolbar_get_icon_size
+	gtk_toolbar_get_item_index
+	gtk_toolbar_get_n_items
+	gtk_toolbar_get_nth_item
 	gtk_toolbar_get_orientation
+	gtk_toolbar_get_relief_style
+	gtk_toolbar_get_show_arrow
 	gtk_toolbar_get_style
 	gtk_toolbar_get_tooltips
 	gtk_toolbar_get_type
+	gtk_toolbar_insert
 	gtk_toolbar_insert_element
 	gtk_toolbar_insert_item
 	gtk_toolbar_insert_space
@@ -1673,6 +1841,7 @@ EXPORTS
 	gtk_toolbar_remove_space
 	gtk_toolbar_set_icon_size
 	gtk_toolbar_set_orientation
+	gtk_toolbar_set_show_arrow
 	gtk_toolbar_set_style
 	gtk_toolbar_set_tooltips
 	gtk_toolbar_space_style_get_type
@@ -1713,6 +1882,18 @@ EXPORTS
 	gtk_tree_iter_copy
 	gtk_tree_iter_free
 	gtk_tree_iter_get_type
+	gtk_tree_model_filter_clear_cache
+	gtk_tree_model_filter_convert_child_iter_to_iter
+	gtk_tree_model_filter_convert_child_path_to_path
+	gtk_tree_model_filter_convert_iter_to_child_iter
+	gtk_tree_model_filter_convert_path_to_child_path
+	gtk_tree_model_filter_get_model
+	gtk_tree_model_filter_get_type
+	gtk_tree_model_filter_new
+	gtk_tree_model_filter_refilter
+	gtk_tree_model_filter_set_modify_func
+	gtk_tree_model_filter_set_visible_column
+	gtk_tree_model_filter_set_visible_func
 	gtk_tree_model_flags_get_type
 	gtk_tree_model_foreach
 	gtk_tree_model_get
@@ -1854,6 +2035,7 @@ EXPORTS
 	gtk_tree_view_column_get_alignment
 	gtk_tree_view_column_get_cell_renderers
 	gtk_tree_view_column_get_clickable
+	gtk_tree_view_column_get_expand
 	gtk_tree_view_column_get_fixed_width
 	gtk_tree_view_column_get_max_width
 	gtk_tree_view_column_get_min_width
@@ -1877,6 +2059,7 @@ EXPORTS
 	gtk_tree_view_column_set_attributes
 	gtk_tree_view_column_set_cell_data_func
 	gtk_tree_view_column_set_clickable
+	gtk_tree_view_column_set_expand
 	gtk_tree_view_column_set_fixed_width
 	gtk_tree_view_column_set_max_width
 	gtk_tree_view_column_set_min_width
@@ -2070,6 +2253,7 @@ EXPORTS
 	gtk_widget_queue_draw
 	gtk_widget_queue_draw_area
 	gtk_widget_queue_resize
+	gtk_widget_queue_resize_no_redraw
 	gtk_widget_realize
 	gtk_widget_ref
 	gtk_widget_region_intersect
@@ -2139,6 +2323,7 @@ EXPORTS
 	gtk_window_get_mnemonic_modifier
 	gtk_window_get_modal
 	gtk_window_get_position
+	gtk_window_get_private
 	gtk_window_get_resizable
 	gtk_window_get_role
 	gtk_window_get_screen
@@ -2170,6 +2355,7 @@ EXPORTS
 	gtk_window_set_auto_startup_notification
 	gtk_window_set_decorated
 	gtk_window_set_default
+	gtk_window_set_default_icon
 	gtk_window_set_default_icon_from_file
 	gtk_window_set_default_icon_list
 	gtk_window_set_default_size
@@ -2201,6 +2387,7 @@ EXPORTS
 	gtk_window_unmaximize
 	gtk_window_unstick
 	gtk_wrap_mode_get_type
+
 ;	gtk_plug_construct
 ;	gtk_plug_construct_for_display
 ;	gtk_plug_get_id
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index fade4783a..e23b75ef7 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -343,8 +343,8 @@ gtk_button_box_get_child_secondary (GtkButtonBox *widget,
   GList *list;
   GtkBoxChild *child_info;
 
-  g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
-  g_return_if_fail (GTK_IS_WIDGET (child));
+  g_return_val_if_fail (GTK_IS_BUTTON_BOX (widget), FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (child), FALSE);
 
   child_info = NULL;
   list = GTK_BOX (widget)->children;
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 293d0bb03..96337feb1 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1053,7 +1053,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
   gtk_editable_set_position (GTK_EDITABLE (preview_entry), 0);
 }
 
-GdkFont*
+static GdkFont*
 gtk_font_selection_get_font_internal (GtkFontSelection *fontsel)
 {
   if (!fontsel->font)
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 61a330384..55376d177 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -995,7 +995,7 @@ icon_sizes_init_for_settings (GtkSettings *settings)
   icon_size_set_all_from_settings (settings);
 }
      
-gboolean
+static gboolean
 icon_size_lookup_intern (GtkSettings *settings,
 			 GtkIconSize  size,
 			 gint        *widthp,
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index d1f7aa698..63adc33f1 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -17,18 +17,28 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <sys/time.h>
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>
 
+#ifdef G_OS_WIN32
+#ifndef S_ISDIR
+#define S_ISDIR(mode) ((mode)&_S_IFDIR)
+#endif
+#endif /* G_OS_WIN32 */
+
 #include "gtkicontheme.h"
 #include "gtkiconthemeparser.h"
 #include "gtkintl.h"
 #include "gtksettings.h"
+#include "gtkprivate.h"
 
 #define DEFAULT_THEME_NAME "hicolor"
 
@@ -514,8 +524,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
   priv->search_path[0] = g_build_filename (g_get_home_dir (),
 					   ".icons",
 					   NULL);
-  priv->search_path[1] = g_strdup (GTK_DATADIR "/pixmaps");
-  priv->search_path[2] = g_strdup (GTK_DATADIR "/icons");
+  priv->search_path[1] = g_build_filename (GTK_DATA_PREFIX, "pixmaps", NULL);
+  priv->search_path[2] = g_build_filename (GTK_DATA_PREFIX, "icons", NULL);
   priv->search_path[3] = g_strdup ("/usr/share/icons");
   priv->search_path[4] = g_strdup ("/usr/share/pixmaps");
   priv->search_path_len = 5;
@@ -920,7 +930,7 @@ load_themes (GtkIconTheme *icon_theme)
   char *abs_file;
   UnthemedIcon *unthemed_icon;
   IconSuffix old_suffix, new_suffix;
-  struct timeval tv;
+  GTimeVal tv;
   
   priv = icon_theme->priv;
 
@@ -1008,7 +1018,7 @@ load_themes (GtkIconTheme *icon_theme)
 
   priv->themes_valid = TRUE;
   
-  gettimeofday(&tv, NULL);
+  g_get_current_time(&tv);
   priv->last_stat_time = tv.tv_sec;
 }
 
@@ -1016,11 +1026,11 @@ static void
 ensure_valid_themes (GtkIconTheme *icon_theme)
 {
   GtkIconThemePrivate *priv = icon_theme->priv;
-  struct timeval tv;
+  GTimeVal tv;
   
   if (priv->themes_valid)
     {
-      gettimeofday(&tv, NULL);
+      g_get_current_time(&tv);
 
       if (ABS (tv.tv_sec - priv->last_stat_time) > 5)
 	gtk_icon_theme_rescan_if_needed (icon_theme);
@@ -1367,7 +1377,7 @@ gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
   GList *d;
   int stat_res;
   struct stat stat_buf;
-  struct timeval tv;
+  GTimeVal tv;
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), FALSE);
 
@@ -1393,7 +1403,7 @@ gtk_icon_theme_rescan_if_needed (GtkIconTheme *icon_theme)
       return TRUE;
     }
   
-  gettimeofday (&tv, NULL);
+  g_get_current_time (&tv);
   priv->last_stat_time = tv.tv_sec;
 
   return FALSE;
diff --git a/gtk/gtkiconthemeparser.c b/gtk/gtkiconthemeparser.c
index ad6bbdfa9..f048998b1 100644
--- a/gtk/gtkiconthemeparser.c
+++ b/gtk/gtkiconthemeparser.c
@@ -17,6 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -762,7 +764,11 @@ calculate_locale (GtkIconThemeFile   *df)
 {
   char *p, *lang;
 
+#ifdef HAVE_LC_MESSAGES
   lang = g_strdup (setlocale (LC_MESSAGES, NULL));
+#else
+  lang = g_strdup (setlocale (LC_CTYPE, NULL));
+#endif
   
   if (lang)
     {
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index b547dd7c9..66104e9cc 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -26,6 +26,7 @@
 #include "gtkimmodule.h"
 #include "gtkradiomenuitem.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 
 static void     gtk_im_multicontext_class_init         (GtkIMMulticontextClass  *class);
 static void     gtk_im_multicontext_init               (GtkIMMulticontext       *im_multicontext);
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 069f6dac0..6fc0368b9 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -47,7 +47,7 @@ all :						\
 	..\config.h				\
 	generated				\
 	gtk-stocks-icons			\
-	gtk-win32-$(GTK_VER).dll		\
+	libgtk-win32-$(GTK_VER)-0.dll		\
 	gtk-query-immodules-$(GTK_VER).exe \
 #	gtk-win32-$(GTK_VER)s.lib \
 #	gtk-x11-$(GTK_VER).dll
@@ -69,6 +69,7 @@ gtk_OBJECTS = 					\
 	gtkbutton.obj				\
 	gtkcalendar.obj				\
 	gtkcelleditable.obj			\
+	gtkcelllayout.obj			\
 	gtkcellrenderer.obj			\
 	gtkcellrenderertext.obj			\
 	gtkcellrenderertoggle.obj		\
@@ -77,6 +78,7 @@ gtk_OBJECTS = 					\
 	gtkcheckmenuitem.obj			\
 	gtkclipboard.obj			\
 	gtkclist.obj				\
+	gtkcolorbutton.obj				\
 	gtkcolorsel.obj				\
 	gtkcolorseldialog.obj			\
 	gtkcombo.obj				\
@@ -88,10 +90,13 @@ gtk_OBJECTS = 					\
 	gtkdrawingarea.obj			\
 	gtkeditable.obj				\
 	gtkentry.obj				\
+	gtkentrycompletion.obj		\
 	gtkeventbox.obj				\
+	gtkexpander.obj			\
 	gtkfilesel.obj				\
 	gtkfixed.obj				\
 	gtkfontsel.obj				\
+	gtkfontbutton.obj				\
 	gtkframe.obj				\
 	gtkgamma.obj				\
 	gtkgc.obj				\
@@ -105,6 +110,8 @@ gtk_OBJECTS = 					\
 	gtkhseparator.obj			\
 	gtkhsv.obj				\
 	gtkiconfactory.obj			\
+	gtkicontheme.obj			\
+	gtkiconthemeparser.obj			\
 	gtkimage.obj				\
 	gtkimagemenuitem.obj	\
 	gtkimcontext.obj			\
@@ -141,6 +148,7 @@ gtk_OBJECTS = 					\
 	gtkprogress.obj				\
 	gtkprogressbar.obj			\
 	gtkradiobutton.obj			\
+	gtkradiotoolbutton.obj			\
 	gtkradiomenuitem.obj			\
 	gtkrange.obj				\
 	gtkrbtree.obj	\
@@ -152,6 +160,7 @@ gtk_OBJECTS = 					\
 	gtkselection.obj			\
 	gtkseparator.obj			\
 	gtkseparatormenuitem.obj \
+	gtkseparatortoolitem.obj \
 	gtksettings.obj \
 	gtksignal.obj				\
 	gtksizegroup.obj \
@@ -179,13 +188,17 @@ gtk_OBJECTS = 					\
 	gtkthemes.obj				\
 	gtktipsquery.obj			\
 	gtktogglebutton.obj			\
+	gtktoggletoolbutton.obj			\
 	gtktoolbar.obj				\
+	gtktoolbutton.obj				\
+	gtktoolitem.obj				\
 	gtktooltips.obj				\
 	gtktree.obj				\
 	gtktreedatalist.obj	\
 	gtktreednd.obj				\
 	gtktreeitem.obj				\
 	gtktreemodel.obj			\
+	gtktreemodelfilter.obj			\
 	gtktreemodelsort.obj			\
 	gtktreeselection.obj			\
 	gtktreesortable.obj \
@@ -211,42 +224,49 @@ gtk_public_h_sources =		\
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
+	gtkaccelmap.h		\
 	gtkaccessible.h \
 	gtkadjustment.h		\
 	gtkalignment.h		\
 	gtkarrow.h		\
 	gtkaspectframe.h	\
+	gtkbbox.h		\
 	gtkbin.h		\
 	gtkbindings.h		\
-	gtkbbox.h		\
 	gtkbox.h		\
 	gtkbutton.h		\
 	gtkcalendar.h		\
+	gtkcelleditable.h	\
+	gtkcelllayout.h		\
+	gtkcellrenderer.h	\
+	gtkcellrendererpixbuf.h	\
+	gtkcellrenderertext.h	\
+	gtkcellrenderertoggle.h	\
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
+	gtkclipboard.h		\
 	gtkclist.h		\
 	gtkclipboard.h		\
+	gtkcolorbutton.h	\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
 	gtkcombo.h		\
 	gtkcontainer.h		\
 	gtkctree.h		\
 	gtkcurve.h		\
-	gtkcelleditable.h \
-	gtkcellrenderer.h	\
-	gtkcellrenderertext.h	\
-	gtkcellrenderertoggle.h	\
-	gtkcellrendererpixbuf.h	\
 	gtkdebug.h		\
 	gtkdialog.h		\
 	gtkdnd.h		\
 	gtkdrawingarea.h	\
 	gtkeditable.h		\
 	gtkentry.h		\
+	gtkentrycompletion.h	\
 	gtkenums.h		\
 	gtkeventbox.h		\
+	gtkexpander.h		\
 	gtkfilesel.h		\
 	gtkfixed.h		\
+	gtkfontbutton.h		\
 	gtkfontsel.h		\
 	gtkframe.h		\
 	gtkgamma.h		\
@@ -261,8 +281,11 @@ gtk_public_h_sources =		\
 	gtkhseparator.h		\
 	gtkhsv.h		\
 	gtkiconfactory.h	\
+	gtkicontheme.h		\
 	gtkimage.h		\
+	gtkimagemenuitem.h	\
 	gtkimcontext.h		\
+	gtkimcontextsimple.h	\
 	gtkimmodule.h		\
 	gtkimmulticontext.h	\
 	gtkinputdialog.h	\
@@ -283,8 +306,8 @@ gtk_public_h_sources =		\
 	gtkmessagedialog.h	\
 	gtkmisc.h		\
 	gtknotebook.h		\
-	gtkoldeditable.h	\
 	gtkobject.h		\
+	gtkoldeditable.h	\
 	gtkoptionmenu.h		\
 	gtkpaned.h		\
 	gtkpixmap.h		\
@@ -295,6 +318,7 @@ gtk_public_h_sources =		\
 	gtkprogressbar.h	\
 	gtkradiobutton.h	\
 	gtkradiomenuitem.h	\
+	gtkradiotoolbutton.h	\
 	gtkrange.h		\
 	gtkrc.h			\
 	gtkruler.h		\
@@ -303,15 +327,20 @@ gtk_public_h_sources =		\
 	gtkscrolledwindow.h	\
 	gtkselection.h		\
 	gtkseparator.h		\
+	gtkseparatormenuitem.h	\
+	gtkseparatortoolitem.h	\
+	gtksettings.h		\
+	gtksignal.h		\
 	gtksizegroup.h	\
 	gtksignal.h		\
 	gtksocket.h		\
 	gtkspinbutton.h		\
-	gtkstyle.h		\
 	gtkstatusbar.h		\
 	gtkstock.h		\
+	gtkstyle.h		\
 	gtktable.h		\
 	gtktearoffmenuitem.h	\
+	gtktext.h		\
 	gtktextbuffer.h		\
 	gtktextchild.h		\
 	gtktextdisplay.h	\
@@ -321,14 +350,18 @@ gtk_public_h_sources =		\
 	gtktexttag.h		\
 	gtktexttagtable.h	\
 	gtktextview.h		\
-	gtktext.h		\
 	gtktipsquery.h		\
 	gtktogglebutton.h	\
+	gtktoggletoolbutton.h	\
 	gtktoolbar.h		\
+	gtktoolbutton.h		\
+	gtktoolitem.h		\
 	gtktooltips.h		\
 	gtktree.h		\
+	gtktreednd.h		\
 	gtktreeitem.h		\
 	gtktreemodel.h		\
+	gtktreemodelfilter.h	\
 	gtktreemodelsort.h	\
 	gtktreeselection.h	\
 	gtktreesortable.h	\
@@ -420,8 +453,11 @@ gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
 #
 # Linking:
 #
-gtk-win32-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
-	$(CC) $(CFLAGS) -LD -Fm -Fegtk-win32-$(GTK_VER).dll $(gtk_OBJECTS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) gdi32.lib user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:gtk.def
+libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def
+	$(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) \
+	$(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
+	gdi32.lib user32.lib advapi32.lib wsock32.lib \
+	$(LDFLAGS) /implib:gtk-win32-$(GTK_VER).lib /def:gtk.def
 
 gtk-win32-$(GTK_VER)s.lib : $(gtk_OBJECTS)
 	lib /out:gtk-win32-$(GTK_VER)s.lib $(gtk_OBJECTS)
diff --git a/gtk/stock-icons/stock_color_picker_25.png b/gtk/stock-icons/stock_color_picker_25.png
new file mode 100644
index 000000000..9273bdd0f
--- /dev/null
+++ b/gtk/stock-icons/stock_color_picker_25.png
diff --git a/gtk/stock-icons/stock_redo_rtl_16.png b/gtk/stock-icons/stock_redo_rtl_16.png
new file mode 100644
index 000000000..0a07d5d99
--- /dev/null
+++ b/gtk/stock-icons/stock_redo_rtl_16.png
diff --git a/gtk/stock-icons/stock_redo_rtl_24.png b/gtk/stock-icons/stock_redo_rtl_24.png
new file mode 100644
index 000000000..a32950992
--- /dev/null
+++ b/gtk/stock-icons/stock_redo_rtl_24.png
diff --git a/gtk/stock-icons/stock_revert_rtl_16.png b/gtk/stock-icons/stock_revert_rtl_16.png
new file mode 100644
index 000000000..8f752250e
--- /dev/null
+++ b/gtk/stock-icons/stock_revert_rtl_16.png
diff --git a/gtk/stock-icons/stock_revert_rtl_24.png b/gtk/stock-icons/stock_revert_rtl_24.png
new file mode 100644
index 000000000..b0014fa5e
--- /dev/null
+++ b/gtk/stock-icons/stock_revert_rtl_24.png
diff --git a/gtk/stock-icons/stock_undelete_rtl_16.png b/gtk/stock-icons/stock_undelete_rtl_16.png
new file mode 100644
index 000000000..c9d3b4dd8
--- /dev/null
+++ b/gtk/stock-icons/stock_undelete_rtl_16.png
diff --git a/gtk/stock-icons/stock_undelete_rtl_24.png b/gtk/stock-icons/stock_undelete_rtl_24.png
new file mode 100644
index 000000000..afd1c3e3d
--- /dev/null
+++ b/gtk/stock-icons/stock_undelete_rtl_24.png
diff --git a/gtk/stock-icons/stock_undo_rtl_16.png b/gtk/stock-icons/stock_undo_rtl_16.png
new file mode 100644
index 000000000..8a9bab10b
--- /dev/null
+++ b/gtk/stock-icons/stock_undo_rtl_16.png
diff --git a/gtk/stock-icons/stock_undo_rtl_24.png b/gtk/stock-icons/stock_undo_rtl_24.png
new file mode 100644
index 000000000..4e8567d54
--- /dev/null
+++ b/gtk/stock-icons/stock_undo_rtl_24.png
diff --git a/makefile.msc b/makefile.msc
new file mode 100644
index 000000000..f95e5d33e
--- /dev/null
+++ b/makefile.msc
@@ -0,0 +1,24 @@
+## Makefile for building the Gtk+ dlls with Microsoft C
+## Use: nmake -f makefile.msc
+
+PARTS = gdk-pixbuf gdk gtk tests
+
+all : \
+	config.h \
+	sub-all
+
+sub-all: 
+	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=all
+
+clean : sub-clean
+
+sub-clean:
+	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
+
+sub-one:
+	@cd $(THIS)
+	@nmake -nologo -f makefile.msc $(TARGET)
+	@cd ..
+
+config.h: config.h.win32
+	copy config.h.win32 config.h
diff --git a/tests/makefile.msc b/tests/makefile.msc
index 64069a4af..cb7f99962 100644
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -65,7 +65,7 @@ EXTRA_OBJETCS = prop-editor.obj
 EXTRA_OBJETCS = prop-editor.obj
 !ENDIF
 
-$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).dll $(TESTAPP).obj
+$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj
 	$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c
author	Hans Breuer <hans@breuer.org>	2003-07-20 15:50:14 +0000
committer	Hans Breuer <hans@src.gnome.org>	2003-07-20 15:50:14 +0000
commit	364272b5b9464085c6acc87c57fb1ddf8bd5f947 (patch)
tree	4ec9a6a85d8ca5f5734e528d0cc01147bb163295
parent	c80e5e66e817417cbef53808ba07ca0575cbe448 (diff)
download	gdk-pixbuf-364272b5b9464085c6acc87c57fb1ddf8bd5f947.tar.gz