2.24.21

It does't work in make distcheck.

INSTALL.in

@@ -4,7 +4,7 @@ Prerequisites
 GTK+ requires the following packages:
 
  - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at the same
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.25.10,
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.28.0,
    Pango 1.20, GdkPixbuf 2.21.0, ATK 1.29.2 and cairo 1.6.0.
 
  - gobject-introspection 0.9.3 or newer.

NEWS

@@ -1,3 +1,333 @@
+Overview of Changes from GTK+ 2.24.20 to 2.24.21
+================================================
+
+* OS X: Various input handling fixes
+ - Avoid a crash on first key press
+ - Fall back from native input method to GtkIMContextSimple
+ - Avoid beeping when using native input method
+ - Reset preedit state when needed
+
+* Look for gtkrc in /usr/share/gtk-2.0, in addition to to system config
+  dirs
+
+* Bug fixes:
+ 513812 Optimize gdk_cairo_set_source_pixbuf() alpha multiplication...
+ 536767 gtksignal.h includes gtk.h
+ 692548 Quartz: Cursor doesn't reset when the mouse leaves a toplev...
+ 695636 _gdk_windowing_create_cairo_surface() may return already fi...
+ 698758 Wrong limit for "Native Windows wider or taller than 65535 ...
+ 699236 Assert triggered during gdk_pixmap_new() if some failure ha...
+ 699673 [3.2/3.4/3.6/3.8] uuid conflicting on Windows
+ 701332 Patch for minor glitch in NSTextInput
+ 701571 1ad25dfb causes NSApp to not notice NSWindow destruction
+ 703789 gtk.immodules still referenced after switch to immodules.cache
+ 705181 Annoying beep on arrow keys when using IME on MacOS
+ 705182 Reset Cocoa IME state when immodule is reset
+
+* Translation updates:
+ Thai
+
+
+Overview of Changes from GTK+ 2.24.19 to 2.24.20
+================================================
+
+* Backport changes from GTK+ 3 to look for rc files in system
+  config dirs in addition to /etc/gtk-2.0 and ~/.gtkrc.
+
+* Backport changes from GTK+ 3 to look for the immodules cache
+  file in libdir. gtk-query-immodules-2.0 gained an --update-cache
+  option to write the output to the correct location. Note that
+  this may require slight adjustment of distro packaging.
+
+* Bug fixes:
+ 560337 GtkFileChooser hour time missing for current date files
+ 649390 CRLF text is copied to clipboard as CRCRLF on Windows
+ 698183 quartz: Text input is too slow and some keys are broken...
+ 702455 Add support for Avahi printers to gtk 2.24.x
+
+* Translation updates:
+ Polish
+
+
+Overview of Changes from GTK+ 2.24.18 to 2.24.19
+================================================
+
+* Bug fixes:
+ 432386 GtkFileChooserDefault leaks memory if a shortcut...
+ 575767 Crashes when XInput device disappears
+ 694273 Patch to support NSTextInputClient in text widgets
+ 698614 GObject: prevent installing properties after init
+ 700578 Missing vertical grid lines when some columns hidden
+
+* Translation updates:
+ German
+
+
+Overview of Changes from GTK+ 2.24.17 to 2.24.18
+================================================
+
+* Bug fixes:
+ 586367 In local_only mode, file chooser should return native paths...
+ 674051 Scrolling zoom in view - incorrect image display
+ 683072 Print dialog shows cryptic status message and displays garb...
+ 683983 Gimp crashes on exporting JPEG files (probably related to E...
+ 694711 write-after-free segfault in GailTreeView
+ 695003 Entry's bg active state in pixmaps-engine is broken in 15 a...
+ 695278 Avoid passing a NULL title to setTitle
+ 695312 Initial 'text' set in the non-numeric-only GtkSpinButton au...
+ 698563 Ensure correct error reporting when CreateDIBSection fails
+
+* Translation updates:
+ Hungarian
+ Interlingua
+
+
+Overview of Changes from GTK+ 2.24.16 to 2.24.17
+================================================
+
+* Bug fixes:
+ GtkFileChooserButton fixes:
+  - Don't emit file-set signal when the change is not the result
+    of a user action
+  - Don't ever use gtk_file_chooser_get_files
+  - Ensure internal consistency when clearing a model
+ 690247 multiple context in a immodule can't be selected
+ 692955 GtkIconCache fails to load non-builtin icons
+ 694742 Fix possible memory leak when GlobalAlloc() fails
+
+
+Overview of Changes from GTK+ 2.24.15 to 2.24.16
+================================================
+
+* Bug fixes:
+ 694077 Make GtkItemFactory produce GtkSeparatorMenuItems
+ 645065 GtkFileChooserButton doesn't handle closing its dialog correctly
+        Reliably stop spinning when a GtkSpinButton is hidden
+
+Overview of Changes from GTK+ 2.24.14 to 2.24.15
+================================================
+
+* Bug fixes:
+ 626499 GtkClipboard unnotified on change of OS X pasteboard owner
+ 656565 Signalify (already existing) GtkMenuShell.insert()
+ 664640 CUPS authentication does not work
+ 669808 fullscreen/unscreen was broken for Quartz on OS X earli...
+ 674556 File chooser dialog does not save its sizes
+ 679883 When printing Custom paper sizes GTK Print Dialog does ...
+ 683511 spinbutton: fix xthickness bug when resizing the text a...
+ 689810 Include guard optimization
+ 689982 Make GChecksum more fully introspectable
+ 690788 Critical in gtknotebook dnd with rgba colormap
+ 692099 autogen.sh doesn't recognize automake 1.13
+ 692554 entry: never use GTK_STATE_ACTIVE to paint the background
+ 692810 Fails to build with the gold linker due to missing refe...
+        Fix scrolling in insensitive modal dialogs
+
+* Translation updates
+ Norwegian bokmål
+
+
+Overview of Changes from GTK+ 2.24.13 to 2.24.14
+================================================
+
+* File chooser:
+ - Use the bookmarks file from the same XDG location
+   as GTK+ 3 if present
+ - Add a setting to specify the startup mode
+
+* Bug fixes:
+ 577806 gtk_file_chooser_add_shortcut_folder adds duplicates...
+ 626499 GtkClipboard unnotified on change of OS X pasteboard...
+ 644906 gtkimcontextime.c: NULL pointer reference
+ 652204 Making GIMP crash with the Text Tool
+ 663990 Tablet pressure is broken on MacOSX
+ 668239 texts disappear when notebook switch page at zh_CN l...
+ 672193 windows (including menus) shown multiple times don't...
+ 681845 Cancel image export crashes or freezes gimp
+ 682919 Crash in GTK+-3.x (3.0.x-3.5.12+) on Windows with CJK...
+ 684419 crash when closing Document History window
+ 685959 [Win32] Memory leak on every redraw of a widget
+ 688710 [PATCH] Splash screens shouldn't stay on top of all a...
+ 689235 Broken function declarations corrupt the stack on win...
+        Quartz: Use window background pattern
+        Quartz: Use the correct minimal line width
+
+* Translation updates
+ German
+
+
+Overview of Changes from GTK+ 2.24.12 to 2.24.13
+================================================
+
+* Implement a gtk-primary-button-warps-slider setting
+  that lets us adjust scale and scrollbar behaviour
+  according to platform.
+
+* Bug fixes:
+ 661973 Try harder to discriminate Shift-F10 and F10
+ 675365 Always check if the global context id changed
+ 674108 Hard crash due to wrong NSAutoreleasePool stacking
+
+* Translation updates:
+ Polish
+
+
+Overview of Changes from GTK+ 2.24.11 to 2.24.12
+================================================
+
+* Allow building with automake 1.12
+
+* Bugs fixed:
+ 616997 gtk_recent_manager_add_item() is slow
+ 680346 gtk+-2.24.11 (commit 3f6592f6) breaks keyboard input...
+ 680901 GTK+: The chinese translations of "even sheet" and  ...
+ 681784 colorspaces used in gtk+ and cairo quartz backends d...
+ 683070 tooltip: add tooltip-radius and tooltip-alpha style ...
+ 683279 range: add a primary-button-warps-slider style prope...
+        quartz: fix corruption during scrolling in some cases
+
+* Translation updates:
+ Polish
+ Traditional Chinese
+
+
+Overview of Changes from GTK+ 2.24.10 to 2.24.11
+================================================
+
+* X11:
+ - Use _NET_WM_STATE_HIDDEN for iconification when supported
+
+* Win32:
+ - Don't drash when installed in a top-level directory
+
+* Quartz:
+ - Make function keys work
+ - Fix the build on OS X 10.7
+ - Fix manual resizing of windows
+ - Handle some key events better (such as dead tilde)
+
+* Bugs fixed:
+ 603559 gtk should handle missing immodules better
+ 640308 GtkStatusIcon never emits plug-removed on socket
+ 643131 gtk_tray_icon_dispose
+ 655065 Build failure on OS X 10.7 Lion
+ 667155 Demos in gtk2 don't comply with gseal
+ 670093 gdk_window_get_screen() not documented in new symbols
+ 670400 First shortcut capture is broken
+ 672125 gtk_enumerate_printers() doesn't call the destroy no...
+ 674556 File chooser dialog does not save its sizes
+ 675421 GtkFileChooser should set its role
+ 675835 Unable to open Preferences > Folders after refreshin...
+ 676362 _gdk_quartz_image_copy_to_image always returns black...
+        iconview: fix autoscroll
+        printing: fix the build with cups 1.6
+
+* Translation updates
+ Romanian
+
+
+Overview of Changes from GTK+ 2.24.9 to 2.24.10
+===============================================
+
+* Win32: make gdk_window_raise work again
+
+* Quartz: implement gdk_window_restack
+
+* Printing: fix a crash with custom option handling
+  that was introduced in 2.24.9
+
+* Bugs fixed:
+ 665955 Trimmed arrow points drawn for GtkArrow
+ 667691 implement gdk_window_restack() for Quartz
+
+
+Overview of Changes from GTK+ 2.24.8 to 2.24.9
+==============================================
+
+* Implement the editing-canceled property in GtkCellEditableEventBox
+* Backport GtkScale fixes
+
+* Several fixes in the MS-Windows theme
+
+* quartz: fix a race condition when waking up the CGRunLoop
+
+* Several build fixes:
+ - Add gmodule-2.0 dependency for gtk-query-immodules-2.0
+ - introspection: Fix srcdir != builddir builds
+
+* Bug fixed:
+  663856 - Make option-foo accelerators use the right symbol
+  664238 - GTK apps crash when dragging something
+  665011 - Fix gtk-demo drawingarea example
+  665013 - Fix 16bit pixmaps
+  662814 - Don't print a g_warning() when GtkRecentManager can't find a file
+  620240 - Fix problems with DND on some X servers
+  629878 - Use the right icon-name for missing images
+  543520 - Set cups Custom print options correctly
+  639455 - Implement the editing-canceled property in GtkCellEditableEventBox
+  667458 - introspection: Fix srcdir != builddir builds
+
+
+Overview of Changes from GTK+ 2.24.7 to 2.24.8
+==============================================
+
+* Win32 updates:
+ Major update of the win32 backend, it now works
+ at least as well as the old 2.16.x version that
+ a lot of windows applications was forced to use
+
+ Some particular highlights:
+ - Tablet support (wintab) works
+ - The MS-Windows theme works better, and is enabled
+   by default on Windows
+ - Pointer grabs on button press now works
+ - Initial Window positioning is improved and now
+   works very similarly to the X11 backend
+ - Scrolling a window with another window overlapping it
+   doesn't produce rendering artifacts on XP
+ - Configure event delivery after window move or resize
+   is much more robust, fixing a variety of rendering hangs
+   and misbehaviours
+ - Scrolling with synaptics touchpads work better
+
+* OS X updates:
+ - Add Command-cursor keyboard navigation in text widgets
+ - Fix loss of motion events after using the menu bar
+ - Handle recursive CFRunLoops, fixing e.g. crashes
+   when dropping files from finder
+ - Set proper event->state values in all events
+
+* Ensure that the MOD1 modifier always means ALT, as this
+  assumption is already used in many places in Gtk+
+
+* Search engine backend updated to Tracker 0.12
+
+* Bugs fixed:
+  84314  gdk_display_sync() and gdk_flush()
+ 142874  use of SetWindowLong in gdkwindow-win32.c causes...
+ 169811  configure_event and window-state-event are not...
+ 171456  "Keep Above" option in Gimp broken on Win32 
+ 324254  Realizing a top-level window widget early positions...
+ 516822  gtk_window_fullscreen does not resize correctly if...
+ 537296  Maximizing a window larger than the screen makes...
+ 542777  Scroll-Wheel doesn't scroll (Win)
+ 552041  Windows' System Menu from taskbar is buggy 
+ 574935  win32: gtk_window_set_geometry_hints() has no effect...
+ 604156  gtk_window_set_modal() freezes application completely 
+ 612359  Dialog positioning hints fail on Windows 7 
+ 631384  Images pasted from clipboard are shifted/wrapped 
+ 647460  typo in msw_style.c?
+ 650300  Notebook tabs are incorrectly displayed with the...
+ 658272  Port gtksearchenginetracker.c to tracker 0.11/0.12
+ 659565  unbreak compilation on OpenBSD
+ 661997  Gtk crashes when changing the TreeView model while ...
+ 662633  Scheduled transaction editor crashes with gtk+-2.24.7
+ 662670  Pressing "Enter" in print dialog box will not cause...
+ 663138  iconview: layout items immediately when setting...
+ 663182  NSImage throws an exception from _gtk_quartz_...
+ 663543  Huge memory leak while using MS-Windows theme (gtk-demo)
+ 663605  Fix event->state of many event types on quartz
+
 Overview of Changes from GTK+ 2.24.6 to 2.24.7
 ==============================================
 

README.win32

@@ -112,8 +112,8 @@ PATH="/devel/target/$HEX/bin:$PATH" gdk-pixbuf-query-loaders >/devel/target/$HEX
 
 grep -v -E 'Automatically generated|Created by|LoaderDir =' <$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders >$TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp &&
     mv $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders.temp $TARGET/etc/gtk-2.0/gdk-pixbuf.loaders &&
-grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/etc/gtk-2.0/gtk.immodules >$TARGET/etc/gtk-2.0/gtk.immodules.temp &&
-    mv $TARGET/etc/gtk-2.0/gtk.immodules.temp $TARGET/etc/gtk-2.0/gtk.immodules &&
+grep -v -E 'Automatically generated|Created by|ModulesPath =' <$TARGET/lib/gtk-2.0/2.10.0/immodules.cache >$TARGET/lib/gtk-2.0/2.10.0/immodules.temp &&
+    mv $TARGET/lib/gtk-2.0/2.10.0/immodules.temp $TARGET/lib/gtk-2.0/2.10.0/immodules.cache &&
 
 ./gtk-zip.sh &&
 

autogen.sh

@@ -48,7 +48,13 @@ fi
 	DIE=1
 }
 
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.13 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.13
+    ACLOCAL=aclocal-1.13
+else if automake-1.12 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.12
+    ACLOCAL=aclocal-1.12
+else if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.11
     ACLOCAL=aclocal-1.11
 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
