gtk+ r20926 - in trunk: . gdk gtk tests

[hans svn gnome org]

Author: hans
Date: Fri Aug  1 14:43:22 2008
New Revision: 20926
URL: http://svn.gnome.org/viewvc/gtk+?rev=20926&view=rev

Log:
2008-08-01  Hans Breuer  <hans breuer org>

	* gdk/makefile.msc : build gdkwindowimpl

	* gtk/gtkwidget.c : fix c99ism - declaration needs to be at the
	start of a block

	* tests/makefile.msc : update



Modified:
   trunk/ChangeLog
   trunk/gdk/makefile.msc
   trunk/gtk/gtkwidget.c
   trunk/tests/makefile.msc

Modified: trunk/gdk/makefile.msc
==============================================================================
--- trunk/gdk/makefile.msc	(original)
+++ trunk/gdk/makefile.msc	Fri Aug  1 14:43:22 2008
@@ -91,6 +91,7 @@
 	gdkgc.obj \
 	gdkglobals.obj \
 	gdkimage.obj \
+	gdkwindowimpl.obj \
 	gdkkeynames.obj \
 	gdkkeys.obj \
 	gdkkeyuni.obj \

Modified: trunk/gtk/gtkwidget.c
==============================================================================
--- trunk/gtk/gtkwidget.c	(original)
+++ trunk/gtk/gtkwidget.c	Fri Aug  1 14:43:22 2008
@@ -8067,9 +8067,11 @@
 _gtk_widget_set_pointer_window   (GtkWidget *widget,
 				  GdkWindow *pointer_window)
 {
+  GdkScreen *screen;
+  
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
+  screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
   g_object_set_qdata (G_OBJECT (screen), quark_pointer_window, pointer_window);
 }
 
@@ -8083,9 +8085,11 @@
 GdkWindow *
 _gtk_widget_get_pointer_window   (GtkWidget *widget)
 {
+  GdkScreen *screen;
+
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
+  screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
   return g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
 }
 

Modified: trunk/tests/makefile.msc
==============================================================================
--- trunk/tests/makefile.msc	(original)
+++ trunk/tests/makefile.msc	Fri Aug  1 14:43:22 2008
@@ -41,7 +41,8 @@
 #
 TESTAPPS = \
 #	autotestfilechooser autotestfilesystem \
-	buildertest floatingtest objecttests \
+#	buildertest floatingtest \
+	objecttests \
 	testaccel testactions testassistant \
 	testbbox \
 	testcairo testcalendar testcellrenderertext testcombo testcombochange \
@@ -50,17 +51,17 @@
 	testfilechooser testfilechooserbutton testframe \
 	testgrouping testgtk \
 	testicontheme testiconview testimage testinput \
-	testmenus testmenubars testmerge testmultidisplay testmultiscreen \
+	testmenus testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \
 	testnouiprint testnotebookdnd \
 	testprint \
 	testrecentchooser testrecentchoosermenu testrgb testrichtext \
 	testselection testspinbutton \
-	testtext textbuffertest testtoolbar testtooltips \
-	testtreecolumns testtreeedit testtreeflow testtreefocus \
+	testtext testtoolbar testtooltips \
+	testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \
 	testtreemodel testtreesort testtreeview treestoretest \
 	testsocket testsocket_child teststatusicon \
 	testthreads testvolumebutton testxinerama \
-	simple 
+	simple
 
 # syntax error : illegal character '-' in macro
 #stresstest-toolbar
@@ -101,8 +102,8 @@
 EXTRA_OBJETCS = testsocket_common.obj
 !ENDIF
 
-$(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) \
+$(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) \
 	$(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c