2.21.1

One hunk got lost when cherry-picking the icon view keynav changes.

Makefile.am

@@ -2,7 +2,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7

NEWS

@@ -1,3 +1,86 @@
+Overview of Changes from GTK+ 2.21.0 to 2.21.1
+==============================================
+
+* GDK has been sealed, with the addition of suitable accessors
+
+* Bugs:
+ 613132 GtkBoxChild should probably be deprecated
+ 592580 GDK needs sealing
+ 607628 DnD operation doesn't work when using offscreen.
+ 565559 Incorrect leave-notify signals for treeview
+ 618162 Description of GdkColor
+ 614581 Gtk print dialog freezes on start up
+ 533946 GtkHScale does not update correctly
+ 618271 Add gtk_window_has_group()
+ 618000 Sync paper size fallbacks with CLDR 1.8.1
+ 551322 configure does not use -lm in jasper (JPEG2000) testing
+ 619114 undefined reference to `XkbBell'
+ 618093 typo in gtkprintoperation.c, "selecion" should be "selection"
+
+* Updated translations:
+ Italian
+
+
+Overview of Changes from GTK+ 2.20.0 to 2.21.0
+==============================================
+
+* Support tracker 0.8 and 0.9 in the filechooser search code
+
+* New API:
+ - add API to convert coords between parent and child windows
+ - add gdk_window_get_effective_parent() and
+   gdk_window_get_effective_toplevel() which are offscreen aware
+ - add gtk_widget_send_focus_change
+ - add accessors for GtkTextView adjustments
+ - add API to reset the im context in GtkTextView and GtkEntry
+
+* Bug fixes:
+ 614513 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_GRAB)?
+ 614510 Needed func for GTK_WIDGET_SET_FLAGS (widget, TOPLEVEL) ?
+ 614515 Func to substitute GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_DEFAULT)?
+ 163251 GtkTextView derivatives need some way to set the need_im_reset flag.
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 615028 gdk/x11/gdkdnd-x11.c missing Xutil.h
+ 615128 gdk monitor order does not seem to be correct
+ 616565 Fix a typo in the offscreen windows docs
+ 616118 please expand documentation for gdk_event_free()
+ 615000 gtk_builder_value_from_string_type() returns FALSE without..
+ 580889 table cells do not implement action interface
+ 616053 GtkTextView lacks accessors for hadjustment and vadjustment
+ 613988 Compile error on DirectFB backend due to missing of gdk_...
+ 614894 Add heuristic for pre XRandR 1.3 drivers
+ 560147 GtkBuilder docs should say what GErrors they throw
+ 615999 Gail doesn't send state-changed events for ATK_STATE_ENABLED
+ 613974 GtkToolItemGroup devides by 0 when allocating space for...
+ 614540 configure wants gio-unix on all platform
+ 557689 In 'select folder' action, filechooser doesn't work when...
+ 615853 BadMatch when pressing keyboard volume keys while pointer...
+ 613887 Misprint in the description of the function gtk_cell_view_...
+ 615162 Fix tooltips on offscreen widgets
+ 616851 assertion `GTK_IS_MISC (misc)' failed
+ 607839 libpixbufloader-png.so not in library list
+ 605186 Use G_DEFINE_INTERFACE macro
+ 402349 FileChooser's default directory is not "active"
+        missing break statement in gtk_tool_item_group_set_property
+        missing default events in  GtkToolItemGroup
+        fix a filechooser crash when removing files
+
+* Translation updates:
+ Basque
+ Bengali India
+ Catalan
+ Catalan (Valencian)
+ Danish
+ Galician
+ Greek
+ Indonesian
+ Kannada
+ Kazakh
+ Latvian
+ Marathi
+ Thai
+ Ukrainian
+
 Overview of Changes from GTK+ 2.19.7 to 2.20.0
 ==============================================
 

build/Makefile.am

@@ -0,0 +1,4 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = \
+	win32

build/win32/Makefile.am

@@ -0,0 +1,4 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = \
+	vs9

build/win32/vs9/Makefile.am

@@ -0,0 +1,16 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST = \
+	README.txt \
+	gtk+.sln \
+	gtk+.vsprops \
+	gdk-pixbuf.vcproj \
+	gdk-pixbuf-csource.vcproj \
+	gdk-pixbuf-query-loaders.vcproj \
+	gdk-win32.vcproj \
+	gdk.vcproj \
+	gdk.vcprojin \
+	gtk.vcproj \
+	gtk.vcprojin \
+	gtk-demo.vcproj \
+	install.vcproj

build/win32/vs9/README.txt

@@ -0,0 +1,22 @@
+Note that all this is rather experimental.
+
+This VS9 solution and the projects it includes are intented to be used
+in a GTK+ source tree unpacked from a tarball. In a git checkout you
+first need to use some Unix-like environment or manual work to expand
+the files needed, like config.h.win32.in into config.h.win32 and the
+.vcprojin files here into corresponding actual .vcproj files.
+
+You will need the parts from below in the GTK+ stack: pango, atk and
+glib. External dependencies are at least zlib, libpng, proxy-libintl,
+fontconfig, freetype, expat. See the corresponding README.txt file in
+glib for details where to unpack them.
+
+The "install" project will copy build results and headers into their
+appropriate location under <root>\vs9\<PlatformName>. For instance,
+built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
+<root>\vs9\<PlatformName>\lib and GTK+ headers into
+<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
+project files higher in the stack are supposed to look for them, not
+from a specific GLib source tree.
+
+--Tor Lillqvist <tml@iki.fi>

