callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Hans Breuer
2008-05-23 20:29:27 +00:00
committed by Hans Breuer
parent a8b5f3ee6b
commit 0b57c6b98f
10 changed files with 348 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdk.symbols
View File

@ -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

25
gdk/makefile.msc
View File

@ -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

11
gdk/win32/makefile.msc
View File

@ -1,9 +1,6 @@
## 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