Commit 0b57c6b9 authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

updated fix c99ism (variable at start of block export functions for window

2008-05-23  Hans Breuer  <hans@breuer.org>

	* **/makefile.msc gtk/makefile.msc.in : updated
	* gtk/gtkwidget.c : fix c99ism (variable at start of block
	* gdk/gdk.symbols gtk/gtk.symbols : export functions for window 
	redirection
	* gtk/gtkfilechooserdefault.c : #include <locale.h> for 
	setlocale(LC_ALL, ...)

svn path=/trunk/; revision=20131
parent a8b5f3ee
2008-05-23 Hans Breuer <hans@breuer.org>
* **/makefile.msc gtk/makefile.msc.in : updated
* gtk/gtkwidget.c : fix c99ism (variable at start of block
* gdk/gdk.symbols gtk/gtk.symbols : export functions for window
redirection
* gtk/gtkfilechooserdefault.c : #include <locale.h> for
setlocale(LC_ALL, ...)
2008-05-23 Tor Lillqvist <tml@novell.com>
* gdk/gdk.symbols: Add gdk_window_redirect_to_drawable and
......
......@@ -11,30 +11,47 @@ PERL = perl
GDK_PIXBUF_VER = 2.0
# -DINCLUDE_gdiplus _replaces_ -DINCLUDE_bmp -DINCLUDE_gif -DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_tiff
# but not yet -DINCLUDE_png
# to get _working_ include modules we need respective defines ...
BUILT_IN_FORMATS = -DINCLUDE_png -DINCLUDE_bmp -DINCLUDE_gif \
-DINCLUDE_ico -DINCLUDE_jpeg -DINCLUDE_xpm -DINCLUDE_wbmp \
BUILT_IN_FORMATS = -DINCLUDE_gdiplus -DINCLUDE_png \
-DINCLUDE_xpm -DINCLUDE_wbmp \
-DINCLUDE_pnm -DINCLUDE_ras
# -DINCLUDE_tiff
PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
# $(JPEG_CFLAGS) $(TIFF_CFLAGS) \
-I. -I.. $(GLIB_CFLAGS) \
$(BUILT_IN_FORMATS) \
$(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \
$(PNG_CFLAGS) $(INTL_CFLAGS) \
$(G_DEBUGGING) \
-DGDK_PIXBUF_ENABLE_BACKEND \
-DGTK_PREFIX=\"/just/some/non/existing/path/\" \
-UUSE_GMODULE # use built-in
# -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
PKG_LINK = $(GLIB_LIBS) \
# $(TIFF_LIBS) \
$(JPEG_LIBS) $(PNG_LIBS) $(INTL_LIBS) \
# $(TIFF_LIBS) $(JPEG_LIBS) \
$(PNG_LIBS) $(INTL_LIBS) \
pixops\pixops.lib \
OBJECTS_NON_NATIVE = \
io-bmp.obj \
io-gif.obj \
io-ico.obj \
io-tiff.obj \
io-jpeg.obj \
OBJECTS_NATIVE = \
io-gdip-animation.obj \
io-gdip-bmp.obj \
io-gdip-emf.obj \
io-gdip-gif.obj \
io-gdip-ico.obj \
io-gdip-jpeg.obj \
io-gdip-tiff.obj \
io-gdip-utils.obj \
io-gdip-wmf.obj
OBJECTS = \
gdk-pixbuf-enum-types.obj \
gdk-pixbuf-animation.obj \
......@@ -47,17 +64,13 @@ OBJECTS = \
gdk-pixbuf.obj \
gdk-pixbuf-simple-anim.obj \
gdk-pixdata.obj \
io-bmp.obj \
io-wbmp.obj \
io-gif.obj \
io-gif-animation.obj \
io-ico.obj \
io-png.obj \
io-pnm.obj \
io-ras.obj \
# io-tiff.obj \
io-xpm.obj \
io-jpeg.obj \
$(OBJECTS_NATIVE)
gdk_pixbuf_headers = \
gdk-pixbuf.h \
......@@ -115,7 +128,7 @@ $(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
lib$(PACKAGE)-$(PKG_VER)-0.dll : $(OBJECTS) $(PACKAGE).def $(PACKAGE).res
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(PACKAGE).res \
$(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib ole32.lib wsock32.lib $(PACKAGE).res \
$(LDFLAGS) /implib:$(PACKAGE)-$(PKG_VER).lib /def:$(PACKAGE).def
make-inline-pixbuf.exe : make-inline-pixbuf.c
......
......@@ -681,7 +681,9 @@ gdk_window_object_get_type G_GNUC_CONST
gdk_window_peek_children
gdk_window_process_all_updates
gdk_window_process_updates
gdk_window_redirect_to_drawable
gdk_window_remove_filter
gdk_window_remove_redirection
gdk_window_set_debug_updates
gdk_window_set_user_data
gdk_window_thaw_toplevel_updates_libgtk_only
......
......@@ -11,7 +11,9 @@ TOP = ..\..
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
# definition should possibly go to build/win32/module.def, too.
WTKIT = ..\..\wtkit126
!IFNDEF WTKIT
WTKIT = $(TOP)\wtkit126
!ENDIF
###############################################################
......@@ -46,10 +48,12 @@ CFLAGS = -FImsvc_recommended_pragmas.h -I . -I .. \
-DGDK_VERSION=\"$(GTK_VER)\" \
-DG_LOG_DOMAIN=\"Gdk\"
EXTRALIBS = $(WTKIT)\lib\i386\wntab32x.lib $(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
$(PANGOCAIRO_LIBS)
EXTRALIBS = \
$(WTKIT)\lib\i386\wntab32x.lib \
$(GLIB_LIBS) \
..\gdk-pixbuf\gdk_pixbuf-$(GDK_PIXBUF_VER).lib \
$(PANGOWIN32_LIBS) $(INTL_LIBS) $(CAIRO_LIBS) \
$(PANGOCAIRO_LIBS)
gdk-win32-backend :
cd win32
......@@ -73,6 +77,7 @@ all: \
gdk_OBJECTS = \
gdk.obj \
gdkapplaunchcontext.obj \
gdkcairo.obj \
gdkcolor.obj \
gdkcursor.obj \
......@@ -134,11 +139,13 @@ gdkmarshalers.h : gdkmarshalers.list
gdkmarshalers.c : gdkmarshalers.list
$(GLIB)\gobject\glib-genmarshal --prefix=gdk_marshal gdkmarshalers.list --body >gdkmarshalers.c
gdkenumtypes.h: $(gdk_public_h_sources) makeenums.pl
$(PERL) makeenums.pl include $(gdk_public_h_sources) > gdkenumtypes.h
gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
$(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.h.template \
$(gdk_public_h_sources) > gdkenumtypes.h
gdkenumtypes.c: $(gdk_public_h_sources) makeenums.pl
$(PERL) makeenums.pl cfile $(gdk_public_h_sources) > gdkenumtypes.c
gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
$(PERL) $(GLIB)\gobject\glib-mkenums --template gdkenumtypes.c.template \
$(gdk_public_h_sources) > gdkenumtypes.c
..\config.h : ..\config.h.win32
copy ..\config.h.win32 ..\config.h
......
## Makefile for building the GDK DLL with Microsoft C
## Use: nmake -f makefile.msc
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
WTKIT = ..\..\..\wtkit126
################################################################
# Nothing much configurable below
......@@ -11,6 +8,12 @@ WTKIT = ..\..\..\wtkit126
TOP = ../../..
!INCLUDE $(TOP)/glib/build/win32/make.msc
# Location of the Wintab toolkit. Downloadable from http://www.pointing.com.
# definition should possibly go to build/win32/module.def, too.
!IFNDEF WTKIT
WTKIT = $(TOP)\wtkit126
!ENDIF
GTK_VER=2.0
CFLAGS = -FImsvc_recommended_pragmas.h \
......@@ -25,6 +28,7 @@ all: \
gdk.res
gdk_win32_OBJECTS = \
gdkapplaunchcontext-win32.obj \
gdkcolor-win32.obj \
gdkcursor-win32.obj \
gdkdnd-win32.obj \
......@@ -47,6 +51,7 @@ gdk_win32_OBJECTS = \
gdkscreen-win32.obj \
gdkselection-win32.obj \
gdkspawn-win32.obj \
gdktestutils-win32.obj \
gdkvisual-win32.obj \
gdkwin32id.obj \
gdkwindow-win32.obj
......
......@@ -4718,6 +4718,7 @@ gtk_widget_get_root_window
gtk_widget_get_screen
gtk_widget_get_settings
gtk_widget_get_size_request
gtk_widget_get_snapshot
gtk_widget_get_style
gtk_widget_get_tooltip_markup
gtk_widget_get_tooltip_text
......
......@@ -84,7 +84,7 @@
#include <time.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <locale.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
......
......@@ -8349,6 +8349,7 @@ gtk_widget_get_snapshot (GtkWidget *widget,
int x, y, width, height;
GdkWindow *parent_window = NULL;
GdkPixmap *pixmap;
GList *windows = NULL, *list;
/* the widget (and parent_window) must be realized to be drawable */
if (widget->parent && !GTK_WIDGET_REALIZED (widget->parent))
......@@ -8361,7 +8362,7 @@ gtk_widget_get_snapshot (GtkWidget *widget,
y = widget->allocation.y;
width = widget->allocation.width;
height = widget->allocation.height;
GList *windows = NULL, *list;
if (widget->parent && !GTK_WIDGET_NO_WINDOW (widget))
{
/* grow snapshot rectangle to cover all widget windows */
......
This diff is collapsed.
......@@ -55,7 +55,7 @@ TESTAPPS = \
testprint \
testrecentchooser testrecentchoosermenu testrgb testrichtext \
testselection testspinbutton \
testtext testtextbuffer testtoolbar testtooltips \
testtext textbuffertest testtoolbar testtooltips \
testtreecolumns testtreeedit testtreeflow testtreefocus \
testtreemodel testtreesort testtreeview treestoretest \
testsocket testsocket_child teststatusicon \
......@@ -76,6 +76,9 @@ one-test-app:
EXTRA_OBJETCS = prop-editor.obj
!IFDEF EXTRA_buildertest
EXTRA_LIBS = $(ATK_LIBS)
!ENDIF
!IFDEF EXTRA_testprint
EXTRA_OBJETCS = testprintfileoperation.obj
......
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