build/win32/vs9/gdk-pixbuf-csource.vcproj

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="gdk-pixbuf-csource"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
+	RootNamespace="gdkpixbufcsource"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/win32/vs9/gdk-pixbuf-query-loaders.vcproj

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk-pixbuf-query-loaders"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
+	RootNamespace="gdkpixbufqueryloaders"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufLibdirDefine)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\gdk-pixbuf\queryloaders.c" />
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/win32/vs9/gdk-pixbuf.vcproj

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk_pixbuf"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
+	RootNamespace="gdk_pixbuf"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(GdkPixbufDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(GdkPixbufDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libpng.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk-pixbuf.def"
+						CommandLine="$(GtkGenerateGdkPixbufDef)"
+						Outputs="$(IntDir)\gdk-pixbuf.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk-pixbuf.def"
+						CommandLine="$(GtkGenerateGdkPixbufDef)"
+						Outputs="$(IntDir)\gdk-pixbuf.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk-pixbuf.def"
+						CommandLine="$(GtkGenerateGdkPixbufDef)"
+						Outputs="$(IntDir)\gdk-pixbuf.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk-pixbuf.def"
+						CommandLine="$(GtkGenerateGdkPixbufDef)"
+						Outputs="$(IntDir)\gdk-pixbuf.def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-aliasdef.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-animation.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-data.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-io.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-loader.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scale.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scaled-anim.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-util.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixdata.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-ani.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-ani-animation.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-utils.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-animation.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-bmp.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-emf.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-gif.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-ico.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-jpeg.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-tiff.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-wmf.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-gif-animation.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-icns.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-pcx.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-png.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-pnm.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-ras.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-tga.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-wbmp.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-xbm.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\io-xpm.c" />
+			<File RelativePath="..\..\..\gdk-pixbuf\pixops\pixops.c" />
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gdk-win32.vcproj

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk-win32"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+	RootNamespace="gdkwin32"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkimage-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gdk.vcprojin

@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gdk"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+	RootNamespace="gdk"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GdkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gdk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\gdk\gdk.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gdk.def"
+						CommandLine="$(GtkGenerateGdkDef)"
+						Outputs="$(IntDir)\gdk.def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgdk.sourcefiles"
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/gtk+.sln

@@ -0,0 +1,122 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build/win32/vs9/gtk+.vsprops

@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="gtk+props"
+	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+		ForcedIncludeFiles="msvc_recommended_pragmas.h"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
+	/>
+	<Tool
+		Name="VCPreBuildEventTool"
+		CommandLine="
+if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
+copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
+:DONE_CONFIG_H&#x0D;&#x0A;
+
+if exist ..\..\..\gdk\gdkconfig.h goto DONE_GDKCONFIG_H&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
+:DONE_GDKCONFIG_H&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="GtkApiVersion"
+		Value="2.0"
+	/>
+	<UserMacro
+		Name="GtkBinaryVersion"
+		Value="2.10.0"
+	/>
+	<UserMacro
+		Name="GtkDummyPrefix"
+		Value="/dummy"
+	/>
+	<UserMacro
+		Name="GtkPrefixDefine"
+		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
+	/>
+	<UserMacro
+		Name="GdkPixbufIncludedLoaderDefines"
+		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus"
+	/>
+	<UserMacro
+		Name="GdkPixbufDefines"
+		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)"
+	/>
+	<UserMacro
+		Name="GdkPixbufLibdirDefine"
+		Value="PIXBUF_LIBDIR=\&quot;$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\&quot;"
+	/>
+	<UserMacro
+		Name="GdkDefines"
+		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
+	/>
+	<UserMacro
+		Name="GtkIncludedImmodulesDefines"
+		Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
+	/>
+	<UserMacro
+		Name="GtkDefines"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
+	/>
+	<UserMacro
+		Name="GtkDoInstall"
+		Value="
+echo on&#x0D;&#x0A;
+mkdir $(OutDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcairo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdrawable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkregion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrgb.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkspawn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccellabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkclist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcomboboxentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkctree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcurve.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdrawingarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrybuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrycompletion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkenums.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeventbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkexpander.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilesel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgamma.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinfobar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinputdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinvisible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkitemfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklistitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmarshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenushell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmessagedialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkplug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrolledwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextiter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextlayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktipsquery.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreednd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelsort.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreesortable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypeutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+
+mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
+
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+"
+	/>
+	<UserMacro
+		Name="GtkGenerateGdkPixbufDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;$(IntDir)\gdk-pixbuf.def&quot;"
+	/>
+	<UserMacro
+		Name="GtkGenerateGdkDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
+	/>
+	<UserMacro
+		Name="GtkGenerateGtkDef"
+		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
+	/>
+	<UserMacro
+		Name="GtkLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="GtkLibtoolCompatibleDllSuffix"
+		Value="-$(GtkApiVersion)-0"
+	/>
+	<UserMacro
+		Name="GtkSeparateVS9DllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="GtkSeparateVS9DllSuffix"
+		Value="-2-vs9"
+	/>
+	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
+	GtkLibtoolCompatibleDllSuffix if that is what you want -->
+	<UserMacro
+		Name="GtkDllPrefix"
+		Value="$(GtkLibtoolCompatibleDllPrefix)"
+	/>
+	<UserMacro
+		Name="GtkDllSuffix"
+		Value="$(GtkLibtoolCompatibleDllSuffix)"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="..\..\..\..\..\vs9\$(PlatformName)"
+	/>
+</VisualStudioPropertySheet>

build/win32/vs9/gtk-demo.vcproj

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk-demo"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+	RootNamespace="gtkdemo"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\button_box.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\changedisplay.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\entry_buffer.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\iconview_edit.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\images.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

build/win32/vs9/gtk.vcprojin

@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gtk"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+	RootNamespace="gtk"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
+				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gtk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gtk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gtk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="$(GtkDefines)"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(IntDir)\gtk.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\gdk\gtk.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gtk.def"
+						CommandLine="$(GtkGenerateGtkDef)"
+						Outputs="$(IntDir)\gtk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gtk.def"
+						CommandLine="$(GtkGenerateGtkDef)"
+						Outputs="$(IntDir)\gtk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gtk.def"
+						CommandLine="$(GtkGenerateGtkDef)"
+						Outputs="$(IntDir)\gtk.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Generating gtk.def"
+						CommandLine="$(GtkGenerateGtkDef)"
+						Outputs="$(IntDir)\gtk.def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgtk.sourcefiles"
+			<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
+			<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
+			<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
+			<File RelativePath="..\..\..\modules\input\imam-et.c" />
+			<File RelativePath="..\..\..\modules\input\imcedilla.c" />
+			<File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
+			<File RelativePath="..\..\..\modules\input\imime.c" />
+			<File RelativePath="..\..\..\modules\input\iminuktitut.c" />
+			<File RelativePath="..\..\..\modules\input\imipa.c" />
+			<File RelativePath="..\..\..\modules\input\immultipress.c" />
+			<File RelativePath="..\..\..\modules\input\imthai.c" />
+			<File RelativePath="..\..\..\modules\input\imti-er.c" />
+			<File RelativePath="..\..\..\modules\input\imti-et.c" />
+			<File RelativePath="..\..\..\modules\input\imviqr.c" />
+			<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
+		</Filter>
+	</Files>
+</VisualStudioProject>

build/win32/vs9/install.vcproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="install"
+	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+	RootNamespace="install"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			
+ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			OutputDirectory="$(GlibEtcInstallRoot)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			DeleteExtensionsOnClean=""
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="$(GtkDoInstall)"
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioProject>

config.h.win32.in

@@ -5,6 +5,9 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
+/* Define if gio can sniff image data */
+/* #undef GDK_PIXBUF_USE_GIO_MIME */
+
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
@@ -12,7 +15,7 @@
 #define GTK_COMPILED_WITH_DEBUGGING "yes"
 
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "c:/devel/target/HEAD/share/locale"
+#define GTK_LOCALEDIR "NONE/share/locale"
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
@@ -97,6 +100,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
+/* Define to 1 if libpapi available */
+/* #undef HAVE_PAPI */
+
 /* Define to 1 is libjpeg supports progressive JPEG */
 /* #undef HAVE_PROGRESSIVE_JPEG */
 
@@ -106,9 +112,6 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if the XShape extension is available */
-/* #undef HAVE_SHAPE_EXT */
-
 /* Define to 1 if shm.h is available */
 /* #undef HAVE_SHM_H */
 
@@ -199,7 +202,7 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Define to 1 is Xinerama is available */
+/* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
 /* Define to 1 if you have the `XInternAtoms' function. */
@@ -229,12 +232,23 @@
 /* Define to 1 if you have the `_NSGetEnviron' function. */
 /* #undef HAVE__NSGETENVIRON */
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
 /* Define to 1 if fd_set is not available */
 #define NO_FD_SET 1
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#ifndef _MSC_VER
+/* #undef NO_MINUS_C_MINUS_O */
+#else 
+#define NO_MINUS_C_MINUS_O 1
+#endif
+
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
 

configure.in

@@ -11,9 +11,9 @@ AC_PREREQ(2.62)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [20])
+m4_define([gtk_minor_version], [21])
 m4_define([gtk_micro_version], [1])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -954,7 +954,7 @@ dnl Test for libpng
 
 dnl Test for libjasper
   if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg)
+    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm)
   fi
 
   if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
@@ -2137,6 +2137,9 @@ docs/reference/libgail-util/Makefile
 docs/faq/Makefile
 docs/tools/Makefile
 docs/tutorial/Makefile
+build/Makefile
+build/win32/Makefile
+build/win32/vs9/Makefile
 gdk-pixbuf/Makefile
 gdk-pixbuf/gdk_pixbuf.rc
 gdk-pixbuf/gdk-pixbuf-features.h

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -23,6 +23,9 @@ Animated images.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufAnimation ##### -->
 <para>
 An opaque struct representing an animation.

docs/reference/gdk-pixbuf/tmpl/creating.sgml

@@ -46,6 +46,9 @@ Creating a pixbuf from image data that is already in memory.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-loading.sgml

@@ -28,6 +28,9 @@ Loading a pixbuf from a file.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_new_from_file ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/file-saving.sgml

@@ -21,6 +21,9 @@ to a socket or store it in a database.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_savev ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml

@@ -72,6 +72,9 @@ Application-driven progressive image loading.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixbufLoader ##### -->
 <para>
 The <structname>GdkPixbufLoader</structname> struct contains only private
@@ -114,6 +117,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-from-drawables.sgml

@@ -26,6 +26,9 @@ Getting parts of an X drawable's image data into a pixbuf.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_get_from_drawable ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml

@@ -23,6 +23,9 @@ Initializing the &gdk-pixbuf; Xlib library.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_init ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml

@@ -24,6 +24,9 @@ Rendering a pixbuf to an X drawable.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_xlib_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml

@@ -20,6 +20,9 @@ Rendering RGB buffers to X drawables.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT XlibRgbCmap ##### -->
   <para>
     FIXME: Describe this.
@@ -198,6 +201,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -230,6 +234,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -238,6 +243,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -246,6 +252,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -254,6 +261,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -262,6 +270,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -270,6 +279,7 @@ displays.
 
 </para>
 
+@void: 
 @Returns: <!--
 Local variables:
 mode: sgml

docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml

@@ -93,6 +93,9 @@ put_pixel (GdkPixbuf *pixbuf, int x, int y, guchar red, guchar green, guchar blu
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkPixbufError ##### -->
 <para>
 An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;

docs/reference/gdk-pixbuf/tmpl/initialization_versions.sgml

@@ -19,6 +19,9 @@ you're linking against.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### VARIABLE gdk_pixbuf_version ##### -->
 <para>
 Contains the full version of the &gdk-pixbuf; library as a string.

docs/reference/gdk-pixbuf/tmpl/inline.sgml

@@ -22,6 +22,9 @@ into #GdkPixbuf<!-- -->s, use gdk_pixbuf_from_pixdata.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixdata ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/module_interface.sgml

@@ -68,6 +68,9 @@ They are not covered by the same stability guarantees as the regular
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_set_option ##### -->
 <para>
 
@@ -84,6 +87,7 @@ They are not covered by the same stability guarantees as the regular
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk-pixbuf/tmpl/refcounting.sgml

@@ -48,6 +48,9 @@ Functions for reference counting and memory management on pixbufs.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_ref ##### -->
   <para>
 

docs/reference/gdk-pixbuf/tmpl/scaling.sgml

@@ -81,6 +81,9 @@ expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkInterpType ##### -->
   <para>
     This enumeration describes the different interpolation modes that

docs/reference/gdk-pixbuf/tmpl/util.sgml

@@ -20,6 +20,9 @@ Utility and miscellaneous convenience functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_add_alpha ##### -->
 <para>
 

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -27,6 +27,9 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 

docs/reference/gdk/tmpl/colors.sgml

@@ -46,6 +46,9 @@ gdk_color_change() will probably become aliases.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkColor ##### -->
 <para>
 The #GdkColor structure is used to describe an 
@@ -57,20 +60,14 @@ allocated or unallocated color.
 @red: The red component of the color. This is
   a value between 0 and 65535, with 65535 indicating
   full intensitiy.
-@green: The blue component of the color.
-@blue: The green component of the color.
+@green: The green component of the color.
+@blue: The blue component of the color.
 
 <!-- ##### STRUCT GdkColormap ##### -->
 <para>
 The colormap structure contains the following public fields.
 </para>
 
-@size: For pseudo-color colormaps, the number of colors
-  in the colormap.
-@colors: An array containing the current values in the
-  colormap. This can be used to map from pixel values
-  back to RGB values. This is only meaningful for
-  pseudo-color colormaps.
 
 <!-- ##### FUNCTION gdk_colormap_new ##### -->
 <para>
@@ -102,6 +99,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -109,6 +107,7 @@ The colormap structure contains the following public fields.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -31,12 +31,14 @@ gdk_window_set_cursor() or by setting the cursor member of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkCursor ##### -->
 <para>
 A <type>GdkCursor</type> structure represents a cursor.
 </para>
 
-@type: the #GdkCursorType of the cursor
 
 <!-- ##### ENUM GdkCursorType ##### -->
 <para>

docs/reference/gdk/tmpl/dnd.sgml

@@ -25,6 +25,9 @@ the GTK+ documentation for more information.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_drag_get_selection ##### -->
 <para>
 </para>
@@ -54,6 +57,7 @@ the GTK+ documentation for more information.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -180,16 +184,6 @@ drag in progress. It is used on both source and destination sides.
 </para>
 
 @parent_instance: the parent instance
-@protocol: the DND protocol which governs this drag.
-@is_source: %TRUE if the context is used on the source side.
-@source_window: the source of this drag.
-@dest_window: the destination window of this drag.
-@targets: a list of targets offered by the source.
-@actions: a bitmask of actions proposed by the source when 
-   @suggested_action is %GDK_ACTION_ASK.
-@suggested_action: the action suggested by the source.
-@action: the action chosen by the destination.
-@start_time: a timestamp recording the start time of this drag.
 
 <!-- ##### ENUM GdkDragAction ##### -->
 <para>

docs/reference/gdk/tmpl/drawing.sgml

@@ -34,6 +34,9 @@ gtk_widget_create_pango_layout().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDrawable ##### -->
 <para>
 An opaque structure representing an object that can be

docs/reference/gdk/tmpl/event_structs.sgml

@@ -23,6 +23,9 @@ required events are received. See gtk_widget_set_events().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### UNION GdkEvent ##### -->
 <para>
 The #GdkEvent struct contains a union of all of the event structs,

docs/reference/gdk/tmpl/events.sgml

@@ -30,6 +30,9 @@ The structs used for each type of event.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GdkEventType ##### -->
 <para>
 Specifies the type of the event.
@@ -165,6 +168,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -172,6 +176,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +184,7 @@ is given in the <link linkend="glib-The-Main-Event-Loop">GLib Main Loop</link>.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -340,6 +346,7 @@ gdk_event_handler_set().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/fonts.sgml

@@ -264,6 +264,9 @@ here).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkFont ##### -->
 <para>
 The <structname>GdkFont</structname> structure represents a font or fontset. It

docs/reference/gdk/tmpl/gcs.sgml

@@ -33,6 +33,9 @@ be set by the latter method.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkGC ##### -->
 <para>
 The #GdkGC structure represents a graphics context.

docs/reference/gdk/tmpl/gdkapplaunchcontext.sgml

@@ -36,6 +36,9 @@ g_object_unref (context);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkAppLaunchContext ##### -->
 <para>
 An opaque structure representing an application launch context.
@@ -47,6 +50,7 @@ An opaque structure representing an application launch context.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -31,6 +31,9 @@ Controls the keyboard/mouse pointer grabs and a set of <type>GdkScreen</type>s
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplay ##### -->
 <para>
 The <structname>GdkDisplay</structname> struct is the GDK representation
@@ -61,6 +64,7 @@ of an X display. All its fields are private and should not be accessed directly.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkdisplaymanager.sgml

@@ -19,6 +19,9 @@ changes.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDisplayManager ##### -->
 <para>
 The <structname>GdkDisplayManager</structname> struct has no interesting 
@@ -45,6 +48,7 @@ fields.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -25,6 +25,9 @@ form a large screen area.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkScreen ##### -->
 <para>
 This is a currently just a placeholder typedef for the first argument of 
@@ -70,6 +73,7 @@ when GDK gets multihead support.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/gdktesting.sgml

@@ -18,6 +18,9 @@ They allow to simulate some user input.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_test_render_sync ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -18,6 +18,9 @@ utility functions.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_init ##### -->
 <para>
 Initializes the GDK library and connects to the X server.
@@ -70,6 +73,7 @@ by GTK+ applications.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -94,6 +98,7 @@ If the locale is not supported by X then it is reset to the standard "C"
 locale.
 </para>
 
+@void: 
 @Returns: the resulting locale.
 
 
@@ -123,6 +128,7 @@ of g_atexit()).
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_notify_startup_complete_with_id ##### -->
@@ -141,6 +147,7 @@ commandline option, the default value is the program name (determined
 with g_get_prgname()) with the first character converted to uppercase. 
 </para>
 
