gtk+ r20657 - in trunk: . gdk gtk tests

[hans svn gnome org]

Author: hans
Date: Fri Jun 20 20:39:22 2008
New Revision: 20657
URL: http://svn.gnome.org/viewvc/gtk+?rev=20657&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/gdk/gdkconfig.h.win32
   trunk/gtk/gtkfilesystem.c
   trunk/gtk/gtkmenuitem.c
   trunk/gtk/gtkmessagedialog.c
   trunk/gtk/gtkplug.c
   trunk/tests/makefile.msc

Modified: trunk/gdk/gdkconfig.h.win32
==============================================================================
--- trunk/gdk/gdkconfig.h.win32	(original)
+++ trunk/gdk/gdkconfig.h.win32	Fri Jun 20 20:39:22 2008
@@ -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
 

Modified: trunk/gtk/gtkfilesystem.c
==============================================================================
--- trunk/gtk/gtkfilesystem.c	(original)
+++ trunk/gtk/gtkfilesystem.c	Fri Jun 20 20:39:22 2008
@@ -555,8 +555,10 @@
 
   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;
 }

Modified: trunk/gtk/gtkmenuitem.c
==============================================================================
--- trunk/gtk/gtkmenuitem.c	(original)
+++ trunk/gtk/gtkmenuitem.c	Fri Jun 20 20:39:22 2008
@@ -1694,7 +1694,7 @@
 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;
 }

Modified: trunk/gtk/gtkmessagedialog.c
==============================================================================
--- trunk/gtk/gtkmessagedialog.c	(original)
+++ trunk/gtk/gtkmessagedialog.c	Fri Jun 20 20:39:22 2008
@@ -654,7 +654,7 @@
 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;
 }

Modified: trunk/gtk/gtkplug.c
==============================================================================
--- trunk/gtk/gtkplug.c	(original)
+++ trunk/gtk/gtkplug.c	Fri Jun 20 20:39:22 2008
@@ -276,7 +276,7 @@
 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;
 }

Modified: trunk/tests/makefile.msc
==============================================================================
--- trunk/tests/makefile.msc	(original)
+++ trunk/tests/makefile.msc	Fri Jun 20 20:39:22 2008
@@ -40,8 +40,8 @@
 # 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
 !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