@@ -59,13 +65,16 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
     ACLOCAL=aclocal-1.7
 else
 	echo
-	echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT."
+	echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x or 1.13.x"
+	echo "installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
 fi
 fi
+fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1

build/win32/vs10/Makefile.am

@@ -16,4 +16,8 @@ EXTRA_DIST += \
 	gtk.vcxproj.filtersin \
 	gtk-demo.vcxproj \
 	gtk-demo.vcxproj.filters \
+	gailutil.vcxproj \
+	gailutil.vcxproj.filters \
+	libwimp.vcxproj \
+	libwimp.vcxproj.filters \
 	install.vcxproj

build/win32/vs10/gailutil.vcxproj

@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}</ProjectGuid>
+    <RootNamespace>gailutil</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v100</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pango-1.0.lib;atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\modules\other\gail\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailmisc.c" />
+    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailtextutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gailutil.vcxproj.filters

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailmisc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\modules\other\gail\libgail-util\gailtextutil.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk-win32.vcxproj

@@ -60,9 +60,6 @@
     <Import Project="gtk+.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -70,7 +67,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

build/win32/vs10/gdk.vcxprojin

@@ -61,7 +61,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
@@ -74,7 +73,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

build/win32/vs10/gtk+.props

@@ -1,39 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj</DefDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>2.0</GtkApiVersion>
     <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
     <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
-    <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
-    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
+    <GtkHost>i686-pc-vs10</GtkHost>
+    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
     <GtkIncludedImmodulesDefines>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</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="\"Gtk\"";GTK_HOST="\"i686-pc-vs10\"";GTK_PRINT_BACKENDS="\"file\"";GTK_PRINT_PREVIEW_COMMAND="\"undefined-gtk-print-preview-command\"";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="\"$(GtkDummyPrefix)/lib\"";GTK_DATADIR="\"$(GtkDummyPrefix)/share\"";GTK_DATA_PREFIX="\"$(GtkDummyPrefix)\"";GTK_SYSCONFDIR="\"$(GtkDummyPrefix)/etc\"";MULTIPRESS_CONFDIR="\"$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\"";MULTIPRESS_LOCALEDIR="\"$(GtkDummyPrefix)/share/locale\"";GTK_VERSION="\"$(GtkVersion)/etc\"";GTK_BINARY_VERSION="\"$(GtkBinaryVersion)/etc\""</GtkDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="$(GtkHost)";GTK_PRINT_BACKENDS="file";GTK_PRINT_PREVIEW_COMMAND="undefined-gtk-print-preview-command";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc"</GtkDefines>
     <GtkDoInstall>
 echo on
 
 mkdir $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+copy $(Configuration)\$(Platform)\bin\*-vs10.dll $(CopyDir)\bin
 
-
-mkdir $(CopyDir)\bin\gtk-demo
-
-copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\bin\gtk-demo
-
-copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\bin\gtk-demo
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
 
 
 mkdir $(CopyDir)\lib
@@ -548,8 +533,55 @@ mkdir $(CopyDir)\lib\gtk-$(GtkApiVersion)\include
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\lib\gtk-$(GtkApiVersion)\include
 
 
+mkdir $(CopyDir)\include\gail-1.0\libgail-util
+
+copy ..\..\..\modules\other\gail\libgail-util\gailmisc.h $(CopyDir)\include\gail-1.0\libgail-util
+
+copy ..\..\..\modules\other\gail\libgail-util\gailtextutil.h $(CopyDir)\include\gail-1.0\libgail-util
+
+copy ..\..\..\modules\other\gail\libgail-util\gail-util.h $(CopyDir)\include\gail-1.0\libgail-util
+
+
 copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
 
+mkdir $(CopyDir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines
+
+copy $(Configuration)\$(Platform)\bin\libwimp.dll $(CopyDir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines
+
+
+mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+
+mkdir $(CopyDir)\share\themes\Default\gtk-2.0-key
+
+copy ..\..\..\gtk\gtkrc.key.default $(CopyDir)\share\themes\Default\gtk-2.0-key\gtkrc
+
+
+mkdir $(CopyDir)\share\themes\Emacs\gtk-2.0-key
+
+copy ..\..\..\gtk\gtkrc.key.emacs $(CopyDir)\share\themes\Emacs\gtk-2.0-key\gtkrc
+
+
+mkdir $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-2.0\gtkrc $(CopyDir)\share\themes\MS-Windows\gtk-2.0
+
+
+mkdir $(CopyDir)\share\themes\Raleigh\gtk-2.0
+
+copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-2.0\gtkrc
+
 </GtkDoInstall>
     <GtkGenerateGdkDef>echo EXPORTS &gt;"$(DefDir)\gdk.def" &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;"$(DefDir)\gdk.def"</GtkGenerateGdkDef>
     <GtkGenerateGtkDefW64>echo EXPORTS &gt;"$(DefDir)\gtk.def" &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -D_WIN64 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;"$(DefDir)\gtk.def"</GtkGenerateGtkDefW64>
@@ -568,8 +600,8 @@ copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <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;$(GlibEtcInstallRoot)\include\GdkPixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
 	<Link>
@@ -613,12 +645,12 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
     <BuildMacro Include="GtkDummyPrefix">
       <Value>$(GtkDummyPrefix)</Value>
     </BuildMacro>
-    <BuildMacro Include="GtkPrefixDefine">
-      <Value>$(GtkPrefixDefine)</Value>
-    </BuildMacro>
     <BuildMacro Include="GdkDefines">
       <Value>$(GdkDefines)</Value>
     </BuildMacro>
+    <BuildMacro Include="GtkHost">
+      <Value>$(GtkHost)</Value>
+    </BuildMacro>
     <BuildMacro Include="GtkIncludedImmodulesDefines">
       <Value>$(GtkIncludedImmodulesDefines)</Value>
     </BuildMacro>

build/win32/vs10/gtk+.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
@@ -8,6 +8,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5A
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwimp", "libwimp.vcxproj", "{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 EndProject
 Global
@@ -50,6 +54,22 @@ Global
 		{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
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.Build.0 = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.ActiveCfg = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.Build.0 = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.ActiveCfg = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.Build.0 = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.ActiveCfg = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.Build.0 = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.Build.0 = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.ActiveCfg = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.Build.0 = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.ActiveCfg = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.Build.0 = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.ActiveCfg = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.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

build/win32/vs10/gtk-demo.vcxproj

@@ -63,7 +63,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -73,10 +72,10 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -97,7 +96,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -120,7 +119,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -143,7 +142,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

build/win32/vs10/gtk.vcxprojin

@@ -74,7 +74,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

build/win32/vs10/install.vcxproj

@@ -63,7 +63,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
@@ -94,6 +94,14 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ProjectReference Include="libwimp.vcxproj">
+      <Project>{7660fb4e-2ae6-483e-8813-0974cbe6f97f}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gailutil.vcxproj">
+      <Project>{b3b6558a-01c8-4c72-9bde-84abb1ae67df}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="gdk.vcxproj">
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

build/win32/vs10/libwimp.vcxproj

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7660FB4E-2AE6-483E-8813-0974CBE6F97F}</ProjectGuid>
+    <RootNamespace>libwimp</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>pangowin32-1.0.lib;pango-1.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_style.c" />
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\xp_theme.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/libwimp.vcxproj.filters

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Sources">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_rc_style.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_style.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\msw_theme_main.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\modules\engines\ms-windows\xp_theme.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs9/Makefile.am

@@ -10,4 +10,6 @@ EXTRA_DIST += \
 	gtk.vcproj \
 	gtk.vcprojin \
 	gtk-demo.vcproj \
+	gailutil.vcproj \
+	libwimp.vcproj \
 	install.vcproj

build/win32/vs9/gailutil.vcproj

@@ -1,12 +1,12 @@
 <?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"
+	Version="9.00"
+	Name="gailutil"
+	ProjectGUID="{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+	RootNamespace="gailutil"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
 			>
@@ -31,29 +31,67 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
@@ -62,84 +100,56 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions="_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				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"
+			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\..\gdk"
+				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
+				AdditionalDependencies="pango-1.0.lib atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\modules\other\gail\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -148,18 +158,25 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
+			Name="Sources"
 			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" />
+			<File RelativePath="..\..\..\modules\other\gail\libgail-util\gailmisc.c" />
+			<File RelativePath="..\..\..\modules\other\gail\libgail-util\gailtextutil.c" />
 		</Filter>
 		<Filter
-			Name="Header Files"
+			Name="Headers"
 			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;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

build/win32/vs9/gdk-pixbuf.vcproj

@@ -1,258 +0,0 @@
-<?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

@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"

build/win32/vs9/gdk.vcprojin

@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"

build/win32/vs9/gtk+.sln

@@ -14,15 +14,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AA
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF} = {B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F} = {7660FB4E-2AE6-483E-8813-0974CBE6F97F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwimp", "libwimp.vcproj", "{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 	EndProjectSection
 EndProject
 Global
@@ -33,14 +47,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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
@@ -49,6 +55,14 @@ Global
 		{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-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-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
@@ -57,14 +71,6 @@ Global
 		{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
@@ -73,6 +79,30 @@ Global
 		{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
+		{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
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|Win32.Build.0 = Debug|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.ActiveCfg = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Debug|x64.Build.0 = Debug|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.ActiveCfg = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|Win32.Build.0 = Release|Win32
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.ActiveCfg = Release|x64
+		{B3B6558A-01C8-4C72-9BDE-84ABB1AE67DF}.Release|x64.Build.0 = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|Win32.Build.0 = Debug|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.ActiveCfg = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Debug|x64.Build.0 = Debug|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.ActiveCfg = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|Win32.Build.0 = Release|Win32
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.ActiveCfg = Release|x64
+		{7660FB4E-2AE6-483E-8813-0974CBE6F97F}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk+.vsprops

@@ -9,7 +9,7 @@
 	<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;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.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"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
@@ -41,37 +41,29 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 		Name="GtkDummyPrefix"
 		Value="/dummy"
 	/>
-	<UserMacro
-		Name="GtkPrefixDefine"
-		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
-	/>
 	<UserMacro
 		Name="GdkDefines"
 		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
 	/>
+	<UserMacro
+		Name="GtkHost"
+		Value="i686-pc-vs9"
+	/>
 	<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;"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;$(GtkHost)\&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_SYSCONFDIR=&quot;$(GtkDummyPrefix)/etc&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot;"
 	/>
 	<UserMacro
 		Name="GtkDoInstall"
 		Value="
 echo on&#x0D;&#x0A;
 mkdir $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-
-mkdir $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-vs9.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;
@@ -331,7 +323,35 @@ copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#
 mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+copy ..\..\..\modules\other\gail\libgail-util\gailmisc.h $(OutDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+copy ..\..\..\modules\other\gail\libgail-util\gailtextutil.h $(OutDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+copy ..\..\..\modules\other\gail\libgail-util\gail-util.h $(OutDir)\include\gail-1.0\libgail-util&#x0D;&#x0A;
+
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+
+mkdir $(Outdir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\libwimp.dll $(Outdir)\lib\gtk-$(GtkApiVersion)\$(GtkHost)\engines&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\themes\Default\gtk-2.0-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.default $(OutDir)\share\themes\Default\gtk-2.0-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\themes\Emacs\gtk-2.0-key&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.key.emacs $(OutDir)\share\themes\Emacs\gtk-2.0-key\gtkrc&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\themes\MS-Windows\gtk-2.0&#x0D;&#x0A;
+copy ..\..\..\modules\engines\ms-windows\Theme\gtk-2.0\gtkrc $(OutDir)\share\themes\MS-Windows\gtk-2.0&#x0D;&#x0A;
+
+mkdir $(OutDir)\share\themes\Raleigh\gtk-2.0&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.default $(OutDir)\share\themes\Raleigh\gtk-2.0\gtkrc&#x0D;&#x0A;
 "
 	/>
 	<UserMacro
@@ -374,6 +394,6 @@ copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\l
 	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\..\vs9\$(PlatformName)"
+		Value="..\..\..\..\vs9\$(PlatformName)"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk-demo.vcproj

@@ -32,10 +32,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkPrefixDefine)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -65,7 +65,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkPrefixDefine)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -98,7 +98,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -131,7 +131,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
+				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

build/win32/vs9/gtk.vcprojin

@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"

build/win32/vs9/libwimp.vcproj

@@ -2,11 +2,11 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gdk-pixbuf-query-loaders"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	RootNamespace="gdkpixbufqueryloaders"
+	Name="libwimp"
+	ProjectGUID="{7660FB4E-2AE6-483E-8813-0974CBE6F97F}"
+	RootNamespace="libwimp"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
+	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@@ -21,7 +21,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			ConfigurationType="1"
+			ConfigurationType="2"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
 			>
@@ -30,30 +30,62 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufLibdirDefine)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions=""
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
@@ -62,84 +94,50 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
 				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"
+			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions=""
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
+				AdditionalDependencies="pangowin32-1.0.lib pango-1.0.lib cairo.lib"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -148,18 +146,27 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
+			Name="Sources"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\gdk-pixbuf\queryloaders.c" />
+			<File RelativePath="..\..\..\modules\engines\ms-windows\msw_rc_style.c" />
+			<File RelativePath="..\..\..\modules\engines\ms-windows\msw_style.c" />
+			<File RelativePath="..\..\..\modules\engines\ms-windows\msw_theme_main.c" />
+			<File RelativePath="..\..\..\modules\engines\ms-windows\xp_theme.c" />
 		</Filter>
 		<Filter
-			Name="Header Files"
+			Name="Headers"
 			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;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

configure.ac

@@ -13,8 +13,8 @@ AC_PREREQ(2.62)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [7])
-m4_define([gtk_interface_age], [7])
+m4_define([gtk_micro_version], [21])
+m4_define([gtk_interface_age], [21])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -32,7 +32,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.27.3])
+m4_define([glib_required_version], [2.28.0])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.6])
@@ -44,14 +44,13 @@ AC_INIT([gtk+], [gtk_version],
 	[gtk+])
 
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
-
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
 AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
-AM_CONFIG_HEADER(config.h)
 
 # Support silent build rules, requires at least automake-1.11. Enable
 # by either passing --enable-silent-rules to configure or passing V=0
@@ -300,7 +299,6 @@ AM_SANITY_CHECK
 
 # Checks for programs.
 AC_ISC_POSIX
-AM_PROG_CC_STDC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -392,6 +390,8 @@ fi
 PKG_CHECK_MODULES(CAIRO_BACKEND,
   [cairo-$cairo_backend >= cairo_required_version])
 
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
+
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
     # right now, symbols starting with _ are not exported
@@ -822,6 +822,9 @@ all_immodules="am-et,cedilla,cyrillic-translit"
 if test "$gdktarget" = "win32"; then
    all_immodules="${all_immodules},ime"
 fi
+if test "$gdktarget" = "quartz"; then
+   all_immodules="${all_immodules},quartz"
+fi
 all_immodules="${all_immodules},inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr"
 if test "$gdktarget" = "x11"; then
    all_immodules="${all_immodules},xim"
@@ -865,6 +868,7 @@ AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
+AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
@@ -1471,6 +1475,12 @@ else
       AC_DEFINE(HAVE_CUPS_API_1_2, 1, 
                 [Define to 1 if CUPS 1.2 API is available])
     fi
+    if test $CUPS_API_MAJOR -gt 1 -o \
+	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
+      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
+                [Define to 1 if CUPS 1.6 API is available])
+      have_cups_api_1_6=yes
+    fi
 
     AC_SUBST(CUPS_API_MAJOR)
     AC_SUBST(CUPS_API_MINOR)
@@ -1550,6 +1560,9 @@ AC_ARG_ENABLE(test-print-backend,
               [enable_test_print_backend=no])
 AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
 
+if test "$os_win32" = "yes"; then
+  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
+fi
 
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
@@ -1588,7 +1601,7 @@ AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
 AC_ARG_ENABLE(man,
               [AC_HELP_STRING([--enable-man],
-                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+                              [regenerate man pages from Docbook [default=no]])],,
               enable_man=no)
 
 if test "${enable_man}" != no; then
@@ -1672,6 +1685,8 @@ elif test "x$gdktarget" = "xwin32" ; then
 #define GDK_WINDOWING_WIN32'
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='
+#define GDK_NATIVE_WINDOW_POINTER
+
 #define GDK_WINDOWING_QUARTZ'
 elif test "x$gdktarget" = "xdirectfb" ; then
   gdk_windowing='

demos/gtk-demo/changedisplay.c

@@ -128,7 +128,7 @@ query_for_toplevel (GdkScreen  *screen,
   gtk_widget_show_all (popup);
   cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
-  if (gdk_pointer_grab (popup->window, FALSE,
+  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
 			GDK_BUTTON_RELEASE_MASK,
 			NULL,
 			cursor,
@@ -232,6 +232,7 @@ open_display_cb (GtkWidget         *button,
   GtkWidget *dialog;
   GtkWidget *display_entry;
   GtkWidget *dialog_label;
+  GtkWidget *content_area;
   gchar *new_screen_name = NULL;
   GdkDisplay *result = NULL;
 
@@ -247,12 +248,14 @@ open_display_cb (GtkWidget         *button,
   gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
   dialog_label =
     gtk_label_new ("Please enter the name of\nthe new display\n");
-
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
+  
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  
+  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
+  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
 
   gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (GTK_BIN (dialog)->child);
+  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));
 
   while (!result)
     {
@@ -621,7 +624,7 @@ do_changedisplay (GtkWidget *do_widget)
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
 
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (info->window))), vbox,
 			  TRUE, TRUE, 0);
 
       frame = create_display_frame (info);

demos/gtk-demo/clipboard.c

@@ -125,7 +125,7 @@ drag_data_received (GtkWidget        *widget,
 {
   GdkPixbuf *pixbuf;
 
-  if (selection_data->length > 0)
+  if (gtk_selection_data_get_length (selection_data) > 0)
     {
       pixbuf = gtk_selection_data_get_pixbuf (selection_data);
       gtk_image_set_from_pixbuf (GTK_IMAGE (data), pixbuf);

demos/gtk-demo/colorsel.c

@@ -19,14 +19,16 @@ expose_event_callback (GtkWidget      *widget,
                        GdkEventExpose *event, 
                        gpointer        data)
 {
-  if (widget->window)
+  GdkWindow *window = gtk_widget_get_window (widget);
+  
+  if (window)
     {
       GtkStyle *style;
       cairo_t *cr;
 
       style = gtk_widget_get_style (widget);
 
-      cr = gdk_cairo_create (widget->window);
+      cr = gdk_cairo_create (window);
 
       gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
       gdk_cairo_rectangle (cr, &event->area);
@@ -50,7 +52,8 @@ change_color_callback (GtkWidget *button,
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
   
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
+  colorsel = 
+    GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG (dialog)));
 
   gtk_color_selection_set_previous_color (colorsel, &color);
   gtk_color_selection_set_current_color (colorsel, &color);

demos/gtk-demo/combobox.c

@@ -435,7 +435,7 @@ do_combobox (GtkWidget *do_widget)
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
      
-    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
+    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
     gtk_container_add (GTK_CONTAINER (combo), entry);
   
   }

demos/gtk-demo/dialog.c

@@ -53,7 +53,7 @@ interactive_dialog_clicked (GtkButton *button,
 
   hbox = gtk_hbox_new (FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0);
 
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);

demos/gtk-demo/drawingarea.c

@@ -26,14 +26,17 @@ scribble_configure_event (GtkWidget         *widget,
                           gpointer           data)
 {
   cairo_t *cr;
+  GtkAllocation allocation;
+  
+  gtk_widget_get_allocation (widget, &allocation);
 
   if (surface)
     cairo_surface_destroy (surface);
 
-  surface = gdk_window_create_similar_surface (widget->window,
+  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
                                                CAIRO_CONTENT_COLOR,
-                                               widget->allocation.width,
-                                               widget->allocation.height);
+                                               allocation.width,
+                                               allocation.height);
 
   /* Initialize the surface to white */
   cr = cairo_create (surface);
@@ -55,7 +58,7 @@ scribble_expose_event (GtkWidget      *widget,
 {
   cairo_t *cr;
 
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
   
   cairo_set_source_surface (cr, surface, 0, 0);
   gdk_cairo_rectangle (cr, &event->area);
@@ -89,7 +92,7 @@ draw_brush (GtkWidget *widget,
   cairo_destroy (cr);
 
   /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (widget->window,
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
                               &update_rect,
                               FALSE);
 }
@@ -148,6 +151,9 @@ checkerboard_expose (GtkWidget      *da,
 {
   gint i, j, xcount, ycount;
   cairo_t *cr;
+  GtkAllocation allocation;
+  
+  gtk_widget_get_allocation (da, &allocation);
 
 #define CHECK_SIZE 10
 #define SPACING 2
@@ -159,17 +165,17 @@ checkerboard_expose (GtkWidget      *da,
    * works.
    */
 
-  cr = gdk_cairo_create (da->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (da));
   gdk_cairo_rectangle (cr, &event->area);
   cairo_clip (cr);
 
   xcount = 0;
   i = SPACING;
-  while (i < da->allocation.width)
+  while (i < allocation.width)
     {
       j = SPACING;
       ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < da->allocation.height)
+      while (j < allocation.height)
         {
           if (ycount % 2)
             cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
@@ -205,7 +211,7 @@ close_window (void)
   window = NULL;
 
   if (surface)
-    g_object_unref (surface);
+    cairo_surface_destroy (surface);
   surface = NULL;
 }
 

demos/gtk-demo/entry_buffer.c

@@ -32,7 +32,7 @@ do_entry_buffer (GtkWidget *do_widget)
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/entry_completion.c

@@ -59,7 +59,7 @@ do_entry_completion (GtkWidget *do_widget)
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/expander.c

@@ -33,7 +33,7 @@ do_expander (GtkWidget *do_widget)
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new ("Expander demo. Click on the triangle for details.");

demos/gtk-demo/hypertext.c

@@ -225,7 +225,7 @@ motion_notify_event (GtkWidget      *text_view,
 
   set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
 
-  gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
+  gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
   return FALSE;
 }
 
@@ -238,7 +238,7 @@ visibility_notify_event (GtkWidget          *text_view,
 {
   gint wx, wy, bx, by;
   
-  gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
+  gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
   
   gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                          GTK_TEXT_WINDOW_WIDGET,

demos/gtk-demo/main.c

@@ -942,7 +942,7 @@ main (int argc, char **argv)
                    G_FILE_TEST_EXISTS))
     {
       g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
     }
   /* -- End of hack -- */
   

demos/gtk-demo/offscreen_window.c

@@ -74,7 +74,7 @@ to_child (GtkRotatedBin *bin,
 
   s = sin (bin->angle);
   c = cos (bin->angle);
-  child_area = bin->child->allocation;
+  gtk_widget_get_allocation (bin->child, &child_area);
 
   w = c * child_area.width + s * child_area.height;
   h = s * child_area.width + c * child_area.height;
@@ -114,7 +114,7 @@ to_parent (GtkRotatedBin *bin,
 
   s = sin (bin->angle);
   c = cos (bin->angle);
-  child_area = bin->child->allocation;
+  gtk_widget_get_allocation (bin->child, &child_area);
 
   w = c * child_area.width + s * child_area.height;
   h = s * child_area.width + c * child_area.height;
@@ -188,7 +188,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
-      child_area = bin->child->allocation;
+      gtk_widget_get_allocation (bin->child, &child_area);
 
       if (x >= 0 && x < child_area.width &&
           y >= 0 && y < child_area.height)
@@ -224,19 +224,23 @@ static void
 gtk_rotated_bin_realize (GtkWidget *widget)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
+  GdkWindow *gdk_window;
   GdkWindowAttr attributes;
   gint attributes_mask;
   gint border_width;
   GtkRequisition child_requisition;
+  GtkAllocation widget_allocation, bin_child_allocation;
+  GtkStyle *style;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  gtk_widget_get_allocation (widget, &widget_allocation);
 
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
+  attributes.x = widget_allocation.x + border_width;
+  attributes.y = widget_allocation.y + border_width;
+  attributes.width = widget_allocation.width - 2 * border_width;
+  attributes.height = widget_allocation.height - 2 * border_width;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget)
                         | GDK_EXPOSURE_MASK
@@ -252,11 +256,11 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
+  
+  gdk_window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
+  gtk_widget_set_window (widget, gdk_window);
+  gdk_window_set_user_data (gdk_window, widget);
+  g_signal_connect (gdk_window, "pick-embedded-child",
                     G_CALLBACK (pick_offscreen_child), bin);
 
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
@@ -264,24 +268,25 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   child_requisition.width = child_requisition.height = 0;
   if (bin->child && gtk_widget_get_visible (bin->child))
     {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
+      gtk_widget_get_allocation (bin->child, &bin_child_allocation);
+      attributes.width = bin_child_allocation.width;
+      attributes.height = bin_child_allocation.height;
     }
   bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)
     gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, gtk_widget_get_window (widget));
   g_signal_connect (bin->offscreen_window, "to-embedder",
                     G_CALLBACK (offscreen_window_to_parent), bin);
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
+  gtk_widget_style_attach (widget);
+  style = gtk_widget_get_style (widget);
+  gtk_style_set_background (style, gdk_window, GTK_STATE_NORMAL);
+  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -376,9 +381,12 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GtkRequisition child_requisition;
+  gint border_width;
   double s, c;
   double w, h;
-
+  
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  
   child_requisition.width = 0;
   child_requisition.height = 0;
 
@@ -390,8 +398,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   w = c * child_requisition.width + s * child_requisition.height;
   h = s * child_requisition.width + c * child_requisition.height;
 
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
+  requisition->width = border_width * 2 + w;
+  requisition->height = border_width * 2 + h;
 }
 
 static void
@@ -403,15 +411,15 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
   gint w, h;
   gdouble s, c;
 
-  widget->allocation = *allocation;
+  gtk_widget_set_allocation (widget, allocation);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
   if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
+    gdk_window_move_resize (gtk_widget_get_window (widget),
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
@@ -452,7 +460,7 @@ static gboolean
 gtk_rotated_bin_damage (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget), NULL, FALSE);
 
   return TRUE;
 }
@@ -468,7 +476,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
 
   if (gtk_widget_is_drawable (widget))
     {
-      if (event->window == widget->window)
+      if (event->window == gtk_widget_get_window (widget))
         {
           GdkPixmap *pixmap;
           GtkAllocation child_area;
@@ -477,9 +485,9 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
           if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              child_area = bin->child->allocation;
+              gtk_widget_get_allocation (bin->child, &child_area);
 
-              cr = gdk_cairo_create (widget->window);
+              cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
               /* transform */
               s = sin (bin->angle);
@@ -505,7 +513,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
         }
       else if (event->window == bin->offscreen_window)
         {
-          gtk_paint_flat_box (widget->style, event->window,
+          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
                               GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                               &event->area, widget, "blah",
                               0, 0, -1, -1);

demos/gtk-demo/offscreen_window2.c

@@ -126,7 +126,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
-      child_area = bin->child->allocation;
+      gtk_widget_get_allocation (bin->child, &child_area);
 
       if (x >= 0 && x < child_area.width &&
           y >= 0 && y < child_area.height)
@@ -163,18 +163,22 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GdkWindowAttr attributes;
+  GdkWindow *gdk_window;
   gint attributes_mask;
   gint border_width;
   GtkRequisition child_requisition;
+  GtkAllocation widget_allocation, bin_child_allocation;
+  GtkStyle *style;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  gtk_widget_get_allocation (widget, &widget_allocation);
 
-  attributes.x = widget->allocation.x + border_width;
-  attributes.y = widget->allocation.y + border_width;
-  attributes.width = widget->allocation.width - 2 * border_width;
-  attributes.height = widget->allocation.height - 2 * border_width;
+  attributes.x = widget_allocation.x + border_width;
+  attributes.y = widget_allocation.y + border_width;
+  attributes.width = widget_allocation.width - 2 * border_width;
+  attributes.height = widget_allocation.height - 2 * border_width;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget)
                         | GDK_EXPOSURE_MASK
@@ -190,11 +194,12 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                                   &attributes, attributes_mask);
-  gdk_window_set_user_data (widget->window, widget);
-  g_signal_connect (widget->window, "pick-embedded-child",
+  
+  gdk_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                               &attributes, attributes_mask);
+  gtk_widget_set_window (widget, gdk_window);
+  gdk_window_set_user_data (gdk_window, widget);
+  g_signal_connect (gdk_window, "pick-embedded-child",
                     G_CALLBACK (pick_offscreen_child), bin);
 
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
@@ -202,24 +207,25 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   child_requisition.width = child_requisition.height = 0;
   if (bin->child && gtk_widget_get_visible (bin->child))
     {
-      attributes.width = bin->child->allocation.width;
-      attributes.height = bin->child->allocation.height;
+      gtk_widget_get_allocation (bin->child, &bin_child_allocation);
+      attributes.width = bin_child_allocation.width;
+      attributes.height = bin_child_allocation.height;
     }
   bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)
     gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, gtk_widget_get_window (widget));
   g_signal_connect (bin->offscreen_window, "to-embedder",
                     G_CALLBACK (offscreen_window_to_parent), bin);
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  widget->style = gtk_style_attach (widget->style, widget->window);
-
-  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
+  gtk_widget_style_attach (widget);
+  style = gtk_widget_get_style (widget);
+  gtk_style_set_background (style, gdk_window, GTK_STATE_NORMAL);
+  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -302,6 +308,9 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkRequisition child_requisition;
+  gint border_width;
+  
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -309,8 +318,8 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   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;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
+  requisition->width = border_width * 2 + child_requisition.width + 10;
+  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
 }
 
 static void
@@ -320,15 +329,16 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   gint border_width;
   gint w, h;
-  widget->allocation = *allocation;
+  
+  gtk_widget_set_allocation (widget, allocation);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
   if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (widget->window,
+    gdk_window_move_resize (gtk_widget_get_window (widget),
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
@@ -357,7 +367,7 @@ static gboolean
 gtk_mirror_bin_damage (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+  gdk_window_invalidate_rect (gtk_widget_get_window (widget), NULL, FALSE);
 
   return TRUE;
 }
@@ -371,7 +381,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
 
   if (gtk_widget_is_drawable (widget))
     {
-      if (event->window == widget->window)
+      if (event->window == gtk_widget_get_window (widget))
         {
           GdkPixmap *pixmap;
           cairo_t *cr;
@@ -383,7 +393,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               gdk_pixmap_get_size (pixmap, &width, &height);
 
-              cr = gdk_cairo_create (widget->window);
+              cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
               cairo_save (cr);
 
@@ -423,7 +433,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
         }
       else if (event->window == bin->offscreen_window)
         {
-          gtk_paint_flat_box (widget->style, event->window,
+          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
                               GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                               &event->area, widget, "blah",
                               0, 0, -1, -1);

demos/gtk-demo/panes.c

@@ -17,15 +17,14 @@ void
 toggle_resize (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  GtkPaned *paned = GTK_PANED (gtk_widget_get_parent (child));
+  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
   gboolean resize, shrink;
 
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  gtk_container_child_get (GTK_CONTAINER (paned), child, "resize", &resize, "shrink", &shrink, NULL);
 
   g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (child)), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, !resize, shrink);
   else
@@ -37,15 +36,14 @@ void
 toggle_shrink (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  GtkPaned *paned = GTK_PANED (gtk_widget_get_parent (child));
+  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
   gboolean resize, shrink;
 
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  gtk_container_child_get (GTK_CONTAINER (paned), child, "resize", &resize, "shrink", &shrink, NULL);
 
   g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (child->parent), child);
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (child)), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, resize, !shrink);
   else
@@ -63,6 +61,11 @@ create_pane_options (GtkPaned	 *paned,
   GtkWidget *table;
   GtkWidget *label;
   GtkWidget *check_button;
+  GtkWidget *child1;
+  GtkWidget *child2;
+  
+  child1 = gtk_paned_get_child1 (paned);
+  child2 = gtk_paned_get_child2 (paned);
   
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
@@ -78,7 +81,7 @@ create_pane_options (GtkPaned	 *paned,
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 1, 2);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child1);
+		    G_CALLBACK (toggle_resize), child1);
   
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
@@ -86,7 +89,7 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child1);
+		    G_CALLBACK (toggle_shrink), child1);
   
   label = gtk_label_new (label2);
   gtk_table_attach_defaults (GTK_TABLE (table), label,
@@ -98,7 +101,7 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child2);
+		    G_CALLBACK (toggle_resize), child2);
   
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
@@ -106,7 +109,7 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child2);
+		    G_CALLBACK (toggle_shrink), child2);
 
   return frame;
 }

demos/gtk-demo/rotated_text.c

@@ -107,17 +107,21 @@ rotated_text_expose_event (GtkWidget      *widget,
   cairo_pattern_t *pattern;
 
   PangoAttrList *attrs;
-
-  int width = widget->allocation.width;
-  int height = widget->allocation.height;
+  GtkAllocation allocation;
+  int width, height;
   double device_radius;
   int i;
+  
+  gtk_widget_get_allocation (widget, &allocation);
+
+  width = allocation.width;
+  height = allocation.height;
 
   /* Create a cairo context and set up a transformation matrix so that the user
    * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
    * [-RADIUS, RADIUS].
    * We first center, then change the scale. */
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
 		   device_radius + (width - 2 * device_radius) / 2,

demos/gtk-demo/search_entry.c

@@ -264,7 +264,7 @@ do_search_entry (GtkWidget *do_widget)
                         G_CALLBACK (search_entry_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/sizegroup.c

@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

demos/gtk-demo/spinner.c

@@ -48,7 +48,7 @@ do_spinner (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     /* Sensitive */

demos/gtk-demo/toolpalette.c

@@ -86,13 +86,15 @@ canvas_expose_event (GtkWidget      *widget,
 {
   cairo_t *cr;
   GList *iter;
+  GtkAllocation allocation;
 
-  cr = gdk_cairo_create (widget->window);
+  cr = gdk_cairo_create (gtk_widget_get_window (widget));
   gdk_cairo_region (cr, event->region);
   cairo_clip (cr);
 
+  gtk_widget_get_allocation (widget, &allocation);
   cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, widget->allocation.width, widget->allocation.height);
+  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
   cairo_fill (cr);
 
   for (iter = canvas_items; iter; iter = iter->next)
@@ -176,6 +178,7 @@ palette_drag_data_received (GtkWidget        *widget,
   GtkToolItemGroup *drop_group = NULL;
   GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
   GtkWidget        *drag_item = NULL;
+  GtkAllocation	    allocation;
 
   while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
     drag_palette = gtk_widget_get_parent (drag_palette);
@@ -186,6 +189,7 @@ palette_drag_data_received (GtkWidget        *widget,
                                                   selection);
       drop_group = gtk_tool_palette_get_drop_group (GTK_TOOL_PALETTE (widget),
                                                     x, y);
+      gtk_widget_get_allocation (GTK_WIDGET (drop_group), &allocation);
     }
 
   if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
@@ -195,8 +199,8 @@ palette_drag_data_received (GtkWidget        *widget,
   else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
     palette_drop_item (GTK_TOOL_ITEM (drag_item),
                        drop_group,
-                       x - GTK_WIDGET (drop_group)->allocation.x,
-                       y - GTK_WIDGET (drop_group)->allocation.y);
+                       x - allocation.x,
+                       y - allocation.y);
 }
 
 /********************************/
@@ -372,7 +376,7 @@ on_combo_orientation_changed (GtkComboBox *combo_box,
                               gpointer     user_data)
 {
   GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW (GTK_WIDGET (palette)->parent);
+  GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (GTK_WIDGET (palette)));
   GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
   GtkTreeIter iter;
   gint val = 0;

docs/reference/gdk/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gdk
+DOC_MODULE=gdk2
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml

docs/reference/gdk/gdk-docs.sgml

@@ -10,7 +10,7 @@
     <releaseinfo>
       This document is for GDK 2 library; the latest versions can be found online at
       <ulink role="online-location"
-      url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
+      url="http://library.gnome.org/devel/gdk2/">http://library.gnome.org/devel/gdk2/</ulink>.
       If you're looking for the newer GDK 3 series of libraries,
       see <ulink role="online-location"
       url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.

docs/reference/gdk/tmpl/cairo_interaction.sgml

@@ -30,6 +30,18 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### FUNCTION gdk_window_create_similar_surface ##### -->
+<para>
+
+</para>
+
+@window: 
+@content: 
+@width: 
+@height: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cairo_create ##### -->
 <para>
 
@@ -70,6 +82,17 @@ Cairo paths and to use pixbufs as sources for drawing operations.
 @pixmap_y: 
 
 
+<!-- ##### FUNCTION gdk_cairo_set_source_window ##### -->
+<para>
+
+</para>
+
+@cr: 
+@window: 
+@x: 
+@y: 
+
+
 <!-- ##### FUNCTION gdk_cairo_rectangle ##### -->
 <para>
 

docs/reference/gdk/tmpl/cursors.sgml

@@ -199,6 +199,15 @@ The standard cursors available.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_cursor_get_cursor_type ##### -->
+<para>
+
+</para>
+
+@cursor: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_cursor_ref ##### -->
 <para>
 

docs/reference/gdk/tmpl/gdkdisplay.sgml

@@ -164,6 +164,15 @@ of an X display. All its fields are private and should not be accessed directly.
 @display: 
 
 
+<!-- ##### FUNCTION gdk_display_is_closed ##### -->
+<para>
+
+</para>
+
+@display: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_display_list_devices ##### -->
 <para>
 

docs/reference/gdk/tmpl/general.sgml

@@ -100,7 +100,7 @@ locale.
 
 @void: 
 @Returns: the resulting locale.
-@Deprecated:2.24: Use setlocale() directly
+@Deprecated: 2.24: Use setlocale() directly
 
 
 <!-- ##### FUNCTION gdk_set_sm_client_id ##### -->
@@ -411,10 +411,3 @@ This macro is defined if GDK is configured to use the X11 backend.
 
 
 
-<!-- ##### MACRO GDK_WINDOWING_WIN32 ##### -->
-<para>
-This macro is defined if GDK is configured to use the Win32 backend.
-</para>
-
-
-

docs/reference/gdk/tmpl/images.sgml

@@ -164,6 +164,96 @@ Destroys a #GdkImage, freeing any resources allocated for it.
 @colormap: 
 
 
+<!-- ##### FUNCTION gdk_image_get_bits_per_pixel ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_bytes_per_pixel ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_bytes_per_line ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_byte_order ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_depth ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_height ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_image_type ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_visual ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_width ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_image_get_pixels ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_image_put_pixel ##### -->
 <para>
 Sets a pixel in a #GdkImage to a given pixel value.

docs/reference/gdk/tmpl/input_devices.sgml

@@ -172,6 +172,15 @@ types that GTK+ understands.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_device_get_name ##### -->
+<para>
+
+</para>
+
+@device: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_device_set_source ##### -->
 <para>
 Sets the source type for an input device.
@@ -181,6 +190,15 @@ Sets the source type for an input device.
 @source: the source type.
 
 
+<!-- ##### FUNCTION gdk_device_get_source ##### -->
+<para>
+
+</para>
+
+@device: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_device_set_mode ##### -->
 <para>
 Sets a the mode of an input device. The mode controls if the 
@@ -193,6 +211,15 @@ entire screen or to a single window.
 @Returns: %TRUE if the mode was successfully changed.
 
 
+<!-- ##### FUNCTION gdk_device_get_mode ##### -->
+<para>
+
+</para>
+
+@device: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_device_set_key ##### -->
 <para>
 Specifies the X key event to generate when a macro button of a device
@@ -205,6 +232,17 @@ is pressed.
 @modifiers: the modifiers to set.
 
 
+<!-- ##### FUNCTION gdk_device_get_key ##### -->
+<para>
+
+</para>
+
+@device: 
+@index: 
+@keyval: 
+@modifiers: 
+
+
 <!-- ##### FUNCTION gdk_device_set_axis_use ##### -->
 <para>
 Specifies how an axis of a device is used.
@@ -215,6 +253,16 @@ Specifies how an axis of a device is used.
 @use: specifies how the axis is used.
 
 
+<!-- ##### FUNCTION gdk_device_get_axis_use ##### -->
+<para>
+
+</para>
+
+@device: 
+@index: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_device_get_core_pointer ##### -->
 <para>
 </para>
@@ -276,6 +324,15 @@ motion history. It contains the following fields:
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_device_get_n_axes ##### -->
+<para>
+
+</para>
+
+@device: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_input_set_extension_events ##### -->
 <para>
 Turns extension events on or off for a particular window,

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -29,7 +29,7 @@ types, they are not deprecated.
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT GdkPixmap ##### -->
+<!-- ##### TYPEDEF GdkPixmap ##### -->
 <para>
 An opaque structure representing an offscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
@@ -71,7 +71,6 @@ window is used.
 @width: the width of the new pixmap in pixels.
 @height: the height of the new pixmap in pixels.
 @Returns: the #GdkBitmap
-
 @Deprecated: 2.22: You can create a Cairo image surface using
 cairo_image_surface_create_for_data() instead. Specify
 %CAIRO_FORMAT_A1 as the format to get a bitmap. Keep in mind that
@@ -81,6 +80,7 @@ gdk_pixmap_new() with a depth of 1 to create a bitmap and then use
 gdk_cairo_create(), cairo_set_source_surface() and cairo_paint()
 to draw the image surface to the bitmap.
 
+
 <!-- ##### FUNCTION gdk_pixmap_create_from_data ##### -->
 <para>
 Create a two-color pixmap from data in XBM data.
@@ -95,13 +95,13 @@ for the new pixmap. Can be %NULL, if the depth is given.
 @fg: the foreground color.
 @bg: the background color.
 @Returns: the #GdkPixmap
-
 @Deprecated: 2.22: If you must replicate the functionality of this
 function, create a pixmap using gdk_pixmap_new(), cairo_paint() it
 with the background color and then create a Cairo image surface as
 pointed out in the docs to gdk_bitmap_create_from_data() and use
 this surface with cairo_mask_surface() to paint the foreground color.
 
+
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
 
 
@@ -144,6 +144,16 @@ this surface with cairo_mask_surface() to paint the foreground color.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pixmap_get_size ##### -->
+<para>
+
+</para>
+
+@pixmap: 
+@width: 
+@height: 
+
+
 <!-- ##### MACRO gdk_pixmap_ref ##### -->
 <para>
 Deprecated equivalent of g_object_ref().

docs/reference/gdk/tmpl/properties.sgml

@@ -48,7 +48,7 @@ data commonly stored in X window properties.
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT GdkAtom ##### -->
+<!-- ##### TYPEDEF GdkAtom ##### -->
 <para>
 An opaque type representing a string as an index into a table
 of strings on the X server.

docs/reference/gdk/tmpl/visuals.sgml

@@ -232,3 +232,81 @@ Deprecated equivalent of g_object_unref().
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_visual_get_bits_per_rgb ##### -->
+<para>
+
+</para>
+
+@visual: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_blue_pixel_details ##### -->
+<para>
+
+</para>
+
+@visual: 
+@mask: 
+@shift: 
+@precision: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_byte_order ##### -->
+<para>
+
+</para>
+
+@visual: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_colormap_size ##### -->
+<para>
+
+</para>
+
+@visual: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_depth ##### -->
+<para>
+
+</para>
+
+@visual: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_green_pixel_details ##### -->
+<para>
+
+</para>
+
+@visual: 
+@mask: 
+@shift: 
+@precision: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_red_pixel_details ##### -->
+<para>
+
+</para>
+
+@visual: 
+@mask: 
+@shift: 
+@precision: 
+
+
+<!-- ##### FUNCTION gdk_visual_get_visual_type ##### -->
+<para>
+
+</para>
+
+@visual: 
+@Returns: 
+
+

docs/reference/gdk/tmpl/windows.sgml

@@ -212,7 +212,7 @@ gdk_offscreen_window_get_pixmap().
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### STRUCT GdkWindow ##### -->
+<!-- ##### TYPEDEF GdkWindow ##### -->
 <para>
 An opaque structure representing an onscreen drawable.
 Pointers to structures of type #GdkPixmap, #GdkBitmap,
@@ -525,6 +525,51 @@ Deprecated equivalent of g_object_unref()
 
 
 
+<!-- ##### FUNCTION gdk_window_get_display ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_window_get_screen ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_window_get_visual ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_window_get_width ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_window_get_height ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_get_window_type ##### -->
 <para>
 
@@ -595,6 +640,24 @@ Deprecated equivalent of g_object_unref()
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_window_is_shaped ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_window_is_input_only ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_get_state ##### -->
 <para>
 
@@ -712,6 +775,15 @@ Deprecated equivalent of g_object_unref()
 @composited: 
 
 
+<!-- ##### FUNCTION gdk_window_get_composited ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_move ##### -->
 <para>
 
@@ -773,6 +845,15 @@ Deprecated equivalent of g_object_unref()
 @window: 
 
 
+<!-- ##### FUNCTION gdk_window_has_native ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_ensure_native ##### -->
 <para>
 
@@ -990,7 +1071,8 @@ Registers a window as a potential drop destination.
 @GdkWindow *, gpointer:
 @GdkWindow *, gpointer:
 @GdkWindow *, gpointer:
-@GdkWindow *, gpointer: 
+@GdkWindow *, gpointer:
+@child_func: 
 @user_data: 
 
 
@@ -1098,6 +1180,15 @@ Registers a window as a potential drop destination.
 @accept_focus: 
 
 
+<!-- ##### FUNCTION gdk_window_get_accept_focus ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_set_focus_on_map ##### -->
 <para>
 
@@ -1107,6 +1198,15 @@ Registers a window as a potential drop destination.
 @focus_on_map: 
 
 
+<!-- ##### FUNCTION gdk_window_get_focus_on_map ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_add_filter ##### -->
 <para>
 
@@ -1293,6 +1393,15 @@ backend, <type>MSG</type>s for Win32).
 @parent_relative: 
 
 
+<!-- ##### FUNCTION gdk_window_get_background_pattern ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### MACRO GDK_PARENT_RELATIVE ##### -->
 <para>
 A special value for <literal>GdkPixmap*</literal> variables, indicating
@@ -1377,6 +1486,15 @@ Deprecated equivalent to gdk_drawable_set_colormap()
 @modal: 
 
 
+<!-- ##### FUNCTION gdk_window_get_modal_hint ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_set_type_hint ##### -->
 <para>
 
@@ -1458,12 +1576,13 @@ Deprecated equivalent of gdk_drawable_get_size().
 
 
 
-<!-- ##### MACRO gdk_window_get_visual ##### -->
+<!-- ##### FUNCTION gdk_window_get_visual ##### -->
 <para>
-Deprecated equivalent of gdk_drawable_get_visual().
+
 </para>
 
-@Returns: the #GdkVisual of the window
+@window: 
+@Returns: 
 
 
 <!-- ##### MACRO gdk_window_get_colormap ##### -->
@@ -1516,6 +1635,30 @@ Deprecated equivalent of gdk_drawable_get_type().
 @root_y: 
 
 
+<!-- ##### FUNCTION gdk_window_coords_from_parent ##### -->
+<para>
+
+</para>
+
+@window: 
+@parent_x: 
+@parent_y: 
+@x: 
+@y: 
+
+
+<!-- ##### FUNCTION gdk_window_coords_to_parent ##### -->
+<para>
+
+</para>
+
+@window: 
+@x: 
+@y: 
+@parent_x: 
+@parent_y: 
+
+
 <!-- ##### FUNCTION gdk_window_get_pointer ##### -->
 <para>
 
@@ -1579,6 +1722,15 @@ or %GDK_META_MASK in the state field of key events.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_window_get_effective_parent ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_get_toplevel ##### -->
 <para>
 
@@ -1588,6 +1740,15 @@ or %GDK_META_MASK in the state field of key events.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_window_get_effective_toplevel ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_window_get_children ##### -->
 <para>
 

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -40,8 +40,7 @@ The current display.
 </para>
 
 @Returns: an Xlib <type>Display*</type>.
-
-@Deprecated: 2.22: Use gdk_display_get_default() to get the default #GdkDisplay or gdk_x11_get_default_xdisplay() to get the corresponding Xlib <type>Display *</type>.
+@Deprecated: 2.22: Use gdk_display_get_default() to get the default #GdkDisplay or gdk_x11_get_default_xdisplay() to get the corresponding Xlib Display *
 
 
 <!-- ##### MACRO GDK_WINDOW_XDISPLAY ##### -->
@@ -537,7 +536,7 @@ Since: 2.2
 
 @display: 
 @message_type: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gdk_x11_display_get_startup_notification_id ##### -->
@@ -821,3 +820,31 @@ Since: 2.2
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_x11_set_sm_client_id ##### -->
+<para>
+
+</para>
+
+@sm_client_id: 
+
+
+<!-- ##### FUNCTION gdk_x11_window_foreign_new_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_x11_window_lookup_for_display ##### -->
+<para>
+
+</para>
+
+@display: 
+@window: 
+@Returns: 
+
+

docs/reference/gtk/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gtk
+DOC_MODULE=gtk2
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gtk-docs.sgml

docs/reference/gtk/gtk-docs.sgml

@@ -11,7 +11,7 @@
     <releaseinfo>
       This document is for the GTK+ 2 library; the latest versions can be found online at
       <ulink role="online-location"
-      url="http://library.gnome.org/devel/gtk/">http://library.gnome.org/devel/gtk</ulink>.
+      url="http://library.gnome.org/devel/gtk2/">http://library.gnome.org/devel/gtk2</ulink>.
       If you're looking for the newer GTK+ 3 series of libraries,
       see <ulink role="online-location"
       url="http://library.gnome.org/devel/gtk3/">http://library.gnome.org/devel/gtk3/</ulink>.

docs/reference/gtk/gtk-query-immodules-2.0.xml

@@ -17,14 +17,16 @@
 <refsynopsisdiv>
 <cmdsynopsis>
 <command>gtk-query-immodules-2.0</command>
+<arg choice="opt">--update-cache</arg>
 <arg choice="opt" rep="repeat">module</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para>
-<command>gtk-query-immodules-2.0</command> collects information about loadable 
-input method modules for GTK+ and writes it to <filename>stdout</filename>. 
+<command>gtk-query-immodules-2.0</command> collects information about loadable
+input method modules for GTK+ and writes it to the default cache file
+location, or to <filename>stdout</filename>.
 </para>
 <para>
 If called without arguments, it looks for modules in the GTK+ input method 
@@ -34,6 +36,22 @@ module path.
 If called with arguments, it looks for the specified modules. The arguments
 may be absolute or relative paths.
 </para>
+<para>
+Normally, the output of <command>gtk-query-immodules-2.0</command> is written
+to <filename><replaceable>libdir</replaceable>/gtk-2.0/2.10.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
+location, the environment variable <link linkend="GTK_IM_MODULE_FILE"><envar>GTK_IM_MODULE_FILE</envar></link>
+can be set to point GTK+ at the file.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--update-cache</term>
+    <listitem><para>Write the output to the default cache location instead of
+                    <filename>stdout</filename></para></listitem>
+  </varlistentry>
+</variablelist>
 </refsect1>
 
 <refsect1><title>Environment</title>

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -56,11 +56,11 @@ gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
       <informalexample><programlisting>
 GtkWidget *combo_box;
 
-combo_box = gtk_combo_box_new_text (<!-- -->);
+combo_box = gtk_combo_box_text_new (<!-- -->);
 
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "First Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "Second Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "Third Item");
       </programlisting></informalexample>
       In order to react to the user's selection, connect to the 
       #GtkComboBox::changed signal and use gtk_combo_box_get_active()
@@ -149,11 +149,11 @@ gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
     <para>
       And here is how it would be done using #GtkComboBoxEntry<!---->:
       <informalexample><programlisting>
-combo_box = gtk_combo_box_entry_new_text (<!-- -->);
+combo_box = gtk_combo_box_text_new_with_entry (<!-- -->);
 
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
-gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "First Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "Second Item");
+gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo_box), "Third Item");
       </programlisting></informalexample>
       In order to react to the user's selection, connect to the #GtkComboBox::changed
       signal on the combo and use 

docs/reference/gtk/running.sgml

@@ -264,6 +264,8 @@ additional environment variables.
     that enables <literal>XSETTINGS</literal> and has a value in
     <literal>Gtk/IMModule</literal>, that will be used for the default
     IM module.
+    This also can be a colon-separated list of input-methods, which
+    GTK+ will try in turn until it finds one available on the system.
   </para>
 </formalpara>
 
@@ -272,11 +274,10 @@ additional environment variables.
 
   <para>
     Specifies the file listing the IM modules to load. This environment
-    variable overrides the <literal>im_module_file</literal> specified in 
-    the RC files, which in turn overrides the default value 
-    <filename><replaceable>sysconfdir</replaceable>/gtk-2.0/gtk.immodules</filename>
-    (<replaceable>sysconfdir</replaceable> is the sysconfdir specified when GTK+ was configured, 
-     usually <filename>/usr/local/etc</filename>.)
+    variable overrides the <literal>im_module_file</literal> specified in
+    the RC files, which in turn overrides the default value
+    <filename><replaceable>libdir</replaceable>/gtk-2.0/2.10.0/immodules.cache</filename>
+    (<replaceable>libdir</replaceable> has the same meaning here as explained for <envar>GTK_PATH</envar>).
   </para>
 </formalpara>
 

docs/reference/gtk/tmpl/gtkaccelmap.sgml

@@ -80,20 +80,18 @@ Loadable keyboard accelerator specifications
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_accel_map_load ##### -->
+<!-- ##### MACRO gtk_accel_map_load ##### -->
 <para>
 
 </para>
 
-@file_name: 
 
 
-<!-- ##### FUNCTION gtk_accel_map_save ##### -->
+<!-- ##### MACRO gtk_accel_map_save ##### -->
 <para>
 
 </para>
 
-@file_name: 
 
 
 <!-- ##### FUNCTION gtk_accel_map_foreach ##### -->

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -286,7 +286,7 @@ key binding signal emission as stored in #GtkBindingSignal.
 @modifiers: 
 @signal_name: 
 @n_args: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_binding_entry_skip ##### -->

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -387,3 +387,12 @@ Returns the current relief style of the given #GtkButton.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_button_get_event_window ##### -->
+<para>
+
+</para>
+
+@button: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -166,6 +166,21 @@ calendar.
 
 </para>
 
+<!-- ##### ARG GtkCalendar:horizontal-separation ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:inner-border ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:vertical-separation ##### -->
+<para>
+
+</para>
+
 <!-- ##### USER_FUNCTION GtkCalendarDetailFunc ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkcelllayout.sgml