+@void: 
 @Returns: the program class.
 
 
@@ -160,6 +167,7 @@ Gets the name of the display, which usually comes from the <envar>DISPLAY</envar
 environment variable or the <option>--display</option> command line option.
 </para>
 
+@void: 
 @Returns: the name of the display.
 
 
@@ -170,12 +178,14 @@ by the server. This is rarely needed by applications. It's main use is for
 trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_screen_width ##### -->
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -183,6 +193,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -190,6 +201,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -197,6 +209,7 @@ trapping X errors with gdk_error_trap_push() and gdk_error_trap_pop().
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -279,6 +292,7 @@ success or the reason for the failure of the grab attempt.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -324,6 +338,7 @@ available.
 <para>
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_get_use_xshm ##### -->
@@ -338,6 +353,7 @@ SYSV shared memory calls. However, it can only be used if the X client and
 server are on the same machine and the server supports it.
 </para>
 
+@void: 
 @Returns: %TRUE if use of the MIT shared memory extension will be attempted.
 
 
@@ -375,6 +391,7 @@ avoid the X error in any other way.
 </programlisting>
 </example>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_error_trap_pop ##### -->
@@ -382,12 +399,13 @@ avoid the X error in any other way.
 Removes the X error trap installed with gdk_error_trap_push().
 </para>
 
+@void: 
 @Returns: the X error code, or 0 if no error occurred.
 
 
 <!-- ##### MACRO GDK_WINDOWING_X11 ##### -->
 <para>
-This macro is defined if GDK is configured to use the X backend.
+This macro is defined if GDK is configured to use the X11 backend.
 </para>
 
 

docs/reference/gdk/tmpl/images.sgml

@@ -58,23 +58,15 @@ displays.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkImage ##### -->
 <para>
 The #GdkImage struct contains information on the image and the pixel data.
 </para>
 
 @parent_instance: the parent instance
-@type: the type of the image.
-@visual: the visual.
-@byte_order: the byte order.
-@width: the width of the image in pixels.
-@height: the height of the image in pixels.
-@depth: the depth of the image, i.e. the number of bits per pixel.
-@bpp: the number of bytes per pixel.
-@bpl: the number of bytes per line of the image.
-@bits_per_pixel: the number of bits per pixel.
-@mem: the pixel data.
-@colormap: the #GdkColormap associated with the image
 
 <!-- ##### FUNCTION gdk_image_new ##### -->
 <para>

docs/reference/gdk/tmpl/input.sgml

@@ -34,6 +34,9 @@ callbacks.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
 
 

docs/reference/gdk/tmpl/input_devices.sgml

@@ -87,6 +87,9 @@ and <structfield>ytilt</structfield>.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkDevice ##### -->
 <para>
 A <structname>GdkDevice</structname> structure contains
@@ -97,15 +100,6 @@ to configure various aspects of the device.
 </para>
 
 @parent_instance: the parent instance
-@name: the name of this device.
-@source: the type of this device.
-@mode: the mode of this device
-@has_cursor: %TRUE if the pointer follows device motion.
-@num_axes: the length of the @axes array.
-@axes: an array of #GdkDeviceAxis, describing the axes of this device.
-@num_keys: the length of the @keys array.
-@keys: an array of #GdkDeviceKey, describing the mapped macro buttons 
-  of this device.
 
 <!-- ##### ENUM GdkInputSource ##### -->
 <para>
@@ -174,6 +168,7 @@ types that GTK+ understands.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -224,6 +219,7 @@ Specifies how an axis of a device is used.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/keys.sgml

@@ -88,6 +88,9 @@ gdk_keymap_translate_keyboard_state() just to get the keyval.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkKeymap ##### -->
 <para>
 A <structname>GdkKeymap</structname> defines the translation from keyboard state
@@ -143,6 +146,7 @@ be mapped to a keyval.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -234,6 +238,15 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_add_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+
+
 <!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
 <para>
 

docs/reference/gdk/tmpl/pango_interaction.sgml

@@ -132,6 +132,9 @@ g_object_unref (gc);
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPangoRenderer ##### -->
 <para>
 
@@ -210,6 +213,7 @@ g_object_unref (gc);
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/pixbufs.sgml

@@ -19,6 +19,9 @@ pixbufs, see the #GdkPixbuf API documentation.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_pixbuf_render_threshold_alpha ##### -->
 <para>
 

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -21,6 +21,9 @@ pixel can be either on or off).
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.

docs/reference/gdk/tmpl/properties.sgml

@@ -45,6 +45,9 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table

docs/reference/gdk/tmpl/regions.sgml

@@ -36,6 +36,9 @@ It can be intersected to regions by using gdk_region_spans_intersect_foreach().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkPoint ##### -->
 <para>
 Defines the x and y coordinates of a point.
@@ -86,6 +89,7 @@ A GdkRegion represents a set of pixels on the screen.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/rgb.sgml

@@ -125,12 +125,16 @@ colors.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gdk_rgb_init ##### -->
 <para>
 This function no longer does anything at all. It's completely useless
 (and harmless).
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_draw_rgb_image ##### -->
@@ -399,6 +403,7 @@ private colormap.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -407,6 +412,7 @@ private colormap.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -427,6 +433,7 @@ dither mode is desired; if the display is not ditherable, it may make
 sense to gray out or hide the corresponding UI widget.
 </para>
 
+@void: 
 @Returns: %TRUE if the preferred visual is ditherable.
 
 

docs/reference/gdk/tmpl/selections.sgml

@@ -50,6 +50,9 @@ to the X Inter-client Communication Conventions Manual
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GdkSelection ##### -->
 <para>
 The #GdkSelection enumeration contains predefined 

docs/reference/gdk/tmpl/threads.sgml

@@ -250,6 +250,9 @@ int main (int argc, char *argv[])
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_THREADS_ENTER ##### -->
 <para>
 This macro marks the beginning of a critical section in which GDK and
@@ -275,6 +278,7 @@ begun with #GDK_THREADS_ENTER.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_enter ##### -->
@@ -285,6 +289,7 @@ conditions.  Only one thread at a time can be in such a critial
 section.
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_threads_leave ##### -->
@@ -292,6 +297,7 @@ section.
 Leaves a critical region begun with gdk_threads_enter(). 
 </para>
 
+@void: 
 
 
 <!-- ##### VARIABLE gdk_threads_mutex ##### -->

docs/reference/gdk/tmpl/visuals.sgml

@@ -54,6 +54,9 @@ then %GDK_VISUAL_STATIC_GRAY.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkVisual ##### -->
 <para>
 The <type>GdkVisual</type> structure contains information about
