From 947b32b7dcaf233f3c2bb9a38fb07c2c64a1ee0b Mon Sep 17 00:00:00 2001
From: Hans Breuer <hans@breuer.org>
Date: Sat, 15 Nov 2003 20:35:55 +0000
Subject: updated added all the new tests

2003-11-15  Hans Breuer  <hans@breuer.org>

	* gdk/makefile.msc gdk/gdk.def
            gtk/gtk.def gtk/makefile.msc.in : updated
	* tests/makefile.msc : added all the new tests

	* gtk/gtkfilefilter.c(finalize) : initialize filter
	from object not from itself

	* gtk/gtkfilesystemwin32.[hc] : copied from gtkfilesystemunix.[hc]
	modified as less as posible to have aworking implementation
	on win32. There maybe the desire to merge the unchanged pats into
	a common base class.
	Also implemented a simple glib based bookmark handling, which
	is currently missing in gtkfilesystemunix.[hc] but can be copied
	over there.
	* gtk/gtkfilechooserwidget.c : conditional include gtkfilesystemwin32.h

	* gdk/win32/gdkwindow-win32.c : implement
	gdk_window_set_keep_above() and gdk_window_set_keep_below()

	* tests/testmerge.c : don't include unistd.h unconditionally,
	#define STDOUT_FILENO if it isn't defined

	* tests/testfilechooser.c : make it compile on win32
---
 tests/makefile.msc | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'tests/makefile.msc')

diff --git a/tests/makefile.msc b/tests/makefile.msc
index cb7f999626..02b599a096 100644
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -38,11 +38,22 @@ all :	\
 #
 # Test programs:
 #
-TESTAPPS = testcalendar testdnd testgtk testinput testrgb testselection \
-		testtext testtextbuffer testsocket testsocket_child \
-		testtreeedit testtreeflow \
-		testtreecolumns testtreefocus testtreesort testtreeview treestoretest \
-		testthreads simple
+TESTAPPS = \
+	testabi testactions \
+	testcalendar testcombo \
+	testdnd \
+	testfilechooser \
+	testgtk \
+	testicontheme testinput \
+	testmenus testmerge testmultidisplay testmultiscreen \
+	testrgb \
+	testselection \
+	testtext testtextbuffer testtoolbar \
+	testtreecolumns testtreeedit testtreeflow testtreefocus \
+	testtreesort testtreeview treestoretest \
+	testsocket testsocket_child \
+	testthreads \
+	simple 
 
 
 all-test-apps: 
@@ -65,8 +76,17 @@ EXTRA_OBJETCS = prop-editor.obj
 EXTRA_OBJETCS = prop-editor.obj
 !ENDIF
 
+!IFDEF EXTRA_testtoolbar
+EXTRA_OBJETCS = prop-editor.obj
+!ENDIF
+
+!IFDEF EXTRA_testfilechooser
+EXTRA_OBJETCS = prop-editor.obj
+EXTRA_LIBS = gdi32.lib user32.lib shell32.lib
+!ENDIF
+
 $(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)
+	$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"$(TESTAPP)\" $(TESTAPP).c
-- 
cgit v1.2.1