diff options
| author | Hans Breuer <hans@breuer.org> | 2003-11-15 20:35:55 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2003-11-15 20:35:55 +0000 |
| commit | 947b32b7dcaf233f3c2bb9a38fb07c2c64a1ee0b (patch) | |
| tree | 291ecb13f1f016b39addcbe1d9f84c551f5d982e /tests/testmerge.c | |
| parent | 9e831c8b8ea506d02e31d4aefa86f49a29a395a6 (diff) | |
| download | gtk+-947b32b7dcaf233f3c2bb9a38fb07c2c64a1ee0b.tar.gz | |
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
Diffstat (limited to 'tests/testmerge.c')
| -rw-r--r-- | tests/testmerge.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/testmerge.c b/tests/testmerge.c index 53c676a6bb..ff78028e46 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -1,8 +1,16 @@ +#include "config.h" + #include <stdio.h> #include <string.h> +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif #include <gtk/gtk.h> +#ifndef STDOUT_FILENO +#define STDOUT_FILENO 1 +#endif + struct { const gchar *filename; guint merge_id; } merge_ids[] = { { "merge-1.ui", 0 }, { "merge-2.ui", 0 }, |