@@ -75,42 +78,6 @@ pixel_from_rgb (GdkVisual *visual,
 </example>
 
 @parent_instance: inherited portion from #GObject
-@type: The type of this visual.
-@depth: The number of bits per pixel.
-@byte_order: The byte-order for this visual.
-@colormap_size: The number of entries in the colormap, for
-    visuals of type %GDK_VISUAL_PSEUDO_COLOR or
-    %GDK_VISUAL_GRAY_SCALE. For other visual types, it
-    is the number of possible levels per color component.
-    If the visual has different numbers of levels for
-    different components, the value of this field is undefined.
-@bits_per_rgb: The number of significant bits per red, green, or blue
-    when specifying colors for this visual. (For instance, for 
-    gdk_colormap_alloc_color())
-@red_mask: A mask giving the bits in a pixel value that
-    correspond to the red field. Significant only for
-    %GDK_VISUAL_PSEUDOCOLOR and %GDK_VISUAL_DIRECTCOLOR.
-@red_shift: The <structfield>red_shift</structfield> and
-    <structfield>red_prec</structfield> give an alternate presentation
-    of the information in <structfield>red_mask</structfield>.
-    <structfield>red_mask</structfield> is a contiguous sequence
-    of <structfield>red_prec</structfield> bits starting at bit
-    number <structfield>red_shift</structfield>. For example,
-    <xref linkend="rgbmask"/> shows constructing a pixel value
-    out of three 16 bit color values.
-@red_prec: See above.
-@green_mask: A mask giving the bits in a pixel value that
-    correspond to the green field.
-@green_shift: The <structfield>green_shift</structfield> and
-    <structfield>green_prec</structfield> give an alternate presentation
-    of the information in <structfield>green_mask</structfield>.
-@green_prec: See above.
-@blue_mask: A mask giving the bits in a pixel value that
-    correspond to the blue field.
-@blue_shift: The <structfield>blue_shift</structfield> and
-    <structfield>blue_prec</structfield> give an alternate presentation
-    of the information in <structfield>blue_mask</structfield>.
-@blue_prec: See above.
 
 <!-- ##### ENUM GdkVisualType ##### -->
 <para>
@@ -171,6 +138,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -179,6 +147,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -187,6 +156,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -195,6 +165,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -203,6 +174,7 @@ in memory as 0x00, 0xcc, 0xee, 0xff.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/windows.sgml

@@ -187,7 +187,6 @@ but also to apply coordinate transformations.
 </para>
 <para>
 To integrate an offscreen window into a window hierarchy, one has to call
-gdk_window_set_embedder() and handle a number of signals. The
 gdk_offscreen_window_set_embedder() and handle a number of signals. The
 #GdkWindow::pick-embedded-child signal on the embedder window is used to
 select an offscreen child at given coordinates, and the #GdkWindow::to-embedder
@@ -210,6 +209,9 @@ gdk_offscreen_window_get_pixmap().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.
@@ -985,7 +987,8 @@ Registers a window as a potential drop destination.
 
 @window: 
 @region: 
-@child_func: 
+@GdkWindow *, gpointer:
+@GdkWindow *, gpointer: 
 @user_data: 
 
 
@@ -1019,6 +1022,7 @@ Registers a window as a potential drop destination.
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_window_process_updates ##### -->
@@ -1746,6 +1750,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -1754,6 +1759,7 @@ The hint must be set before mapping the window.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -17,6 +17,9 @@ X backend-specific functions
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO GDK_ROOT_WINDOW ##### -->
 <para>
 Obtains the Xlib window id of the root window of the current screen. 
@@ -657,6 +660,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -665,6 +669,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -673,6 +678,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -681,6 +687,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
@@ -724,6 +731,7 @@ Since: 2.2
 
 </para>
 
+@void: 
 
 
 <!-- ##### FUNCTION gdk_x11_visual_get_xvisual ##### -->

docs/reference/gtk/compiling.sgml

@@ -81,5 +81,14 @@ The same for <filename>gtkunixprint.h</filename> if you use the non-portable
 <link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
 </para>
 
+<para>
+The next major version, GTK+ 3,  will remove many implementation details and
+struct members from its public headers. To ensure that your application will
+not have problems with this, you can define the preprocessor symbol
+GSEAL_ENABLE. This will make the compiler catch all uses of direct access to
+struct fields so that you can go through them one by one and replace them with
+a call to an accessor function instead.
+</para>
+
 </refsect1>
 </refentry>

docs/reference/gtk/gtk-docs.sgml

@@ -500,6 +500,10 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <title>Index of new symbols in 2.20</title>
     <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-22" role="2.22">
+    <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.22.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk-sections.txt

@@ -1315,6 +1315,8 @@ gtk_entry_get_progress_fraction
 gtk_entry_set_progress_pulse_step
 gtk_entry_get_progress_pulse_step
 gtk_entry_progress_pulse
+gtk_entry_im_context_filter_keypress
+gtk_entry_reset_im_context
 GtkEntryIconPosition
 gtk_entry_set_icon_from_pixbuf
 gtk_entry_set_icon_from_stock
@@ -1993,6 +1995,8 @@ gtk_icon_view_set_tooltip_cell
 gtk_icon_view_get_tooltip_context
 gtk_icon_view_set_tooltip_column
 gtk_icon_view_get_tooltip_column
+gtk_icon_view_get_item_row
+gtk_icon_view_get_item_column
 <SUBSECTION Dnd>
 GtkIconViewDropPosition
 gtk_icon_view_enable_model_drag_source
@@ -4120,6 +4124,8 @@ gtk_text_view_get_tabs
 gtk_text_view_set_accepts_tab
 gtk_text_view_get_accepts_tab
 gtk_text_view_get_default_attributes
+gtk_text_view_im_context_filter_keypress
+gtk_text_view_reset_im_context
 GTK_TEXT_VIEW_PRIORITY_VALIDATE
 <SUBSECTION Standard>
 GTK_TEXT_VIEW
@@ -5683,6 +5689,7 @@ gtk_widget_class_find_style_property
 gtk_widget_class_list_style_properties
 gtk_widget_region_intersect
 gtk_widget_send_expose
+gtk_widget_send_focus_change
 gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist

docs/reference/gtk/tmpl/.gitignore

@@ -0,0 +1,3 @@
+gtkhbox.sgml
+gtkmessagedialog.sgml
+gtktesting.sgml

docs/reference/gtk/tmpl/gtkaccelmap.sgml

@@ -17,6 +17,9 @@ Loadable keyboard accelerator specifications
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkAccelMap ##### -->
 <para>
 
@@ -148,6 +151,7 @@ Loadable keyboard accelerator specifications
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -1,560 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAction
-
-<!-- ##### SECTION Short_Description ##### -->
-An action which can be triggered by a menu or toolbar item
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Actions represent operations that the user can be perform, along with
-some information how it should be presented in the interface. Each action 
-provides methods to create icons, menu items and toolbar items representing 
-itself.
-</para>
-<para>
-As well as the callback that is called when the action gets activated, the 
-following also gets associated with the action:
-<itemizedlist>
-  <listitem><para>a name (not translated, for path lookup)</para></listitem>
-  <listitem><para>a label (translated, for display)</para></listitem>
-  <listitem><para>an accelerator</para></listitem>
-  <listitem><para>whether label indicates a stock id</para></listitem>
-  <listitem><para>a tooltip (optional, translated)</para></listitem>
-  <listitem><para>a toolbar label (optional, shorter than label)</para></listitem>
-</itemizedlist>
-The action will also have some state information:
-<itemizedlist>
-  <listitem><para>visible (shown/hidden)</para></listitem>
-  <listitem><para>sensitive (enabled/disabled)</para></listitem>
-</itemizedlist>
-</para>
-<para>
-Apart from regular actions, there are <link linkend="GtkToggleAction">toggle 
-actions</link>, which can be toggled between two states and <link 
-linkend="GtkRadioAction">radio actions</link>, of which only one in a group 
-can be in the "active" state. Other actions can be implemented as #GtkAction 
-subclasses.
-</para>
-<para>
-Each action can have one or more proxy menu item, toolbar button or
-other proxy widgets.  Proxies mirror the state of the action (text
-label, tooltip, icon, visible, sensitive, etc), and should change when
-the action's state changes. When the proxy is activated, it should
-activate its action.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkActionGroup, #GtkUIManager
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAction ##### -->
-<para>
-The <structname>GtkAction</structname> struct contains only private members
-and should not be accessed directly.
-</para>
-
-
-<!-- ##### SIGNAL GtkAction::activate ##### -->
-<para>
-
-</para>
-
-@action: the object which received the signal.
-
-<!-- ##### ARG GtkAction:action-group ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:always-show-image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:gicon ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:hide-if-empty ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:icon-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:is-important ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:short-label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:stock-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:tooltip ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible-horizontal ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible-overflown ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAction:visible-vertical ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_action_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@label: 
-@tooltip: 
-@stock_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_get_name ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_is_sensitive ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_get_sensitive ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_sensitive ##### -->
-<para>
-
-</para>
-
-@action: 
-@sensitive: 
-
-
-<!-- ##### FUNCTION gtk_action_is_visible ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_get_visible ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_visible ##### -->
-<para>
-
-</para>
-
-@action: 
-@visible: 
-
-
-<!-- ##### FUNCTION gtk_action_activate ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_create_icon ##### -->
-<para>
-
-</para>
-
-@action: 
-@icon_size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_create_menu_item ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_create_tool_item ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_create_menu ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_connect_proxy ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_disconnect_proxy ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_get_proxies ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_connect_accelerator ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_disconnect_accelerator ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_block_activate ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_unblock_activate ##### -->
-<para>
-
-</para>
-
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_block_activate_from ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_unblock_activate_from ##### -->
-<para>
-
-</para>
-
-@action: 
-@proxy: 
-
-
-<!-- ##### FUNCTION gtk_action_get_always_show_image ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_always_show_image ##### -->
-<para>
-
-</para>
-
-@action: 
-@always_show: 
-
-
-<!-- ##### FUNCTION gtk_action_get_accel_path ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_accel_path ##### -->
-<para>
-
-</para>
-
-@action: 
-@accel_path: 
-
-
-<!-- ##### FUNCTION gtk_action_get_accel_closure ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_accel_group ##### -->
-<para>
-
-</para>
-
-@action: 
-@accel_group: 
-
-
-<!-- ##### FUNCTION gtk_action_set_label ##### -->
-<para>
-
-</para>
-
-@action: 
-@label: 
-
-
-<!-- ##### FUNCTION gtk_action_get_label ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_short_label ##### -->
-<para>
-
-</para>
-
-@action: 
-@short_label: 
-
-
-<!-- ##### FUNCTION gtk_action_get_short_label ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_tooltip ##### -->
-<para>
-
-</para>
-
-@action: 
-@tooltip: 
-
-
-<!-- ##### FUNCTION gtk_action_get_tooltip ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_stock_id ##### -->
-<para>
-
-</para>
-
-@action: 
-@stock_id: 
-
-
-<!-- ##### FUNCTION gtk_action_get_stock_id ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_gicon ##### -->
-<para>
-
-</para>
-
-@action: 
-@icon: 
-
-
-<!-- ##### FUNCTION gtk_action_get_gicon ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_icon_name ##### -->
-<para>
-
-</para>
-
-@action: 
-@icon_name: 
-
-
-<!-- ##### FUNCTION gtk_action_get_icon_name ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_visible_horizontal ##### -->
-<para>
-
-</para>
-
-@action: 
-@visible_horizontal: 
-
-
-<!-- ##### FUNCTION gtk_action_get_visible_horizontal ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_visible_vertical ##### -->
-<para>
-
-</para>
-
-@action: 
-@visible_vertical: 
-
-
-<!-- ##### FUNCTION gtk_action_get_visible_vertical ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_set_is_important ##### -->
-<para>
-
-</para>
-
-@action: 
-@is_important: 
-
-
-<!-- ##### FUNCTION gtk_action_get_is_important ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -70,6 +70,9 @@ it doesn't allow you to specify a signal.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkActionGroup ##### -->
 <para>
 The <structname>GtkActionGroup</structname> struct contains only private 

docs/reference/gtk/tmpl/gtkadjustment.sgml

@@ -31,6 +31,9 @@ after changing the value and its bounds. This results in the emission of the
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkAdjustment ##### -->
 <para>
 The #GtkAdjustment-struct struct contains the following fields.

docs/reference/gtk/tmpl/gtkalignment.sgml

@@ -1,141 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAlignment
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget which controls the alignment and size of its child
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAlignment widget controls the alignment and size of its child widget.
-It has four settings: xscale, yscale, xalign, and yalign.
-</para>
-<para>
-The scale settings are used to specify how much the child widget should
-expand to fill the space allocated to the #GtkAlignment.
-The values can range from 0 (meaning the child doesn't expand at all) to
-1 (meaning the child expands to fill all of the available space).
-</para>
-<para>
-The align settings are used to place the child widget within the available
-area. The values range from 0 (top or left) to 1 (bottom or right).
-Of course, if the scale settings are both set to 1, the alignment settings
-have no effect.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAlignment ##### -->
-<para>
-The #GtkAlignment-struct struct contains private data only, and should
-be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkAlignment:bottom-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:left-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:right-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:top-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:xscale ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAlignment:yscale ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_alignment_new ##### -->
-<para>
-Creates a new #GtkAlignment.
-</para>
-
-@xalign: the horizontal alignment of the child widget, from 0 (left) to 1
-(right).
-@yalign: the vertical alignment of the child widget, from 0 (top) to 1
-(bottom).
-@xscale: the amount that the child widget expands horizontally to fill up
-unused space, from 0 to 1.
-A value of 0 indicates that the child widget should never expand.
-A value of 1 indicates that the child widget will expand to fill all of the
-space allocated for the #GtkAlignment.
-@yscale: the amount that the child widget expands vertically to fill up
-unused space, from 0 to 1. The values are similar to @xscale.
-@Returns: the new #GtkAlignment.
-
-
-<!-- ##### FUNCTION gtk_alignment_set ##### -->
-<para>
-Sets the #GtkAlignment values.
-</para>
-
-@alignment: a #GtkAlignment.
-@xalign: the horizontal alignment of the child widget, from 0 (left) to 1
-(right).
-@yalign: the vertical alignment of the child widget, from 0 (top) to 1
-(bottom).
-@xscale: the amount that the child widget expands horizontally to fill up
-unused space, from 0 to 1.
-A value of 0 indicates that the child widget should never expand.
-A value of 1 indicates that the child widget will expand to fill all of the
-space allocated for the #GtkAlignment.
-@yscale: the amount that the child widget expands vertically to fill up
-unused space, from 0 to 1. The values are similar to @xscale.
-
-
-<!-- ##### FUNCTION gtk_alignment_get_padding ##### -->
-<para>
-
-</para>
-
-@alignment: 
-@padding_top: 
-@padding_bottom: 
-@padding_left: 
-@padding_right: 
-
-
-<!-- ##### FUNCTION gtk_alignment_set_padding ##### -->
-<para>
-
-</para>
-
-@alignment: 
-@padding_top: 
-@padding_bottom: 
-@padding_left: 
-@padding_right: 
-
-

docs/reference/gtk/tmpl/gtkarrow.sgml

@@ -1,82 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkArrow
-
-<!-- ##### SECTION Short_Description ##### -->
-Displays an arrow
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkArrow should be used to draw simple arrows that need to point in
-one of the four cardinal directions (up, down, left, or right).  The
-style of the arrow can be one of shadow in, shadow out, etched in, or
-etched out.  Note that these directions and style types may be
-ammended in versions of Gtk to come.
-</para>
-<para>
-GtkArrow will fill any space alloted to it, but since it is inherited
-from #GtkMisc, it can be padded and/or aligned, to fill exactly the
-space the programmer desires.
-</para>
-<para>
-Arrows are created with a call to gtk_arrow_new().  The direction or
-style of an arrow can be changed after creation by using gtk_arrow_set().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>gtk_paint_arrow()</term>
-<listitem><para>the function used internally to paint the arrow.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkArrow ##### -->
-<para>
-The #GtkArrow struct containes the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-</para>
-
-
-<!-- ##### ARG GtkArrow:arrow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkArrow:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkArrow:arrow-scaling ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_arrow_new ##### -->
-<para>
-Creates a new arrow widget.
-</para>
-
-@arrow_type: a valid #GtkArrowType.
-@shadow_type: a valid #GtkShadowType.
-@Returns: the new #GtkArrow widget.
-
-
-<!-- ##### FUNCTION gtk_arrow_set ##### -->
-<para>
-Sets the direction and style of the #GtkArrow, @arrow.
-</para>
-
-@arrow: a widget of type #GtkArrow.
-@arrow_type: a valid #GtkArrowType.
-@shadow_type: a valid #GtkShadowType.
-
-

docs/reference/gtk/tmpl/gtkaspectframe.sgml

@@ -1,88 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAspectFrame
-
-<!-- ##### SECTION Short_Description ##### -->
-A frame that constrains its child to a particular aspect ratio
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAspectFrame is useful when you want
-pack a widget so that it can resize but always retains
-the same aspect ratio. For instance, one might be
-drawing a small preview of a larger image. #GtkAspectFrame
-derives from #GtkFrame, so it can draw a label and
-a frame around the child. The frame will be
-"shrink-wrapped" to the size of the child.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAspectFrame ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkAspectFrame:obey-child ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:ratio ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAspectFrame:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_aspect_frame_new ##### -->
-<para>
-Create a new #GtkAspectFrame.
-</para>
-
-@label: Label text.
-@xalign: Horizontal alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (left aligned)
-to 1.0 (right aligned)
-@yalign: Vertical alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (left aligned)
-to 1.0 (right aligned)
-@ratio: The desired aspect ratio.
-@obey_child: If %TRUE, @ratio is ignored, and the aspect
-    ratio is taken from the requistion of the child.
-@Returns: the new #GtkAspectFrame.
-<!-- # Unused Parameters # -->
-@ratio: The desired aspect ratio.
-
-
-<!-- ##### FUNCTION gtk_aspect_frame_set ##### -->
-<para>
-Set parameters for an existing #GtkAspectFrame.
-</para>
-
-@aspect_frame: a #GtkAspectFrame
-@xalign: Horizontal alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (left aligned)
-to 1.0 (right aligned)
-@yalign: Vertical alignment of the child within the allocation of
-the #GtkAspectFrame. This ranges from 0.0 (left aligned)
-to 1.0 (right aligned)
-@ratio: The desired aspect ratio.
-@obey_child: If %TRUE, @ratio is ignored, and the aspect
-    ratio is taken from the requistion of the child.
-
-

docs/reference/gtk/tmpl/gtkassistant.sgml

@@ -1,344 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAssistant
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to guide users through multi-step operations
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkAssistant is a widget used to represent a generally complex
-operation splitted in several steps, guiding the user through its pages
-and controlling the page flow to collect the necessary data.
-</para>
-<refsect2 id="GtkAssistant-BUILDER-UI"><title>GtkAssistant as GtkBuildable</title>
-<para>
-The GtkAssistant implementation of the GtkBuildable interface exposes the
-@action_area as internal children with the name "action_area".
-</para>
-<para>
-To add pages to an assistant in GtkBuilder, simply add it as a &lt;child&gt;
-to the GtkAssistant object, and set its child properties as necessary.
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAssistant ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkAssistant::apply ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::cancel ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::close ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-
-<!-- ##### SIGNAL GtkAssistant::prepare ##### -->
-<para>
-
-</para>
-
-@assistant: the object which received the signal.
-@widget: 
-
-<!-- ##### ARG GtkAssistant:complete ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:header-image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:page-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:sidebar-image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:content-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAssistant:header-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_assistant_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_current_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_current_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_num: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_n_pages ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_nth_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_num: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_prepend_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_append_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_insert_page ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@position: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkAssistantPageFunc ##### -->
-<para>
-A function used by gtk_assistant_set_forward_page_func() to know which
-is the next page given a current one. It's called both for computing the
-next page when the user presses the "forward" button and for handling
-the behavior of the "last" button.
-</para>
-
-@current_page: The page number used to calculate the next page.
-@data: user data.
-@Returns: The next page number.
-
-
-<!-- ##### FUNCTION gtk_assistant_set_forward_page_func ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page_func: 
-@data: 
-@destroy: 
-
-
-<!-- ##### ENUM GtkAssistantPageType ##### -->
-<para>
-An enum for determining the page role inside the #GtkAssistant. It's used to
-handle buttons sensitivity and visibility.
-</para>
-
-<para>
-Note that an assistant needs to end its page flow with a page of type GTK_ASSISTANT_PAGE_CONFIRM
-or GTK_ASSISTANT_PAGE_SUMMARY to be correct.
-</para>
-
-@GTK_ASSISTANT_PAGE_CONTENT: The page has regular contents.
-@GTK_ASSISTANT_PAGE_INTRO: The page contains an introduction to the assistant task.
-@GTK_ASSISTANT_PAGE_CONFIRM: The page lets the user confirm or deny the changes.
-@GTK_ASSISTANT_PAGE_SUMMARY: The page informs the user of the changes done.
-@GTK_ASSISTANT_PAGE_PROGRESS: Used for tasks that take a long time to complete, blocks the assistant until the page is marked as complete.
-
-<!-- ##### FUNCTION gtk_assistant_set_page_type ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_type ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_title ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_title ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_header_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_header_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_side_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_side_image ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_set_page_complete ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@complete: 
-
-
-<!-- ##### FUNCTION gtk_assistant_get_page_complete ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@page: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_assistant_add_action_widget ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_assistant_remove_action_widget ##### -->
-<para>
-
-</para>
-
-@assistant: 
-@child: 
-
-
-<!-- ##### FUNCTION gtk_assistant_update_buttons_state ##### -->
-<para>
-
-</para>
-
-@assistant: 
-
-

docs/reference/gtk/tmpl/gtkbbox.sgml

@@ -11,8 +11,7 @@ of #GtkHButtonBox and #GtkVButtonBox widgets.
 </para>
 <para>
 gtk_button_box_get_child_size() retrieves the minimum width and height 
-for widgets in a given button box. gtk_button_box_set_child_size() 
-allows those properties to be changed.
+for widgets in a given button box.
 </para>
 <para>
 The internal padding of buttons can be retrieved and changed per button box using
@@ -51,6 +50,9 @@ behaves as if homogeneous was %TRUE.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkButtonBox ##### -->
 <para>
 This is a read-only struct; no members should be modified directly.
@@ -178,7 +180,8 @@ Sets a new default size for the children of a given button box.
 @widget: a #GtkButtonBox
 @min_width: a default width for buttons in @widget
 @min_height: a default height for buttons in @widget
-@Deprecated: Use the style properties
+@Deprecated: This is not supported anymore and can only be set through the theme
+  changing the style properties:
   "<link linkend="GtkButtonBox--s-child-min-width">child-min-width</link>"
   and
   "<link linkend="GtkButtonBox--s-child-min-height">child-min-height</link>"

docs/reference/gtk/tmpl/gtkbin.sgml

@@ -1,54 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkBin
-
-<!-- ##### SECTION Short_Description ##### -->
-A container with just one child
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkBin widget is a container with just one child.
-It is not very useful itself, but it is useful for deriving subclasses,
-since it provides common code needed for handling a single child widget.
-</para>
-<para>
-Many GTK+ widgets are subclasses of #GtkBin, including #GtkWindow, #GtkButton,
-#GtkFrame, #GtkHandleBox, and #GtkScrolledWindow.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkBin ##### -->
-<para>
-The #GtkBin-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#GtkWidget *child;</entry>
-<entry>the child widget.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_bin_get_child ##### -->
-<para>
-
-</para>
-
-@bin: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -120,6 +120,9 @@ The "unbind" functionality has been introduced in GTK+ 2.12.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkBindingSet ##### -->
 <para>
 A binding set maintains a list of activatable key bindings.

docs/reference/gtk/tmpl/gtkbox.sgml

@@ -101,6 +101,9 @@ layouts.</para></listitem>
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkBox ##### -->
 <para>
 The #GtkBox-struct describes an instance of GtkBox and contains the 

docs/reference/gtk/tmpl/gtkbuildable.sgml

@@ -1,193 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkBuildable
-
-<!-- ##### SECTION Short_Description ##### -->
-Interface for objects that can be built by GtkBuilder
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-In order to allow construction from a <link linkend="BUILDER-UI">GtkBuilder 
-UI description</link>, an object class must implement the 
-GtkBuildable interface. The interface includes methods for setting 
-names and properties of objects, parsing custom tags, constructing 
-child objects.
-</para>
-<para>
-The GtkBuildable interface is implemented by all widgets and 
-many of the non-widget objects that are provided by GTK+. The
-main user of this interface is #GtkBuilder, there should be
-very little need for applications to call any 
-<function>gtk_buildable_...</function> functions.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkBuildable ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### STRUCT GtkBuildableIface ##### -->
-<para>
-The GtkBuildableIface interface contains method that are
-necessary to allow #GtkBuilder to construct an object from
-a GtkBuilder UI definition.
-</para>
-
-@g_iface: the parent class
-@set_name: Stores the name attribute given in the GtkBuilder UI definition.
-  #GtkWidget stores the name as object data. Implement this method if your
-  object has some notion of "name" and it makes sense to map the XML name
-  attribute to it.
-@get_name: The getter corresponding to @set_name. Implement this
-  if you implement @set_name.
-@add_child: Adds a child. The @type parameter can be used to 
-  differentiate the kind of child. #GtkContainer implements this 
-  to add add a child widget to the container, #GtkNotebook uses 
-  the @type to distinguish between page labels (of type "page-label") 
-  and normal children.
-@set_buildable_property: Sets a property of a buildable object.
-  It is normally not necessary to implement this, g_object_set_property()
-  is used by default. #GtkWindow implements this to delay showing itself
-  (i.e. setting the #GtkWidget:visible property) until the whole interface 
-  is created.
-@construct_child: Constructs a child of a buildable that has been
-  specified as "constructor" in the UI definition. #GtkUIManager implements 
-  this to reference to a widget created in a &lt;ui&gt; tag which is outside 
-  of the normal GtkBuilder UI definition hierarchy.  A reference to the
-  constructed object is returned and becomes owned by the caller.
-@custom_tag_start: Implement this if the buildable needs to parse 
-  content below &lt;child&gt;. To handle an element, the implementation
-  must fill in the @parser structure and @user_data and return %TRUE.
-  #GtkWidget implements this to parse keyboard accelerators specified
-  in &lt;accelerator&gt; elements. #GtkContainer implements it to map 
-  properties defined via &lt;packing&gt; elements to child properties.
-  Note that @user_data must be freed in @custom_tag_end or @custom_finished.
-@custom_tag_end: Called for the end tag of each custom element that is
-  handled by the buildable (see @custom_tag_start).
-@custom_finished: Called for each custom tag handled by the buildable
-  when the builder finishes parsing (see @custom_tag_start)
-@parser_finished: Called when a builder finishes the parsing
-  of a UI definition. It is normally not necessary to implement this,
-  unless you need to perform special cleanup actions. #GtkWindow sets
-  the #GtkWidget:visible property here.
-@get_internal_child: Returns an internal child of a buildable. 
-  #GtkDialog implements this to give access to its @vbox, making
-  it possible to add children to the vbox in a UI definition.
-  Implement this if the buildable has internal children that may
-  need to be accessed from a UI definition.
-
-<!-- ##### FUNCTION gtk_buildable_set_name ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@name: 
-
-
-<!-- ##### FUNCTION gtk_buildable_get_name ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_buildable_add_child ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@child: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_buildable_set_buildable_property ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@name: 
-@value: 
-
-
-<!-- ##### FUNCTION gtk_buildable_construct_child ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_buildable_custom_tag_start ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@child: 
-@tagname: 
-@parser: 
-@data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_buildable_custom_tag_end ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@child: 
-@tagname: 
-@data: 
-
-
-<!-- ##### FUNCTION gtk_buildable_custom_finished ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@child: 
-@tagname: 
-@data: 
-
-
-<!-- ##### FUNCTION gtk_buildable_parser_finished ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-
-
-<!-- ##### FUNCTION gtk_buildable_get_internal_child ##### -->
-<para>
-
-</para>
-
-@buildable: 
-@builder: 
-@childname: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkbuilder.sgml

@@ -246,6 +246,9 @@ respective objects, see
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkBuilder ##### -->
 <para>
 
@@ -300,6 +303,7 @@ using #GtkBuilder.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -24,6 +24,9 @@ the #GtkLabel.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkButton ##### -->
 <para>
 This should not be accessed directly.  Use the accessor functions below.
@@ -158,6 +161,7 @@ Creates a new #GtkButton widget. To add a child widget to the button,
 use gtk_container_add().
 </para>
 
+@void: 
 @Returns: The newly created #GtkButton widget.
 
 

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -36,6 +36,9 @@ gtk_calendar_get_date().
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCalendar ##### -->
 <para>
 <structfield>num_marked_dates</structfield> is an integer containing the
@@ -191,6 +194,7 @@ calendar.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -18,6 +18,9 @@ to be usable when editing the contents of a #GtkTreeView cell.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellEditable ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -58,6 +58,9 @@ content of the element is the attribute value.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellLayout ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -51,6 +51,9 @@ respectively.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GtkCellRendererState ##### -->
 <para>
 Tells how a cell is to be rendererd.

docs/reference/gtk/tmpl/gtkcellrendereraccel.sgml

@@ -23,6 +23,9 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererAccel ##### -->
 <para>
 
@@ -81,6 +84,7 @@ The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml

@@ -34,6 +34,9 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererCombo ##### -->
 <para>
 
@@ -69,6 +72,7 @@ The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

@@ -33,6 +33,9 @@ property is set to a pixbuf, it renders that one.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
 <para>
 
@@ -89,6 +92,7 @@ property is set to a pixbuf, it renders that one.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

@@ -22,6 +22,9 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererProgress ##### -->
 <para>
 
@@ -63,6 +66,7 @@ The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

@@ -33,6 +33,9 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererSpin ##### -->
 <para>
 
@@ -59,6 +62,7 @@ The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -25,6 +25,9 @@ the #GtkCellRendererText allows to edit its text using an entry.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererText ##### -->
 <para>
 
@@ -265,6 +268,7 @@ the #GtkCellRendererText allows to edit its text using an entry.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

@@ -20,6 +20,9 @@ property. When activated, it emits the toggled signal.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellRendererToggle ##### -->
 <para>
 
@@ -64,6 +67,7 @@ property. When activated, it emits the toggled signal.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -20,6 +20,9 @@ and drag and drop.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCellView ##### -->
 <para>
 
@@ -51,6 +54,7 @@ and drag and drop.
 
 </para>
 
+@void: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkcheckbutton.sgml

@@ -37,6 +37,9 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCheckButton ##### -->
 <para>
 <structfield>toggle_button</structfield> is a #GtkToggleButton representing the actual toggle button that composes the check button.
@@ -58,6 +61,7 @@ The important signal ('toggled') is also inherited from #GtkToggleButton.
 Creates a new #GtkCheckButton.
 </para>
 
+@void: 
 @Returns: a #GtkWidget.
 
 

docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml

@@ -25,6 +25,9 @@ toggles the value.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCheckMenuItem ##### -->
 <para>
 The #GtkCheckMenuItem-struct struct contains the following fields.
@@ -81,6 +84,7 @@ field of the #GtkCheckMenuItem-struct struct to discover the new state.
 Creates a new #GtkCheckMenuItem.
 </para>
 
+@void: 
 @Returns: a new #GtkCheckMenuItem.
 
 

docs/reference/gtk/tmpl/gtkclipboard.sgml

@@ -87,6 +87,9 @@ Storing data on clipboards
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkClipboard ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkclist.sgml

@@ -23,6 +23,9 @@ in newly written code. Use #GtkTreeView instead.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkCList ##### -->
 <para>
 This is the embodiment of the #GtkCList widget.  This structure contains

docs/reference/gtk/tmpl/gtkcolorbutton.sgml

@@ -19,6 +19,9 @@ widget for selecting a color in a preference dialog.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkColorButton ##### -->
 <para>
 The GtkColorButton struct has only private fields and 
@@ -58,6 +61,7 @@ should not be used directly.
 
 </para>
 
+@void: 
 @Returns: