Commit 8e2ef498 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

must return a value of the appropriate type with g_return_val_if_fail

2008-06-20  Hans Breuer  <hans@breuer.org>

	* gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return
	a value of the appropriate type with g_return_val_if_fail
	
	* gdk/gdkconfig.h.win32 : add the GSEAL definition here as well

	* gtk/gtkfilesystem.c : don't add the "File System" on win32

	* tests/makefile.msc : remove broken autotestfile(system|chooser) 
	from build


svn path=/trunk/; revision=20657
parent 2e75eb13
2008-06-20 Hans Breuer <hans@breuer.org>
* gtk/gtkmenuitem.c gtk/gtkmessagedialog.c gtk/gtkplug.c : must return
a value of the appropriate type with g_return_val_if_fail
* gdk/gdkconfig.h.win32 : add the GSEAL definition here as well
* gtk/gtkfilesystem.c : don't add the "File System" on win32
* tests/makefile.msc : remove broken autotestfile(system|chooser)
from build
2008-06-20 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkeditable.c: Document and use - instead of _ in signal names.
......
......@@ -10,6 +10,14 @@
extern "C" {
#endif /* __cplusplus */
#ifndef GSEAL
/* introduce GSEAL() here for all of Gdk and Gtk+ without the need to modify GLib */
# ifdef GSEAL_ENABLE
# define GSEAL(ident) _g_sealed__ ## ident
# else
# define GSEAL(ident) ident
# endif
#endif /* !GSEAL */
#define GDK_WINDOWING_WIN32
......
......@@ -555,8 +555,10 @@ _gtk_file_system_list_volumes (GtkFileSystem *file_system)
list = g_slist_copy (priv->volumes);
#ifndef G_OS_WIN32
/* Prepend root volume */
list = g_slist_prepend (list, (gpointer) root_volume_token);
#endif
return list;
}
......
......@@ -1694,7 +1694,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
G_CONST_RETURN gchar *
gtk_menu_item_get_accel_path (GtkMenuItem *menu_item)
{
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL);
return menu_item->accel_path;
}
......
......@@ -654,7 +654,7 @@ gtk_message_dialog_set_image (GtkMessageDialog *dialog,
GtkWidget *
gtk_message_dialog_get_image (GtkMessageDialog *dialog)
{
g_return_if_fail (GTK_IS_MESSAGE_DIALOG (dialog));
g_return_val_if_fail (GTK_IS_MESSAGE_DIALOG (dialog), NULL);
return dialog->image;
}
......
......@@ -276,7 +276,7 @@ gtk_plug_get_id (GtkPlug *plug)
gboolean
gtk_plug_get_embedded (GtkPlug *plug)
{
g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);
g_return_val_if_fail (GTK_IS_PLUG (plug), FALSE);
return plug->socket_window != NULL;
}
......
......@@ -40,8 +40,8 @@ all : \
# Test programs:
#
TESTAPPS = \
autotestfilechooser autotestfilesystem \
buildertest floatingtest \
# autotestfilechooser autotestfilesystem \
buildertest floatingtest objecttests \
testaccel testactions testassistant \
testbbox \
testcairo testcalendar testcellrenderertext testcombo testcombochange \
......@@ -101,8 +101,8 @@ EXTRA_OBJETCS = testsocket_common.obj
EXTRA_OBJETCS = testsocket_common.obj
!ENDIF
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS)
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
$(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
$(TESTAPP).obj : $(TESTAPP).c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment