Abstract GtkMenuProxy type module work in progress.

This makes it possible to create filter subclasses by implementing the vcalls.
You can optionally chain up to the parent class' implementation, to make it
possible to have "your filter + additional custom filtering".

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=604150

INSTALL.in

@@ -4,9 +4,11 @@ Prerequisites
 GTK+ requires the following packages:
 
  - The GLib, Pango, ATK and cairo libraries, available at the same
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.21.3,
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.23.6,
    Pango 1.20, ATK 1.29.2 and cairo 1.6.0.
 
+ - gobject-introspection 0.6.7 or newer.
+
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not
    these libraries are available from:

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,212 @@
+Overview of Changes from GTK+ 2.20.x to 2.90.0
+==============================================
+
+* GtkExtendedLayout: Width-for-height geometry management
+
+* gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
+
+
+Overview of Changes from GTK+ 2.19.7 to 2.20.0
+==============================================
+
+* Support the tracker 0.8 api in the file chooser search code
+
+* Bug fixes:
+ 609929 Dragging between two windows cause the menu widget...
+ 613241 entry sends extra notify::text with "" on destroy
+ 610946 error during gtk+ build + nonsense error messages
+ 610176 Some cups1.2 feature use not shielded by API version-check
+ 612574 GtkMenuItem does not emit notify::label when label...
+ 612505 Entry layout not updated when underlying buffer changes
+ 612346 gdk_window_set_icon_name doesn't work
+ 612308 GTK+ Build error: redefinition of 'struct IPrintDialogCallback'
+ 611118 Set APPLICATION_ID when launching desktop app
+ 612768 DND cause crash in VNC environment
+ 612575 Improve docs of gtk_notebook_set_tab_label_packing
+ 605333 Confusing error in documentation
+ 613028 Do not get a GtkSettings for size lookup if...
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Dutch
+ Estonian
+ Finnish
+ Galician
+ Gujarati
+ Italian
+ Punjabi
+ Romanian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.19.6 to 2.19.7
+==============================================
+
+* Bug fixes:
+ 611707 Move documentation from templates to inline comments
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 612066 empathy hangs when clicked on information about contact...
+ 557420 Some compose sequences don't work anymore...
+ 569042 gailbooleancell does not seem to attend to changes...
+ 600992 File chooser reference counting issues
+ 610905 gtk_drag_source_set need instrospection hint
+ 611051 Search Entry Clear Icon not accessible
+ 611217 Incorrect translator comment
+ 611317 Document targets in drag and drop
+ 611319 gtk_window_set_transient_for undocumented NULL value for parent
+ 611658 Update documentation for gtkvscrollbar
+ 611662 Update documentation for gtkvseparator
+ 611686 focus_in/focus_out in gailtreeview.c should return FALSE...
+ 611831 Move documentation to inline comments: GtkVBox
+ 612119 Do not scroll when middle pasting
+
+* Translation updates:
+ Afrikaans
+ Arabic
+ Basque
+ British English
+ Bulgarian
+ Czech
+ Danish
+ French
+ Galician
+ German
+ Greek
+ Hungarian
+ Lithuanian
+ Low German
+ Norwegian bokmål
+ Polish
+ Portuguese
+ Russian
+ Slovenian
+ Swedish
+
+
+Overview of Changes from GTK+ 2.19.5 to 2.19.6
+==============================================
+
+* Bugs fixed:
+ 610701 gnome-shell crashes frequently
+ 604799 Crash when button is pressed.
+ 609744 crash at parse_data_for_row_pseudocolor
+ 600789 gdk/gdkwindow.c "find_native_sibling_above" will crash
+ 610141 gtk_assistant_get_nth_page() function fails to deliver...
+ 609952 destroying a notebook window when the last tab got dragged...
+ 603923 [annotations] gtk_tree_store_newv/set_column_types
+ 610474 [annotations] Add allow-none
+ 609650 GtkPlug Embedded signal is not emitted when plug...
+ 610381 More space between toolbar icon and label
+ 548026 No accessor for GtkWidget.requisition
+ 609514 fix introspection comments for gtk_tree_view_get_path_at_pos
+ 610235 msgid in bad English
+ 607697 GDK_META_MASK always set on Alt-Enter with gtk+ 2.19.x
+ 610632 gtk_info_bar_set_default_response problem
+ 609172 gdk/directfb: little cleanups
+ 610184 gtk_assistant_set_current_page() segfaults...
+
+* Updated translations
+ Bulgarian
+ Czech
+ Estonian
+ German
+ Japanese
+ Korean
+ Lithuanian
+ Norwegian bokmål
+ Oriya
+ Polish
+ Romanian
+ Slovenian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.19.4 to 2.19.5
+==============================================
+
+* GSEAL work:
+ - Add accessors for GtkPaned members
+ - Add gtk_widget_style_attach
+ - Seal GtkTextTag
+ - Deprecate GtkCurveType
+ - More GtkWidget flags accessors
+
+* Bugs fixed:
+ 403485 Move docs from tmpl/* to the source files
+ 556263 Deprecate GtkCurve
+ 554420 Seal GtkTextTag
+ 561816 Optimize gtk_paned_set_position notifications
+ 606288 Not using GtkOptionMenu deprecated symbols in test file
+ 607061 GtkPlug socket window is sometimes incorrectly unref'd
+ 607344 GtkCalendar: crash when using tooltips via glade
+ 607885 GtkPaned::handle lack accessor
+ 608162 gtktoolbutton doesn't create right proxy menu item...
+ 608345 wrong reference on gdk_keymap_translate_keyboard_state
+ 608370 dnd drag-dest signal handlers don't get correctly disconn...
+ 608410 GOK types backwards in text entry fields
+ 608615 DnD events sent to wrong window
+ 608807 Marks on GtkScale widgets can overlap
+ 609188 gdk/directfb: compiler warning in _gdk_windowing_pointer_grab()
+ 609191 gdk/directfb: use G_DEFINE_TYPE in gdkcolor-directfb
+ 609199 gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
+ 609201 gdk/directfb: max cursor size is artificially limited
+ 591186 GTK Menu Bar is unreadable under Windows 7
+
+* Updated translations
+ Bengali
+ Brazilian Portuguese
+ Czech
+ Estonian
+ French
+ Norwegian bokmål
+ Slovak
+ Spanish
+ Thai
+
+
+Overview of Changes from GTK+ 2.19.3 to 2.19.4
+==============================================
+
+* GSeal:
+ - New accessors for GtkEntry windows
+ - New accessors for GtkRange members
+
+* Bugs fixed:
+ 607082 Add accessors for sealed GtkRange members
+ 567729 Add GtkToolPalette
+ 591102 gdk_pixbuf_save() creates a zero-size file...
+ 600865 gnome-panel crashed with "BadPixmap...
+ 601412 action area presence makes gnome-terminal window grow...
+ 603144 Suspected wrong builtin page size: Chinese PRC6 and...
+ 606009 weirdness with clipping in abiword - csw
+ 606698 Misplaced declaration of gtk_print_job_set_status
+ 606761 pixops.c: variables are declared at middle of block
+ 607217 Mixing calls to _set_markup and _set_text causes...
+ 607269 gtk_label_set_attributes with empty list no longer...
+ 607322 Double-click doesn't work if the item is selected...
+ 607687 f-spot crashes when using themes using the pixmap...
+ 607778 Add accessors for GtkEntry's windows
+ 607770 Leak in GtkTreeView with HildonPannableArea
+ 603245 drawing artifacts with action widgets and long tab...
+
+* Updated translations:
+ Arabic
+ Asturian
+ Basque
+ Bengali
+ Bulgarian
+ Burmese
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Swedish
+
+
 Overview of Changes from GTK+ 2.19.2 to 2.19.3
 ==============================================
 

README.in

@@ -37,13 +37,14 @@ Release notes for 2.20
   which are doing so may need some adjustments, since the addition of the
   message area changed the internal widget hierarchy.
 
-* GDK will now set all matching virtual modifiers in the state field of
-  key events. Depending on your X modifier map, this can lead to more bits
-  in the state field being set than before. If you are manually matching
-  key events against key/modifier combinations you should make sure that
-  you properly mask away irrelevant parts of the state field. The
-  gdk_keymap_map_virtual_modifiers() function can help with matching
-  against virtual modifiers.
+* GtkBuilder no longer sets the "name" property of widgets to the ID
+  attribute of the <object>. Use gtk_buildable_get_name() instead of
+  gtk_widget_get_name() to obtain the ID.
+
+* GTK+ now includes introspection data, as a consequence, it gained a
+  dependency on gobject-introspection. It is possible to build without
+  introspection by passing --disable-introspection to configure.
+
 
 Release notes for 2.18
 ======================

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,8 +11,8 @@ 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], [19])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [21])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.21.3])
+m4_define([glib_required_version], [2.23.6])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.6])
@@ -131,6 +131,7 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -139,6 +140,7 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -149,6 +151,7 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
@@ -1716,7 +1719,13 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
+# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
+if test "x$gdktarget" = "xx11"; then
+  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
+else
+  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
+fi
+
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 #
@@ -2128,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

demos/gtk-demo/appwindow.c

@@ -595,7 +595,7 @@ do_appwindow (GtkWidget *do_widget)
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/assistant.c

@@ -153,7 +153,7 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_prepare), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {

demos/gtk-demo/builder.c

@@ -53,7 +53,7 @@ do_builder (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/button_box.c

@@ -113,7 +113,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/clipboard.c

@@ -314,7 +314,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/colorsel.c

@@ -125,7 +125,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (change_color_callback), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/combobox.c

@@ -440,7 +440,7 @@ do_combobox (GtkWidget *do_widget)
   
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/dialog.c

@@ -167,7 +167,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/drawingarea.c

@@ -57,7 +57,7 @@ scribble_expose_event (GtkWidget      *widget,
    */
 
   gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                     widget->style->fg_gc[gtk_widget_get_state (widget)],
                      pixmap,
                      /* Only copy the area that was exposed. */
                      event->area.x, event->area.y,
@@ -318,7 +318,7 @@ do_drawingarea (GtkWidget *do_widget)
 
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/editable_cells.c

@@ -381,7 +381,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/entry_buffer.c

@@ -54,7 +54,7 @@ do_entry_buffer (GtkWidget *do_widget)
     g_object_unref (buffer);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/entry_completion.c

@@ -86,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
     gtk_entry_completion_set_text_column (completion, 0);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/expander.c

@@ -47,7 +47,7 @@ do_expander (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (expander), label);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/hypertext.c

@@ -300,7 +300,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_show_all (sw);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/iconview.c

@@ -358,7 +358,7 @@ do_iconview (GtkWidget *do_widget)
 	}
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/iconview_edit.c

@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/images.c

@@ -317,6 +317,7 @@ do_images (GtkWidget *do_widget)
   GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
+  GIcon     *gicon;
   GError *error = NULL;
   char *filename;
 
@@ -415,6 +416,26 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
+      /* Symbolic icon */
+
+      label = gtk_label_new (NULL);
+      gtk_label_set_markup (GTK_LABEL (label),
+			    "<u>Symbolic themed icon</u>");
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
+
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Progressive */
 
@@ -450,7 +471,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/infobar.c

@@ -90,7 +90,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/links.c

@@ -70,7 +70,7 @@ do_links (GtkWidget *do_widget)
       gtk_widget_show (label);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/list_store.c

@@ -29,7 +29,9 @@ enum
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
   COLUMN_PULSE,
+  COLUMN_ICON,
   COLUMN_ACTIVE,
+  COLUMN_SENSITIVE,
   NUM_COLUMNS
 };
 
@@ -92,11 +94,24 @@ create_model (void)
                               G_TYPE_STRING,
                               G_TYPE_STRING,
                               G_TYPE_UINT,
+                              G_TYPE_STRING,
+                              G_TYPE_BOOLEAN,
                               G_TYPE_BOOLEAN);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
+      gchar *icon_name;
+      gboolean sensitive;
+
+      if (i == 1 || i == 3)
+        icon_name = "battery-critical-charging-symbolic";
+      else
+        icon_name = NULL;
+      if (i == 3)
+        sensitive = FALSE;
+      else
+        sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
                           COLUMN_FIXED, data[i].fixed,
@@ -104,7 +119,9 @@ create_model (void)
                           COLUMN_SEVERITY, data[i].severity,
                           COLUMN_DESCRIPTION, data[i].description,
                           COLUMN_PULSE, 0,
+                          COLUMN_ICON, icon_name,
                           COLUMN_ACTIVE, FALSE,
+                          COLUMN_SENSITIVE, sensitive,
                           -1);
     }
 
@@ -199,6 +216,19 @@ add_columns (GtkTreeView *treeview)
                                                      NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
   gtk_tree_view_append_column (treeview, column);
+
+  /* column for symbolic icon */
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
+  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
+                                                     renderer,
+                                                     "icon-name",
+                                                     COLUMN_ICON,
+                                                     "sensitive",
+                                                     COLUMN_SENSITIVE,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
+  gtk_tree_view_append_column (treeview, column);
 }
 
 static gboolean
@@ -272,7 +302,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (window_closed), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
       if (timeout == 0) {

demos/gtk-demo/menus.c

@@ -191,12 +191,12 @@ do_menus (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/offscreen_window.c

@@ -166,7 +166,7 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
 static void
 gtk_rotated_bin_init (GtkRotatedBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -184,7 +184,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -229,7 +229,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -262,7 +262,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -331,7 +331,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
   GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -339,7 +339,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -382,7 +382,7 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   s = sin (bin->angle);
@@ -410,13 +410,13 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -436,7 +436,7 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
         child_allocation.width = MIN ((w - s * child_allocation.height) / c,
                                       (h - c * child_allocation.height) / s);
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 child_allocation.x,
                                 child_allocation.y,
@@ -466,7 +466,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
   gdouble s, c;
   gdouble w, h;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -474,7 +474,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
           GtkAllocation child_area;
           cairo_t *cr;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               child_area = bin->child->allocation;
@@ -566,7 +566,7 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (bin), button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/offscreen_window2.c

@@ -104,7 +104,7 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
 static void
 gtk_mirror_bin_init (GtkMirrorBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -122,7 +122,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -167,7 +167,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -200,7 +200,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -269,7 +269,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -277,7 +277,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -306,7 +306,7 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
@@ -327,13 +327,13 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -344,7 +344,7 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
       child_allocation.height = child_requisition.height;
       child_allocation.width = child_requisition.width;
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 allocation->x + border_width,
                                 allocation->y + border_width,
@@ -369,7 +369,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   gint width, height;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -378,7 +378,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
           cairo_matrix_t matrix;
           cairo_pattern_t *mask;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               gdk_drawable_get_size (pixmap, &width, &height);
@@ -487,7 +487,7 @@ do_offscreen_window2 (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/panes.c

@@ -180,7 +180,7 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_show_all (vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/pickers.c

@@ -59,7 +59,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/pixbufs.c

@@ -260,7 +260,7 @@ do_pixbufs (GtkWidget *do_widget)
         }
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/rotated_text.c

@@ -223,7 +223,7 @@ do_rotated_text (GtkWidget *do_widget)
       pango_attr_list_unref (attrs);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/search_entry.c

@@ -1,6 +1,6 @@
-/* Entry/Search Entry 
+/* Entry/Search Entry
  *
- * GtkEntry allows to display icons and progress information. 
+ * GtkEntry allows to display icons and progress information.
  * This demo shows how to use these features in a search entry.
  */
 
@@ -45,21 +45,21 @@ finish_search (GtkButton *button)
   show_find_button ();
   g_source_remove (search_progress_id);
   search_progress_id = 0;
-  
+
   return FALSE;
 }
 
 static gboolean
 start_search_feedback (gpointer data)
 {
-  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
+  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
                                            (GSourceFunc)search_progress, data,
                                            (GDestroyNotify)search_progress_done);
   return FALSE;
 }
 
 static void
-start_search (GtkButton *button, 
+start_search (GtkButton *button,
               GtkEntry  *entry)
 {
   show_cancel_button ();
@@ -77,16 +77,99 @@ stop_search (GtkButton *button,
 }
 
 static void
-icon_press_cb (GtkEntry       *entry, 
+clear_entry (GtkEntry *entry)
+{
+  gtk_entry_set_text (entry, "");
+}
+
+static void
+search_by_name (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_FIND);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by name\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_description (GtkWidget *item,
+                       GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_EDIT);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by description\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_file (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_OPEN);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by file name\n"
+                                   "Click here to change the search type");
+}
+
+GtkWidget *
+create_search_menu (GtkWidget *entry)
+{
+  GtkWidget *menu;
+  GtkWidget *item;
+  GtkWidget *image;
+
+  menu = gtk_menu_new ();
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _name");
+  image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_name), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _description");
+  image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_description), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _file name");
+  image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_file), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  gtk_widget_show_all (menu);
+
+  return menu;
+}
+
+static void
+icon_press_cb (GtkEntry       *entry,
                gint            position,
                GdkEventButton *event,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
                     event->button, event->time);
-  else 
-    gtk_entry_set_text (entry, "");
+  else
+    clear_entry (entry);
 }
 
 static void
@@ -97,7 +180,7 @@ text_changed_cb (GtkEntry   *entry,
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry, 
+  gtk_entry_set_icon_sensitive (entry,
                                 GTK_ENTRY_ICON_SECONDARY,
                                 has_text);
   gtk_widget_set_sensitive (button, has_text);
@@ -114,45 +197,6 @@ activate_cb (GtkEntry  *entry,
 
 }
 
-static void
-search_by_name (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_FIND);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by name\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_description (GtkWidget *item, 
-                       GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_EDIT);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by description\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_file (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_OPEN);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by file name\n"
-                                   "Click here to change the search type");
-} 
-
 static void
 search_entry_destroyed (GtkWidget  *widget)
 {
@@ -165,7 +209,35 @@ search_entry_destroyed (GtkWidget  *widget)
   window = NULL;
 }
 
