callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated added all the new tests

Browse Source 
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
This commit is contained in:
Hans Breuer
2003-11-15 20:35:55 +00:00
committed by Hans Breuer
parent 9e831c8b8e
commit 947b32b7dc
16 changed files with 1567 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/makefile.msc
View File

@ -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

17
tests/testfilechooser.c
View File

@ -1,11 +1,26 @@
#include "config.h"
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <time.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#ifdef G_OS_WIN32
# define WIN32_MEAN_AND_LEAN
# include <windows.h> /* ExtractAssociatedIcon */
# include <io.h>
# define localtime_r(t,b) localtime(t)
# ifndef S_ISREG
# define S_ISREG(m) ((m) & _S_IFREG)
# endif
# include <gdk/win32/gdkwin32.h> /* gdk_win32_hdc_get */
#endif
#include "prop-editor.h"
static GtkWidget *preview_label;

8
tests/testmerge.c
View File

@ -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 },