GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 49199978 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

build gdkwindowimpl

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


svn path=/trunk/; revision=20926
parent c01cc055
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
2008-07-31 Cody Russell <bratsche@gnome.org> 2008-07-31 Cody Russell <bratsche@gnome.org>
Bug 56070 – Can't click button after setting it sensitive. Bug 56070 – Can't click button after setting it sensitive.
......
...@@ -91,6 +91,7 @@ gdk_OBJECTS = \ ...@@ -91,6 +91,7 @@ gdk_OBJECTS = \
gdkgc.obj \ gdkgc.obj \
gdkglobals.obj \ gdkglobals.obj \
gdkimage.obj \ gdkimage.obj \
gdkwindowimpl.obj \
gdkkeynames.obj \ gdkkeynames.obj \
gdkkeys.obj \ gdkkeys.obj \
gdkkeyuni.obj \ gdkkeyuni.obj \
......
...@@ -8067,9 +8067,11 @@ void ...@@ -8067,9 +8067,11 @@ void
_gtk_widget_set_pointer_window (GtkWidget *widget, _gtk_widget_set_pointer_window (GtkWidget *widget,
GdkWindow *pointer_window) GdkWindow *pointer_window)
{ {
GdkScreen *screen;
g_return_if_fail (GTK_IS_WIDGET (widget)); 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); g_object_set_qdata (G_OBJECT (screen), quark_pointer_window, pointer_window);
} }
...@@ -8083,9 +8085,11 @@ _gtk_widget_set_pointer_window (GtkWidget *widget, ...@@ -8083,9 +8085,11 @@ _gtk_widget_set_pointer_window (GtkWidget *widget,
GdkWindow * GdkWindow *
_gtk_widget_get_pointer_window (GtkWidget *widget) _gtk_widget_get_pointer_window (GtkWidget *widget)
{ {
GdkScreen *screen;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); 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); return g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
} }
......
...@@ -41,7 +41,8 @@ all : \ ...@@ -41,7 +41,8 @@ all : \
# #
TESTAPPS = \ TESTAPPS = \
# autotestfilechooser autotestfilesystem \ # autotestfilechooser autotestfilesystem \
buildertest floatingtest objecttests \ # buildertest floatingtest \
objecttests \
testaccel testactions testassistant \ testaccel testactions testassistant \
testbbox \ testbbox \
testcairo testcalendar testcellrenderertext testcombo testcombochange \ testcairo testcalendar testcellrenderertext testcombo testcombochange \
...@@ -50,17 +51,17 @@ TESTAPPS = \ ...@@ -50,17 +51,17 @@ TESTAPPS = \
testfilechooser testfilechooserbutton testframe \ testfilechooser testfilechooserbutton testframe \
testgrouping testgtk \ testgrouping testgtk \
testicontheme testiconview testimage testinput \ testicontheme testiconview testimage testinput \
testmenus testmenubars testmerge testmultidisplay testmultiscreen \ testmenus testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \
testnouiprint testnotebookdnd \ testnouiprint testnotebookdnd \
testprint \ testprint \
testrecentchooser testrecentchoosermenu testrgb testrichtext \ testrecentchooser testrecentchoosermenu testrgb testrichtext \
testselection testspinbutton \ testselection testspinbutton \
testtext textbuffertest testtoolbar testtooltips \ testtext testtoolbar testtooltips \
testtreecolumns testtreeedit testtreeflow testtreefocus \ testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \
testtreemodel testtreesort testtreeview treestoretest \ testtreemodel testtreesort testtreeview treestoretest \
testsocket testsocket_child teststatusicon \ testsocket testsocket_child teststatusicon \
testthreads testvolumebutton testxinerama \ testthreads testvolumebutton testxinerama \
simple simple
# syntax error : illegal character '-' in macro # syntax error : illegal character '-' in macro
#stresstest-toolbar #stresstest-toolbar
...@@ -101,8 +102,8 @@ EXTRA_OBJETCS = testsocket_common.obj ...@@ -101,8 +102,8 @@ EXTRA_OBJETCS = testsocket_common.obj
EXTRA_OBJETCS = testsocket_common.obj EXTRA_OBJETCS = testsocket_common.obj
!ENDIF !ENDIF
$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS)
$(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \ $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
$(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS) $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
$(TESTAPP).obj : $(TESTAPP).c $(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