-                
+static void
+entry_populate_popup (GtkEntry *entry,
+                      GtkMenu  *menu,
+                      gpointer user_data)
+{
+  GtkWidget *item;
+  GtkWidget *search_menu;
+  gboolean has_text;
+
+  has_text = gtk_entry_get_text_length (entry) > 0;
+
+  item = gtk_separator_menu_item_new ();
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("C_lear");
+  gtk_widget_show (item);
+  g_signal_connect_swapped (item, "activate",
+                            G_CALLBACK (clear_entry), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_set_sensitive (item, has_text);
+
+  search_menu = create_search_menu (GTK_WIDGET (entry));
+  item = gtk_menu_item_new_with_label ("Search by");
+  gtk_widget_show (item);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+}
+
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
@@ -173,19 +245,17 @@ do_search_entry (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
-  GtkWidget *item;
-  GtkWidget *image;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
-  
+
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("Search Entry",
                                             GTK_WINDOW (do_widget),
- 					    0,
-					    GTK_STOCK_CLOSE,
-					    GTK_RESPONSE_NONE,
-					    NULL);
+                                            0,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_NONE,
+                                            NULL);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "response",
@@ -216,59 +286,43 @@ do_search_entry (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
 
       find_button = gtk_button_new_with_label ("Find");
-      g_signal_connect (find_button, "clicked", 
+      g_signal_connect (find_button, "clicked",
                         G_CALLBACK (start_search), entry);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
       gtk_widget_show (find_button);
 
       cancel_button = gtk_button_new_with_label ("Cancel");
-      g_signal_connect (cancel_button, "clicked", 
+      g_signal_connect (cancel_button, "clicked",
                         G_CALLBACK (stop_search), NULL);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
       gtk_widget_show (cancel_button);
 
       /* Set up the search icon */
       search_by_name (NULL, GTK_ENTRY (entry));
-      
+
       /* Set up the clear icon */
-      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
-                                     GTK_ENTRY_ICON_SECONDARY, 
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
                                      GTK_STOCK_CLEAR);
       text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
 
-      g_signal_connect (entry, "icon-press", 
+      g_signal_connect (entry, "icon-press",
                         G_CALLBACK (icon_press_cb), NULL);
-      g_signal_connect (entry, "notify::text", 
+      g_signal_connect (entry, "notify::text",
                         G_CALLBACK (text_changed_cb), find_button);
-      g_signal_connect (entry, "activate", 
+      g_signal_connect (entry, "activate",
                         G_CALLBACK (activate_cb), NULL);
 
       /* Create the menu */
-      menu = gtk_menu_new ();
+      menu = create_search_menu (entry);
       gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
 
-      item = gtk_image_menu_item_new_with_label ("Search by name");
-      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by description");
-      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by file name");
-      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      gtk_widget_show_all (menu);
+      /* add accessible alternatives for icon functionality */
+      g_signal_connect (entry, "populate-popup",
+                        G_CALLBACK (entry_populate_popup), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {
@@ -279,5 +333,3 @@ do_search_entry (GtkWidget *do_widget)
 
   return window;
 }
-
-

demos/gtk-demo/sizegroup.c

@@ -158,7 +158,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (toggle_grouping), size_group);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/spinner.c

@@ -83,7 +83,7 @@ do_spinner (GtkWidget *do_widget)
     on_play_clicked (NULL, NULL);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/stock_browser.c

@@ -532,7 +532,7 @@ do_stock_browser (GtkWidget *do_widget)
 			NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/textscroll.c

@@ -191,7 +191,7 @@ do_textscroll (GtkWidget *do_widget)
       create_text_view (hbox, FALSE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/textview.c

@@ -500,7 +500,7 @@ do_textview (GtkWidget *do_widget)
       gtk_widget_show_all (vpaned);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/toolpalette.c

@@ -151,9 +151,9 @@ palette_drop_item (GtkToolItem      *drag_item,
 }
 
 static void
-palette_drop_group (GtkToolPalette *palette,
-                    GtkWidget      *drag_group,
-                    GtkWidget      *drop_group)
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
 {
   gint drop_position = -1;
 
@@ -173,8 +173,9 @@ palette_drag_data_received (GtkWidget        *widget,
                             guint             time,
                             gpointer          data)
 {
-  GtkWidget *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget *drag_item = NULL, *drop_group = NULL;
+  GtkToolItemGroup *drop_group = NULL;
+  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
+  GtkWidget        *drag_item = NULL;
 
   while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
     drag_palette = gtk_widget_get_parent (drag_palette);
@@ -188,10 +189,12 @@ palette_drag_data_received (GtkWidget        *widget,
     }
 
   if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette), drag_item, drop_group);
+    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
+                        GTK_TOOL_ITEM_GROUP (drag_item),
+                        drop_group);
   else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
     palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                       GTK_TOOL_ITEM_GROUP (drop_group),
+                       drop_group,
                        x - GTK_WIDGET (drop_group)->allocation.x,
                        y - GTK_WIDGET (drop_group)->allocation.y);
 }
@@ -613,7 +616,7 @@ do_toolpalette (GtkWidget *do_widget)
                                 gtk_label_new ("Interactive DnD Mode"));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/tree_store.c

@@ -438,7 +438,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/ui_manager.c

@@ -221,7 +221,7 @@ do_ui_manager (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK (gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);

docs/RELEASE-HOWTO

@@ -7,6 +7,7 @@ dependencies:
 * gtk-doc
 * docbook-utils
 Without those packages make distcheck will *not* pass.
+Make sure that gtk-doc is the latest released version.
 
 
  0) Go back to a pristine working directory. With git, this works:
@@ -101,7 +102,7 @@ Without those packages make distcheck will *not* pass.
     summary of changes.
 
 18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to gnome-hackers.
+    gtk-devel-list. Set reply-to to desktop-devel-list.
 
 19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web cvs module.
+    in the gtk-web git module.

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

@@ -186,4 +186,7 @@
       </address>
     </para>
   </appendix>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk/gdk-docs.sgml

@@ -107,5 +107,12 @@
   <index id="api-index-2-18" role="2.18">
     <title>Index of new symbols in 2.18</title>
     <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
+  <index id="api-index-2-20" role="2.20">
+    <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -1006,6 +1006,7 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
 
 <SUBSECTION>

docs/reference/gdk/tmpl/keys.sgml

@@ -34,7 +34,7 @@ When it makes sense, key values can be converted to and from
 Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 </para>
 
-<para>
+<para id="key-group-explanation">
 One #GdkKeymap object exists for each user display. gdk_keymap_get_default() 
 returns the #GdkKeymap for the default display; to obtain keymaps for other 
 displays, use gdk_keymap_get_for_display(). A keymap

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

docs/reference/gtk/building.sgml

@@ -244,17 +244,24 @@ How to compile GTK+ itself
 	<para>
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
-	  fonts and matching them against font names. 
+	  fonts and matching them against font names.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <ulink url="http://www.cairographics.org">Cairo</ulink>
-          is a graphics library that supports vector graphics and image 
+          is a graphics library that supports vector graphics and image
           compositing. Both Pango and GTK+ use cairo for much of their
           drawing.
         </para>
       </listitem>
+      <listitem>
+	<para>
+	  <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
+          is a framework for making introspection data available to
+          language bindings.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink> 
@@ -368,6 +375,9 @@ How to compile GTK+ itself
 	  <group>
 	    <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
 	  </group>
+          <group>
+	    <arg>--disable-introspection</arg>
+          </group>
 	</cmdsynopsis>
       </para>
 
@@ -580,7 +590,13 @@ How to compile GTK+ itself
           for the Linux framebuffer.
 	</para>
       </formalpara>
+      <formalpara>
+        <title><systemitem>--disable-introspection</systemitem></title>
 
+        <para>
+          Build without introspection support.
+        </para>
+      </formalpara>
     </refsect1>
 
 </refentry>

docs/reference/gtk/drawing-model.xml

@@ -443,7 +443,7 @@ my_widget_init (MyWidget *widget)
 {
   ...
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
+  gtk_widget_set_double_buffered (widget, FALSE);
 
   ...
 }

docs/reference/gtk/gtk-docs.sgml

@@ -150,6 +150,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkwindowgroup.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
+      <xi:include href="xml/gtkoffscreenwindow.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
@@ -293,6 +294,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkorientable.xml" />
+      <xi:include href="xml/gtkextendedlayout.xml" />
     </chapter>
 
     <chapter id="Ornaments">
@@ -499,4 +501,15 @@ 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>
+  <index id="api-index-3-0" role="3.0">
+    <title>Index of new symbols in 3.0</title>
+    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gtk/gtk-sections.txt

@@ -154,6 +154,7 @@ gtk_accel_label_accelerator_width
 <TITLE>GtkAccessible</TITLE>
 GtkAccessible
 gtk_accessible_connect_widget_destroyed
+gtk_accessible_get_widget
 
 <SUBSECTION Standard>
 GTK_ACCESSIBLE
@@ -1336,6 +1337,8 @@ gtk_entry_set_icon_tooltip_markup
 gtk_entry_get_icon_tooltip_markup
 gtk_entry_set_icon_drag_source
 gtk_entry_get_current_icon_drag_source
+gtk_entry_get_icon_window
+gtk_entry_get_text_window
 
 <SUBSECTION Standard>
 GTK_ENTRY
@@ -1372,7 +1375,9 @@ GTK_ENTRY_BUFFER_CLASS
 GTK_IS_ENTRY_BUFFER_CLASS
 GTK_ENTRY_BUFFER_GET_CLASS
 GTK_ENTRY_BUFFER_MAX_SIZE
+
 <SUBSECTION Private>
+GtkEntryBufferPrivate
 gtk_entry_buffer_get_type
 </SECTION>
 
@@ -2656,8 +2661,8 @@ GTK_IS_INFO_BAR_CLASS
 GTK_INFO_BAR_GET_CLASS
 
 <SUBSECTION Private>
+GtkInfoBarPrivate
 gtk_info_bar_get_type
-GtkMessageAreaPrivate
 </SECTION>
 
 <SECTION>
@@ -2853,6 +2858,7 @@ gtk_paned_get_child2
 gtk_paned_set_gutter_size
 gtk_paned_set_position
 gtk_paned_get_position
+gtk_paned_get_handle_window
 <SUBSECTION Standard>
 GTK_PANED
 GTK_IS_PANED
@@ -3098,6 +3104,13 @@ gtk_range_set_upper_stepper_sensitivity
 gtk_range_get_upper_stepper_sensitivity
 gtk_range_get_flippable
 gtk_range_set_flippable
+gtk_range_get_min_slider_size
+gtk_range_get_range_rect
+gtk_range_get_slider_range
+gtk_range_get_slider_size_fixed
+gtk_range_set_min_slider_size
+gtk_range_set_slider_size_fixed
+
 <SUBSECTION Standard>
 GTK_RANGE
 GTK_IS_RANGE
@@ -3608,6 +3621,7 @@ GtkSpinner
 gtk_spinner_new
 gtk_spinner_start
 gtk_spinner_stop
+
 <SUBSECTION Standard>
 GTK_SPINNER
 GTK_IS_SPINNER
@@ -3615,7 +3629,10 @@ GTK_TYPE_SPINNER
 GTK_SPINNER_CLASS
 GTK_IS_SPINER_CLASS
 GTK_SPINNER_GET_CLASS
+GTK_IS_SPINNER_CLASS
+
 <SUBSECTION Private>
+GtkSpinnerPrivate
 gtk_spinner_get_type
 </SECTION>
 
@@ -3674,6 +3691,7 @@ gtk_status_icon_set_has_tooltip
 gtk_status_icon_get_has_tooltip
 gtk_status_icon_set_title
 gtk_status_icon_get_title
+gtk_status_icon_set_name
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
 gtk_status_icon_set_blinking
@@ -4052,6 +4070,8 @@ gtk_text_view_new
 gtk_text_view_new_with_buffer
 gtk_text_view_set_buffer
 gtk_text_view_get_buffer
+gtk_text_view_get_hadjustment
+gtk_text_view_get_vadjustment
 gtk_text_view_scroll_to_mark
 gtk_text_view_scroll_to_iter
 gtk_text_view_scroll_mark_onscreen
@@ -4501,6 +4521,7 @@ gtk_tool_item_group_set_item_position
 gtk_tool_item_group_set_label
 gtk_tool_item_group_set_label_widget
 gtk_tool_item_group_set_header_relief
+
 <SUBSECTION Standard>
 GtkToolItemGroupClass
 GTK_TOOL_ITEM_GROUP
@@ -4509,7 +4530,9 @@ GTK_TYPE_TOOL_ITEM_GROUP
 GTK_TOOL_ITEM_GROUP_CLASS
 GTK_IS_TOOL_ITEM_GROUP_CLASS
 GTK_TOOL_ITEM_GROUP_GET_CLASS
+
 <SUBSECTION Private>
+GtkToolItemGroupPrivate
 gtk_tool_item_group_get_type
 </SECTION>
 
@@ -4652,6 +4675,7 @@ gtk_tree_path_append_index
 gtk_tree_path_prepend_index
 gtk_tree_path_get_depth
 gtk_tree_path_get_indices
+gtk_tree_path_get_indices_with_depth
 gtk_tree_path_free
 gtk_tree_path_copy
 gtk_tree_path_compare
@@ -5650,6 +5674,7 @@ gtk_widget_modify_text
 gtk_widget_modify_base
 gtk_widget_modify_font
 gtk_widget_modify_cursor
+gtk_widget_modify_symbolic_color
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
 gtk_widget_create_pango_layout
@@ -5672,9 +5697,11 @@ 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
+gtk_widget_style_attach
 gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_child_notify
@@ -5733,11 +5760,17 @@ gtk_widget_set_visible
 gtk_widget_has_default
 gtk_widget_has_focus
 gtk_widget_has_grab
+gtk_widget_has_rc_style
 gtk_widget_is_drawable
 gtk_widget_is_toplevel
 gtk_widget_set_window
 gtk_widget_set_receives_default
 gtk_widget_get_receives_default
+gtk_widget_set_realized
+gtk_widget_get_realized
+gtk_widget_set_mapped
+gtk_widget_get_mapped
+gtk_widget_get_requisition
 
 <SUBSECTION>
 gtk_requisition_copy
@@ -6665,6 +6698,7 @@ gtk_icon_info_get_base_size
 gtk_icon_info_get_filename
 gtk_icon_info_get_builtin_pixbuf
 gtk_icon_info_load_icon
+gtk_icon_info_load_symbolic
 gtk_icon_info_set_raw_coordinates
 gtk_icon_info_get_embedded_rect
 gtk_icon_info_get_attach_points
@@ -6810,6 +6844,8 @@ GTK_IS_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW_GET_IFACE
 GTK_TYPE_PRINT_OPERATION_PREVIEW
+GtkPrintOperationClass
+GtkPrintOperationPreviewIface
 
 <SUBSECTION Private>
 gtk_print_error_quark
@@ -7070,10 +7106,20 @@ gtk_paper_size_to_key_file
 
 <SUBSECTION Standard>
 GTK_TYPE_PAPER_SIZE
+GTK_CUSTOM_PAPER_UNIX_DIALOG
+GTK_CUSTOM_PAPER_UNIX_DIALOG_CLASS
+GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_CLASS
+GTK_IS_CUSTOM_PAPER_UNIX_DIALOG
+GTK_IS_CUSTOM_PAPER_UNIX_DIALOG_CLASS
+GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG
+GtkCustomPaperUnixDialog
+GtkCustomPaperUnixDialogClass
+
 
 <SUBSECTION Private>
 gtk_paper_size_get_type
 gtk_custom_paper_unix_dialog_get_type
+GtkCustomPaperUnixDialogPrivate
 </SECTION>
 
 
@@ -7241,6 +7287,7 @@ GTK_MOUNT_OPERATION_CLASS
 GTK_MOUNT_OPERATION_GET_CLASS
 GTK_TYPE_MOUNT_OPERATION
 <SUBSECTION Private>
+GtkMountOperationLookupContext
 gtk_mount_operation_get_type
 GtkMountOperationPrivate
 </SECTION>
@@ -7264,3 +7311,26 @@ GTK_TYPE_ORIENTABLE
 <SUBSECTION Private>
 gtk_orientable_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtkextendedlayout</FILE>
+<TITLE>GtkExtendedLayout</TITLE>
+GtkExtendedLayout
+GtkExtendedLayoutIface
+gtk_extended_layout_get_desired_height
+gtk_extended_layout_get_desired_size
+gtk_extended_layout_get_desired_width
+gtk_extended_layout_get_height_for_width
+gtk_extended_layout_get_width_for_height
+gtk_extended_layout_is_height_for_width
+
+<SUBSECTION Standard>
+GTK_EXTENDED_LAYOUT
+GTK_EXTENDED_LAYOUT_CLASS
+GTK_EXTENDED_LAYOUT_GET_IFACE
+GTK_IS_EXTENDED_LAYOUT
+GTK_TYPE_EXTENDED_LAYOUT
+
+<SUBSECTION Private>
+gtk_extended_layout_get_type
+</SECTION>

docs/reference/gtk/gtk.types

@@ -54,6 +54,7 @@ gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
 gtk_expander_get_type
+gtk_extended_layout_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
@@ -104,6 +105,7 @@ gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
+gtk_offscreen_window_get_type
 gtk_old_editable_get_type
 gtk_option_menu_get_type
 gtk_orientable_get_type

docs/reference/gtk/tmpl/.gitignore

@@ -0,0 +1,6 @@
+gtkbbox.sgml
+gtkbox.sgml
+gtkbuilder.sgml
+gtkhbox.sgml
+gtkmessagedialog.sgml
+gtktesting.sgml

docs/reference/gtk/tmpl/gtkaccellabel.sgml

@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAccelLabel
-
-<!-- ##### SECTION Short_Description ##### -->
-A label which displays an accelerator key on the right of the text
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAccelLabel widget is a subclass of #GtkLabel that also displays an
-accelerator key on the right of the label text, e.g. 'Ctl+S'.
-It is commonly used in menus to show the keyboard short-cuts for commands.
-</para>
-<para>
-The accelerator key to display is not set explicitly.
-Instead, the #GtkAccelLabel displays the accelerators which have been added to
-a particular widget. This widget is set by calling
-gtk_accel_label_set_accel_widget().
-</para>
-<para>
-For example, a #GtkMenuItem widget may have an accelerator added to emit the
-"activate" signal when the 'Ctl+S' key combination is pressed.
-A #GtkAccelLabel is created and added to the #GtkMenuItem, and
-gtk_accel_label_set_accel_widget() is called with the #GtkMenuItem as the
-second argument. The #GtkAccelLabel will now display 'Ctl+S' after its label.
-</para>
-<para>
-Note that creating a #GtkMenuItem with gtk_menu_item_new_with_label() (or
-one of the similar functions for #GtkCheckMenuItem and #GtkRadioMenuItem)
-automatically adds a #GtkAccelLabel to the #GtkMenuItem and calls
-gtk_accel_label_set_accel_widget() to set it up for you.
-</para>
-<para>
-A #GtkAccelLabel will only display accelerators which have %GTK_ACCEL_VISIBLE
-set (see #GtkAccelFlags).
-A #GtkAccelLabel can display multiple accelerators and even signal names,
-though it is almost always used to display just one accelerator key.
-</para>
-
-<example>
-<title>Creating a simple menu item with an accelerator key.</title>
-<programlisting>
-  GtkWidget *save_item;
-  GtkAccelGroup *accel_group;
-
-  /* Create a GtkAccelGroup and add it to the window. */
-  accel_group = gtk_accel_group_new (<!-- -->);
-  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-  /* Create the menu item using the convenience function. */
-  save_item = gtk_menu_item_new_with_label ("Save");
-  gtk_widget_show (save_item);
-  gtk_container_add (GTK_CONTAINER (menu), save_item);
-
-  /* Now add the accelerator to the GtkMenuItem. Note that since we called
-     gtk_menu_item_new_with_label(<!-- -->) to create the GtkMenuItem the
-     GtkAccelLabel is automatically set up to display the GtkMenuItem
-     accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. */
-  gtk_widget_add_accelerator (save_item, "activate", accel_group,
-                              GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term><link linkend="gtk-keyboard-accelerators">Keyboard Accelerators</link>
-</term>
-<listitem><para>installing and using keyboard short-cuts.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkItemFactory</term>
-<listitem><para>an easier way to create menus.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAccelLabel ##### -->
-<para>
-The #GtkAccelLabel-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkAccelLabel:accel-closure ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_accel_label_new ##### -->
-<para>
-Creates a new #GtkAccelLabel.
-</para>
-
-@string: the label string. Must be non-%NULL.
-@Returns: a new #GtkAccelLabel.
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_closure ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_closure: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_widget: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_width ##### -->
-<para>
-Returns the width needed to display the accelerator key(s).
-This is used by menus to align all of the #GtkMenuItem widgets, and shouldn't
-be needed by applications.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: the width needed to display the accelerator key(s).
-
-
-<!-- ##### FUNCTION gtk_accel_label_refetch ##### -->
-<para>
-Recreates the string representing the accelerator keys.
-This should not be needed since the string is automatically updated whenever
-accelerators are added or removed from the associated widget.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: always returns %FALSE.
-
-

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

@@ -1,210 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkButtonBox
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for GtkHButtonBox and GtkVButtonBox
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The primary purpose of this class is to keep track of the various properties
-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.
-</para>
-<para>
-The internal padding of buttons can be retrieved and changed per button box using
-gtk_button_box_get_child_ipadding() and gtk_button_box_set_child_ipadding()
-respectively.
-</para>
-<para>
-gtk_button_box_get_spacing() and gtk_button_box_set_spacing() retrieve and
-change default number of pixels between buttons, respectively.
-</para>
-<para>
-gtk_button_box_get_layout() and gtk_button_box_set_layout() retrieve and alter the method
-used to spread the buttons in a button box across the container, respectively.
-</para>
-
-<para>
-The main purpose of GtkButtonBox is to make sure the children have all the same size.
-Therefore it ignores the homogeneous property which it inherited from GtkBox, and always
-behaves as if homogeneous was %TRUE.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkVButtonBox</term>
-<listitem><para>Vertical sub-class of #GtkButtonBox.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkHButtonBox</term>
-<listitem><para>Horizontal sub-class of #GtkButtonBox.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkButtonBox ##### -->
-<para>
-This is a read-only struct; no members should be modified directly.
-</para>
-
-
-<!-- ##### ARG GtkButtonBox:layout-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButtonBox:secondary ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### MACRO GTK_BUTTONBOX_DEFAULT ##### -->
-<para>
-Used internally only.
-</para>
-
-
-
-<!-- ##### MACRO gtk_button_box_get_spacing ##### -->
-<para>
-Retrieves how much space a button box is placing between each child button.
-</para>
-
-@b: a #GtkButtonBox
-@Returns: the current spacing applied to the buttons in @widget
-@Deprecated: Use gtk_box_get_spacing() instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_get_layout ##### -->
-<para>
-Retrieves the method being used to arrange the buttons in a button box.
-</para>
-
-@widget: a #GtkButtonBox.
-@Returns: the method used to layout buttons in @widget.
-
-
-<!-- ##### FUNCTION gtk_button_box_get_child_size ##### -->
-<para>
-Retrieves the current width and height of all child widgets in a button box.
-@min_width and @min_height are filled with those values, respectively.
-</para>
-
-@widget: a #GtkButtonBox.
-@min_width: the width of the buttons contained by @widget.
-@min_height: the height of the buttons contained by @widget.
-@Deprecated: Use the style properties
-<literal>"child-min-width/-height"</literal> instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_get_child_ipadding ##### -->
-<para>
-Gets the default number of pixels that pad the buttons in a given button box.
-</para>
-
-@widget: a #GtkButtonBox.
-@ipad_x: the horizontal padding used by buttons in @widget.
-@ipad_y: the vertical padding used by buttons in @widget.
-@Deprecated: Use the style properties 
-  "<link linkend="GtkButtonBox--s-child-internal-pad-x">child-internal-pad-x</link>"
-  and
-  "<link linkend="GtkButtonBox--s-child-internal-pad-y">child-internal-pad-y</link>"
-  instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_get_child_secondary ##### -->
-<para>
-
-</para>
-
-@widget: 
-@child: 
-@Returns: 
-
-
-<!-- ##### MACRO gtk_button_box_set_spacing ##### -->
-<para>
-Sets the amount of spacing between buttons in a given button box.
-</para>
-
-@b: a #GtkButtonBox
-@s: the number of pixels of spacing
-@Deprecated: Use gtk_box_set_spacing() instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_set_layout ##### -->
-<para>
-Changes the way buttons are arranged in their container.
-</para>
-
-@widget: a #GtkButtonBox.
-@layout_style: the new layout style.
-
-
-<!-- ##### FUNCTION gtk_button_box_set_child_size ##### -->
-<para>
-Sets a new default size for the children of a given button box.
-</para>
-
-@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
-  "<link linkend="GtkButtonBox--s-child-min-width">child-min-width</link>"
-  and
-  "<link linkend="GtkButtonBox--s-child-min-height">child-min-height</link>"
-  instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_set_child_ipadding ##### -->
-<para>
-Changes the amount of internal padding used by all buttons in a given button
-box.
-</para>
-
-@widget: a #GtkButtonBox.
-@ipad_x: the horizontal padding that should be used by each button in @widget.
-@ipad_y: the vertical padding that should be used by each button in @widget.
-@Deprecated: Use the style properties
-<literal>"child-internal-pad-x/-y"</literal> instead.
-
-
-<!-- ##### FUNCTION gtk_button_box_set_child_secondary ##### -->
-<para>
-
-</para>
-
-@widget: 
-@child: 
-@is_secondary: 
-
-

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

@@ -156,6 +156,7 @@ a #GtkBindingEntry.
 @signals: 	action signals of this entry
 
 <!-- ##### STRUCT GtkBindingSignal ##### -->
+<anchor id="keybinding-signals"/>
 <para>
 A #GtkBindingSignal stores the necessary information to activate a widget
 in response to a key press via a signal emission.

docs/reference/gtk/tmpl/gtkbox.sgml

@@ -1,291 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkBox
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for box containers
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkBox is an abstract widget which encapsulates functionality for a
-particular kind of container, one that organizes a variable number of
-widgets into a rectangular area.  GtkBox has a number of derived
-classes, e.g. #GtkHBox and #GtkVBox.
-</para>
-<para>
-The rectangular area of a GtkBox is organized into either a single row
-or a single column of child widgets depending upon whether the box is
-of type #GtkHBox or #GtkVBox, respectively.  Thus, all children of a
-GtkBox are allocated one dimension in common, which is the height of a
-row, or the width of a column.
-</para>
-<para>
-GtkBox uses a notion of <emphasis>packing</emphasis>.  Packing refers to
-adding widgets with reference to a particular position in a
-#GtkContainer.  For a GtkBox, there are two reference positions: the
-<emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.  
-For a #GtkVBox, the start is defined as the top of the box and the end is
-defined as the bottom.  For a #GtkHBox the start is defined as the
-left side and the end is defined as the right side.
-</para>
-<para>
-Use repeated calls to gtk_box_pack_start() to pack widgets into a
-GtkBox from start to end.  Use gtk_box_pack_end() to add widgets from
-end to start.  You may intersperse these calls and add widgets from
-both ends of the same GtkBox.
-</para>
-<para>
-Use gtk_box_pack_start_defaults() or gtk_box_pack_end_defaults()
-to pack widgets into a GtkBox if you do not need to specify the
-#GtkBox:expand, #GtkBox:fill, or #GtkBox:padding child properties 
-for the child to be added.
-</para>
-<para>
-Because GtkBox is a #GtkContainer, you may also use
-gtk_container_add() to insert widgets into the box, and they will be
-packed as if with gtk_box_pack_start_defaults().  Use
-gtk_container_remove() to remove widgets from the GtkBox.
-</para>
-<para>
-Use gtk_box_set_homogeneous() to specify whether or not all children
-of the GtkBox are forced to get the same amount of space.
-</para>
-<para>
-Use gtk_box_set_spacing() to determine how much space will be
-minimally placed between all children in the GtkBox.
-</para>
-<para>
-Use gtk_box_reorder_child() to move a GtkBox child to a different
-place in the box.
-</para>
-<para>
-Use gtk_box_set_child_packing() to reset the #GtkBox:expand, 
-#GtkBox:fill and #GtkBox:padding child properties.
-Use gtk_box_query_child_packing() to query these fields.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkHBox</term>
-<listitem><para>a derived class that organizes widgets into a row.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkVBox</term>
-<listitem><para>a derived class that organizes widgets into a column.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkFrame</term>
-<listitem><para>a #GtkWidget useful for drawing a border around a GtkBox.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkTable</term>
-<listitem><para>a #GtkContainer for organizing widgets into a grid,
-rather than independent rows or columns.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkLayout</term>
-<listitem><para>a #GtkContainer for organizing widgets into arbitrary
-layouts.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkBox ##### -->
-<para>
-The #GtkBox-struct describes an instance of GtkBox and contains the 
-following fields.  (These fields should be considered read-only. 
-They should never be set by an application.)
-</para>
-
-
-<!-- ##### ARG GtkBox:homogeneous ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:expand ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:fill ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:pack-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkBox:position ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkBoxChild ##### -->
-<para>
-The #GtkBoxChild-struct holds a child widget of GtkBox and describes
-how the child is to be packed into the GtkBox.  Use
-gtk_box_query_child_packing() and gtk_box_set_child_packing() to query
-and reset the <structfield>padding</structfield>,
-<structfield>expand</structfield>, <structfield>fill</structfield>,
-and <structfield>pack</structfield> fields.
-</para>
-<para>
-#GtkBoxChild-struct contains the following fields.  (These fields
-should be considered read-only. They should never be directly set by an
-application.)
-</para>
-
-@widget: the child widget, packed into the GtkBox.
-@padding: the number of extra pixels to put between this child and its
-  neighbors, set when packed, zero by default.
-@expand: flag indicates whether extra space should be given to this
-  child. Any extra space given to the parent GtkBox is divided up 
-  among all children with this attribute set to %TRUE; set when packed, 
-  %TRUE by default.
-@fill: flag indicates whether any extra space given to this child due 
-  to its @expand attribute being set is actually allocated to the child, 
-  rather than being used as padding around the widget; set when packed, 
-  %TRUE by default.
-@pack: one of #GtkPackType indicating whether the child is packed with 
-  reference to the start (top/left) or end (bottom/right) of the GtkBox.
-@is_secondary: %TRUE if the child is secondary
-
-<!-- ##### FUNCTION gtk_box_pack_start ##### -->
-<para>
-
-</para>
-
-@box: 
-@child: 
-@expand: 
-@box
-@fill: 
-@padding: 
-
-
-<!-- ##### FUNCTION gtk_box_pack_end ##### -->
-<para>
-
-</para>
-
-@box: 
-@child: 
-@expand: 
-@fill: 
-@padding: 
-
-
-<!-- ##### FUNCTION gtk_box_pack_start_defaults ##### -->
-<para>
-
-</para>
-
-@box: 
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_box_pack_end_defaults ##### -->
-<para>
-
-</para>
-
-@box: 
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_box_get_homogeneous ##### -->
-<para>
-
-</para>
-
-@box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_box_set_homogeneous ##### -->
-<para>
-
-</para>
-
-@box: 
-@homogeneous: 
-
-
-<!-- ##### FUNCTION gtk_box_get_spacing ##### -->
-<para>
-
-</para>
-
-@box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_box_set_spacing ##### -->
-<para>
-
-</para>
-
-@box: 
-@spacing: 
-
-
-<!-- ##### FUNCTION gtk_box_reorder_child ##### -->
-<para>
-
-</para>
-
-@box: 
-@child: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_box_query_child_packing ##### -->
-<para>
-
-</para>
-
-@box: 
-@child: 
-@expand: 
-@fill: 
-@padding: 
-@pack_type: 
-
-
-<!-- ##### FUNCTION gtk_box_set_child_packing ##### -->
-<para>
-
-</para>
-
-@box: 
-@child: 
-@expand: 
-@fill: 
-@padding: 
-@pack_type: 
-
-

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

@@ -1,456 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkBuilder
-
-<!-- ##### SECTION Short_Description ##### -->
-Build an interface from an XML UI definition
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A GtkBuilder is an auxiliary object that reads textual descriptions
-of a user interface and instantiates the described objects. To pass a
-description to a GtkBuilder, call gtk_builder_add_from_file() or
-gtk_builder_add_from_string(). These functions can be called multiple
-times; the builder merges the content of all descriptions.
-</para>
-<para>
-A GtkBuilder holds a reference to all objects that it has constructed
-and drops these references when it is finalized. This finalization can
-cause the destruction of non-widget objects or widgets which are not
-contained in a toplevel window. For toplevel windows constructed by a
-builder, it is the responsibility of the user to call gtk_widget_destroy()
-to get rid of them and all the widgets they contain.
-</para>
-<para>
-The functions gtk_builder_get_object() and gtk_builder_get_objects()
-can be used to access the widgets in the interface by the names assigned
-to them inside the UI description. Toplevel windows returned by these
-functions will stay around until the user explicitly destroys them
-with gtk_widget_destroy(). Other widgets will either be part of a
-larger hierarchy constructed by the builder (in which case you should
-not have to worry about their lifecycle), or without a parent, in which
-case they have to be added to some container to make use of them.
-Non-widget objects need to be reffed with g_object_ref() to keep them
-beyond the lifespan of the builder.
-</para>
-<para>
-The function gtk_builder_connect_signals() and variants thereof can be
-used to connect handlers to the named signals in the description.
-</para>
-
-<refsect2 id="BUILDER-UI"><title>GtkBuilder UI Definitions</title>
-<para>
-GtkBuilder parses textual descriptions of user interfaces which
-are specified in an XML format which can be roughly described
-by the DTD below. We refer to these descriptions as
-<firstterm>GtkBuilder UI definitions</firstterm> or just
-<firstterm>UI definitions</firstterm> if the context is clear.
-Do not confuse GtkBuilder UI Definitions with
-<link linkend="XML-UI">GtkUIManager UI Definitions</link>,
-which are more limited in scope.
-</para>
-<para>
-<programlisting><![CDATA[
-<!ELEMENT interface (requires|object)* >
-<!ELEMENT object    (property|signal|child|ANY)* >
-<!ELEMENT property  PCDATA >
-<!ELEMENT signal    EMPTY >
-<!ELEMENT requires  EMPTY >
-<!ELEMENT child     (object|ANY*) >
-
-<!ATTLIST interface  domain         	    #IMPLIED >
-<!ATTLIST object     id             	    #REQUIRED
-                     class          	    #REQUIRED
-                     type-func      	    #IMPLIED
-                     constructor    	    #IMPLIED >
-<!ATTLIST requires   lib             	    #REQUIRED
-                     version          	    #REQUIRED >
-<!ATTLIST property   name           	    #REQUIRED
-                     translatable   	    #IMPLIED
-                     comments               #IMPLIED
-                     context                #IMPLIED >
-<!ATTLIST signal     name           	    #REQUIRED
-                     handler        	    #REQUIRED
-                     after          	    #IMPLIED
-                     swapped        	    #IMPLIED
-                     object         	    #IMPLIED
-                     last_modification_time #IMPLIED >
-<!ATTLIST child      type           	    #IMPLIED
-                     internal-child 	    #IMPLIED >
-]]></programlisting>
-</para>
-<para>
-The toplevel element is &lt;interface&gt;.
-It optionally takes a "domain" attribute, which will make
-the builder look for translated strings using dgettext() in the
-domain specified. This can also be done by calling
-gtk_builder_set_translation_domain() on the builder.
-Objects are described by &lt;object&gt; elements, which can
-contain &lt;property&gt; elements to set properties, &lt;signal&gt;
-elements which connect signals to handlers, and &lt;child&gt;
-elements, which describe child objects (most often widgets
-inside a container, but also e.g. actions in an action group,
-or columns in a tree model). A &lt;child&gt; element contains
-an &lt;object&gt; element which describes the child object.
-The target toolkit version(s) are described by &lt;requires&gt;
-elements, the "lib" attribute specifies the widget library in
-question (currently the only supported value is "gtk+") and the "version"
-attribute specifies the target version in the form "&lt;major&gt;.&lt;minor&gt;".
-The builder will error out if the version requirements are not met.
-</para>
-<para>
-Typically, the specific kind of object represented by an
-&lt;object&gt; element is specified by the "class" attribute.
-If the type has not been loaded yet, GTK+ tries to find the
-<function>_get_type()</function> from the class name by applying
-heuristics. This works in most cases, but if necessary, it is
-possible to specify the name of the <function>_get_type()</function>
-explictly with the "type-func" attribute. As a special case,
-GtkBuilder allows to use an object that has been constructed
-by a #GtkUIManager in another part of the UI definition by
-specifying the id of the #GtkUIManager in the "constructor"
-attribute and the name of the object in the "id" attribute.
-</para>
-<para>
-Objects must be given a name with the "id" attribute, which
-allows the application to retrieve them from the builder with
-gtk_builder_get_object(). An id is also necessary to use the
-object as property value in other parts of the UI definition.
-</para>
-<para>
-Setting properties of objects is pretty straightforward with
-the &lt;property&gt; element: the "name" attribute specifies
-the name of the property, and the content of the element
-specifies the value. If the "translatable" attribute is
-set to a true value, GTK+ uses gettext() (or dgettext() if
-the builder has a translation domain set) to find a translation
-for the value. This happens before the value is parsed, so
-it can be used for properties of any type, but it is probably
-most useful for string properties. It is also possible to
-specify a context to disambiguate short strings, and comments
-which may help the translators.
-</para>
-<para>
-GtkBuilder can parse textual representations for the most
-common property types: characters, strings, integers, floating-point
-numbers, booleans (strings like "TRUE", "t", "yes", "y", "1" are
-interpreted as %TRUE, strings like "FALSE, "f", "no", "n", "0" are
-interpreted as %FALSE), enumerations (can be specified by their
-name, nick or integer value), flags (can be specified by their name,
-nick, integer value, optionally combined with "|", e.g.
-"GTK_VISIBLE|GTK_REALIZED")  and colors (in a format understood by
-gdk_color_parse()). Objects can be referred to by their name.
-Pixbufs can be specified as a filename of an image file to load.
-In general, GtkBuilder allows forward references to objects &mdash;
-an object doesn't have to constructed before it can be referred to.
-The exception to this rule is that an object has to be constructed
-before it can be used as the value of a construct-only property.
-</para>
-<para>
-Signal handlers are set up with the &lt;signal&gt; element.
-The "name" attribute specifies the name of the signal, and the
-"handler" attribute specifies the function to connect to the signal.
-By default, GTK+ tries to find the handler using g_module_symbol(),
-but this can be changed by passing a custom #GtkBuilderConnectFunc
-to gtk_builder_connect_signals_full(). The remaining attributes,
-"after", "swapped" and "object", have the same meaning as the
-corresponding parameters of the g_signal_connect_object() or
-g_signal_connect_data() functions. A "last_modification_time" attribute
-is also allowed, but it does not have a meaning to the builder.
-</para>
-<para>
-Sometimes it is necessary to refer to widgets which have implicitly
-been constructed by GTK+ as part of a composite widget, to set
-properties on them or to add further children (e.g. the @vbox
-of a #GtkDialog). This can be achieved by setting the "internal-child"
-propery of the &lt;child&gt; element to a true value. Note that
-GtkBuilder still requires an &lt;object&gt; element for the internal
-child, even if it has already been constructed.
-</para>
-<para>
-A number of widgets have different places where a child can be
-added (e.g. tabs vs. page content in notebooks). This can be reflected
-in a UI definition by specifying the "type" attribute on a &lt;child&gt;
-The possible values for the "type" attribute are described in
-the sections describing the widget-specific portions of UI definitions.
-</para>
-<example>
-<title>A GtkBuilder UI Definition</title>
-<programlisting><![CDATA[
-<interface>
-  <object class="GtkDialog" id="dialog1">
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="vbox1">
-        <property name="border-width">10</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="border-width">20</property>
-            <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use-stock">TRUE</property>
-                <signal name="clicked" handler="ok_button_clicked"/>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
-]]></programlisting>
-</example>
-<para>
-Beyond this general structure, several object classes define
-their own XML DTD fragments for filling in the ANY placeholders
-in the DTD above. Note that a custom element in a &lt;child&gt;
-element gets parsed by the custom tag handler of the parent
-object, while a custom element in an &lt;object&gt; element
-gets parsed by the custom tag handler of the object.
-</para>
-<para>
-These XML fragments are explained in the documentation of the
-respective objects, see
-<link linkend="GtkWidget-BUILDER-UI">GtkWidget</link>,
-<link linkend="GtkLabel-BUILDER-UI">GtkLabel</link>,
-<link linkend="GtkWindow-BUILDER-UI">GtkWindow</link>,
-<link linkend="GtkContainer-BUILDER-UI">GtkContainer</link>,
-<link linkend="GtkDialog-BUILDER-UI">GtkDialog</link>,
-<link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link>,
-<link linkend="GtkColorSelectionDialog-BUILDER-UI">GtkColorSelectionDialog</link>,
-<link linkend="GtkFontSelectionDialog-BUILDER-UI">GtkFontSelectionDialog</link>,
-<link linkend="GtkComboBoxEntry-BUILDER-UI">GtkComboBoxEntry</link>,
-<link linkend="GtkExpander-BUILDER-UI">GtkExpander</link>,
-<link linkend="GtkFrame-BUILDER-UI">GtkFrame</link>,
-<link linkend="GtkListStore-BUILDER-UI">GtkListStore</link>,
-<link linkend="GtkTreeStore-BUILDER-UI">GtkTreeStore</link>,
-<link linkend="GtkNotebook-BUILDER-UI">GtkNotebook</link>,
-<link linkend="GtkSizeGroup-BUILDER-UI">GtkSizeGroup</link>,
-<link linkend="GtkTreeView-BUILDER-UI">GtkTreeView</link>,
-<link linkend="GtkUIManager-BUILDER-UI">GtkUIManager</link>,
-<link linkend="GtkActionGroup-BUILDER-UI">GtkActionGroup</link>.
-<link linkend="GtkMenuItem-BUILDER-UI">GtkMenuItem</link>,
-<link linkend="GtkAssistant-BUILDER-UI">GtkAssistant</link>,
-<link linkend="GtkScale-BUILDER-UI">GtkScale</link>.
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkBuilder ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkBuilder:translation-domain ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION GtkBuilderConnectFunc ##### -->
-<para>
-
-</para>
-
-@builder: 
-@object: 
-@signal_name: 
-@handler_name: 
-@connect_object: 
-@flags: 
-@user_data: 
-
-
-<!-- ##### ENUM GtkBuilderError ##### -->
-<para>
-Error codes that identify various errors that can occur while
-using #GtkBuilder.
-</para>
-
-@GTK_BUILDER_ERROR_INVALID_TYPE_FUNCTION: A type-func attribute didn't name
-    a function that returns a #GType.
-@GTK_BUILDER_ERROR_UNHANDLED_TAG: The input contained a tag that #GtkBuilder
-    can't handle.
-@GTK_BUILDER_ERROR_MISSING_ATTRIBUTE: An attribute that is required by
-    #GtkBuilder was missing.
-@GTK_BUILDER_ERROR_INVALID_ATTRIBUTE: #GtkBuilder found an attribute that 
-    it doesn't understand.
-@GTK_BUILDER_ERROR_INVALID_TAG: #GtkBuilder found a tag that
-    it doesn't understand.
-@GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE: A required property value was 
-    missing.
-@GTK_BUILDER_ERROR_INVALID_VALUE: #GtkBuilder couldn't parse
-    some attribute value.
-@GTK_BUILDER_ERROR_VERSION_MISMATCH: The input file requires a newer version
-    of GTK+.
-@GTK_BUILDER_ERROR_DUPLICATE_ID: An object id occurred twice.
-
-<!-- ##### FUNCTION gtk_builder_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_add_from_file ##### -->
-<para>
-
-</para>
-
-@builder: 
-@filename: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_add_from_string ##### -->
-<para>
-
-</para>
-
-@builder: 
-@buffer: 
-@length: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_add_objects_from_file ##### -->
-<para>
-
-</para>
-
-@builder: 
-@filename: 
-@object_ids: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_add_objects_from_string ##### -->
-<para>
-
-</para>
-
-@builder: 
-@buffer: 
-@length: 
-@object_ids: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_get_object ##### -->
-<para>
-
-</para>
-
-@builder: 
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_get_objects ##### -->
-<para>
-
-</para>
-
-@builder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_connect_signals ##### -->
-<para>
-
-</para>
-
-@builder: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_builder_connect_signals_full ##### -->
-<para>
-
-</para>
-
-@builder: 
-@func: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_builder_set_translation_domain ##### -->
-<para>
-
-</para>
-
-@builder: 
-@domain: 
-
-
-<!-- ##### FUNCTION gtk_builder_get_translation_domain ##### -->
-<para>
-
-</para>
-
-@builder: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_get_type_from_name ##### -->
-<para>
-
-</para>
-
-@builder: 
-@type_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_value_from_string ##### -->
-<para>
-
-</para>
-
-@builder: 
-@pspec: 
-@string: 
-@value: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_builder_value_from_string_type ##### -->
-<para>
-
-</para>
-
-@builder: 
-@type: 
-@string: 
-@value: 
-@error: 
-@Returns: 
-
-
-<!-- ##### MACRO GTK_BUILDER_WARN_INVALID_CHILD_TYPE ##### -->
-<para>
-This macro should be used to emit a warning about and unexpected 
-@type value in a #GtkBuildable add_child implementation.
-</para>
-
-@object: the #GtkBuildable on which the warning ocurred
-@type: the unexpected type value
-
-
-<!-- ##### MACRO GTK_BUILDER_ERROR ##### -->
-<para>
-The #GError quark for #GtkBuilder errors
-</para>
-
-
-

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -6,100 +6,107 @@ Base class for widgets which contain other widgets
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-A GTK+ user interface is constructed by nesting widgets inside widgets. 
-Container widgets are the inner nodes in the resulting tree of widgets: 
-they contain other widgets. So, for example, you might have a #GtkWindow 
-containing a #GtkFrame containing a GtkLabel. If you wanted an image instead 
-of a textual label inside the frame, you might replace the #GtkLabel widget 
+A GTK+ user interface is constructed by nesting widgets inside widgets.
+Container widgets are the inner nodes in the resulting tree of widgets:
+they contain other widgets. So, for example, you might have a #GtkWindow
+containing a #GtkFrame containing a GtkLabel. If you wanted an image instead
+of a textual label inside the frame, you might replace the #GtkLabel widget
 with a #GtkImage widget.
 </para>
 <para>
-There are two major kinds of container widgets in GTK+. Both are subclasses 
+There are two major kinds of container widgets in GTK+. Both are subclasses
 of the abstract #GtkContainer base class.
 </para>
 <para>
-The first type of container widget has a single child widget and derives 
-from #GtkBin. These containers are <firstterm>decorators</firstterm>, which 
-add some kind of functionality to the child. For example, a #GtkButton makes 
-its child into a clickable button; a #GtkFrame draws a frame around its child 
+The first type of container widget has a single child widget and derives
+from #GtkBin. These containers are <firstterm>decorators</firstterm>, which
+add some kind of functionality to the child. For example, a #GtkButton makes
+its child into a clickable button; a #GtkFrame draws a frame around its child
 and a #GtkWindow places its child widget inside a top-level window.
 </para>
 <para>
-The second type of container can have more than one child; its purpose is to 
-manage <firstterm>layout</firstterm>. This means that these containers assign 
-sizes and positions to their children. For example, a #GtkHBox arranges its 
-children in a horizontal row, and a #GtkTable arranges the widgets it contains 
-in a two-dimensional grid. 
+The second type of container can have more than one child; its purpose is to
+manage <firstterm>layout</firstterm>. This means that these containers assign
+sizes and positions to their children. For example, a #GtkHBox arranges its
+children in a horizontal row, and a #GtkTable arranges the widgets it contains
+in a two-dimensional grid.
 </para>
 <para>
-To fulfill its task, a layout container must negotiate the size requirements 
-with its parent and its children. This negotiation is carried out in two 
-phases, <firstterm>size requisition</firstterm> and <firstterm>size 
-allocation</firstterm>. 
+To fulfill its task, a layout container must negotiate the size requirements
+with its parent and its children. The basic form of this negotiation is
+carried out in two phases, <firstterm>size requisition</firstterm> and
+<firstterm>size allocation</firstterm>, which are implemented by the
+size_request() and size_allocate() virtual functions in #GtkWidget.
+</para>
+<para>
+GTK+ also supports a more complicated form of size negotiation called
+<firstterm>width-for-height</firstterm> (and its dual
+<firstterm>height-for-width</firstterm>). See #GtkExtendedLayout
+to learn more about width-for-height geometry management.
 </para>
 <refsect2 id="size-requisition"><title>Size Requisition</title>
 <para>
-The size requisition of a widget is it's desired width and height. 
+The size requisition of a widget is it's desired width and height.
 This is represented by a #GtkRequisition.
 </para>
 <para>
-How a widget determines its desired size depends on the widget. 
-A #GtkLabel, for example, requests enough space to display all its text. 
-Container widgets generally base their size request on the requisitions 
-of their children.  
+How a widget determines its desired size depends on the widget.
+A #GtkLabel, for example, requests enough space to display all its text.
+Container widgets generally base their size request on the requisitions
+of their children.
 </para>
 <para>
-The size requisition phase of the widget layout process operates top-down. 
-It starts at a top-level widget, typically a #GtkWindow. The top-level widget 
-asks its child for its size requisition by calling gtk_widget_size_request(). 
-To determine its requisition, the child asks its own children for their 
-requisitions and so on. Finally, the top-level widget will get a requisition 
-back from its child. 
+The size requisition phase of the widget layout process operates top-down.
+It starts at a top-level widget, typically a #GtkWindow. The top-level widget
+asks its child for its size requisition by calling gtk_widget_size_request().
+To determine its requisition, the child asks its own children for their
+requisitions and so on. Finally, the top-level widget will get a requisition
+back from its child.
 </para>
 </refsect2>
 <refsect2 id="size-allocation"><title>Size Allocation</title>
 <para>
-When the top-level widget has determined how much space its child would like 
-to have, the second phase of the size negotiation, size allocation, begins. 
-Depending on its configuration (see gtk_window_set_resizable()), the top-level 
-widget may be able to expand in order to satisfy the size request or it may 
-have to ignore the size request and keep its fixed size. It then tells its 
-child widget how much space it gets by calling gtk_widget_size_allocate(). 
-The child widget divides the space among its children and tells each child 
-how much space it got, and so on. Under normal circumstances, a #GtkWindow 
+When the top-level widget has determined how much space its child would like
+to have, the second phase of the size negotiation, size allocation, begins.
+Depending on its configuration (see gtk_window_set_resizable()), the top-level
+widget may be able to expand in order to satisfy the size request or it may
+have to ignore the size request and keep its fixed size. It then tells its
+child widget how much space it gets by calling gtk_widget_size_allocate().
+The child widget divides the space among its children and tells each child
+how much space it got, and so on. Under normal circumstances, a #GtkWindow
 will always give its child the amount of space the child requested.
 </para>
 <para>
-A child's size allocation is represented by a #GtkAllocation. This struct 
-contains not only a width and height, but also a position (i.e. X and Y 
+A child's size allocation is represented by a #GtkAllocation. This struct
+contains not only a width and height, but also a position (i.e. X and Y
 coordinates), so that containers can tell their children not only how much
-space they have gotten, but also where they are positioned inside the space 
-available to the container. 
+space they have gotten, but also where they are positioned inside the space
+available to the container.
 </para>
 <para>
-Widgets are required to honor the size allocation they receive; a size 
+Widgets are required to honor the size allocation they receive; a size
 request is only a request, and widgets must be able to cope with any size.
 </para>
 </refsect2>
 <refsect2 id="child-properties"><title>Child properties</title>
 <para>
-<structname>GtkContainer</structname> introduces <firstterm>child 
+<structname>GtkContainer</structname> introduces <firstterm>child
 properties</firstterm> - these are object properties that are not specific
 to either the container or the contained widget, but rather to their relation.
 Typical examples of child properties are the position or pack-type of a widget
 which is contained in a #GtkBox.</para>
 <para>
-Use gtk_container_class_install_child_property() to install child properties 
+Use gtk_container_class_install_child_property() to install child properties
 for a container class and gtk_container_class_find_child_property() or
 gtk_container_class_list_child_properties() to get information about existing
 child properties.
 </para>
 <para>
-To set the value of a child property, use gtk_container_child_set_property(), 
-gtk_container_child_set() or gtk_container_child_set_valist(). 
-To obtain the value of a child property, use 
+To set the value of a child property, use gtk_container_child_set_property(),
+gtk_container_child_set() or gtk_container_child_set_valist().
+To obtain the value of a child property, use
 gtk_container_child_get_property(), gtk_container_child_get() or
-gtk_container_child_get_valist(). To emit notification about child property 
+gtk_container_child_get_valist(). To emit notification about child property
 changes, use gtk_widget_child_notify().
 </para>
 </refsect2>
@@ -107,7 +114,7 @@ changes, use gtk_widget_child_notify().
 <refsect2 id="GtkContainer-BUILDER-UI">
 <title>GtkContainer as GtkBuildable</title>
 <para>
-The GtkContainer implementation of the GtkBuildable interface 
+The GtkContainer implementation of the GtkBuildable interface
 supports a &lt;packing&gt; element for children, which can
 contain multiple &lt;property&gt; elements that specify
 child properties for the child.
@@ -152,7 +159,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget: 
+@widget:
 
 <!-- ##### SIGNAL GtkContainer::check-resize ##### -->
 <para>
@@ -167,7 +174,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget: 
+@widget:
 
 <!-- ##### SIGNAL GtkContainer::set-focus-child ##### -->
 <para>
@@ -175,7 +182,7 @@ for regular properties.
 </para>
 
 @container: the object which received the signal.
-@widget: 
+@widget:
 
 <!-- ##### ARG GtkContainer:border-width ##### -->
 <para>
@@ -197,7 +204,7 @@ for regular properties.
 
 </para>
 
-@widget: 
+@widget:
 
 
 <!-- ##### MACRO GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID ##### -->
@@ -206,7 +213,7 @@ This macro should be used to emit a standard warning about unexpected
 properties in set_child_property() and get_child_property() implementations.
 </para>
 
-@object: the #GObject on which set_child_property() or get_child_property() 
+@object: the #GObject on which set_child_property() or get_child_property()
    was called
 @property_id: the numeric id of the property
 @pspec: the #GParamSpec of the property
@@ -225,8 +232,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@widget: 
+@container:
+@widget:
 
 
 <!-- ##### FUNCTION gtk_container_remove ##### -->
@@ -234,8 +241,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@widget: 
+@container:
+@widget:
 
 
 <!-- ##### FUNCTION gtk_container_add_with_properties ##### -->
@@ -243,10 +250,10 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@widget: 
-@first_prop_name: 
-@Varargs: 
+@container:
+@widget:
+@first_prop_name:
+@Varargs:
 
 
 <!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
@@ -254,8 +261,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_resize_mode ##### -->
@@ -263,8 +270,8 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@resize_mode: 
+@container:
+@resize_mode:
 
 
 <!-- ##### FUNCTION gtk_container_check_resize ##### -->
@@ -272,7 +279,7 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
+@container:
 
 
 <!-- ##### FUNCTION gtk_container_foreach ##### -->
@@ -280,9 +287,9 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@callback: 
-@callback_data: 
+@container:
+@callback:
+@callback_data:
 
 
 <!-- ##### FUNCTION gtk_container_foreach_full ##### -->
@@ -290,11 +297,11 @@ Does the same as gtk_container_set_border_width().
 
 </para>
 
-@container: 
-@callback: 
-@marshal: 
-@callback_data: 
-@notify: 
+@container:
+@callback:
+@marshal:
+@callback_data:
+@notify:
 @Deprecated: Use gtk_container_foreach() instead.
 
 
@@ -311,8 +318,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
@@ -320,8 +327,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@needs_redraws: 
+@container:
+@needs_redraws:
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_child ##### -->
@@ -329,8 +336,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_child ##### -->
@@ -338,8 +345,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
+@container:
+@child:
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_vadjustment ##### -->
@@ -347,8 +354,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
@@ -356,8 +363,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@adjustment: 
+@container:
+@adjustment:
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_hadjustment ##### -->
@@ -365,8 +372,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
@@ -374,8 +381,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@adjustment: 
+@container:
+@adjustment:
 
 
 <!-- ##### FUNCTION gtk_container_resize_children ##### -->
@@ -383,7 +390,7 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
+@container:
 
 
 <!-- ##### FUNCTION gtk_container_child_type ##### -->
@@ -391,8 +398,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_child_get ##### -->
@@ -400,10 +407,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@first_prop_name: 
-@Varargs: 
+@container:
+@child:
+@first_prop_name:
+@Varargs:
 
 
 <!-- ##### FUNCTION gtk_container_child_set ##### -->
@@ -411,10 +418,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@first_prop_name: 
-@Varargs: 
+@container:
+@child:
+@first_prop_name:
+@Varargs:
 
 
 <!-- ##### FUNCTION gtk_container_child_get_property ##### -->
@@ -422,10 +429,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@property_name: 
-@value: 
+@container:
+@child:
+@property_name:
+@value:
 
 
 <!-- ##### FUNCTION gtk_container_child_set_property ##### -->
@@ -433,10 +440,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@property_name: 
-@value: 
+@container:
+@child:
+@property_name:
+@value:
 
 
 <!-- ##### FUNCTION gtk_container_child_get_valist ##### -->
@@ -444,10 +451,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@first_property_name: 
-@var_args: 
+@container:
+@child:
+@first_property_name:
+@var_args:
 
 
 <!-- ##### FUNCTION gtk_container_child_set_valist ##### -->
@@ -455,10 +462,10 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@first_property_name: 
-@var_args: 
+@container:
+@child:
+@first_property_name:
+@var_args:
 
 
 <!-- ##### FUNCTION gtk_container_forall ##### -->
@@ -466,9 +473,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@callback: 
-@callback_data: 
+@container:
+@callback:
+@callback_data:
 
 
 <!-- ##### FUNCTION gtk_container_get_border_width ##### -->
@@ -476,8 +483,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@Returns: 
+@container:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_border_width ##### -->
@@ -485,8 +492,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@border_width: 
+@container:
+@border_width:
 
 
 <!-- ##### FUNCTION gtk_container_propagate_expose ##### -->
@@ -494,9 +501,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@child: 
-@event: 
+@container:
+@child:
+@event:
 
 
 <!-- ##### FUNCTION gtk_container_get_focus_chain ##### -->
@@ -504,9 +511,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@focusable_widgets: 
-@Returns: 
+@container:
+@focusable_widgets:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_set_focus_chain ##### -->
@@ -514,8 +521,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
-@focusable_widgets: 
+@container:
+@focusable_widgets:
 
 
 <!-- ##### FUNCTION gtk_container_unset_focus_chain ##### -->
@@ -523,7 +530,7 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@container: 
+@container:
 
 
 <!-- ##### FUNCTION gtk_container_class_find_child_property ##### -->
@@ -531,9 +538,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass: 
-@property_name: 
-@Returns: 
+@cclass:
+@property_name:
+@Returns:
 
 
 <!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
@@ -541,9 +548,9 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass: 
-@property_id: 
-@pspec: 
+@cclass:
+@property_id:
+@pspec:
 
 
 <!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
@@ -551,8 +558,8 @@ Does the same as gtk_container_get_children().
 
 </para>
 
-@cclass: 
-@n_properties: 
-@Returns: 
+@cclass:
+@n_properties:
+@Returns:
 
 

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -348,17 +348,14 @@ a widget.
 
 <!-- ##### FUNCTION gtk_drag_source_set ##### -->
 <para>
-Sets up a widget so that GTK+ will start a drag
-operation when the user clicks and drags on the
-widget. The widget must have a window.
+
 </para>
 
-@widget: a #GtkWidget
-@start_button_mask: the bitmask of buttons that can start the drag
-@targets: the table of targets that the drag will support
-@n_targets: the number of items in @targets
-@actions: the bitmask of possible actions for a drag from this
- widget.
+@widget:
+@start_button_mask:
+@targets:
+@n_targets:
+@actions:
 
 
 <!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->

docs/reference/gtk/tmpl/gtkdrawingarea.sgml

@@ -56,7 +56,7 @@ gboolean
 expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   gdk_draw_arc (widget->window,
-                widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                widget->style->fg_gc[gtk_widget_get_state (widget)],
                 TRUE,
                 0, 0, widget->allocation.width, widget->allocation.height,
                 0, 64 * 360);

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -1019,3 +1019,22 @@ Specifies the side of the entry at which an icon is placed.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_entry_get_icon_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@icon_pos: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_entry_get_text_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkhbox.sgml

@@ -1,49 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkHBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A horizontal container box
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkHBox is a container that organizes child widgets into a single row.
-</para>
-
-<para>
-Use the #GtkBox packing interface to determine the arrangement,
-spacing, width, and alignment of GtkHBox children.
-</para>
-
-<para>
-All children are allocated the same height.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkVBox</term>
-<listitem><para>a sister class that organizes widgets into a column.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkHBox ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_hbox_new ##### -->
-<para>
-Creates a new GtkHBox.
-</para>
-
-@homogeneous: %TRUE if all children are to be given equal space allotments.
-@spacing: the number of pixels to place by default between children.
-@Returns: a new GtkHBox.
-
-

docs/reference/gtk/tmpl/gtklabel.sgml

@@ -141,7 +141,7 @@ the clipboard. Only labels that contain useful-to-copy information
 </para>
 </refsect2>
 
-<refsect2>
+<refsect2 id="label-text-layout">
 <title>Text layout</title>
 
 <para>
@@ -155,11 +155,23 @@ Labels can automatically wrap text if you call
 gtk_label_set_line_wrap().
 </para>
 <para>
-gtk_label_set_justify() sets how the lines in a label align 
-with one another. If you want to set how the label as a whole 
+gtk_label_set_justify() sets how the lines in a label align
+with one another. If you want to set how the label as a whole
 aligns in its available space, see gtk_misc_set_alignment().
 </para>
-
+<para>
+The #GtkLabel:width-chars and #GtkLabel:max-width-chars properties
+can be used to control the size allocation of ellipsized or wrapped
+labels. For ellipsizing labels, if either is specified (and less
+than the actual text size), it is used as the minimum width, and the actual
+text size is used as the natural width of the label. For wrapping labels,
+width-chars is used as the minimum width, if specified, and max-width-chars
+is used as the natural width. Even if max-width-chars specified, wrapping
+labels will be rewrapped to use all of the available width.
+</para>
+<note><para>Note that the interpretation of #GtkLabel:width-chars and
+#GtkLabel:max-width-chars has changed a bit with the introduction of
+width-for-height geometry management and #GtkExtendedLayout.</para></note>
 </refsect2>
 
 <refsect2>

docs/reference/gtk/tmpl/gtkmessagedialog.sgml

@@ -1,213 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkMessageDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-A convenient message window
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkMessageDialog presents a dialog with an image representing the type of 
-message (Error, Question, etc.) alongside some message text. It's simply a 
-convenience widget; you could construct the equivalent of #GtkMessageDialog 
-from #GtkDialog without too much effort, but #GtkMessageDialog saves typing.
-</para>
-
-<para>
-The easiest way to do a modal message dialog is to use gtk_dialog_run(), though
-you can also pass in the %GTK_DIALOG_MODAL flag, gtk_dialog_run() automatically
-makes the dialog modal and waits for the user to respond to it. gtk_dialog_run()
-returns when any dialog button is clicked.
-<example>
-<title>A modal dialog.</title>
-<programlisting>
- dialog = gtk_message_dialog_new (main_application_window,
-                                  GTK_DIALOG_DESTROY_WITH_PARENT,
-                                  GTK_MESSAGE_ERROR,
-                                  GTK_BUTTONS_CLOSE,
-                                  "Error loading file '&percnt;s': &percnt;s",
-                                  filename, g_strerror (errno));
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-</programlisting>
-</example>
-</para>
-
-<para>
-You might do a non-modal #GtkMessageDialog as follows:
-<example>
-<title>A non-modal dialog.</title>
-<programlisting>
- dialog = gtk_message_dialog_new (main_application_window,
-                                  GTK_DIALOG_DESTROY_WITH_PARENT,
-                                  GTK_MESSAGE_ERROR,
-                                  GTK_BUTTONS_CLOSE,
-                                  "Error loading file '&percnt;s': &percnt;s",
-                                  filename, g_strerror (errno));
-
- /* Destroy the dialog when the user responds to it (e.g. clicks a button) */
- g_signal_connect_swapped (dialog, "response",
-                           G_CALLBACK (gtk_widget_destroy),
-                           dialog);
-</programlisting>
-</example>
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkDialog
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkMessageDialog ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkMessageDialog:buttons ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:message-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:secondary-text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:secondary-use-markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:use-markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:message-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMessageDialog:use-separator ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkMessageType ##### -->
-<para>
-The type of message being displayed in the dialog.
-</para>
-
-@GTK_MESSAGE_INFO: Informational message
-@GTK_MESSAGE_WARNING: Nonfatal warning message
-@GTK_MESSAGE_QUESTION: Question requiring a choice
-@GTK_MESSAGE_ERROR: Fatal error message
-@GTK_MESSAGE_OTHER: None of the above, doesn't get an icon
-
-<!-- ##### ENUM GtkButtonsType ##### -->
-<para>
-Prebuilt sets of buttons for the dialog. If 
-none of these choices are appropriate, simply use %GTK_BUTTONS_NONE
-then call gtk_dialog_add_buttons().
-</para>
-
-@GTK_BUTTONS_NONE: no buttons at all
-@GTK_BUTTONS_OK: an OK button
-@GTK_BUTTONS_CLOSE: a Close button
-@GTK_BUTTONS_CANCEL: a Cancel button
-@GTK_BUTTONS_YES_NO: Yes and No buttons
-@GTK_BUTTONS_OK_CANCEL: OK and Cancel buttons
-
-<!-- ##### FUNCTION gtk_message_dialog_new ##### -->
-<para>
-
-</para>
-
-@parent: 
-@flags: 
-@type: 
-@buttons: 
-@message_format: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_new_with_markup ##### -->
-<para>
-
-</para>
-
-@parent: 
-@flags: 
-@type: 
-@buttons: 
-@message_format: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_set_markup ##### -->
-<para>
-
-</para>
-
-@message_dialog: 
-@str: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_set_image ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@image: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_get_image ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_format_secondary_text ##### -->
-<para>
-
-</para>
-
-@message_dialog: 
-@message_format: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_message_dialog_format_secondary_markup ##### -->
-<para>
-
-</para>
-
-@message_dialog: 
-@message_format: 
-@Varargs: 
-
-

docs/reference/gtk/tmpl/gtkplug.sgml

@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPlug
-
-<!-- ##### SECTION Short_Description ##### -->
-Toplevel for embedding into other processes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Together with #GtkSocket, #GtkPlug provides the ability
-to embed widgets from one process into another process
-in a fashion that is transparent to the user. One
-process creates a #GtkSocket widget and, passes the
-ID of that widgets window to the other process, 
-which then creates a #GtkPlug with that window ID.
-Any widgets contained in the #GtkPlug then will appear
-inside the first applications window.
-</para>
-
-<note>
-<para>
-The #GtkPlug and #GtkSocket widgets are currently not available 
-on all platforms supported by GTK+.
-</para>
-</note>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkSocket</term>
-<listitem><para>the widget that a #GtkPlug plugs into.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkPlug ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkPlug::embedded ##### -->
-<para>
-
-</para>
-
-@plug: the object which received the signal.
-
-<!-- ##### ARG GtkPlug:embedded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPlug:socket-window ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_plug_construct ##### -->
-<para>
-</para>
-
-@plug: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_construct_for_display ##### -->
-<para>
-
-</para>
-
-@plug: 
-@display: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_new ##### -->
-<para>
-</para>
-
-@socket_id: the window ID of the socket, or 0.
-@Returns: the new #GtkPlug widget.
-
-
-<!-- ##### FUNCTION gtk_plug_new_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@socket_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_id ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_embedded ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_socket_window ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkrange.sgml

@@ -364,3 +364,58 @@ at the end of range widgets.
 @flippable: 
 
 
+<!-- ##### FUNCTION gtk_range_get_min_slider_size ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_range_get_range_rect ##### -->
+<para>
+
+</para>
+
+@range: 
+@range_rect: 
+
+
+<!-- ##### FUNCTION gtk_range_get_slider_range ##### -->
+<para>
+
+</para>
+
+@range: 
+@slider_start: 
+@slider_end: 
+
+
+<!-- ##### FUNCTION gtk_range_get_slider_size_fixed ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_range_set_min_slider_size ##### -->
+<para>
+
+</para>
+
+@range: 
+@min_size: 
+
+
+<!-- ##### FUNCTION gtk_range_set_slider_size_fixed ##### -->
+<para>
+
+</para>
+
+@range: 
+@size_fixed: 
+
+

docs/reference/gtk/tmpl/gtksocket.sgml

@@ -1,170 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkSocket
-
-<!-- ##### SECTION Short_Description ##### -->
-Container for widgets from other processes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Together with #GtkPlug, #GtkSocket provides the ability
-to embed widgets from one process into another process
-in a fashion that is transparent to the user. One
-process creates a #GtkSocket widget and, passes the
-that widget's window ID to the other process, 
-which then creates a #GtkPlug with that window ID.
-Any widgets contained in the #GtkPlug then will appear
-inside the first applications window.
-</para>
-
-<para>
-The socket's window ID is obtained by using
-gtk_socket_get_id(). Before using this function,
-the socket must have been realized, and for hence,
-have been added to its parent.
-
-<example>
-<title>Obtaining the window ID of a socket.</title>
-<programlisting>
-GtkWidget *socket = gtk_socket_new (<!-- -->);
-gtk_widget_show (socket);
-gtk_container_add (GTK_CONTAINER (parent), socket);
-
-/* The following call is only necessary if one of
- * the ancestors of the socket is not yet visible.
- */
-gtk_widget_realize (socket);
-g_print ("The ID of the sockets window is %#x\n",
-         gtk_socket_get_id (socket));
-</programlisting>
-</example>
-</para>
-
-<para>
-Note that if you pass the window ID of the socket to another
-process that will create a plug in the socket, you 
-must make sure that the socket widget is not destroyed
-until that plug is created. Violating this rule will
-cause unpredictable consequences, the most likely
-consequence being that the plug will appear as a 
-separate toplevel window. You can check if the plug
-has been created by examining the
-<structfield>plug_window</structfield> field of the
-#GtkSocket structure. If this field is non-%NULL, 
-then the plug has been successfully created inside
-of the socket.
-</para>
-
-<para>
-When GTK+ is notified that the embedded window has been
-destroyed, then it will destroy the socket as well. You
-should always, therefore, be prepared for your sockets
-to be destroyed at any time when the main event loop
-is running. To prevent this from happening, you can
-connect to the #GtkSocket::plug-removed signal.
-</para>
-
-<para>
-The communication between a #GtkSocket and a #GtkPlug follows the 
-<ulink url="http://www.freedesktop.org/standards/xembed-spec">XEmbed</ulink>
-protocol. This protocol has also been implemented in other toolkits, e.g.  
-<application>Qt</application>, allowing the same level of integration
-when embedding a <application>Qt</application> widget in GTK or vice versa.</para>
-
-<para>
-A socket can also be used to swallow arbitrary 
-pre-existing top-level windows using gtk_socket_steal(),
-though the integration when this is done will not be as close
-as between a #GtkPlug and a #GtkSocket.</para>
-
-<note>
-<para>
-The #GtkPlug and #GtkSocket widgets are currently not available 
-on all platforms supported by GTK+.
-</para>
-</note>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkPlug</term>
-<listitem><para>the widget that plugs into a #GtkSocket.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><ulink url="http://www.freedesktop.org/standards/xembed-spec">XEmbed</ulink></term>
-<listitem><para>the XEmbed Protocol Specification.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkSocket ##### -->
-<para>
-The #GtkSocket structure contains the <structfield>plug_window</structfield>
-field.  (This field should be considered read-only. It should
-never be set by an application.)
-</para>
-
-
-<!-- ##### SIGNAL GtkSocket::plug-added ##### -->
-<para>
-
-</para>
-
-@socket_: 
-
-<!-- ##### SIGNAL GtkSocket::plug-removed ##### -->
-<para>
-
-</para>
-
-@socket_: 
-@Returns: 
-
-<!-- ##### FUNCTION gtk_socket_new ##### -->
-<para>
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_socket_steal ##### -->
-<para>
-</para>
-
-@socket_: a #GtkSocket.
-@wid: 
-
-
-<!-- ##### FUNCTION gtk_socket_add_id ##### -->
-<para>
-
-</para>
-
-@socket_: 
-@window_id: 
-
-
-<!-- ##### FUNCTION gtk_socket_get_id ##### -->
-<para>
-
-</para>
-
-@socket_: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_socket_get_plug_window ##### -->
-<para>
-
-</para>
-
-@socket_: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkstatusicon.sgml

@@ -443,6 +443,15 @@ on Win32 doesn't allow to embed arbitrary widgets.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_status_icon_set_name ##### -->
+<para>
+
+</para>
+
+@status_icon: 
+@name: 
+
+
 <!-- ##### FUNCTION gtk_status_icon_set_visible ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtktesting.sgml

@@ -1,177 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Testing
-
-<!-- ##### SECTION Short_Description ##### -->
-Utilities for testing GTK+ applications
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION gtk_test_create_simple_window ##### -->
-<para>
-
-</para>
-
-@window_title: 
-@dialog_text: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_create_widget ##### -->
-<para>
-
-</para>
-
-@widget_type: 
-@first_property_name: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_display_button_window ##### -->
-<para>
-
-</para>
-
-@window_title: 
-@dialog_text: 
-@Varargs: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_find_label ##### -->
-<para>
-
-</para>
-
-@widget: 
-@label_pattern: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_find_sibling ##### -->
-<para>
-
-</para>
-
-@base_widget: 
-@widget_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_find_widget ##### -->
-<para>
-
-</para>
-
-@widget: 
-@label_pattern: 
-@widget_type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_init ##### -->
-<para>
-
-</para>
-
-@argcp: 
-@argvp: 
-@Varargs: 
-
-
-<!-- ##### FUNCTION gtk_test_list_all_types ##### -->
-<para>
-
-</para>
-
-@n_types: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_register_all_types ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_test_slider_get_value ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_slider_set_perc ##### -->
-<para>
-
-</para>
-
-@widget: 
-@percentage: 
-
-
-<!-- ##### FUNCTION gtk_test_spin_button_click ##### -->
-<para>
-
-</para>
-
-@spinner: 
-@button: 
-@upwards: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_text_get ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_text_set ##### -->
-<para>
-
-</para>
-
-@widget: 
-@string: 
-
-
-<!-- ##### FUNCTION gtk_test_widget_click ##### -->
-<para>
-
-</para>
-
-@widget: 
-@button: 
-@modifiers: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_test_widget_send_key ##### -->
-<para>
-
-</para>
-
-@widget: 
-@keyval: 
-@modifiers: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtktreemodel.sgml

@@ -412,6 +412,16 @@ compatibility reasons.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_tree_path_get_indices_with_depth ##### -->
+<para>
+
+</para>
+
+@path:
+@depth: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_tree_path_free ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkvbbox.sgml

@@ -1,98 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVButtonBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A container for arranging buttons vertically
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A button box should be used to provide a consistent layout of buttons
-throughout your application. The layout/spacing can be altered by the
-programmer, or if desired, by the user to alter the 'feel' of a
-program to a small degree.
-</para>
-<para>
-A #GtkVButtonBox is created with gtk_vbutton_box_new(). Buttons are
-packed into a button box the same way widgets are added to any other
-container, using gtk_container_add(). You can also use
-gtk_box_pack_start() or gtk_box_pack_end(), but for button boxes both
-these functions work just like gtk_container_add(), ie., they pack the
-button in a way that depends on the current layout style and on
-whether the button has had gtk_button_box_set_child_secondary() called
-on it.
-</para>
-
-<para>
-The spacing between buttons can be set with gtk_box_set_spacing(). The
-arrangement and layout of the buttons can be changed with
-gtk_button_box_set_layout().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkBox</term>
-<listitem><para>Used to pack widgets into button boxes.</para></listitem>
-</varlistentry><varlistentry>
-<term>#GtkButtonBox</term>
-<listitem><para>Provides functions for controlling button boxes.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkHButtonBox</term>
-<listitem><para>Pack buttons horizontally</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVButtonBox ##### -->
-<para>
-GtkVButtonBox does not contain any public fields.
-</para>
-
-
-<!-- ##### FUNCTION gtk_vbutton_box_new ##### -->
-<para>
-Creates a new vertical button box.
-</para>
-
-@Returns: a new button box #GtkWidget.
-
-
-<!-- ##### FUNCTION gtk_vbutton_box_get_spacing_default ##### -->
-<para>
-Retrieves the current default spacing for vertical button boxes. This is the number of pixels 
-to be placed between the buttons when they are arranged.
-</para>
-
-@Returns: the default number of pixels between buttons.
-
-
-<!-- ##### FUNCTION gtk_vbutton_box_set_spacing_default ##### -->
-<para>
-Changes the default spacing that is placed between widgets in an
-vertical button box.
-</para>
-
-@spacing: an integer value.
-
-
-<!-- ##### FUNCTION gtk_vbutton_box_get_layout_default ##### -->
-<para>
-Retrieves the current layout used to arrange buttons in button box widgets.
-</para>
-
-@Returns: the current #GtkButtonBoxStyle.
-
-
-<!-- ##### FUNCTION gtk_vbutton_box_set_layout_default ##### -->
-<para>
-Sets a new layout mode that will be used by all button boxes.
-</para>
-
-@layout: a new #GtkButtonBoxStyle.
-
-

docs/reference/gtk/tmpl/gtkvbox.sgml

@@ -1,49 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A vertical container box
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkVBox is a container that organizes child widgets into a single column.
-</para>
-
-<para>
-Use the #GtkBox packing interface to determine the arrangement,
-spacing, height, and alignment of GtkVBox children.
-</para>
-
-<para>
-All children are allocated the same width.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkHBox</term>
-<listitem><para>a sister class that organizes widgets into a row.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVBox ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_vbox_new ##### -->
-<para>
-Creates a new GtkVBox.
-</para>
-
-@homogeneous: %TRUE if all children are to be given equal space allotments.
-@spacing: the number of pixels to place by default between children.
-@Returns: a new GtkVBox.
-
-

docs/reference/gtk/tmpl/gtkviewport.sgml

@@ -1,134 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkViewport
-
-<!-- ##### SECTION Short_Description ##### -->
-An adapter which makes widgets scrollable
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkViewport widget acts as an adaptor class, implementing 
-scrollability for child widgets that lack their own scrolling 
-capabilities. Use #GtkViewport to scroll child widgets such as 
-#GtkTable, #GtkBox, and so on.
-</para>
-
-<para>
-If a widget has native scrolling abilities, such as #GtkTextView, 
-#GtkTreeView or #GtkIconview, it can be added to a #GtkScrolledWindow 
-with gtk_container_add(). If a widget does not, you must first add the 
-widget to a #GtkViewport, then add the viewport to the scrolled window. 
-The convenience function gtk_scrolled_window_add_with_viewport() does 
-exactly this, so you can ignore the presence of the viewport.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkScrolledWindow, #GtkAdjustment
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkViewport ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkViewport::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
-@viewport: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkViewport:hadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkViewport:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkViewport:vadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_viewport_new ##### -->
-<para>
-
-</para>
-
-@hadjustment: 
-@vadjustment: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_viewport_get_hadjustment ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_viewport_get_vadjustment ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_viewport_set_hadjustment ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_viewport_set_vadjustment ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_viewport_set_shadow_type ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_viewport_get_shadow_type ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_viewport_get_bin_window ##### -->
-<para>
-
-</para>
-
-@viewport: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkvolumebutton.sgml

@@ -1,35 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVolumeButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button which pops up a volume control
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkVolumeButton is a subclass of #GtkScaleButton that has
-been tailored for use as a volume control widget with suitable 
-icons, tooltips and accessible labels.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVolumeButton ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_volume_button_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkvpaned.sgml

@@ -1,35 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVPaned
-
-<!-- ##### SECTION Short_Description ##### -->
-A container with two panes arranged vertically
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The VPaned widget is a container widget with two
-children arranged vertically. The division between
-the two panes is adjustable by the user by dragging
-a handle. See #GtkPaned for details.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVPaned ##### -->
-<para>
-</para>
-
-
-<!-- ##### FUNCTION gtk_vpaned_new ##### -->
-<para>
-Create a new #GtkVPaned
-</para>
-
-@Returns: the new #GtkVPaned
-
-

docs/reference/gtk/tmpl/gtkvruler.sgml

@@ -1,50 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVRuler
-
-<!-- ##### SECTION Short_Description ##### -->
-A vertical ruler
-
-<!-- ##### SECTION Long_Description ##### -->
-<note>
-<para>
- This widget is considered too specialized/little-used for
- GTK+, and will in the future be moved to some other package.  If
- your application needs this widget, feel free to use it, as the
- widget does work and is useful in some applications; it's just not
- of general interest. However, we are not accepting new features for
- the widget, and it will eventually move out of the GTK+
- distribution.
-</para>
-</note>
-<para>
-The VRuler widget is a widget arranged vertically creating a ruler that is
-utilized around other widgets such as a text widget. The ruler is used to show
-the location of the mouse on the window and to show the size of the window in
-specified units. The available units of measurement are GTK_PIXELS, GTK_INCHES
-and GTK_CENTIMETERS. GTK_PIXELS is the default. 
-rulers.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVRuler ##### -->
-<para>
-The #GtkVRuler struct contains private data and should be accessed
-using the functions below. 
-</para>
-
-
-<!-- ##### FUNCTION gtk_vruler_new ##### -->
-<para>
-Creates a new vertical ruler
-</para>
-
-@Returns: a new #GtkVRuler.
-
-

docs/reference/gtk/tmpl/gtkvscale.sgml

@@ -1,51 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVScale
-
-<!-- ##### SECTION Short_Description ##### -->
-A vertical slider widget for selecting a value from a range
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkVScale widget is used to allow the user to select a value using
-a vertical slider. To create one, use gtk_hscale_new_with_range().
-</para>
-<para>
-The position to show the current value, and the number of decimal places
-shown can be set using the parent #GtkScale class's functions.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVScale ##### -->
-<para>
-The #GtkVScale-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### FUNCTION gtk_vscale_new ##### -->
-<para>
-Creates a new #GtkVScale.
-</para>
-
-@adjustment: the #GtkAdjustment which sets the range of the scale.
-@Returns: a new #GtkVScale.
-
-
-<!-- ##### FUNCTION gtk_vscale_new_with_range ##### -->
-<para>
-
-</para>
-
-@min: 
-@max: 
-@step: 
-@Returns: 
-
-