@@ -149,7 +149,7 @@ as appropriate.
 
 @cell_layout: 
 @cell: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_cell_layout_add_attribute ##### -->

docs/reference/gtk/tmpl/gtkcombobox.sgml

@@ -101,11 +101,21 @@ gtk_combo_box_get_active_text().
 
 </para>
 
+<!-- ##### ARG GtkComboBox:entry-text-column ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkComboBox:focus-on-click ##### -->
 <para>
 
 </para>
 
+<!-- ##### ARG GtkComboBox:has-entry ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkComboBox:has-frame ##### -->
 <para>
 
@@ -160,6 +170,15 @@ gtk_combo_box_get_active_text().
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_combo_box_new_with_entry ##### -->
+<para>
+
+</para>
+
+@void: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_combo_box_new_with_model ##### -->
 <para>
 
@@ -169,6 +188,15 @@ gtk_combo_box_get_active_text().
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_combo_box_new_with_model_and_entry ##### -->
+<para>
+
+</para>
+
+@model: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_combo_box_get_wrap_width ##### -->
 <para>
 
@@ -450,3 +478,30 @@ gtk_combo_box_get_active_text().
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_combo_box_get_has_entry ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_set_entry_text_column ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@text_column: 
+
+
+<!-- ##### FUNCTION gtk_combo_box_get_entry_text_column ##### -->
+<para>
+
+</para>
+
+@combo_box: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkcontainer.sgml

@@ -249,7 +249,7 @@ Does the same as gtk_container_set_border_width().
 @container: 
 @widget: 
 @first_prop_name: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
@@ -406,7 +406,7 @@ Does the same as gtk_container_get_children().
 @container: 
 @child: 
 @first_prop_name: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_container_child_set ##### -->
@@ -417,7 +417,7 @@ Does the same as gtk_container_get_children().
 @container: 
 @child: 
 @first_prop_name: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_container_child_get_property ##### -->

docs/reference/gtk/tmpl/gtkdialog.sgml

@@ -272,7 +272,7 @@ directly, but into the @vbox and @action_area, as described above.
 @parent: 
 @flags: 
 @first_button_text: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -312,7 +312,7 @@ directly, but into the @vbox and @action_area, as described above.
 
 @dialog: 
 @first_button_text: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_dialog_add_action_widget ##### -->
@@ -416,7 +416,7 @@ directly, but into the @vbox and @action_area, as described above.
 
 @dialog: 
 @first_response_id: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_dialog_set_alternative_button_order_from_array ##### -->

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -839,7 +839,6 @@ Specifies the side of the entry at which an icon is placed.
 
 @GTK_ENTRY_ICON_PRIMARY: At the beginning of the entry (depending on the text direction).
 @GTK_ENTRY_ICON_SECONDARY: At the end of the entry (depending on the text direction).
-
 @Since: 2.16
 
 <!-- ##### FUNCTION gtk_entry_set_icon_from_pixbuf ##### -->

docs/reference/gtk/tmpl/gtkexpander.sgml

@@ -115,6 +115,11 @@ a <child> type attribute.
 
 </para>
 
+<!-- ##### ARG GtkExpander:label-fill ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkExpander:label-widget ##### -->
 <para>
 
@@ -271,3 +276,21 @@ a &lt;child&gt; type attribute.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_expander_set_label_fill ##### -->
+<para>
+
+</para>
+
+@expander: 
+@label_fill: 
+
+
+<!-- ##### FUNCTION gtk_expander_get_label_fill ##### -->
+<para>
+
+</para>
+
+@expander: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml

@@ -168,7 +168,7 @@ dialog = gtk_file_chooser_dialog_new ("Open File",
 @parent: 
 @action: 
 @first_button_text: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -182,7 +182,7 @@ dialog = gtk_file_chooser_dialog_new ("Open File",
 @action: 
 @backend: 
 @first_button_text: 
-@Varargs: 
+@...: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkfilesel.sgml

@@ -156,19 +156,16 @@ Creates a new file selection dialog box. By default it will contain a #GtkTreeVi
 @Deprecated: Use gtk_file_chooser_dialog_new() instead
 
 
-<!-- ##### FUNCTION gtk_file_selection_set_filename ##### -->
+<!-- ##### MACRO gtk_file_selection_set_filename ##### -->
 <para>
 </para>
 
-@filesel: 
-@filename: 
 
 
-<!-- ##### FUNCTION gtk_file_selection_get_filename ##### -->
+<!-- ##### MACRO gtk_file_selection_get_filename ##### -->
 <para>
 </para>
 
-@filesel: 
 @Returns: 
 
 
@@ -200,12 +197,11 @@ Hides the file operation buttons that normally appear at the top of the dialog.
 @filesel: a #GtkFileSelection.
 
 
-<!-- ##### FUNCTION gtk_file_selection_get_selections ##### -->
+<!-- ##### MACRO gtk_file_selection_get_selections ##### -->
 <para>
 
 </para>
 
-@filesel: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkfontseldlg.sgml

@@ -136,3 +136,12 @@ fonts.</para></listitem>
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_selection ##### -->
+<para>
+
+</para>
+
+@fsd: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkhruler.sgml

@@ -48,7 +48,6 @@ Creates a new horizontal ruler.
 
 @void: 
 @Returns: a new #GtkHRuler.
-
 @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
     unmaintained and too specialized. There is no replacement.
 

docs/reference/gtk/tmpl/gtkiconfactory.sgml

@@ -376,12 +376,11 @@ This attribute is optional.</para>
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_icon_source_get_filename ##### -->
+<!-- ##### MACRO gtk_icon_source_get_filename ##### -->
 <para>
 
 </para>
 
-@source: 
 @Returns: 
 
 
@@ -466,13 +465,11 @@ This attribute is optional.</para>
 @setting: 
 
 
-<!-- ##### FUNCTION gtk_icon_source_set_filename ##### -->
+<!-- ##### MACRO gtk_icon_source_set_filename ##### -->
 <para>
 
 </para>
 
-@source: 
-@filename: 
 
 
 <!-- ##### FUNCTION gtk_icon_source_set_pixbuf ##### -->

docs/reference/gtk/tmpl/gtkicontheme.sgml

@@ -194,42 +194,32 @@ The #GQuark used for #GtkIconThemeError errors.
 @screen: 
 
 
-<!-- ##### FUNCTION gtk_icon_theme_set_search_path ##### -->
+<!-- ##### MACRO gtk_icon_theme_set_search_path ##### -->
 <para>
 
 </para>
 
-@icon_theme: 
-@path: 
-@n_elements: 
 
 
-<!-- ##### FUNCTION gtk_icon_theme_get_search_path ##### -->
+<!-- ##### MACRO gtk_icon_theme_get_search_path ##### -->
 <para>
 
 </para>
 
-@icon_theme: 
-@path: 
-@n_elements: 
 
 
-<!-- ##### FUNCTION gtk_icon_theme_append_search_path ##### -->
+<!-- ##### MACRO gtk_icon_theme_append_search_path ##### -->
 <para>
 
 </para>
 
-@icon_theme: 
-@path: 
 
 
-<!-- ##### FUNCTION gtk_icon_theme_prepend_search_path ##### -->
+<!-- ##### MACRO gtk_icon_theme_prepend_search_path ##### -->
 <para>
 
 </para>
 
-@icon_theme: 
-@path: 
 
 
 <!-- ##### FUNCTION gtk_icon_theme_set_custom_theme ##### -->
@@ -393,12 +383,11 @@ The #GQuark used for #GtkIconThemeError errors.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_icon_info_get_filename ##### -->
+<!-- ##### MACRO gtk_icon_info_get_filename ##### -->
 <para>
 
 </para>
 
-@icon_info: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkiconview.sgml

@@ -112,6 +112,11 @@ private fields and should not be directly accessed.
 
 </para>
 
+<!-- ##### ARG GtkIconView:item-orientation ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkIconView:item-padding ##### -->
 <para>
 
@@ -392,6 +397,24 @@ selected rows.  It will be called on every selected row in the view.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_icon_view_set_item_orientation ##### -->
+<para>
+
+</para>
+
+@icon_view: 
+@orientation: 
+
+
+<!-- ##### FUNCTION gtk_icon_view_get_item_orientation ##### -->
+<para>
+
+</para>
+
+@icon_view: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_view_set_columns ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkitem.sgml

@@ -77,3 +77,5 @@ Emits the "toggle" signal on the given item.
 
 @item: a #GtkItem.
 @Deprecated: 2.22: This function will be removed in GTK+ 3
+
+

docs/reference/gtk/tmpl/gtkliststore.sgml

@@ -181,7 +181,7 @@ and common wisdom is to separate the two, as far as possible.
 </para>
 
 @n_columns: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -212,7 +212,7 @@ and common wisdom is to separate the two, as far as possible.
 
 @list_store: 
 @iter: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_list_store_set_valist ##### -->
@@ -296,7 +296,7 @@ and common wisdom is to separate the two, as far as possible.
 @list_store: 
 @iter: 
 @position: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_list_store_insert_with_valuesv ##### -->

docs/reference/gtk/tmpl/gtkmain.sgml

@@ -432,6 +432,7 @@ Registers a function to be called when the mainloop is started.
 @data: Data to pass to that function.
 @Deprecated: This function is going to be removed in GTK+ 3.0
 
+
 <!-- ##### FUNCTION gtk_quit_add_destroy ##### -->
 <para>
 Trigger destruction of @object in case the mainloop at level @main_level

docs/reference/gtk/tmpl/gtkmenushell.sgml

@@ -79,6 +79,15 @@ This signal is emitted when a menu shell is deactivated.
 
 @menushell: the object which received the signal.
 
+<!-- ##### SIGNAL GtkMenuShell::insert ##### -->
+<para>
+
+</para>
+
+@menushell: the object which received the signal.
+@widget: 
+@arg1: 
+
 <!-- ##### SIGNAL GtkMenuShell::move-current ##### -->
 <para>
 An action signal which moves the current menu item in the direction 

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -182,6 +182,11 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
+<!-- ##### ARG GtkNotebook:group-name ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkNotebook:homogeneous ##### -->
 <para>
 
@@ -714,6 +719,24 @@ Deprecated compatibility macro.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_notebook_get_tab_hborder ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_notebook_get_tab_vborder ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_notebook_set_current_page ##### -->
 <para>
 
@@ -759,6 +782,24 @@ Deprecated compatibility macro.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_notebook_set_group_name ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@group_name: 
+
+
+<!-- ##### FUNCTION gtk_notebook_get_group_name ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_notebook_set_action_widget ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkobject.sgml

@@ -138,7 +138,6 @@ Tells about the state of the object.
 @GTK_FLOATING: 
 @GTK_RESERVED_1: 
 @GTK_RESERVED_2: reserved for future use
-
 @Deprecated: 2.22: Do not re-use #GtkObject flags but use your own variable to
   store flags.
 
@@ -149,7 +148,6 @@ accessing its members.
 </para>
 
 @obj: the object whose flags are returned.
-
 @Deprecated: 2.22: Do not re-use #GtkObject flags but use your own variable to
   store flags.
 
@@ -190,10 +188,12 @@ function.
 a #GTK_TYPE_FOO macro.)
 @first_property_name: name of the first property to set when constructing
    the object.
-@Varargs: the first argument's value, followed by any number of
-name/argument-value pairs, terminated with %NULL.
+@...: 
 @Returns: the new #GtkObject.
 @Deprecated: Use g_object_new() instead.
+<!-- # Unused Parameters # -->
+@Varargs: the first argument's value, followed by any number of
+name/argument-value pairs, terminated with %NULL.
 
 
 <!-- ##### FUNCTION gtk_object_sink ##### -->
@@ -275,8 +275,10 @@ Gets properties of an object.
 
 @object: a #GtkObject.
 @first_property_name: name of first property to get the value for.
-@Varargs: %NULL-terminated list of name-return location pairs.
+@...: 
 @Deprecated: Use g_object_get() instead.
+<!-- # Unused Parameters # -->
+@Varargs: %NULL-terminated list of name-return location pairs.
 
 
 <!-- ##### FUNCTION gtk_object_set ##### -->
@@ -298,9 +300,11 @@ void set_box_properties (GtkBox* box)
 
 @object: a #GtkObject.
 @first_property_name: name of the first property to set
+@...: 
+@Deprecated: Use g_object_set() instead.
+<!-- # Unused Parameters # -->
 @Varargs: the value of the first argument, followed optionally
 by more name/value pairs, followed by %NULL.
-@Deprecated: Use g_object_set() instead.
 
 
 <!-- ##### FUNCTION gtk_object_set_data ##### -->

docs/reference/gtk/tmpl/gtkrange.sgml

@@ -91,6 +91,11 @@ of the "steppers". It also provides properties and methods for setting a
 
 </para>
 
+<!-- ##### ARG GtkRange:round-digits ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkRange:show-fill-level ##### -->
 <para>
 
@@ -131,6 +136,11 @@ of the "steppers". It also provides properties and methods for setting a
 
 </para>
 
+<!-- ##### ARG GtkRange:stepper-position-details ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkRange:stepper-size ##### -->
 <para>
 
@@ -264,15 +274,6 @@ of the "steppers". It also provides properties and methods for setting a
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_range_get_value ##### -->
-<para>
-
-</para>
-
-@range: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_range_set_increments ##### -->
 <para>
 
@@ -293,6 +294,15 @@ of the "steppers". It also provides properties and methods for setting a
 @max: 
 
 
+<!-- ##### FUNCTION gtk_range_get_value ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_range_set_value ##### -->
 <para>
 
@@ -302,6 +312,24 @@ of the "steppers". It also provides properties and methods for setting a
 @value: 
 
 
+<!-- ##### FUNCTION gtk_range_get_round_digits ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_range_set_round_digits ##### -->
+<para>
+
+</para>
+
+@range: 
+@round_digits: 
+
+
 <!-- ##### ENUM GtkSensitivityType ##### -->
 <para>
 Determines how GTK+ handles the sensitivity of stepper arrows

docs/reference/gtk/tmpl/gtkrc.sgml

@@ -888,11 +888,12 @@ statement in a RC file.
 @Deprecated: Use gtk_rc_parse_string() with a suitable string instead.
 
 
-<!-- ##### FUNCTION gtk_rc_parse ##### -->
+<!-- ##### MACRO gtk_rc_parse ##### -->
 <para>
 Parses a given resource file.
 </para>
 
+<!-- # Unused Parameters # -->
 @filename: the filename of a file to parse. If @filename is not absolute, it
   is searched in the current directory.
 
@@ -931,11 +932,10 @@ Parses resource information directly from a string.
 @settings: 
 
 
-<!-- ##### FUNCTION gtk_rc_add_default_file ##### -->
+<!-- ##### MACRO gtk_rc_add_default_file ##### -->
 <para>
 </para>
 
-@filename: 
 
 
 <!-- ##### FUNCTION gtk_rc_get_default_files ##### -->
@@ -946,11 +946,10 @@ Parses resource information directly from a string.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_rc_set_default_files ##### -->
+<!-- ##### MACRO gtk_rc_set_default_files ##### -->
 <para>
 </para>
 
-@filenames: 
 
 
 <!-- ##### FUNCTION gtk_rc_parse_color ##### -->

docs/reference/gtk/tmpl/gtkrecentchooserdialog.sgml

@@ -77,7 +77,7 @@ Recently used files are supported since GTK+ 2.10.
 @title: 
 @parent: 
 @first_button_text: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -90,7 +90,7 @@ Recently used files are supported since GTK+ 2.10.
 @parent: 
 @manager: 
 @first_button_text: 
-@Varargs: 
+@...: 
 @Returns: 
 
 

docs/reference/gtk/tmpl/gtkruler.sgml

@@ -76,11 +76,9 @@ This should be points_per_unit. This is the size of the unit in 1/72nd's of an i
 @pixels_per_unit: 
 @ruler_scale: 
 @subdivide: 
-
 @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
     unmaintained and too specialized. There is no replacement.
 
-
 <!-- ##### FUNCTION gtk_ruler_set_metric ##### -->
 <para>
 This calls the #GTKMetricType to set the ruler to units defined. Available units
@@ -90,7 +88,6 @@ is GTK_PIXELS.
 
 @ruler: the gtkruler
 @metric: the unit of measurement
-
 @Deprecated: 2.24: #GtkRuler has been removed from GTK 3 for being
     unmaintained and too specialized. There is no replacement.
 

docs/reference/gtk/tmpl/gtkselection.sgml

@@ -73,8 +73,6 @@ an efficient form. This structure should be treated as
 opaque.
 </para>
 
-@list: 
-@ref_count: 
 
 <!-- ##### STRUCT GtkTargetPair ##### -->
 <para>

docs/reference/gtk/tmpl/gtksettings.sgml

@@ -264,6 +264,11 @@ GtkSettings instance for the default screen.
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-primary-button-warps-slider ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-print-backends ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtksignal.sgml

@@ -269,9 +269,11 @@ which takes a string and returns a boolean value.
 @return_val: the type of return value, or #GTK_TYPE_NONE for a signal
 without a return value.
 @n_args: the number of parameter the handlers may take.
-@Varargs: a list of #GTK_TYPE_*, one for each parameter.
+@...: 
 @Returns: the signal id.
 @Deprecated: Use g_signal_new() instead.
+<!-- # Unused Parameters # -->
+@Varargs: a list of #GTK_TYPE_*, one for each parameter.
 
 
 <!-- ##### FUNCTION gtk_signal_newv ##### -->
@@ -347,9 +349,11 @@ The default handler will be called first if
 
 @object: the object that emits the signal.
 @signal_id: the signal identifier.
+@...: 
+@Deprecated: Use g_signal_emit() instead.
+<!-- # Unused Parameters # -->
 @Varargs: the parameters to the function, followed
 by a pointer to the return type, if any.
-@Deprecated: Use g_signal_emit() instead.
 
 
 <!-- ##### FUNCTION gtk_signal_emit_by_name ##### -->
@@ -360,9 +364,11 @@ handlers to be run.
 
 @object: the object that emits the signal.
 @name: the name of the signal.
+@...: 
+@Deprecated: Use g_signal_emit_by_name() instead.
+<!-- # Unused Parameters # -->
 @Varargs: the parameters to the function, followed
 by a pointer to the return type, if any.
-@Deprecated: Use g_signal_emit_by_name() instead.
 
 
 <!-- ##### FUNCTION gtk_signal_emitv ##### -->

docs/reference/gtk/tmpl/gtkstatusbar.sgml

@@ -136,6 +136,15 @@ below.
 @message_id: 
 
 
+<!-- ##### FUNCTION gtk_statusbar_remove_all ##### -->
+<para>
+
+</para>
+
+@statusbar: 
+@context_id: 
+
+
 <!-- ##### FUNCTION gtk_statusbar_set_has_resize_grip ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkstyle.sgml

@@ -251,7 +251,7 @@ Does the same as gtk_style_apply_default_background().
 @style: 
 @widget_type: 
 @first_property_name: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION gtk_draw_hline ##### -->
@@ -984,10 +984,6 @@ A struct that specifies a border around a rectangular area that can
 be of different width on each side.
 </para>
 
-@left: The width of the left border.
-@right: The width of the right border.
-@top: The width of the top border.
-@bottom: The width of the bottom border.
 
 <!-- ##### FUNCTION gtk_border_new ##### -->
 <para>