Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transform

...otherwise they don't make it into the release tarballs.

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

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -145,6 +145,7 @@ DISTCHECK_CONFIGURE_FLAGS =		\
 		--enable-gtk-doc 	\
 		--enable-man 		\
 		--disable-rebuilds 	\
+		--disable-maintainer-mode \
 		--enable-introspection
 
 GITIGNOREFILES = \

NEWS

@@ -1,3 +1,241 @@
+Overview of Changes in GTK+ 3.1.14
+==================================
+
+* GtkTreeView:
+ - The GtkTreeModelFilter and GtkTreeModelSort implementations
+   have been improved and a comprehensive test suite has been added.
+
+* GtkFileChooser:
+ - The selected file(s) can now be copied to the clipboard
+
+* Bugs fixed:
+ 656851 Allow use of GVariant in GtkListStore
+ 344858 gtk_menu_item_new_with_label() created widget with refcount 2
+ 349502 option to copy full path in "Save AS"/"Open file" dialogs
+ 621076 GtkTreeModelFilter does not emit all signals in some situations
+ 634136 GtkTable::children accessor
+ 649588 crash when sending a notification: "Gdk-CRITICAL **: gdk_visual_...
+ 650762 gtk_misc_set_alignment replacement with the new API functions
+ 651827 Crash in check_application()
+ 656986 GtkSwitch is unusable when added to primary toolbar.
+ 657146 Missing files in POTFILEs.in
+ 657260 Gtk should use AtkWindow and remove that hack on GailUtil
+ 657359 Crash when specifying data length in gtk_css_provider_load_...
+ 657384 missing accessors for GdkEvent structures
+
+* Translation updates:
+ Galician
+ German
+ Gujarati
+ Indonesian
+ Norwegian bokmål
+ Persian
+ Russian
+ Serbian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Uighur
+
+
+Overview of Changes in GTK+ 3.1.12
+==================================
+
+* GtkFontChooserDialog: A newly designed font selection dialog
+  that is intended to replace GtkFontSelectionDialog
+
+* Drawing of focus rectangles is now optional; it can be turned
+  off altogether, or until actual keyboard interaction happens,
+  with the gtk-visible-focus setting.
+
+* OS X: Fixes for 10.7 (Lion)
+
+* Bugs fixed:
+ 407885 A new GtkFontSelectionDialog
+ 508601 Copying from GTK+ applications causes crash
+ 599664 The print dialog should not block while looking for an...
+ 645258 Add gtk_text_iter_assign API
+ 649567 hide focus rectangles when not keynavigating
+ 652991 Remove local copy of introspection.m4
+ 653817 Would like GtkGrid methods to insert rows/columns
+ 653964 Installing MinGW32 build misses gdk/win32 headers
+ 655074 Fix crash with undecorated windows on MacOS Lion
+ 655122 Crash when resizing window on MacOS Lion
+ 655173 small memory leak in GtkStyleProperty
+ 655495 Make X11-specific functions introspectable
+ 655496 X11-specific objects methods are introspected as static functions
+ 655545 condition can never be true in gtk_tree_view_real_set_cursor
+ 655822 Removal of GSettings key causes crash on upgrades
+ 656098 Tweak GtkAppChooser's short description
+ 656421 3.1.10: G_DISABLE_DEPRECATED detection breaks compilation
+
+* Translation updates
+ Brazilian Portuguese
+ Bulgarian
+ Russian
+ Spanish
+ Swedish
+ Traditional Chinese
+
+
+Overview of Changes in GTK+ 3.1.10
+==================================
+
+* Assorted file chooser improvements/redesign:
+ - Remove the expander in Save mode
+ - Move the path bar up in Save mode
+ - Remember the last opened directory
+ - Start in recently-used mode when no folder is set
+ - Update recent-files when confirming in the file chooser
+
+* Accessibility:
+ - Gail has been merged into GTK+ and is no longer a module
+ - A testsuite for a11y functionality has been added
+
+* Theming:
+ - Icon view cells can now have a border
+
+* GtkMountOperation can now show processes on OpenBSD
+
+* Gdk input devices now expose their XInput2 device ID
+  via gdk_x11_device_get_id()
+
+* Bugs fixed:
+ 653450 gtkfilechooser crashes when adding favorite
+ 653705 GtkAssistant doesn't notice destroyed pages
+ 653947 Crash in gdk/x11/gdkdevicemanager-xi2.c:get_event_window
+ 654125 gdkoffscreenwindow set any impl handlers to null...
+ 654179 iconview: make it possible for selected cells to render...
+ 654428 focusable labels are emitting inappropriate object:text-sel...
+ 654678 Message dialog's primary text font increases on every call...
+ 654695 Memory corruption in gtk_theming_engine_register_property()
+ 654720 void return issues cause compile issues for GTK 3.1.8
+ 655009 Clamp border radius following CSS specs
+ 654266 No longer possible to set empty text on a GtkProgressBar
+
+* Translation updates:
+ Galician
+ German
+ Hebrew
+ Latvian
+ Lithuanian
+ Norwegian bokmål
+ Persian
+ Polish
+ Slovenian
+ Spanish
+ Uighur
+
+
+Overview of Changes in GTK+ 3.1.8
+=================================
+
+* Theming improvements:
+  - Multiple colors are now supported
+  - Support CSS font properties like font-size, font-family, etc
+  - nth-child works for toolbars too
+
+* Bug fixes:
+ 652506 Improve GtkAssistant button labels
+ 652618 themingengine: shrink the background size to the padding-box
+ 652769 Reordering/removing hidden children in GtkBox results in 100% CPU
+ 653053 Avoid GApplication being released twice...
+ 653191 uninitialized variable in completion_match_func
+ 653333 Assigned value is garbage or undefined in gtktoolpalette.c:565
+ 653512 GtkEntryCompletion: Use a PAGE_STEP macro instead of a magic number
+ 653785 GtkStyleContext ignores style classes when getting style properties
+
+* Translation updates:
+ Belarusian
+ Dutch
+ Galician
+ Hebrew
+ Norwegian bokmål
+ Persian
+ Slovenian
+ Spanish
+
+Overview of Changes in GTK+ 3.1.6
+=================================
+
+* GtkOverlay is a new container that allows to place one or more
+  'overlay' widgets on top of another widget. This can be used
+  for 'floating statusbars' and similar interfaces.
+
+* GtkLockButton has been simplified in appearance to look like
+  a normal button
+
+* GtkNotebook now supports height-for-width layout
+
+* Accessibility for menuitems and combo boxes has been restored
+
+* The horizontal and vertical subclasses of GtkBox, GtkPaned,
+  GtkSeparator, GtkScrollbar, GtkScale and GtkButtonBox have
+  been deprecated
+
+* The print dialog can now display color profile information
+
+* Many enhancements and fixes to CSS theming
+ - The CSS parser has been rewritten with the goal of better
+   CSS compliance and improved error handling
+ - A testsuite for the parser has been added
+ - Attributes can be inherited from parent widgets
+ - Shorthand properties are supported
+ - Color and font attributes are now inherited
+ - Borders and padding are now handled much more consistently,
+   and border-radius support is more complete
+ - text-shadow, box-shadow and icon-shadow attributes are now
+   supported
+ - nth-child works for boxes
+
+* Bug fixes:
+ 353712 allow reducing selection in GtkLabel
+ 576492 GtkBuilder does not respect G_PARAM_CONSTRUCT properties
+ 624539 Keep track of last focused window
+ 634491 gtk_tree_path_append_index() is linear in the number of indices
+ 634994 Explicitly declare internal reserved bits in GdkModifierType
+ 641087 Wish: GtkApplication::window-added signal
+ 642768 Make tracker search backend a bit less verbose
+ 642773 Make file search non-case sensitive
+ 642929 GtkFileChooserDialog with GTK_FILE_CHOOSER_ACTION_CREATE_...
+ 644906 gtkimcontextime.c: NULL pointer reference
+ 646859 GtkCssProvider.load_from_data introspection
+ 649314 Add support for the text-shadow property
+ 649779 Add missing gtk_widget_override_* annotations
+ 649972 Crash when loading an ui file with an empty GtkGrid
+ 649979 Argument count TypeError from Gtk.TreeView.enable_model_drag_...
+ 650012 GtkAppChooser* documentation does not document the content_type
+ 650110 Add sanity check in GtkEntryCompletion
+ 650114 gtk_entry_set_completion does not destroy idle source
+ 650167 Unused variable in GtkEditable example code
+ 650202 Optimization in theme_subdir_load (gtkicontheme.c)
+ 650302 Combo box menu items should expose their displayed text
+ 650382 GtkButton uses wrong values in grab
+ 650418 menu: don't use the border as a padding value
+ 650420 all: avoid boxed structs copying where possible
+ 650424 treeview: theming-related fixes
+ 650530 GtkAssistant beautification patches
+ 650664 gtkstatusbar: gtk_misc_set_alignment () function replacement
+ 651194 Should support border-image as a shorthand property
+ 651706 gdk: Update keysyms list from latest X.org headers
+ 651707 Move private functions to private headers
+ 651734 GtkLockButton: symbolic icon is fuzzy
+ 651979 compose-parse.py can not work with the newest gdkkeysyms.h...
+ 652045 file open dialog refuses to open or complete non-local files
+ 652102 Issues when redrawing multiple GdkWindows
+ 652103 Add a GtkPrinterOptionWidget type of label to just show info...
+ 652282 build: fix win32 configure checks
+
+ * Updated translations
+ Catalan (Valencian)
+ Esperanto
+ Galician
+ Hebrew
+ Norwegian bokmål
+ Slovenian
+ Spanish
+
+
 Overview of Changes in GTK+ 3.1.4
 =================================
 

README.in

@@ -27,6 +27,13 @@ Installation
 See the file 'INSTALL'
 
 
+Release notes for 3.2
+=====================
+
+* The accessible implementations for GTK+ widgets have been integrated
+  into libgtk itself, and the gail module does not exist anymore. This
+  change should not affect applications very much.
+
 Release notes for 3.0
 =====================
 

autogen.sh

@@ -7,6 +7,8 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+mkdir -p m4
+
 GTKDOCIZE=`which gtkdocize`
 if test -z $GTKDOCIZE; then
         echo "*** No GTK-Doc found, please install it ***"

build/win32/vs10/Makefile.am

@@ -14,6 +14,12 @@ EXTRA_DIST += \
 	gtk.vcxprojin \
 	gtk.vcxproj.filters \
 	gtk.vcxproj.filtersin \
-	gtk-demo.vcxproj \
-	gtk-demo.vcxproj.filters \
+	gtk3-demo.vcxproj \
+	gtk3-demo.vcxproj.filters \
+	libgail.vcxproj \
+	libgail.vcxproj.filters \
+	libgail.vcxprojin \
+	libgail.vcxproj.filtersin \
+	gailutil.vcxproj \
+	gailutil.vcxproj.filters \
 	install.vcxproj

build/win32/vs10/README.txt

@@ -1,77 +1,80 @@
-Note that all this is rather experimental.
-
-This VS10 solution and the projects it includes are intented to be used
-in a GTK+ source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment or manual work to expand
-the files needed, like config.h.win32.in into config.h.win32 and the
-.vcprojin files here into corresponding actual .vcproj files.
-
-You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
-ATK and GLib.  External dependencies are at least Cairo
-(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
-gettext-runtime, fontconfig*, freetype*, expat*.  See the 
-build/win32/vs10/README.txt file in glib for details where to unpack them.
-
-It is recommended that one builds the dependencies with VS10 as far as
-possible, especially those from and using the GTK+ stack (i.e. GLib,
-Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
-to different CRTs can be kept at a minimum.  zlib, libpng, and Cairo
-do contain support for compiling under VS10 using VS
-project files and/or makefiles at this time of writing, For the
-GTK+ stack, VS10 project files are either available under
-$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK**
-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
-unstable version of Pango.  There is no known official VS10 build
-support for fontconfig (along with freetype and expat) and
-gettext-runtime, so please use the binaries from: 
-
-ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
-ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
-
-The recommended build order for these dependencies:
-(first unzip any dependent binaries downloaded from the ftp.gnome.org
- as described in the README.txt file in the build/win32/vs10 folder)
--zlib
--libpng
--(for GDK-Pixbuf, if not using GDI+) IJG JPEG
--(for GDK-Pixbuf, if not using GDI+) libtiff
- [libtiff requires zlib and IJG JPEG]
--(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]
--(optional for GLib) PCRE (version 8.12 or later, use of CMake to
-  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
--GLib
--Cairo (inclusive of Cairo-GObject)
--ATK-2.x**
--Pango
--GDK-Pixbuf
-(note the last 3 dependencies are not interdependent, so the last 3
- dependencies can be built in any order)
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs10\<PlatformName>. For instance,
-built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
-<root>\vs10\<PlatformName>\lib and GTK+ headers into
-<root>\vs10\<PlatformName>\include\gtk-3.0. This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific GLib source tree.
-
-*About the dependencies marked with *: I will see whether it is possible
- to reduce the depepdencies on building and running GTK+ by making these
- dependencies optional, as those are not compulsory components for
- building and running GTK+ itself, but note that they are needed for
- people running and building GIMP. They are referred to by components
- in Cairo and Pango mainly.
- 
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
-  in VS under "Properties Manager" view (it is under any one of the
-  build configurations, right-click on atkprops and select "Properties").
-  Navigate to "User Macros", and edit the following fields:
-  AtkApiVersion -> 2.0
-  AtkLibToolCompatibleDllSuffix -> -2.0-0
-  AtkSeperateVS10DLLSuffix -> -2-vs10
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
-  this will be in the subsequent releases of ATK-2.x and was committed
-  upstream.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@yahoo.com.tw>
+Note that all this is rather experimental.
+
+This VS10 solution and the projects it includes are intented to be used
+in a GTK+ source tree unpacked from a tarball. In a git checkout you
+first need to use some Unix-like environment or manual work to expand
+the files needed, like config.h.win32.in into config.h.win32 and the
+.vcxprojin and .vcxproj.filtersin files here into corresponding actual
+.vcxproj and vcxproj.filters files.
+
+You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
+ATK and GLib.  External dependencies are at least Cairo
+(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
+gettext-runtime, fontconfig*, freetype*, expat*.  See the 
+build/win32/vs10/README.txt file in glib for details where to unpack them.
+
+It is recommended that one builds the dependencies with VS10 as far as
+possible, especially those from and using the GTK+ stack (i.e. GLib,
+Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
+to different CRTs can be kept at a minimum.
+
+zlib, libpng, and Cairo do contain support for compiling under VS10
+using VS project files and/or makefiles at this time of writing, For the
+GTK+ stack, VS10 project files are either available under
+$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK
+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
+unstable version of Pango.  There is no known official VS10 build
+support for fontconfig (along with freetype and expat) and
+gettext-runtime, so please use the binaries from: 
+
+ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,
+and build the following, if not already done so: 
+
+Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
+ .dll files: <root>\vs10\<PlatformName>\bin
+ .lib files: <root>\vs10\<PlatformName>\lib
+ .h files: <root>\vs10\<PlatformName>\include
+
+The recommended build order for these dependencies:
+(first unzip any dependent binaries downloaded from the ftp.gnome.org
+ as described in the README.txt file in the build/win32/vs10 folder)
+-zlib
+-libpng
+-(for GDK-Pixbuf, if not using GDI+) IJG JPEG
+-(for GDK-Pixbuf, if not using GDI+) libtiff
+ [libtiff requires zlib and IJG JPEG]
+-(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]
+-(optional for GLib) PCRE (version 8.12 or later, use of CMake to
+  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)
+-GLib **
+-Cairo (inclusive of Cairo-GObject)
+-ATK**
+-Pango**
+-GDK-Pixbuf**
+(note the last 3 dependencies are not interdependent, so the last 3
+ dependencies can be built in any order)
+
+The "install" project will copy build results and headers into their
+appropriate location under <root>\vs10\<PlatformName>. For instance,
+built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
+<root>\vs10\<PlatformName>\lib and GTK+ headers into
+<root>\vs10\<PlatformName>\include\gtk-3.0. This is then from where
+project files higher in the stack are supposed to look for them, not
+from a specific GLib source tree.
+
+*About the dependencies marked with *: These dependencies are optional
+ as those are not compulsory components for building and running GTK+
+ itself, but note that they are needed for people running and building
+ GIMP or those who need complex script support via fontconfig.  They
+ are referred to by components in Cairo and Pango mainly.
+ Decide whether you need fontconfig support prior to building Cairo
+ and Pango.
+
+**:Put the sources of the packages marked with ** in <root>\<package-
+    source-tree>, and build with VS10 from there.
+
+--Tor Lillqvist <tml@iki.fi>
+--Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

build/win32/vs10/gailutil.vcxproj

@@ -0,0 +1,181 @@
+<?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>{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}</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>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</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>
+    <_ProjectFileVersion>10.0.40219.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>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\libgail-util\gailmisc.c" />
+    <ClCompile Include="..\..\..\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="..\..\..\libgail-util\gailmisc.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\libgail-util\gailtextutil.c">
+      <Filter>Sources</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk-win32.vcxproj

@@ -61,13 +61,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -92,7 +91,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

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>
@@ -71,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -116,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

build/win32/vs10/gtk+.props

@@ -3,7 +3,7 @@
   <PropertyGroup Label="UserMacros">
     <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj</DefDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>3.0</GtkApiVersion>
     <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
     <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
@@ -102,6 +102,23 @@ copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
+
+
 mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -302,6 +319,8 @@ copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -330,6 +349,8 @@ copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\g
 
 copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -523,11 +544,22 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 
+mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
+
+
 copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
 
 
 copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
 
+copy $(Configuration)\$(Platform)\bin\gailutil.lib $(CopyDir)\lib
+
 
 mkdir $(CopyDir)\share\glib-2.0\schemas
 
@@ -549,19 +581,18 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
     <GtkDllSuffix>$(GtkSeparateVS10DllSuffix)</GtkDllSuffix>
   </PropertyGroup>
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <_PropertySheetDisplayName>gtk+props</_PropertySheetDisplayName>
     <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\</IntDir>
+    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <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_DEPRECATED;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>
-      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>

build/win32/vs10/gtk+.sln

@@ -1,65 +1,85 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 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}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-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
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
-		{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
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 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}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-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
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
+		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.Build.0 = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.ActiveCfg = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build/win32/vs10/gtk.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>
@@ -71,7 +70,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -81,7 +80,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -101,7 +100,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -116,7 +115,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -126,7 +125,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,7 +145,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -199,6 +198,10 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="libgail.vcxproj">
+      <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/gtk3-demo.vcxproj

@@ -189,6 +189,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\overlay.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />

build/win32/vs10/gtk3-demo.vcxproj.filters

@@ -86,6 +86,9 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\overlay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs10/install.vcxproj

@@ -63,7 +63,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
     <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
@@ -106,6 +105,10 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="gailutil.vcxproj">
+      <Project>{29e3e814-1ba3-4ad7-a3a7-3669cb80a942}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/libgail.vcxproj.filtersin

@@ -0,0 +1,20 @@
+<?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>
+#include "libgail.vs10.sourcefiles.filters"
+  </ItemGroup>
+</Project>

build/win32/vs10/libgail.vcxprojin

@@ -0,0 +1,126 @@
+<?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>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
+    <RootNamespace>libgail</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</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>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+#include "libgail.vs10.sourcefiles"
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs9/Makefile.am

@@ -9,5 +9,8 @@ EXTRA_DIST += \
 	gdk.vcprojin \
 	gtk.vcproj \
 	gtk.vcprojin \
-	gtk-demo.vcproj \
+	gtk3-demo.vcproj \
+	libgail.vcproj \
+	libgail.vcprojin \
+	gailutil.vcproj \
 	install.vcproj

build/win32/vs9/README.txt

@@ -7,7 +7,7 @@ the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.
 
 You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
-ATK (2.x)** and GLib.  External dependencies are at least Cairo
+ATK and GLib.  External dependencies are at least Cairo
 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs9/README.txt file in glib for details where to unpack them.
@@ -15,12 +15,13 @@ build/win32/vs9/README.txt file in glib for details where to unpack them.
 It is recommended that one builds the dependencies with VS9 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,
 Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls
-to different CRTs can be kept at a minimum.  zlib, libpng, and Cairo
-do contain support for compiling under VS9 using VS
-project files and/or makefiles at this time of writing, For the
+to different CRTs can be kept at a minimum.  
+
+zlib, libpng, and Cairo do contain support for compiling under VS9
+using VS project files and/or makefiles at this time of writing, For the
 GTK+ stack, VS9 project files are either available under
-$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK**
-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK
+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next
 unstable version of Pango.  There is no known official VS9 build
 support for fontconfig (along with freetype and expat) and
 gettext-runtime, so please use the binaries from: 
@@ -28,6 +29,14 @@ gettext-runtime, so please use the binaries from:
 ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
 ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
+Unzip the binaries obtained from ftp.gnome.org in <root>\vs9\<PlatformName>,
+and build the following, if not already done so: 
+
+Note: put the resulting zlib, libpng, pcre and Cairo files as follows:
+ .dll files: <root>\vs9\<PlatformName>\bin
+ .lib files: <root>\vs9\<PlatformName>\lib
+ .h files: <root>\vs9\<PlatformName>\include
+
 The recommended build order for these dependencies:
 (first unzip any dependent binaries downloaded from the ftp.gnome.org
  as described in the README.txt file in the build/win32/vs9 folder)
@@ -39,11 +48,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to
   build PCRE is recommended-see build/win32/vs9/README.txt of GLib)
--GLib
+-GLib **
 -Cairo (inclusive of Cairo-GObject)
--ATK-2.x**
--Pango
--GDK-Pixbuf
+-ATK**
+-Pango**
+-GDK-Pixbuf**
 (note the last 3 dependencies are not interdependent, so the last 3
  dependencies can be built in any order)
 
@@ -55,23 +64,16 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.
 
-*About the dependencies marked with *: I will see whether it is possible
- to reduce the depepdencies on building and running GTK+ by making these
- dependencies optional, as those are not compulsory components for
- building and running GTK+ itself, but note that they are needed for
- people running and building GIMP.  They are referred to by components
- in Cairo and Pango mainly.
+*About the dependencies marked with *: These dependencies are optional
+ as those are not compulsory components for building and running GTK+
+ itself, but note that they are needed for people running and building
+ GIMP or those who need complex script support via fontconfig.  They
+ are referred to by components in Cairo and Pango mainly.
+ Decide whether you need fontconfig support prior to building Cairo
+ and Pango.
 
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops
-  in VS under "Properties Manager" view (it is under any one of the
-  build configurations, right-click on atkprops and select "Properties").
-  Navigate to "User Macros", and edit the following fields:
-  AtkApiVersion -> 2.0
-  AtkLibToolCompatibleDllSuffix -> -2.0-0
-  AtkSeperateVS9DLLSuffix -> -2-vs9
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-
-  this will be in the subsequent releases of ATK-2.x and was committed
-  upstream.
+**:Put the sources of the packages marked with ** in <root>\<package-
+    source-tree>, and build with VS9 from there.
 
 --Tor Lillqvist <tml@iki.fi>
 --Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

build/win32/vs9/gailutil.vcproj

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="gailutil"
+	ProjectGUID="{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
+	RootNamespace="gailutil"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				GenerateDebugInformation="true"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				GenerateDebugInformation="true"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				PreprocessorDefinitions="GTK_DISABLE_DEPRECATED;GDK_DISABLE_DEPRECATED"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="atk-1.0.lib"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
+				TargetMachine="17"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File RelativePath="..\..\..\libgail-util\gailmisc.c" />
+			<File RelativePath="..\..\..\libgail-util\gailtextutil.c" />
+		</Filter>
+		<Filter
+			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>
+</VisualStudioProject>

build/win32/vs9/gdk-win32.vcproj

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -73,7 +73,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

build/win32/vs9/gdk.vcprojin

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -97,7 +97,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

build/win32/vs9/gtk+.sln

@@ -10,9 +10,18 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46} = {F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-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}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
@@ -23,6 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
 	EndProjectSection
 EndProject
 Global
@@ -73,6 +83,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
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|Win32.Build.0 = Debug|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.ActiveCfg = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Debug|x64.Build.0 = Debug|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.ActiveCfg = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|Win32.Build.0 = Release|Win32
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.ActiveCfg = Release|x64
+		{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}.Release|x64.Build.0 = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.ActiveCfg = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|Win32.Build.0 = Debug|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.ActiveCfg = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Debug|x64.Build.0 = Debug|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.ActiveCfg = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
+		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk+.vsprops

@@ -4,17 +4,17 @@
 	Version="8.00"
 	Name="gtk+props"
 	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
+	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
+		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"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -105,6 +105,15 @@ copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#
 copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32cursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32display.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32dnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32keys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32screen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32window.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+
 mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -205,6 +214,7 @@ copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x
 copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklockbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -219,6 +229,7 @@ copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;
 copy ..\..\..\gtk\gtknumerableicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoverlay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -316,9 +327,15 @@ copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#
 copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 
+mkdir $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gail-util.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailmisc.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailtextutil.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+
 copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib&#x0D;&#x0A;
 
 mkdir $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;

build/win32/vs9/gtk.vcprojin

@@ -32,7 +32,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -97,7 +97,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"

build/win32/vs9/gtk3-demo.vcproj

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

build/win32/vs9/libgail.vcprojin

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="big5"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libgail"
+	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+	RootNamespace="libgail"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			InheritedPropertySheets=".\gtk+.vsprops"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="$(GtkDefines)"
+				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+#include "libgail.sourcefiles"
+		</Filter>
+		<Filter
+			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>
+</VisualStudioProject>

config.h.win32.in

@@ -112,11 +112,15 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if shm.h is available */
-/* #undef HAVE_SHM_H */
+/* Define to 1 if rint() is available */
+#ifndef _MSC_VER
+#define HAVE_RINT 1
+#endif
 
-/* Define to 1 if sigsetjmp is available */
-/* #undef HAVE_SIGSETJMP */
+/* Define to 1 if round() is available */
+#ifndef _MSC_VER
+#define HAVE_ROUND 1
+#endif
 
 /* Have the sockaddr_un.sun_len member */
 /* #undef HAVE_SOCKADDR_UN_SUN_LEN */
@@ -128,6 +132,9 @@
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else
+#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
+#define HAVE_STDINT_H 1
+#endif
 /* #undef HAVE_STDINT_H */
 #endif
 
@@ -135,7 +142,9 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef _MSC_VER
 #define HAVE_STRINGS_H 1
+#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [1])
-m4_define([gtk_micro_version], [4])
+m4_define([gtk_micro_version], [15])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -27,6 +27,7 @@ AC_INIT([gtk+], [gtk_version],
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
 
 # Define a string for the earliest version that this release has
 # backwards binary compatibility with for all interfaces a module
@@ -38,11 +39,11 @@ AC_CONFIG_MACRO_DIR([m4])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.29.4])
-m4_define([pango_required_version], [1.24.0])
-m4_define([atk_required_version], [1.30])
+m4_define([glib_required_version], [2.29.14])
+m4_define([pango_required_version], [1.29.0])
+m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.22.0])
+m4_define([gdk_pixbuf_required_version], [2.23.5])
 m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -61,13 +62,13 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.10 no-define -Wno-portability dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
-# Support silent build rules, requires at least automake-1.11. Disable
+# Support silent build rules. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
 # to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
 
 #
 # For each of the libraries we build, we define the following
@@ -164,6 +165,9 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
+  *-*-openbsd*)
+    os_openbsd=yes
+    ;;
 esac
 
 dnl
@@ -298,11 +302,11 @@ AC_ARG_ENABLE(quartz-backend,
                               [enable the quartz gdk backend])],
 			      [backend_set=yes])
 AC_ARG_ENABLE(broadway-backend,
-              [AC_HELP_STRING([--enable-broadway-backend],
+              [AS_HELP_STRING([--enable-broadway-backend],
                               [enable the broadway (HTML5) gdk backend])],
 			      [backend_set=yes])
 AC_ARG_ENABLE(wayland-backend,
-              [AC_HELP_STRING([--enable-wayland-backend],
+              [AS_HELP_STRING([--enable-wayland-backend],
                               [enable the wayland gdk backend])],
 			      [backend_set=yes])
 
@@ -379,7 +383,7 @@ if test "x$enable_wayland_backend" == "xyes"; then
   GIO_PACKAGE=gio-unix-2.0
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl egl"
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
@@ -749,6 +753,18 @@ if test $gtk_uxtheme_h = yes; then
 fi
 AC_MSG_RESULT($gtk_uxtheme_h)
 
+# Check for round()
+AC_CHECK_LIB(m,round,have_round=yes,have_round=no)
+if test $have_round = yes; then
+    AC_DEFINE(HAVE_ROUND, 1, [Define to 1 if round() is available])
+fi
+
+# Check for rint()
+AC_CHECK_LIB(m,rint,have_rint=yes,have_rint=no)
+if test $have_rint = yes; then
+    AC_DEFINE(HAVE_RINT, 1, [Define to 1 if rint() is available])
+fi
+
 # Checks for gdkspawn
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)
@@ -1096,6 +1112,10 @@ if test "x$enable_x11_backend" = xyes; then
     fi
   fi
 
+  # Check for XGetEventData for GenericEvents
+  AC_CHECK_FUNC(XGetEventData,
+                AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
+
   # set up things for XInput
   if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
     have_xinput=yes
@@ -1243,7 +1263,7 @@ LDFLAGS="$saved_ldflags"
 
 GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
 
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
@@ -1295,8 +1315,12 @@ if test "x$enable_x11_backend" = xyes; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
+if test x"$os_openbsd" = xyes; then
+  GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm"
+fi
+
 GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
@@ -1515,19 +1539,71 @@ GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
 #################################################
 
 AC_ARG_ENABLE(packagekit,
-              [AS_HELP_STRING([--disable-packagekit],
-                              [build packagekit open-with module])])
-
-build_packagekit=no
-if test "os_win32" != "yes"; then
-        if test "x$enable_packagekit" != "xno"; then
-                build_packagekit=yes
-                AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
-        fi
+              [AS_HELP_STRING([--enable-packagekit=@<:@yes/no/auto@:>@],
+                              [build packagekit open-with module [default=auto]])],
+              [enable_packagekit="$enableval"],
+              [enable_packagekit=auto])
+if test "$enable_packagekit" = "auto"; then
+  if test "$os_win32" = "yes"; then
+    enable_packagekit=no
+  else
+    enable_packagekit=yes
+  fi
 fi
 
+AC_MSG_CHECKING([Whether to use PackageKit])
+build_packagekit=no
+if test "x$enable_packagekit" != "xno"; then
+  if test "$os_win32" != "yes"; then
+    build_packagekit=yes
+    AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable packagekit])
+  else
+    AC_MSG_ERROR([packagekit support is not available on win32])
+  fi
+fi
+AC_MSG_RESULT([$build_packagekit])
+
 AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
 
+##################################################
+# colord module
+#################################################
+
+AC_ARG_ENABLE(colord,
+              [AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@],
+                              [build colord support code [default=auto]])],
+              [enable_colord="$enableval"],
+              [enable_colord=auto])
+if test "$enable_colord" = "auto"; then
+  if test "$os_win32" = "yes"; then
+    enable_colord=no
+  else
+    enable_colord=yes
+  fi
+fi
+
+AC_MSG_CHECKING([Whether to use colord])
+have_colord=no
+if test "x$enable_colord" != "xno"; then
+        if test "$os_win32" != "yes"; then
+                PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
+                                  have_colord=yes, have_colord=no)
+                if test "enable_colord" = "yes"; then
+                        if test "have_colord" = "no"; then
+                                AC_MSG_ERROR([--enable-colord specified, but not available])
+                        fi
+                fi
+        else
+                AC_MSG_ERROR([colord support is not available on win32])
+        fi
+fi
+AC_MSG_RESULT([$have_colord])
+
+if test "have_colord" = "yes"; then
+        AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
+fi
+AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1648,8 +1724,12 @@ po-properties/Makefile.in
 demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
+demos/pixbuf-demo/Makefile
 examples/Makefile
 tests/Makefile
+tests/a11y/Makefile
+tests/css/Makefile
+tests/css/parser/Makefile
 tests/reftests/Makefile
 docs/Makefile
 docs/reference/Makefile
@@ -1677,12 +1757,10 @@ gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
+gtk/a11y/Makefile
 gtk/tests/Makefile
+libgail-util/Makefile
 modules/Makefile
-modules/other/Makefile
-modules/other/gail/Makefile
-modules/other/gail/libgail-util/Makefile
-modules/other/gail/tests/Makefile
 modules/engines/Makefile
 modules/engines/pixbuf/Makefile
 modules/engines/ms-windows/Makefile
@@ -1716,6 +1794,7 @@ echo "        Print backends:       $PRINT_BACKENDS"
 echo "        Dynamic modules:      $build_dynamic_modules"
 echo "        Included immodules:   $included_immodules"
 echo "        PackageKit support:   $build_packagekit"
+echo "        colord support:       $have_colord"
 echo "        Introspection:        $found_introspection"
 echo "        Debugging:            $enable_debug"
 echo "        Documentation:        $enable_gtk_doc"

demos/Makefile.am

@@ -1,59 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo
-
-INCLUDES = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk		\
-	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
-	$(GTK_DEP_LIBS)				\
-	$(MATH_LIB)
-
-noinst_PROGRAMS = 		\
-	testanimation 		\
-	testpixbuf-color	\
-	testpixbuf-save		\
-	testpixbuf-scale 	\
-	pixbuf-demo
-
-testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
-testpixbuf_scale_DEPENDENCIES = $(DEPS)
-testanimation_DEPENDENCIES = $(DEPS)
-pixbuf_demo_DEPENDENCIES = $(DEPS)
-
-testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
-testpixbuf_scale_LDADD = $(LDADDS)
-testanimation_LDADD = $(LDADDS)
-pixbuf_demo_LDADD = $(LDADDS)
-
-testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
-testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
-testanimation_SOURCES = testanimation.c pixbuf-init.c
-pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
-
-EXTRA_DIST +=			\
-	apple-red.png		\
-	background.jpg		\
-	gnome-applets.png	\
-	gnome-calendar.png	\
-	gnome-foot.png		\
-	gnome-gimp.png		\
-	gnome-gmush.png		\
-	gnome-gsame.png		\
-	gnu-keys.png
+SUBDIRS = gtk-demo pixbuf-demo
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -30,6 +30,7 @@ demos =						\
 	menus.c					\
 	offscreen_window.c			\
 	offscreen_window2.c			\
+	overlay.c				\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
@@ -45,7 +46,7 @@ demos =						\
 	tree_store.c				\
 	ui_manager.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DDEMOCODEDIR="\"$(democodedir)\""	\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
@@ -72,7 +73,7 @@ EXTRA_DIST += 		\
 	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
-	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\

demos/gtk-demo/changedisplay.c

@@ -125,7 +125,7 @@ query_for_toplevel (GdkScreen  *screen,
   gtk_container_add (GTK_CONTAINER (popup), frame);
 
   label = gtk_label_new (prompt);
-  gtk_misc_set_padding (GTK_MISC (label), 10, 10);
+  g_object_set (label, "margin", 10, NULL);
   gtk_container_add (GTK_CONTAINER (frame), label);
 
   gtk_widget_show_all (popup);
@@ -397,7 +397,8 @@ left_align_button_new (const char *label)
   GtkWidget *button = gtk_button_new_with_mnemonic (label);
   GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
 
-  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
+  gtk_widget_set_halign (child, GTK_ALIGN_START);
+  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
 
   return button;
 }

demos/gtk-demo/colorsel.c

@@ -20,13 +20,12 @@ draw_callback (GtkWidget *widget,
                gpointer   data)
 {
   GtkStyleContext *context;
-  GdkRGBA *bg;
+  GdkRGBA rgba;
 
   context = gtk_widget_get_style_context (widget);
-  gtk_style_context_get (context, 0, "background-color", &bg, NULL);
-  gdk_cairo_set_source_rgba (cr, bg);
+  gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &rgba);
+  gdk_cairo_set_source_rgba (cr, &rgba);
   cairo_paint (cr);
-  gdk_rgba_free (bg);
 
   return TRUE;
 }
@@ -68,7 +67,6 @@ do_colorsel (GtkWidget *do_widget)
 {
   GtkWidget *vbox;
   GtkWidget *button;
-  GtkWidget *alignment;
 
   if (!window)
     {
@@ -111,12 +109,11 @@ do_colorsel (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      alignment = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-
       button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_container_add (GTK_CONTAINER (alignment), button);
+      gtk_widget_set_halign (button, GTK_ALIGN_END);
+      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
 
-      gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
 
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_color_callback), NULL);

demos/gtk-demo/list_store.c

@@ -105,7 +105,7 @@ create_model (void)
       gboolean sensitive;
 
       if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
+        icon_name = "battery-caution-charging-symbolic";
       else
         icon_name = NULL;
       if (i == 3)

demos/gtk-demo/main.c

@@ -45,7 +45,7 @@ get_democodedir (void)
       if (result == NULL)
 	result = "unknown-location";
 
-      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
+      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
     }
 
   return result;
@@ -931,7 +931,6 @@ main (int argc, char **argv)
   GtkWidget *notebook;
   GtkWidget *hbox;
   GtkWidget *tree;
-  GtkTextTag *tag;
 
   /* Most code in gtk-demo is intended to be exemplary, but not
    * these few lines, which are just a hack so gtk-demo will work
@@ -967,38 +966,38 @@ main (int argc, char **argv)
 			    create_text (&info_buffer, FALSE),
 			    gtk_label_new_with_mnemonic ("_Info"));
 
-  tag = gtk_text_buffer_create_tag (info_buffer, "title",
-                                    "font", "Sans 18",
-                                    NULL);
-   g_object_unref (info_buffer);
+  gtk_text_buffer_create_tag (info_buffer, "title",
+                              "font", "Sans 18",
+                              NULL);
+  g_object_unref (info_buffer);
 
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new_with_mnemonic ("_Source"));
 
 
-  tag = gtk_text_buffer_create_tag (source_buffer, "comment",
-				    "foreground", "DodgerBlue",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "type",
-				    "foreground", "ForestGreen",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "string",
-				    "foreground", "RosyBrown",
-				    "weight", PANGO_WEIGHT_BOLD,
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "control",
-				    "foreground", "purple",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-				    "style", PANGO_STYLE_OBLIQUE,
- 				    "foreground", "burlywood4",
-                                    NULL);
-  tag = gtk_text_buffer_create_tag (source_buffer, "function",
-				    "weight", PANGO_WEIGHT_BOLD,
- 				    "foreground", "DarkGoldenrod4",
-                                    NULL);
-   g_object_unref (source_buffer);
+  gtk_text_buffer_create_tag (source_buffer, "comment",
+                              "foreground", "DodgerBlue",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "type",
+                              "foreground", "ForestGreen",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "string",
+                              "foreground", "RosyBrown",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "control",
+                              "foreground", "purple",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
+                              "style", PANGO_STYLE_OBLIQUE,
+                              "foreground", "burlywood4",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "function",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "foreground", "DarkGoldenrod4",
+                              NULL);
+  g_object_unref (source_buffer);
   
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);

demos/gtk-demo/overlay.c

@@ -0,0 +1,181 @@
+/* Overlay
+ *
+ * Stack widgets in static positions over a main widget
+ */
+
+#include <gtk/gtk.h>
+
+GtkWidget *
+do_overlay (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *view;
+      GtkWidget *sw;
+      GtkWidget *overlay;
+      GtkWidget *entry;
+      GtkWidget *label;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                             gtk_widget_get_screen (do_widget));
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   450, 450);
+      
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_window_set_title (GTK_WINDOW (window), "Overlay");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
+
+      view = gtk_text_view_new ();
+
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+      gtk_container_add (GTK_CONTAINER (sw), view);
+
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+
+      entry = gtk_entry_new ();
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_END);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_END);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_START);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 20);
+      gtk_widget_set_margin_right (label, 20);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_END);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+      gtk_widget_set_margin_left (label, 10);
+      gtk_widget_set_margin_right (label, 10);
+      gtk_widget_set_margin_top (label, 5);
+      gtk_widget_set_margin_bottom (label, 5);
+
+      entry = gtk_entry_new ();
+      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), entry);
+
+      label = gtk_label_new ("Hello world");
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+
+      gtk_widget_show_all (overlay);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/pickers.c

@@ -1,7 +1,7 @@
-/* Pickers 
+/* Pickers
  *
  * These widgets are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts, files and directories.
+ * They allow to select colors, fonts, files, directories and applications.
  */
 
 #include <gtk/gtk.h>
@@ -18,14 +18,14 @@ do_pickers (GtkWidget *do_widget)
     gtk_window_set_screen (GTK_WINDOW (window),
                            gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Pickers");
-   
+
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed),
                       &window);
-    
+
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    table = gtk_table_new (4, 2, FALSE);    
+    table = gtk_table_new (5, 2, FALSE);
     gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
     gtk_table_set_row_spacings (GTK_TABLE (table), 3);
     gtk_container_add (GTK_CONTAINER (window), table);
@@ -33,30 +33,42 @@ do_pickers (GtkWidget *do_widget)
     gtk_container_set_border_width (GTK_CONTAINER (table), 10);
 
     label = gtk_label_new ("Color:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_color_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
 
     label = gtk_label_new ("Font:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     picker = gtk_font_button_new ();
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
 
     label = gtk_label_new ("File:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a File", 
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
 
     label = gtk_label_new ("Folder:");
-    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-    picker = gtk_file_chooser_button_new ("Pick a Folder", 
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    picker = gtk_file_chooser_button_new ("Pick a Folder",
                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
     gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
+
+    label = gtk_label_new ("Mail:");
+    gtk_widget_set_halign (label, GTK_ALIGN_START);
+    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
+    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 4, 5);
   }
 
   if (!gtk_widget_get_visible (window))
@@ -64,7 +76,7 @@ do_pickers (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {    
+    {
       gtk_widget_destroy (window);
       window = NULL;
     }

demos/gtk-demo/sizegroup.c

@@ -46,7 +46,8 @@ add_row (GtkTable     *table,
   GtkWidget *label;
 
   label = gtk_label_new_with_mnemonic (label_text);
-  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_widget_set_valign (label, GTK_ALIGN_END);
   gtk_table_attach (GTK_TABLE (table), label,
 		    0, 1,                  row, row + 1,
 		    GTK_EXPAND | GTK_FILL, 0,

demos/gtk-demo/textview.c

@@ -132,7 +132,6 @@ insert_text (GtkTextBuffer *buffer)
   GtkTextIter start, end;
   GdkPixbuf *pixbuf;
   GdkPixbuf *scaled;
-  GtkTextChildAnchor *anchor;
   char *filename;
 
   /* demo_find_file() looks in the current directory first,
@@ -376,15 +375,15 @@ insert_text (GtkTextBuffer *buffer)
 
   gtk_text_buffer_insert (buffer, &iter,
                           "You can put widgets in the buffer: Here's a button: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " and a menu: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " and a scale: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " and an animation: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, " finally a text entry: ", -1);
-  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+  gtk_text_buffer_create_child_anchor (buffer, &iter);
   gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
 
   gtk_text_buffer_insert (buffer, &iter,

demos/gtk-demo/ui_manager.c

@@ -205,7 +205,8 @@ do_ui_manager (GtkWidget *do_widget)
 
       label = gtk_label_new ("Type\n<alt>\nto start");
       gtk_widget_set_size_request (label, 200, 200);
-      gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+      gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
 
 

demos/pixbuf-demo/Makefile.am

@@ -0,0 +1,41 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir)/gdk		\
+	-DGDK_DISABLE_DEPRECATED	\
+	-DGTK_DISABLE_DEPRECATED	\
+	$(GTK_DEBUG_FLAGS)		\
+	$(GTK_DEP_CFLAGS)
+
+DEPS = \
+	$(top_builddir)/gtk/libgtk-3.la
+
+LDADDS = \
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
+	$(GTK_DEP_LIBS)			\
+	$(MATH_LIB)
+
+noinst_PROGRAMS = 		\
+	pixbuf-demo
+
+pixbuf_demo_DEPENDENCIES = $(DEPS)
+
+pixbuf_demo_LDADD = $(LDADDS)
+
+pixbuf_demo_SOURCES = pixbuf-demo.c
+
+EXTRA_DIST +=			\
+	apple-red.png		\
+	background.jpg		\
+	gnome-applets.png	\
+	gnome-calendar.png	\
+	gnome-foot.png		\
+	gnome-gimp.png		\
+	gnome-gmush.png		\
+	gnome-gsame.png		\
+	gnu-keys.png
+
+-include $(top_srcdir)/git.mk

demos/pixbuf-demo/pixbuf-demo.c

@@ -181,14 +181,11 @@ destroy_cb (GObject *object, gpointer data)
 	gtk_main_quit ();
 }
 
-extern void pixbuf_init();
-
 int
 main (int argc, char **argv)
 {
 	GtkWidget *window;
 
-	pixbuf_init ();
 	gtk_init (&argc, &argv);
 
 	if (!load_pixbufs ()) {

demos/pixbuf-init.c

@@ -1,20 +0,0 @@
-#include "config.h"
-#include <glib.h>
-
-#include <sys/stat.h>
-#include <stdlib.h>
-
-static gboolean
-file_exists (const char *filename)
-{
-  struct stat statbuf;
-
-  return stat (filename, &statbuf) == 0;
-}
-
-void
-pixbuf_init (void)
-{
-  if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
-}

demos/testgtk/main.c

@@ -1,392 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gtk/gtk.h>
-
-#include <demos.h>
-
-static GtkTextBuffer *info_buffer;
-static GtkTextBuffer *source_buffer;
-
-static gchar *current_file = NULL;
-
-enum {
-  TITLE_COLUMN,
-  FILENAME_COLUMN,
-  FUNC_COLUMN,
-  ITALIC_COLUMN,
-  NUM_COLUMNS
-};
-
-gboolean
-read_line (FILE *stream, GString *str)
-{
-  int n_read = 0;
-  
-  flockfile (stream);
-
-  g_string_truncate (str, 0);
-  
-  while (1)
-    {
-      int c;
-      
-      c = getc_unlocked (stream);
-
-      if (c == EOF)
-	goto done;
-      else
-	n_read++;
-
-      switch (c)
-	{
-	case '\r':
-	case '\n':
-	  {
-	    int next_c = getc_unlocked (stream);
-	    
-	    if (!(next_c == EOF ||
-		  (c == '\r' && next_c == '\n') ||
-		  (c == '\n' && next_c == '\r')))
-	      ungetc (next_c, stream);
-	    
-	    goto done;
-	  }
-	default:
-	  g_string_append_c (str, c);
-	}
-    }
-
- done:
-
-  funlockfile (stream);
-
-  return n_read > 0;
-}
-
-void
-load_file (const gchar *filename)
-{
-  FILE *file;
-  GtkTextIter start, end;
-  GString *buffer = g_string_new (NULL);
-  int state = 0;
-  gboolean in_para = 0;
-
-  if (current_file && !strcmp (current_file, filename))
-    return;
-
-  g_free (current_file);
-  current_file = g_strdup (filename);
-  
-  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
-  gtk_text_buffer_delete (info_buffer, &start, &end);
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_delete (source_buffer, &start, &end);
-
-  file = fopen (filename, "r");
-  if (!file)
-    {
-      g_warning ("Cannot open %s: %s\n", filename, g_strerror (errno));
-      return;
-    }
-
-  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  while (read_line (file, buffer))
-    {
-      gchar *p = buffer->str;
-      gchar *q;
-      
-      switch (state)
-	{
-	case 0:
-	  /* Reading title */
-	  while (*p == '/' || *p == '*' || isspace (*p))
-	    p++;
-	  q = p + strlen (p);
-	  while (q > p && isspace (*(q - 1)))
-	    q--;
-
-	  if (q > p)
-	    {
-	      int len_chars = g_utf8_pointer_to_offset (p, q);
-
-	      end = start;
-
-	      g_assert (strlen (p) >= q - p);
-	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-	      start = end;
-
-	      gtk_text_iter_backward_chars (&start, len_chars);
-	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
-
-	      start = end;
-	      
-	      state++;
-	    }
-	  break;
-	    
-	case 1:
-	  /* Reading body of info section */
-	  while (isspace (*p))
-	    p++;
-	  if (*p == '*' && *(p + 1) == '/')
-	    {
-	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-	      state++;
-	    }
-	  else
-	    {
-	      int len;
-	      
-	      while (*p == '*' || isspace (*p))
-		p++;
-
-	      len = strlen (p);
-	      while (isspace (*(p + len - 1)))
-		len--;
-	      
-	      if (len > 0)
-		{
-		  if (in_para)
-		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-		  g_assert (strlen (p) >= len);
-		  gtk_text_buffer_insert (info_buffer, &start, p, len);
-		  in_para = 1;
-		}
-	      else
-		{
-		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-		  in_para = 0;
-		}
-	    }
-	  break;
-
-	case 2:
-	  /* Skipping blank lines */
-	  while (isspace (*p))
-	    p++;
-	  if (*p)
-	    {
-	      p = buffer->str;
-	      state++;
-	      /* Fall through */
-	    }
-	  else
-	    break;
-	  
-	case 3:
-	  /* Reading program body */
-	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
-	  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-	  break;
-	}
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
-  fclose (file);
-}
-
-gboolean
-button_press_event_cb (GtkTreeView    *tree_view,
-		       GdkEventButton *event,
-		       GtkTreeModel   *model)
-{
-  if (event->type == GDK_2BUTTON_PRESS)
-    {
-      GtkTreePath *path = NULL;
-
-      gtk_tree_view_get_path_at_pos (tree_view,
-				     event->window,
-				     event->x,
-				     event->y,
-				     &path,
-				     NULL);
-
-      if (path)
-	{
-	  GtkTreeIter iter;
-	  gboolean italic;
-	  GVoidFunc func;
-
-	  gtk_tree_model_get_iter (model, &iter, path);
-	  gtk_tree_store_get (GTK_TREE_STORE (model),
-			      &iter,
-			      FUNC_COLUMN, &func,
-			      ITALIC_COLUMN, &italic,
-			      -1);
-	  (func) ();
-	  gtk_tree_store_set (GTK_TREE_STORE (model),
-			      &iter,
-			      ITALIC_COLUMN, !italic,
-			      -1);
-	  gtk_tree_path_free (path);
-	}
-
-      g_signal_stop_emission_by_name (tree_view, "button-press-event");
-      return TRUE;
-    }
-  
-  return FALSE;
-}
-
-static void
-selection_cb (GtkTreeSelection *selection,
-	      GtkTreeModel     *model)
-{
-  GtkTreeIter iter;
-  GValue value = {0, };
-
-  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
-    return;
-
-  gtk_tree_model_get_value (model, &iter,
-			    FILENAME_COLUMN,
-			    &value);
-  load_file (g_value_get_string (&value));
-  g_value_unset (&value);
-}
-
-static GtkWidget *
-create_text (GtkTextBuffer **buffer,
-	     gboolean        is_source)
-{
-  GtkWidget *scrolled_window;
-  GtkWidget *text_view;
-  PangoFontDescription *font_desc;
-
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-				  GTK_POLICY_AUTOMATIC,
-				  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-				       GTK_SHADOW_IN);
-  
-  text_view = gtk_text_view_new ();
-  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-  
-  *buffer = gtk_text_buffer_new (NULL);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
-
-  if (is_source)
-    {
-      font_desc = pango_font_description_from_string ("Courier 10");
-      gtk_widget_modify_font (text_view, font_desc);
-      pango_font_description_free (font_desc);
-    }
-  
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), !is_source);
-  
-  return scrolled_window;
-}
-
-/* Technically a list, but if we do go to 80 demos, we may want to move to a tree */
-static GtkWidget *
-create_tree (void)
-{
-  GtkTreeSelection *selection;
-  GtkCellRenderer *cell;
-  GtkWidget *tree_view;
-  GtkTreeViewColumn *column;
-  GtkTreeStore *model;
-  GtkTreeIter iter;
-  gint i;
-
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-
-  gtk_tree_selection_set_type (GTK_TREE_SELECTION (selection),
-			       GTK_TREE_SELECTION_SINGLE);
-  gtk_widget_set_usize (tree_view, 200, -1);
-
-  for (i=0; i < G_N_ELEMENTS (testgtk_demos); i++)
-    {
-      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
-
-      gtk_tree_store_set (GTK_TREE_STORE (model),
-			  &iter,
-			  TITLE_COLUMN, testgtk_demos[i].title,
-			  FILENAME_COLUMN, testgtk_demos[i].filename,
-			  FUNC_COLUMN, testgtk_demos[i].func,
-			  ITALIC_COLUMN, FALSE,
-			  -1);
-    }
-
-  cell = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Widget",
-						     cell,
-						     "text", TITLE_COLUMN,
-						     "italic", ITALIC_COLUMN,
-						     NULL);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-			       GTK_TREE_VIEW_COLUMN (column));
-
-  g_signal_connect (selection, "selection-changed", selection_cb, model);
-  g_signal_connect (tree_view, "button-press-event", G_CALLBACK (button_press_event_cb), model);
-
-  return tree_view;
-}
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *notebook;
-  GtkWidget *hbox;
-  GtkWidget *tree;
-  GtkTextTag *tag;
-
-  gtk_init (&argc, &argv);
-  
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (window, "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), hbox);
-
-  tree = create_tree ();
-  gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&info_buffer, FALSE),
-			    gtk_label_new ("Info"));
-
-
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-			    create_text (&source_buffer, TRUE),
-			    gtk_label_new ("Source"));
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  g_object_set (tag,
-                "font", "Sans 18",
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  g_object_set (tag,
-                "font", "Courier 10",
-                "pixels_above_lines", 0,
-                "pixels_below_lines", 0,
-                NULL);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  gtk_widget_show_all (window);
-  
-
-  load_file (testgtk_demos[0].filename);
-  
-  gtk_main ();
-
-  return 0;
-}

docs/CODING-STYLE

@@ -421,10 +421,10 @@ definitions should be vertically aligned in three columns:
 The maximum width of each column is given by the longest element in the
 column:
 
-  void                  gtk_type_set_property (GtkType      *type,
-                                               const gchar  *value,
-                                               GError      **error);
-  G_CONST_RETURN gchar *gtk_type_get_property (GtkType      *type);
+  void         gtk_type_set_property (GtkType      *type,
+                                      const gchar  *value,
+                                      GError      **error);
+  const gchar *gtk_type_get_property (GtkType      *type);
 
 It is also possible to align the columns to the next tab:
 

docs/Makefile.am

@@ -8,7 +8,6 @@ EXTRA_DIST += \
 	developers.txt			\
 	dnd_internals.txt		\
 	focus_tracking.txt		\
-	generation.txt			\
 	gtkdocs_fix			\
 	make-todo			\
 	refcounting.txt			\

docs/generation.txt

@@ -1,177 +0,0 @@
-Overview:
-========
-
-This file describes the way that autogeneration
-works within the GTK+ source code.
-
-The following files in the gdk/ subdirectory
-are autogenerated:
-
-  gdkkeysyms.h
-  gdkcursors.h 
-
-The following files in the gtk/ subdirectory 
-are autogenerated:
-
- gtk.defs
-   Description of GTK+ types (and some functions) in a lisp-style
-   format.
- gtktypebuiltins.h
-   Header file including declarations for internal types  
- gtktypebuiltins_vars.c
-   Variables for type values for internal types.
- gtktypebuiltins_ids.c
-   Arrays holding information about each internal type.
- gtktypebuiltins_evals.c
-   Arrays holding mapping between enumeration values
-   and strings.
-
- gtkmarshal.c
- gtkmarshal.h
-   Autogenerated signal marshallers
-
-GDK
-===
-
-gdkkeysyms.h and gdkcursors.h are generated from
-the corresponding header files
-
-  X11/cursorfont.h
-  X11/keysymdef.h
-
-by some simple sed scripts. These are not actually
-run automatically because we want all the keysyms
-even on systems with a limited set.
-So the Gdk rule to generate both files (X-derived-headers)
-only needs to be rerun for every new release of the X Window
-System.
-
-GTK+ - type definitions
-=======================
-
-The type definitions are generated from several sources:
-
- gtk-boxed.defs - definitions for boxed types
- GTK+ header files
- GDK header files
-
-The makeenums.pl script does a heuristic parse of 
-the header files and extracts all enumerations declarations.
-It also recognizes a number of pseudo-comments in the
-header files:
-
-Two of these apply to individual enumeration values:
-
-  /*< skip >*/
-
- This enumeration value should be skipped.
-  
-  /*< nick=NICK >*/
-
- The nickname for this value should NICK instead of the
- normally guessed value. For instance:
-
-  typedef enum {
-    GTK_TARGET_SAME_APP = 1 << 0,    /*< nick=same-app >*/
-    GTK_TARGET_SAME_WIDGET = 1 << 1  /*< nick=same-widget >*/
-  } GtkTargetFlags;
-
- makes the nicks "same-app" and "same-widget", instead of
- "app" and "widget" that would normally be used.
-
-The other two apply to entire enumeration declarations.
- 
-  /*< prefix=PREFIX >*/
-
-  Specifies the prefix to be removed from the enumeration
-  values to generate nicknames.
-
-  /*< flags >*/
-
- Specifies that this enumeration is used as a bitfield.
- (makenums.pl normally guesses this from the presence of values
-  with << operators). For instance:
-
-  typedef enum                    /*< flags >*/
-  {
-    GDK_IM_PREEDIT_AREA      = 0x0001, 
-    GDK_IM_PREEDIT_CALLBACKS = 0x0002, 
-    [ ... ]
- } GdkIMStyle;
-
-makeenums.pl can be run into two modes:
-
- 1) Generate the gtktypebuiltins_eval.c file (this
-    contains arrays holding the mapping of 
-    string <=> enumeration value)
-
- 2) Generate the enumeration portion of gtk.defs.
-
-The enumeration portion is added to the boxed type 
-declarations in gtk-boxed.defs to create gtk.defs.
-
-The makeetypes.awk program takes the gtk.defs file, and
-from that generates various files depending on the
-third parameter passed to it:
-
- macros: gtktypebuiltins.h
- variables: gtktypebuiltins_vars.c
- entries: gtktypebuiltins_ids.c
-
-GTK+ - marshallers
-==================
-
-The files gtkmarshal.c and gtkmarshal.h include declarations
-and definitions for the marshallers needed inside of
-GTK+. The marshallers to be generated are listed in
-the file gtkmashal.list, which is processed
-by genmarshal.pl.
-
-The format of this file is a list of lines:
-
-  <retval-type>:<arg1-type>,<arg2-type>,<arg3-type>
- 
-e.g.:
-
-  BOOL:POINTER,STRING,STRING,POINTER
-
-A marshaller is generated for each line in the file.
-The possible types are:
-
- NONE
- BOOL
- CHAR
- INT
- UINT
- LONG
- ULONG
- FLOAT
- DOUBLE
- STRING
- ENUM
- FLAGS
- BOXED
- POINTER
- OBJECT
- FOREIGN    (gpointer data, GtkDestroyNotify notify)
- C_CALLBACK (GtkFunction func, gpointer func_data)
- SIGNAL     (GtkSignalFunc f, gpointer data)
- ARGS       (gint n_args, GtkArg *args)
- CALLBACK   (GtkCallBackMarshal marshall,
-             gpointer data,
-	     GtkDestroyNotify Notify)
-
-Some of these types map to multiple return values - these
-are marked above with the return types in parentheses.
-
-NOTES
-=====
-
-When autogenerating GTK+ files, the autogenerated
-files are often rebuild resulting in the same result.
-
-To prevent unnecessary rebuilds of the entire directory, some files
-that multiple other source files depend on are not actually written
-to directly.  Instead, an intermediate file is written, which
-is then compared to the old file, and only if it is different
-is it copied into the final location.

docs/reference/gdk/Makefile.am

@@ -37,7 +37,7 @@ EXTRA_HFILES=			\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/gdk	\

docs/reference/gdk/gdk-docs.sgml

@@ -57,6 +57,10 @@
     <title>Index of new symbols in 3.0</title>
     <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-3-2" role="3.2">
+    <title>Index of new symbols in 3.2</title>
+    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -761,11 +761,16 @@ gdk_event_put
 gdk_event_new
 gdk_event_copy
 gdk_event_free
-gdk_event_get_time
-gdk_event_get_state
 gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
 gdk_event_get_coords
+gdk_event_get_keycode
+gdk_event_get_keyval
 gdk_event_get_root_coords
+gdk_event_get_scroll_direction
+gdk_event_get_state
+gdk_event_get_time
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
@@ -928,6 +933,8 @@ GDK_POINTER_TO_XID
 GDK_XID_TO_POINTER
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
+gdk_x11_device_get_id
+gdk_x11_device_manager_lookup
 gdk_x11_display_get_user_time
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_get_startup_notification_id

docs/reference/gdk/tmpl/.gitignore

@@ -1,23 +0,0 @@
-cairo_interaction.sgml
-colors.sgml
-cursors.sgml
-dnd.sgml
-drawing.sgml
-events.sgml
-event_structs.sgml
-gdkapplaunchcontext.sgml
-gdkdisplay.sgml
-gdkdisplaymanager.sgml
-gdkscreen.sgml
-gdktesting.sgml
-general.sgml
-keys.sgml
-pango_interaction.sgml
-properties.sgml
-pixbufs.sgml
-regions.sgml
-selections.sgml
-threads.sgml
-visuals.sgml
-windows.sgml
-x_interaction.sgml

docs/reference/gtk/Makefile.am

@@ -94,7 +94,7 @@ IGNORE_HFILES=				\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\
@@ -124,6 +124,7 @@ content_files =					\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
 	osx.sgml				\
@@ -146,6 +147,7 @@ expand_content_files = 				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
 	migrating-GtkApplication.xml		\
+	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
 	text_widget.sgml			\
@@ -277,6 +279,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/appchooserbutton.png				\
 	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
+	$(srcdir)/images/box-packing.png				\
+	$(srcdir)/images/box-expand.png				\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
@@ -296,6 +300,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/label.png					\
 	$(srcdir)/images/link-button.png				\
 	$(srcdir)/images/list-and-tree.png				\
+	$(srcdir)/images/lockbutton.png				\
 	$(srcdir)/images/lockbutton-locked.png				\
 	$(srcdir)/images/lockbutton-unlocked.png			\
 	$(srcdir)/images/lockbutton-sorry.png				\
@@ -329,6 +334,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/layout-rltb.png				\
 	$(srcdir)/images/layout-tblr.png				\
 	$(srcdir)/images/layout-tbrl.png				\
+	$(srcdir)/images/widget-hvalign.png				\
 	$(srcdir)/images/window-default.png				\
 	$(srcdir)/images/hello-world.png				\
 	$(srcdir)/images/grid-packing.png				\
@@ -365,6 +371,7 @@ HTML_IMAGES = \
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \
 	--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
 	--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
 	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo

docs/reference/gtk/building.sgml

@@ -49,12 +49,12 @@ How to compile GTK+ itself
       of the tools are already included in the source packages. But
       it's useful to know a bit about how packages that use these
       tools work. A source package is distributed as a
-      <literal>tar.gz</literal> or <literal>tar.bz2</literal> file
+      <literal>tar.bz2</literal> or <literal>tar.xz</literal> file
       which you unpack into a directory full of the source files as follows:
     </para>
     <programlisting>
-      tar xvfz gtk+-3.0.0.tar.gz
-      tar xvfj gtk+-3.0.0.tar.bz2
+      tar xvfj gtk+-3.2.0.tar.bz2
+      tar xvfJ gtk+-3.2.0.tar.xz
     </programlisting>
     <para>
       In the toplevel directory that is created, there will be
@@ -162,8 +162,8 @@ How to compile GTK+ itself
     </itemizedlist>
     <para>
       Some of the libraries that GTK+ depends on are maintained by
-      by the GTK+ team: GLib, GdkPixbuf, Pango, and ATK. Other libraries
-      are maintained separately.
+      by the GTK+ team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
+      Other libraries are maintained separately.
     </para>
     <itemizedlist>
       <listitem>
@@ -171,16 +171,24 @@ How to compile GTK+ itself
           The GLib library provides core non-graphical functionality
           such as high level data types, Unicode manipulation, and
           an object and type system to C programs. It is available
-          from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+
-          FTP site</ulink>.
+          from the <ulink url="http://ftp.gtk.org/pub/glib/">GTK+
+          FTP site</ulink> or
+          <ulink url="http://download.gnome.org/sources/glib/">here</ulink>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          The <ulink url="http://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
+          provides facilities for loading images in a variety of file formats.
+          It is available
+          <ulink url="http://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
         </para>
       </listitem>
       <listitem>
         <para>
           <ulink url="http://www.pango.org">Pango</ulink> is a library
-          for internationalized text handling. It is available from
-          the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP
-          site</ulink>.
+          for internationalized text handling. It is available
+          <ulink url="http://download.gnome.org/sources/pango/">here</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -188,10 +196,21 @@ How to compile GTK+ itself
           ATK is the Accessibility Toolkit. It provides a set of generic
           interfaces allowing accessibility technologies such as
           screen readers to interact with a graphical user interface.
-          It is available from the <ulink
-          url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site</ulink>.
+          It is available
+          <ulink url="http://download.gnome.org/sources/atk/">here</ulink>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://live.gnome.org/GObjectIntrospection">Gobject Introspection</ulink>
+          is a framework for making introspection data available to
+          language bindings. It is available
+          <ulink url="http://download.gnome.org/sources/gobject-introspection/">here</ulink>.
+        </para>
+      </listitem>
+    </itemizedlist>
+    <itemizedlist>
+      <title>External dependencies</title>
       <listitem>
         <para>
           The <ulink url="http://www.gnu.org/software/libiconv/">GNU
@@ -235,19 +254,6 @@ How to compile GTK+ itself
           drawing.
         </para>
       </listitem>
-      <listitem>
-        <para>
-          The GdkPixbuf library provides facilities for loading
-          images in a variety of file formats.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
-          is a framework for making introspection data available to
-          language bindings.
-        </para>
-      </listitem>
       <listitem>
         <para>
           The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>

docs/reference/gtk/gtk-docs.sgml

@@ -219,6 +219,8 @@
       <xi:include href="xml/gtkfilechooserwidget.xml" />
       <xi:include href="xml/gtkfilefilter.xml" />
       <xi:include href="xml/gtkfontbutton.xml" />
+      <xi:include href="xml/gtkfontchooser.xml" />
+      <xi:include href="xml/gtkfontchooserdlg.xml" />
       <xi:include href="xml/gtkfontsel.xml" />
       <xi:include href="xml/gtkfontseldlg.xml" />
     </chapter>
@@ -242,6 +244,7 @@
       <xi:include href="xml/gtknotebook.xml" />
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
+      <xi:include href="xml/gtkoverlay.xml" />
       <xi:include href="xml/gtkorientable.xml" />
     </chapter>
 
@@ -353,8 +356,9 @@
 
     <xi:include href="xml/migrating-checklist.sgml" />
     <xi:include href="xml/migrating-2to3.xml" />
-    <xi:include href="xml/migrating-GtkApplication.xml" />
     <xi:include href="xml/migrating-GtkStyleContext.xml" />
+    <xi:include href="xml/migrating-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkGrid.xml" />
   </part>
 
   <part>

docs/reference/gtk/gtk3-sections.txt

@@ -354,6 +354,7 @@ gtk_assistant_get_nth_page
 gtk_assistant_prepend_page
 gtk_assistant_append_page
 gtk_assistant_insert_page
+gtk_assistant_remove_page
 GtkAssistantPageFunc
 gtk_assistant_set_forward_page_func
 GtkAssistantPageType
@@ -1475,6 +1476,62 @@ GtkFontSelectionDialogPrivate
 gtk_font_selection_dialog_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkfontchooser</FILE>
+<TITLE>GtkFontChooser</TITLE>
+GtkFontChooser
+gtk_font_chooser_new
+gtk_font_chooser_get_family
+gtk_font_chooser_get_face
+gtk_font_chooser_get_size
+gtk_font_chooser_get_font_name
+gtk_font_chooser_set_font_name
+gtk_font_chooser_get_preview_text
+gtk_font_chooser_set_preview_text
+gtk_font_chooser_get_show_preview_entry
+gtk_font_chooser_set_show_preview_entry
+GtkFontFilterFunc
+gtk_font_chooser_set_filter_func
+
+<SUBSECTION Standard>
+GtkFontChooserClass
+GTK_TYPE_FONT_CHOOSER
+GTK_FONT_CHOOSER
+GTK_FONT_CHOOSER_CLASS
+GTK_IS_FONT_CHOOSER
+GTK_IS_FONT_CHOOSER_CLASS
+GTK_FONT_CHOOSER_GET_CLASS
+
+<SUBSECTION Private>
+GtkFontChooserPrivate
+gtk_font_chooser_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkfontchooserdlg</FILE>
+<TITLE>GtkFontChooserDialog</TITLE>
+GtkFontChooserDialog
+gtk_font_chooser_dialog_new
+gtk_font_chooser_dialog_get_font_chooser
+gtk_font_chooser_dialog_get_font_name
+gtk_font_chooser_dialog_set_font_name
+gtk_font_chooser_dialog_get_preview_text
+gtk_font_chooser_dialog_set_preview_text
+
+<SUBSECTION Standard>
+GtkFontChooserDialogClass
+GTK_TYPE_FONT_CHOOSER_DIALOG
+GTK_FONT_CHOOSER_DIALOG
+GTK_FONT_CHOOSER_DIALOG_CLASS
+GTK_IS_FONT_CHOOSER_DIALOG
+GTK_IS_FONT_CHOOSER_DIALOG_CLASS
+GTK_FONT_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+GtkFontChooserDialogPrivate
+gtk_font_chooser_dialog_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkframe</FILE>
 <TITLE>GtkFrame</TITLE>
@@ -5050,6 +5107,8 @@ gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
 gtk_widget_style_attach
+gtk_widget_class_set_accessible_type
+gtk_widget_class_set_accessible_role
 gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_child_notify
@@ -5108,6 +5167,7 @@ gtk_widget_unset_state_flags
 gtk_widget_get_state_flags
 gtk_widget_has_default
 gtk_widget_has_focus
+gtk_widget_has_visible_focus
 gtk_widget_has_grab
 gtk_widget_has_rc_style
 gtk_widget_is_drawable
@@ -5290,6 +5350,8 @@ gtk_window_get_opacity
 gtk_window_set_opacity
 gtk_window_get_mnemonics_visible
 gtk_window_set_mnemonics_visible
+gtk_window_get_focus_visible
+gtk_window_set_focus_visible
 gtk_window_set_has_resize_grip
 gtk_window_get_has_resize_grip
 gtk_window_resize_grip_is_visible
@@ -5416,7 +5478,10 @@ GTK_CHECK_VERSION
 <TITLE>GtkWidgetPath</TITLE>
 GtkWidgetPath
 gtk_widget_path_append_type
+gtk_widget_path_append_with_siblings
 gtk_widget_path_copy
+gtk_widget_path_ref
+gtk_widget_path_unref
 gtk_widget_path_free
 gtk_widget_path_get_object_type
 gtk_widget_path_has_parent
@@ -5427,6 +5492,8 @@ gtk_widget_path_iter_clear_classes
 gtk_widget_path_iter_clear_regions
 gtk_widget_path_iter_get_name
 gtk_widget_path_iter_get_object_type
+gtk_widget_path_iter_get_siblings
+gtk_widget_path_iter_get_sibling_index
 gtk_widget_path_iter_has_class
 gtk_widget_path_iter_has_name
 gtk_widget_path_iter_has_qclass
@@ -5522,6 +5589,7 @@ GTK_STYLE_CLASS_BACKGROUND
 GTK_STYLE_CLASS_BUTTON
 GTK_STYLE_CLASS_CALENDAR
 GTK_STYLE_CLASS_CELL
+GTK_STYLE_CLASS_COMBOBOX_ENTRY
 GTK_STYLE_CLASS_CHECK
 GTK_STYLE_CLASS_DEFAULT
 GTK_STYLE_CLASS_ENTRY
@@ -5542,18 +5610,23 @@ GTK_STYLE_CLASS_PROGRESSBAR
 GTK_STYLE_CLASS_SPINNER
 GTK_STYLE_CLASS_TOOLBAR
 GTK_STYLE_CLASS_PRIMARY_TOOLBAR
+GTK_STYLE_CLASS_INLINE_TOOLBAR
 GTK_STYLE_CLASS_PANE_SEPARATOR
 GTK_STYLE_CLASS_SEPARATOR
+GTK_STYLE_CLASS_SIDEBAR
 GTK_STYLE_CLASS_DND
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
 GTK_STYLE_CLASS_FRAME
 GTK_STYLE_CLASS_HIGHLIGHT
+GTK_STYLE_CLASS_IMAGE
 GTK_STYLE_CLASS_INFO
 GTK_STYLE_CLASS_MARK
 GTK_STYLE_CLASS_NOTEBOOK
 GTK_STYLE_CLASS_QUESTION
 GTK_STYLE_CLASS_SCALE
+GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE
+GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW
 GTK_STYLE_CLASS_SPINBUTTON
 GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
@@ -5637,6 +5710,7 @@ gtk_render_option
 gtk_render_slider
 gtk_render_activity
 gtk_render_icon_pixbuf
+gtk_render_icon
 
 <SUBSECTION Standard>
 GTK_TYPE_STYLE_CONTEXT
@@ -5662,8 +5736,22 @@ gtk_css_provider_load_from_data
 gtk_css_provider_load_from_file
 gtk_css_provider_load_from_path
 gtk_css_provider_new
+gtk_css_provider_to_string
 GTK_CSS_PROVIDER_ERROR
 GtkCssProviderError
+<SUBSECTION>
+GtkCssSection
+GtkCssSectionType
+gtk_css_section_get_end_line
+gtk_css_section_get_end_position
+gtk_css_section_get_file
+gtk_css_section_get_parent
+gtk_css_section_get_section_type
+gtk_css_section_get_start_line
+gtk_css_section_get_start_position
+gtk_css_section_get_type
+gtk_css_section_ref
+gtk_css_section_unref
 <SUBSECTION Standard>
 GTK_TYPE_CSS_PROVIDER
 GTK_CSS_PROVIDER
@@ -5674,6 +5762,7 @@ GTK_IS_CSS_PROVIDER_CLASS
 <SUBSECTION Private>
 gtk_css_provider_get_type
 gtk_css_provider_error_quark
+gtk_css_section_get_type
 </SECTION>
 
 <SECTION>
@@ -5712,6 +5801,7 @@ GTK_THEMING_ENGINE_GET_CLASS
 GTK_IS_THEMING_ENGINE
 GTK_IS_THEMING_ENGINE_CLASS
 <SUBSECTION Private>
+GtkThemingEnginePrivate
 GTK_TYPE_THEMING_ENGINE
 gtk_theming_engine_get_type
 </SECTION>
@@ -5728,6 +5818,7 @@ gtk_symbolic_color_new_mix
 gtk_symbolic_color_ref
 gtk_symbolic_color_unref
 gtk_symbolic_color_resolve
+gtk_symbolic_color_to_string
 
 <SUBSECTION Standard>
 GTK_TYPE_SYMBOLIC_COLOR
@@ -5746,6 +5837,7 @@ gtk_gradient_add_color_stop
 gtk_gradient_ref
 gtk_gradient_unref
 gtk_gradient_resolve
+gtk_gradient_to_string
 
 <SUBSECTION Standard>
 GTK_TYPE_GRADIENT
@@ -6896,6 +6988,10 @@ GtkGrid
 gtk_grid_new
 gtk_grid_attach
 gtk_grid_attach_next_to
+gtk_grid_get_child_at
+gtk_grid_insert_row
+gtk_grid_insert_column
+gtk_grid_insert_next_to
 gtk_grid_set_row_homogeneous
 gtk_grid_get_row_homogeneous
 gtk_grid_set_row_spacing
@@ -7070,3 +7166,24 @@ GTK_LOCK_BUTTON_GET_CLASS
 gtk_lock_button_get_type
 GtkLockButtonPrivate
 </SECTION>
+
+<SECTION>
+<FILE>gtkoverlay</FILE>
+<TITLE>GtkOverlay</TITLE>
+GtkOverlay
+
+gtk_overlay_new
+
+<SUBSECTION Standard>
+GTK_TYPE_OVERLAY
+GTK_OVERLAY
+GTK_OVERLAY_CLASS
+GTK_IS_OVERLAY
+GTK_IS_OVERLAY_CLASS
+GTK_OVERLAY_GET_CLASS
+GtkOverlayClass
+
+<SUBSECTION Private>
+gtk_overlay_get_type
+GtkOverlayPrivate
+</SECTION>

docs/reference/gtk/gtk3.types

@@ -105,6 +105,7 @@ gtk_notebook_get_type
 gtk_numerable_icon_get_type
 gtk_offscreen_window_get_type
 gtk_orientable_get_type
+gtk_overlay_get_type
 gtk_page_setup_get_type
 gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type

docs/reference/gtk/migrating-2to3.xml

@@ -704,8 +704,8 @@ cairo_arc (cr, 1.5, 1.5, 1.5, 0, 2 * M_PI);
 cairo_fill (cr);
 cairo_destroy (cr);
 
-pixbuf = gdk_pixbuf_get_from_surface (NULL, s,
-                                      0, 0, 0, 0,
+pixbuf = gdk_pixbuf_get_from_surface (s,
+                                      0, 0,
                                       3, 3);
 
 cairo_surface_destroy (s);

docs/reference/gtk/migrating-GtkGrid.xml

@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<chapter id="gtk-migrating-GtkGrid">
+
+  <title>Migrating from other containers to GtkGrid</title>
+
+  <para>
+    #GtkGrid is an attempt to write a comprehensive, legacy-free,
+    box-layout container that is flexible enough to replace #GtkBox,
+    #GtkTable and the like.
+  </para>
+
+  <para>
+    The layout model of GtkGrid is to arrange its children in rows and
+    columns. This is done by assigning positions on a two-dimentions
+    grid that stretches arbitrarily far in all directions.
+    Children can span multiple rows or columns, too.
+ </para>
+
+  <section>
+
+    <title>GtkBox versus GtkGrid: packing</title>
+
+    <para>
+      GtkBox works by arranging child widgets in a single line, either
+      horizontally or vertically. It allows packing children from the
+      beginning or end, using gtk_box_pack_start() and gtk_box_pack_end().
+    </para>
+
+    <inlinegraphic fileref="box-packing.png" format="PNG"></inlinegraphic>
+
+  <example>
+    <title>A simple box</title>
+    <programlisting>
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  gtk_box_pack_start (GTK_BOX (box), gtk_label_new ("One"), FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), gtk_label_new ("Two"), FALSE, FALSE, 0);
+    </programlisting>
+    <para>This can be done with #GtkGrid as follows:</para>
+    <programlisting>
+  grid = gtk_grid_new ();
+
+  child1 = gtk_label_new ("One");
+  gtk_grid_attach (GTK_GRID (grid), child1, 0, 0, 1, 1);
+  child2 = gtk_label_new ("Two");
+  gtk_grid_attach_next_to (GTK_GRID (grid), child2, child1, GTK_POS_RIGHT, 1, 1);
+    </programlisting>
+    <para>
+      And similarly for gtk_box_pack_end(). In that case, you
+      would use #GTK_POS_LEFT to place the grid children from
+      left to right.
+    </para>
+    <para>
+      If you only need to pack children from the start, using
+      gtk_container_add() is an even simpler alternative. GtkGrid
+      places children added with gtk_container_add() in a single
+      row or column according to its #GtkOrientable:orientation.
+    </para>
+  </example>
+
+    <para>
+      One difference to keep in mind is that the gtk_box_pack_start/pack_end
+      functions allow you to place an arbitrary number of children from
+      either end without ever 'colliding in the middle'. With GtkGrid, you
+      have to leave enough space between the two ends, if you want to combine
+      packing from both ends towards the middle. In practice, this should be
+      easy to avoid; and GtkGrid simply ignores entirely empty rows or
+      columns for layout and spacing.
+    </para>
+    <para>
+      On the other hand, GtkGrid is more flexible in that its grid extends
+      indefinitively in both directions &mdash; there is no problem with
+      using negative numbers for the grid positions. So, if you discover
+      that you need to place a widget before your existing arrangement,
+      you always can.
+    </para>
+  </section>
+
+  <section>
+    <title>GtkBox versus GtkGrid: sizing</title>
+
+    <para>
+      When adding a child to a GtkBox, there are two hard-to-remember
+      parameters (child properties, more exactly) named expand and fill
+      that determine how the child size behaves in the main direction
+      of the box. If expand is set, the box allows the position occupied
+      by the child to grow when extra space is available. If fill is
+      also set, the extra space is allocated to the child widget itself.
+      Otherwise it is left 'free'.
+      There is no control about the 'minor' direction; children
+      are always given the full size in the minor direction.
+    </para>
+
+    <inlinegraphic fileref="box-expand.png" format="PNG"></inlinegraphic>
+
+    <para>
+      GtkGrid does not have any custom child properties for controlling
+      size allocation to children. Instead, it fully supports the newly
+      introduced #GtkWidget:hexpand, #GtkWidget:vexpand, #GtkWidget:halign
+      and #GtkWidget:valign properties.
+    </para>
+    <para>
+      The #GtkWidget:hexpand and #GtkWidget:vexpand properties operate
+      in a similar way to the expand child properties of #GtkBox. As soon
+      as a column contains a hexpanding child, GtkGrid allows the column
+      to grow when extra space is available (similar for rows and vexpand).
+      In contrast to GtkBox, all the extra space is always allocated
+      to the child widget, there are no 'free' areas.
+    </para>
+    <para>
+      To replace the functionality of the fill child properties, you can
+      set the #GtkWidget:halign and #GtkWidget:valign properties. An
+      align value of #GTK_ALIGN_FILL has the same effect as setting fill
+      to %TRUE, a value of #GTK_ALIGN_CENTER has the same effect as setting
+      fill to %FALSE. The image below shows the effect of various combinations
+      of halign and valign.
+    </para>
+
+    <inlinegraphic fileref="widget-hvalign.png" format="PNG"></inlinegraphic>
+
+    <example>
+      <title>Expansion and alignment</title>
+      <programlisting>
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+  gtk_box_pack_start (GTK_BOX (box), gtk_label_new ("One"), TRUE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box), gtk_label_new ("Two"), TRUE, TRUE, 0);
+      </programlisting>
+    <para>This can be done with #GtkGrid as follows:</para>
+    <programlisting>
+  grid = gtk_grid_new ();
+
+  child1 = gtk_label_new ("One");
+  gtk_widget_set_hexpand (child1, TRUE);
+  gtk_widget_set_halign (child1, GTK_ALIGN_CENTER);
+  gtk_grid_attach (GTK_GRID (grid), child1, 0, 0, 1, 1);
+  child2 = gtk_label_new ("Two");
+  gtk_widget_set_hexpand (child2, TRUE);
+  gtk_widget_set_halign (child1, GTK_ALIGN_FILL);
+  gtk_grid_attach_next_to (GTK_GRID (grid), child2, child1, GTK_POS_RIGHT, 1, 1);
+      </programlisting>
+    </example>
+    <para>
+      One difference between the new GtkWidget expand properties and
+      the GtkBox child property of the same name is that widget expandability
+      is 'inherited' from children. What this means is that a container
+      will become itself expanding as soon as it has
+      an expanding child. This is typically what you want, it lets
+      you e.g. mark the content pane of your application window as
+      expanding, and all the intermediate containers between the
+      content pane and the toplevel window will automatically do
+      the right thing. This automatism can be overridden at any
+      point by setting the expand flags on a container explicitly.
+    </para>
+    <para>
+      Another difference between GtkBox and GtkGrid with respect to
+      expandability is when there are no expanding children at all.
+      In this case, GtkBox will forcibly expand all children whereas
+      GtkGrid will not. In practice, the effect of this is typically
+      that a grid will 'stick to the corner' when the toplevel
+      containing it is grown, instead of spreading out its children
+      over the entire area. The problem can be fixed by setting some
+      or all of the children to expand.
+    </para>
+
+    <para>
+      When you set the #GtkBox:homogeneous property on a GtkBox,
+      it reserves the same space for all its children. GtkGrid does
+      this in a very similar way, with #GtkGrid:row-homogeneous and
+      #GtkGrid:column-homogeneous properties which control whether
+      all rows have the same height and whether all columns have
+      the same width.
+    </para>
+  </section>
+
+  <section>
+    <title>GtkBox versus GtkGrid: spacing</title>
+
+    <para>
+      With GtkBox, you have to specify the #GtkBox:spacing when
+      you construct it. This property specifies the space that
+      separates the children from each other. Additionally, you
+      can specify extra space to put around each child individually,
+      using the #GtkBox:padding child property.
+    </para>
+
+    <para>
+      GtkGrid is very similar when it comes to spacing between the
+      children, except that it has two separate properties,
+      #GtkGrid:row-spacing and #GtkGrid:column-spacing, for the
+      space to leave between rows and columns. Note that row-spacing
+      is the space <emphasis>between</emphasis> rows, not inside
+      a row. So, if you doing a horizontal layout, you need to set
+      #GtkGrid:column-spacing.
+    </para>
+    <para>
+      GtkGrid doesn't have any custom child properties to specify
+      per-child padding; instead you can use the #GtkWidget:margin
+      property. You can also set different padding on each side with
+      the  #GtkWidget:margin-left, #GtkWidget:margin-right,
+      #GtkWidget:margin-top and #GtkWidget:margin-bottom properties.
+    </para>
+
+    <example>
+      <title>Spacing in boxes</title>
+
+      <programlisting>
+         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+         gtk_box_pack_start (GTK_BOX (box), child, FALSE, FALSE, 12);
+      </programlisting>
+      <para>This can be done with #GtkGrid as follows:</para>
+      <programlisting>
+         grid = gtk_grid_new ();
+         gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+         g_object_set (child, "margin", 12, NULL);
+         gtk_grid_attach (GTK_GRID (box), child, 0, 0, 1, 1);
+      </programlisting>
+    </example>
+  </section>
+
+<!--
+  <section>
+    <title>GtkTable versus GtkGrid</title>
+    cover here: spanning, attachment points, grid size, attach options vs expand/align
+
+  </section>
+-->
+</chapter>

docs/reference/gtk/migrating-GtkStyleContext.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<section id="gtk-migrating-GtkStyleContext">
+<chapter id="gtk-migrating-GtkStyleContext">
   <title>Theming changes</title>
 
   <para>
@@ -688,4 +688,4 @@
       </listitem>
     </orderedlist>
   </section>
-</section>
+</chapter>

docs/reference/gtk/question_index.sgml

@@ -102,8 +102,8 @@ state (explained in its documentation).
 </para>
 
 <para>
-For strings returned from functions, they will be declared "const" (using
-#G_CONST_RETURN) if they should not be freed. Non-const strings should be
+For strings returned from functions, they will be declared "const"
+if they should not be freed. Non-const strings should be
 freed with g_free(). Arrays follow the same rule. If you find an
 undocumented exception to the rules, please report a bug to <ulink
 url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.

docs/reference/gtk/tmpl/.gitignore

@@ -1,146 +0,0 @@
-gtkaccelmap.sgml
-gtkactiongroup.sgml
-gtkaboutdialog.sgml
-gtkadjustment.sgml
-gtkbbox.sgml
-gtkbindings.sgml
-gtkbox.sgml
-gtkbuilder.sgml
-gtkbutton.sgml
-gtkcalendar.sgml
-gtkcelleditable.sgml
-gtkcelllayout.sgml
-gtkcellrenderer.sgml
-gtkcellrendereraccel.sgml
-gtkcellrenderercombo.sgml
-gtkcellrendererpixbuf.sgml
-gtkcellrendererprogress.sgml
-gtkcellrendererspin.sgml
-gtkcellrenderertext.sgml
-gtkcellrenderertoggle.sgml
-gtkcellview.sgml
-gtkcheckbutton.sgml
-gtkcheckmenuitem.sgml
-gtkclipboard.sgml
-gtkcolorbutton.sgml
-gtkcolorsel.sgml
-gtkcolorseldlg.sgml
-gtkcombobox.sgml
-gtkcomboboxentry.sgml
-gtkcontainer.sgml
-gtkdialog.sgml
-gtkdnd.sgml
-gtkdrawingarea.sgml
-gtkeditable.sgml
-gtkentry.sgml
-gtkentrybuffer.sgml
-gtkenum.sgml
-gtkeventbox.sgml
-gtkexpander.sgml
-gtkfeatures.sgml
-gtkfixed.sgml
-gtkfilechooserbutton.sgml
-gtkfilechooserdialog.sgml
-gtkfilechooserwidget.sgml
-gtkfilefilter.sgml
-gtkfontbutton.sgml
-gtkfontsel.sgml
-gtkfontseldlg.sgml
-gtkframe.sgml
-gtkhandlebox.sgml
-gtkhbbox.sgml
-gtkhbox.sgml
-gtkhpaned.sgml
-gtkhscale.sgml
-gtkhscrollbar.sgml
-gtkhseparator.sgml
-gtkhsv.c
-gtkiconfactory.sgml
-gtkicontheme.sgml
-gtkiconview.sgml
-gtkimagemenuitem.sgml
-gtkimcontext.sgml
-gtkimcontextsimple.sgml
-gtkimmulticontext.sgml
-gtkinvisible.sgml
-gtkitemfactory.sgml
-gtklabel.sgml
-gtklayout.sgml
-gtklinkbutton.sgml
-gtkliststore.sgml
-gtkmain.sgml
-gtkmenu.sgml
-gtkmenubar.sgml
-gtkmenuitem.sgml
-gtkmenushell.sgml
-gtkmenutoolbutton.sgml
-gtkmessagedialog.sgml
-gtkmisc.sgml
-gtknotebook.sgml
-gtkobject.sgml
-gtkorientable.sgml
-gtkpagesetup.sgml
-gtkpagesetupunixdialog.sgml
-gtkpaned.sgml
-gtkpapersize.sgml
-gtkprintcontext.sgml
-gtkprinter.sgml
-gtkprintjob.sgml
-gtkprintoperation.sgml
-gtkprintsettings.sgml
-gtkprintunixdialog.sgml
-gtkprogressbar.sgml
-gtkradioaction.sgml
-gtkradiobutton.sgml
-gtkradiomenuitem.sgml
-gtkradiotoolbutton.sgml
-gtkrange.sgml
-gtkrc.sgml
-gtkrecentaction.sgml
-gtkrecentchooser.sgml
-gtkrecentchooserdialog.sgml
-gtkrecentchoosermenu.sgml
-gtkrecentchooserwidget.sgml
-gtkrecentmanager.sgml
-gtkscale.sgml
-gtkscalebutton.sgml
-gtkscrollbar.sgml
-gtkscrolledwindow.sgml
-gtkselection.sgml
-gtkseparator.sgml
-gtkseparatormenuitem.sgml
-gtkseparatortoolitem.sgml
-gtksettings.sgml
-gtksizegroup.sgml
-gtkstatusbar.sgml
-gtkstatusicon.sgml
-gtkstyle.sgml
-gtktable.sgml
-gtktearoffmenuitem.sgml
-gtktesting.sgml
-gtktextbuffer.sgml
-gtktextiter.sgml
-gtktextmark.sgml
-gtktexttag.sgml
-gtktexttagtable.sgml
-gtktextview.sgml
-gtktoggleaction.sgml
-gtktogglebutton.sgml
-gtktoggletoolbutton.sgml
-gtktoolbar.sgml
-gtktoolbutton.sgml
-gtktoolitem.sgml
-gtktooltip.sgml
-gtktreednd.sgml
-gtktreemodel.sgml
-gtktreemodelfilter.sgml
-gtktreemodelsort.sgml
-gtktreeselection.sgml
-gtktreesortable.sgml
-gtktreestore.sgml
-gtktreeview.sgml
-gtktreeviewcolumn.sgml
-gtktypeutils.sgml
-gtkuimanager.sgml
-gtkwindow.sgml
-gtkwindowgroup.sgml

docs/reference/libgail-util/Makefile.am

@@ -9,20 +9,20 @@ DOC_MODULE=gail-libgail-util3
 DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml
 
 # The directory containing the source code (if it contains documentation).
-DOC_SOURCE_DIR=../../../modules/other/gail/libgail-util
+DOC_SOURCE_DIR=../../../libgail-util
 
 # Used for dependencies
-HFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.h
-CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c
+HFILE_GLOB = $(top_srcdir)/libgail-util/*.h
+CFILE_GLOB = $(top_srcdir)/libgail-util/*.c
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                      \
+AM_CPPFLAGS =                   \
         -I$(top_srcdir)         \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/modules/other/gail/libgail-util/libgailutil.la
+GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil.la
 
 # gtkdoc-mkdb related varaibles
 MKDB_OPTIONS =

docs/tools/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)/gdk		\
 	-I$(top_srcdir)/gdk		\

docs/tools/shooter.c

@@ -121,8 +121,7 @@ take_window_shot (Window   child,
 		  gboolean include_decoration)
 {
   GdkWindow *window;
-  Display *disp;
-  Window w, xid;
+  Window xid;
   gint x_orig, y_orig;
   gint x = 0, y = 0;
   gint width, height;
@@ -130,9 +129,6 @@ take_window_shot (Window   child,
   GdkPixbuf *tmp, *tmp2;
   GdkPixbuf *retval;
 
-  disp = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-  w = GDK_ROOT_WINDOW ();
-
   if (include_decoration)
     xid = find_toplevel_window (child);
   else

examples/Makefile.am

@@ -35,7 +35,7 @@ OLD_EXAMPLES = \
 		tictactoe \
 		wheelbarrow
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/gdk			\
 	-I$(top_builddir)/gdk			\

examples/arrow/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-arrow: arrow.c 
-	$(CC) arrow.c -o arrow $(DEPRECTATED) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o arrow

examples/arrow/arrow.c

@@ -1,72 +0,0 @@
-
-#include <gtk/gtk.h>
-
-/* Create an Arrow widget with the specified parameters
- * and pack it into a button */
-static GtkWidget *create_arrow_button( GtkArrowType  arrow_type,
-                                       GtkShadowType shadow_type )
-{
-  GtkWidget *button;
-  GtkWidget *arrow;
-
-  button = gtk_button_new ();
-  arrow = gtk_arrow_new (arrow_type, shadow_type);
-
-  gtk_container_add (GTK_CONTAINER (button), arrow);
-  
-  gtk_widget_show (button);
-  gtk_widget_show (arrow);
-
-  return button;
-}
-
-int main( int   argc,
-          char *argv[] )
-{
-  /* GtkWidget is the storage type for widgets */
-  GtkWidget *window;
-  GtkWidget *button;
-  GtkWidget *box;
-
-  /* Initialize the toolkit */
-  gtk_init (&argc, &argv);
-
-  /* Create a new window */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  gtk_window_set_title (GTK_WINDOW (window), "Arrow Buttons");
-
-  /* It's a good idea to do this for all windows. */
-  g_signal_connect (G_OBJECT (window), "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
-
-  /* Sets the border width of the window. */
-  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-  /* Create a box to hold the arrows/buttons */
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 2);
-  gtk_container_add (GTK_CONTAINER (window), box);
-
-  /* Pack and show all our widgets */
-  gtk_widget_show (box);
-
-  button = create_arrow_button (GTK_ARROW_UP, GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
-
-  button = create_arrow_button (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
-  
-  button = create_arrow_button (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
-  
-  button = create_arrow_button (GTK_ARROW_RIGHT, GTK_SHADOW_ETCHED_OUT);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 3);
-  
-  gtk_widget_show (window);
-  
-  /* Rest in gtk_main and wait for the fun to begin! */
-  gtk_main ();
-  
-  return 0;
-}

examples/aspectframe/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall 		 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-aspectframe: aspectframe.c 
-	$(CC) aspectframe.c -o aspectframe $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o aspectframe

examples/aspectframe/aspectframe.c

@@ -1,42 +0,0 @@
-
-#include <gtk/gtk.h>
-   
-int main( int argc,
-          char *argv[] )
-{
-    GtkWidget *window;
-    GtkWidget *aspect_frame;
-    GtkWidget *drawing_area;
-    gtk_init (&argc, &argv);
-   
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (window), "Aspect Frame");
-    g_signal_connect (G_OBJECT (window), "destroy",
-	              G_CALLBACK (gtk_main_quit), NULL);
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-   
-    /* Create an aspect_frame and add it to our toplevel window */
-   
-    aspect_frame = gtk_aspect_frame_new ("2x1", /* label */
-                                         0.5, /* center x */
-                                         0.5, /* center y */
-                                         2, /* xsize/ysize = 2 */
-                                         FALSE /* ignore child's aspect */);
-   
-    gtk_container_add (GTK_CONTAINER (window), aspect_frame);
-    gtk_widget_show (aspect_frame);
-   
-    /* Now add a child widget to the aspect frame */
-   
-    drawing_area = gtk_drawing_area_new ();
-   
-    /* Ask for a 200x200 window, but the AspectFrame will give us a 200x100
-     * window since we are forcing a 2x1 aspect ratio */
-    gtk_widget_set_size_request (drawing_area, 200, 200);
-    gtk_container_add (GTK_CONTAINER (aspect_frame), drawing_area);
-    gtk_widget_show (drawing_area);
-   
-    gtk_widget_show (window);
-    gtk_main ();
-    return 0;
-}

examples/base/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-base: base.c 
-	$(CC) base.c -o base $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o base

examples/base/base.c

@@ -1,17 +0,0 @@
-
-#include <gtk/gtk.h>
-
-int main( int   argc,
-          char *argv[] )
-{
-    GtkWidget *window;
-    
-    gtk_init (&argc, &argv);
-    
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_widget_show  (window);
-    
-    gtk_main ();
-    
-    return 0;
-}

examples/buttonbox/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-buttonbox: buttonbox.c 
-	$(CC) buttonbox.c -o buttonbox $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o buttonbox

examples/buttonbox/buttonbox.c

@@ -1,119 +0,0 @@
-
-#include <gtk/gtk.h>
-
-/* Create a Button Box with the specified parameters */
-static GtkWidget *create_bbox( gint  horizontal,
-                               char *title,
-                               gint  spacing,
-                               gint  child_w,
-                               gint  child_h,
-                               gint  layout )
-{
-  GtkWidget *frame;
-  GtkWidget *bbox;
-  GtkWidget *button;
-
-  frame = gtk_frame_new (title);
-
-  if (horizontal)
-    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-  else
-    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
-
-  gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
-  gtk_container_add (GTK_CONTAINER (frame), bbox);
-
-  /* Set the appearance of the Button Box */
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
-  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_OK);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_HELP);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-
-  return frame;
-}
-
-int main( int   argc,
-          char *argv[] )
-{
-  static GtkWidget* window = NULL;
-  GtkWidget *main_vbox;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *frame_horz;
-  GtkWidget *frame_vert;
-
-  /* Initialize GTK */
-  gtk_init (&argc, &argv);
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-
-  g_signal_connect (G_OBJECT (window), "destroy",
-		    G_CALLBACK (gtk_main_quit),
-		    NULL);
-
-  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
-  frame_horz = gtk_frame_new ("Horizontal Button Boxes");
-  gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
-  gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
-
-  gtk_box_pack_start (GTK_BOX (vbox),
-	   create_bbox (TRUE, "Spread (spacing 40)", 40, 85, 20, GTK_BUTTONBOX_SPREAD),
-		      TRUE, TRUE, 0);
-
-  gtk_box_pack_start (GTK_BOX (vbox),
-	   create_bbox (TRUE, "Edge (spacing 30)", 30, 85, 20, GTK_BUTTONBOX_EDGE),
-		      TRUE, TRUE, 5);
-
-  gtk_box_pack_start (GTK_BOX (vbox),
-           create_bbox (TRUE, "Start (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_START),
-		      TRUE, TRUE, 5);
-
-  gtk_box_pack_start (GTK_BOX (vbox),
-	   create_bbox (TRUE, "End (spacing 10)", 10, 85, 20, GTK_BUTTONBOX_END),
-		      TRUE, TRUE, 5);
-
-  frame_vert = gtk_frame_new ("Vertical Button Boxes");
-  gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
-  gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
-
-  gtk_box_pack_start (GTK_BOX (hbox),
-           create_bbox (FALSE, "Spread (spacing 5)", 5, 85, 20, GTK_BUTTONBOX_SPREAD),
-		      TRUE, TRUE, 0);
-
-  gtk_box_pack_start (GTK_BOX (hbox),
-           create_bbox (FALSE, "Edge (spacing 30)", 30, 85, 20, GTK_BUTTONBOX_EDGE),
-		      TRUE, TRUE, 5);
-
-  gtk_box_pack_start (GTK_BOX (hbox),
-           create_bbox (FALSE, "Start (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_START),
-		      TRUE, TRUE, 5);
-
-  gtk_box_pack_start (GTK_BOX (hbox),
-           create_bbox (FALSE, "End (spacing 20)", 20, 85, 20, GTK_BUTTONBOX_END),
-		      TRUE, TRUE, 5);
-
-  gtk_widget_show_all (window);
-
-  /* Enter the event loop */
-  gtk_main ();
-    
-  return 0;
-}

examples/buttons/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall -Wunused		 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-buttons: buttons.c 
-	$(CC) buttons.c -o buttons $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o buttons

examples/buttons/buttons.c

@@ -1,92 +0,0 @@
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-
-/* Create a new hbox with an image and a label packed into it
- * and return the box. */
-
-static GtkWidget *xpm_label_box( gchar     *xpm_filename,
-                                 gchar     *label_text )
-{
-    GtkWidget *box;
-    GtkWidget *label;
-    GtkWidget *image;
-
-    /* Create box for image and label */
-    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (box), 2);
-
-    /* Now on to the image stuff */
-    image = gtk_image_new_from_file (xpm_filename);
-
-    /* Create a label for the button */
-    label = gtk_label_new (label_text);
-
-    /* Pack the image and label into the box */
-    gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 3);
-    gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 3);
-
-    gtk_widget_show (image);
-    gtk_widget_show (label);
-
-    return box;
-}
-
-/* Our usual callback function */
-static void callback( GtkWidget *widget,
-                      gpointer   data )
-{
-    g_print ("Hello again - %s was pressed\n", (char *) data);
-}
-
-int main( int   argc,
-          char *argv[] )
-{
-    /* GtkWidget is the storage type for widgets */
-    GtkWidget *window;
-    GtkWidget *button;
-    GtkWidget *box;
-
-    gtk_init (&argc, &argv);
-
-    /* Create a new window */
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-    gtk_window_set_title (GTK_WINDOW (window), "Pixmap'd Buttons!");
-
-    /* It's a good idea to do this for all windows. */
-    g_signal_connect (G_OBJECT (window), "destroy",
-	              G_CALLBACK (gtk_main_quit), NULL);
-
-    g_signal_connect (G_OBJECT (window), "delete-event",
-	 	      G_CALLBACK (gtk_main_quit), NULL);
-
-    /* Sets the border width of the window. */
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
-    /* Create a new button */
-    button = gtk_button_new ();
-
-    /* Connect the "clicked" signal of the button to our callback */
-    g_signal_connect (G_OBJECT (button), "clicked",
-		      G_CALLBACK (callback), (gpointer) "cool button");
-
-    /* This calls our box creating function */
-    box = xpm_label_box ("info.xpm", "cool button");
-
-    /* Pack and show all our widgets */
-    gtk_widget_show (box);
-
-    gtk_container_add (GTK_CONTAINER (button), box);
-
-    gtk_widget_show (button);
-
-    gtk_container_add (GTK_CONTAINER (window), button);
-
-    gtk_widget_show (window);
-
-    /* Rest in gtk_main and wait for the fun to begin! */
-    gtk_main ();
-
-    return 0;
-}

examples/buttons/info.xpm

@@ -1,92 +0,0 @@
-/* XPM */
-static char *openfile[] = {
-/* width height num_colors chars_per_pixel */
-"    20    19       66            2",
-/* colors */
-".. c None",
-".# c #000000",
-".a c #dfdfdf",
-".b c #7f7f7f",
-".c c #006f6f",
-".d c #00efef",
-".e c #009f9f",
-".f c #004040",
-".g c #00bfbf",
-".h c #ff0000",
-".i c #ffffff",
-".j c #7f0000",
-".k c #007070",
-".l c #00ffff",
-".m c #00a0a0",
-".n c #004f4f",
-".o c #00cfcf",
-".p c #8f8f8f",
-".q c #6f6f6f",
-".r c #a0a0a0",
-".s c #7f7f00",
-".t c #007f7f",
-".u c #5f5f5f",
-".v c #707070",
-".w c #00f0f0",
-".x c #009090",
-".y c #ffff00",
-".z c #0000ff",
-".A c #00afaf",
-".B c #00d0d0",
-".C c #00dfdf",
-".D c #005f5f",
-".E c #00b0b0",
-".F c #001010",
-".G c #00c0c0",
-".H c #000f0f",
-".I c #00007f",
-".J c #005050",
-".K c #002f2f",
-".L c #dfcfcf",
-".M c #dfd0d0",
-".N c #006060",
-".O c #00e0e0",
-".P c #00ff00",
-".Q c #002020",
-".R c #dfc0c0",
-".S c #008080",
-".T c #001f1f",
-".U c #003f3f",
-".V c #007f00",
-".W c #00000f",
-".X c #000010",
-".Y c #00001f",
-".Z c #000020",
-".0 c #00002f",
-".1 c #000030",
-".2 c #00003f",
-".3 c #000040",
-".4 c #00004f",
-".5 c #000050",
-".6 c #00005f",
-".7 c #000060",
-".8 c #00006f",
-".9 c #000070",
-"#. c #7f7f80",
-"## c #9f9f9f",
-/* pixels */
-"........................................",
-"........................................",
-"........................................",
-".......................#.#.#............",
-".....................#.......#...#......",
-"...............................#.#......",
-".......#.#.#.................#.#.#......",
-".....#.y.i.y.#.#.#.#.#.#.#..............",
-".....#.i.y.i.y.i.y.i.y.i.#..............",
-".....#.y.i.y.i.y.i.y.i.y.#..............",
-".....#.i.y.i.y.#.#.#.#.#.#.#.#.#.#.#....",
-".....#.y.i.y.#.s.s.s.s.s.s.s.s.s.#......",
-".....#.i.y.#.s.s.s.s.s.s.s.s.s.#........",
-".....#.y.#.s.s.s.s.s.s.s.s.s.#..........",
-".....#.#.s.s.s.s.s.s.s.s.s.#............",
-".....#.#.#.#.#.#.#.#.#.#.#..............",
-"........................................",
-"........................................",
-"........................................"
-};

examples/calendar/Makefile

@@ -1,13 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED
-
-calendar: calendar.c
-	$(CC) calendar.c -o calendar $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f calendar

examples/calendar/calendar.c

@@ -1,413 +0,0 @@
-/*
- * Copyright (C) 1998 Cesar Miquel, Shawn T. Amundson, Mattias Grönlund
- * Copyright (C) 2000 Tony Gale
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#define DEF_PAD 10
-#define DEF_PAD_SMALL 5
-
-#define TM_YEAR_BASE 1900
-
-typedef struct _CalendarData {
-  GtkWidget *flag_checkboxes[5];
-  gboolean  settings[5];
-  GtkWidget *font_dialog;
-  GtkWidget *window;
-  GtkWidget *prev2_sig;
-  GtkWidget *prev_sig;
-  GtkWidget *last_sig;
-  GtkWidget *month;
-} CalendarData;
-
-enum {
-  calendar_show_header,
-  calendar_show_days,
-  calendar_month_change,
-  calendar_show_week,
-  calendar_monday_first
-};
-
-/*
- * GtkCalendar
- */
-
-static void calendar_date_to_string( CalendarData *data,
-                                     char         *buffer,
-                                     gint          buff_len )
-{
-  GDate date;
-  guint year, month, day;
-
-  gtk_calendar_get_date (GTK_CALENDAR (data->window),
-			 &year, &month, &day);
-  g_date_set_dmy (&date, day, month + 1, year);
-  g_date_strftime (buffer, buff_len - 1, "%x", &date);
-
-}
-
-static void calendar_set_signal_strings( char         *sig_str,
-                                         CalendarData *data )
-{
-  const gchar *prev_sig;
-
-  prev_sig = gtk_label_get_text (GTK_LABEL (data->prev_sig));
-  gtk_label_set_text (GTK_LABEL (data->prev2_sig), prev_sig);
-
-  prev_sig = gtk_label_get_text (GTK_LABEL (data->last_sig));
-  gtk_label_set_text (GTK_LABEL (data->prev_sig), prev_sig);
-  gtk_label_set_text (GTK_LABEL (data->last_sig), sig_str);
-}
-
-static void calendar_month_changed( GtkWidget    *widget,
-                                    CalendarData *data )
-{
-  char buffer[256] = "month_changed: ";
-
-  calendar_date_to_string (data, buffer + 15, 256 - 15);
-  calendar_set_signal_strings (buffer, data);
-}
-
-static void calendar_day_selected( GtkWidget    *widget,
-                                   CalendarData *data )
-{
-  char buffer[256] = "day_selected: ";
-
-  calendar_date_to_string (data, buffer + 14, 256 - 14);
-  calendar_set_signal_strings (buffer, data);
-}
-
-static void calendar_day_selected_double_click ( GtkWidget    *widget,
-                                                 CalendarData *data )
-{
-  char buffer[256] = "day_selected_double_click: ";
-  guint day;
-
-  calendar_date_to_string (data, buffer + 27, 256 - 27);
-  calendar_set_signal_strings (buffer, data);
-
-  gtk_calendar_get_date (GTK_CALENDAR (data->window),
-			 NULL, NULL, &day);
-
-  if (GTK_CALENDAR (data->window)->marked_date[day-1] == 0) {
-    gtk_calendar_mark_day (GTK_CALENDAR (data->window), day);
-  } else {
-    gtk_calendar_unmark_day (GTK_CALENDAR (data->window), day);
-  }
-}
-
-static void calendar_prev_month( GtkWidget    *widget,
-                                 CalendarData *data )
-{
-  char buffer[256] = "prev_month: ";
-
-  calendar_date_to_string (data, buffer + 12, 256 - 12);
-  calendar_set_signal_strings (buffer, data);
-}
-
-static void calendar_next_month( GtkWidget    *widget,
-                                 CalendarData *data )
-{
-  char buffer[256] = "next_month: ";
-
-  calendar_date_to_string (data, buffer + 12, 256 - 12);
-  calendar_set_signal_strings (buffer, data);
-}
-
-static void calendar_prev_year( GtkWidget    *widget,
-                                CalendarData *data )
-{
-  char buffer[256] = "prev_year: ";
-
-  calendar_date_to_string (data, buffer + 11, 256 - 11);
-  calendar_set_signal_strings (buffer, data);
-}
-
-static void calendar_next_year( GtkWidget    *widget,
-                                CalendarData *data )
-{
-  char buffer[256] = "next_year: ";
-
-  calendar_date_to_string (data, buffer + 11, 256 - 11);
-  calendar_set_signal_strings (buffer, data);
-}
-
-
-static void calendar_set_flags( CalendarData *calendar )
-{
-  gint i;
-  gint options = 0;
-  for (i = 0;i < 5; i++)
-    if (calendar->settings[i])
-      {
-	options = options + (1 << i);
-      }
-  if (calendar->window)
-    gtk_calendar_set_display_options (GTK_CALENDAR (calendar->window), options);
-}
-
-static void calendar_toggle_flag( GtkWidget    *toggle,
-                                  CalendarData *calendar)
-{
-  gint i;
-  gint j;
-  j = 0;
-  for (i = 0; i < 5; i++)
-    if (calendar->flag_checkboxes[i] == toggle)
-      j = i;
-
-  calendar->settings[j] = !calendar->settings[j];
-  calendar_set_flags (calendar);
-
-}
-
-static void calendar_font_selection_ok( GtkWidget    *button,
-                                        CalendarData *calendar )
-{
-  GtkRcStyle *style;
-  char *font_name;
-
-  if (calendar->window)
-    {
-      font_name = gtk_font_selection_dialog_get_font_name (GTK_FONT_SELECTION_DIALOG (calendar->font_dialog));
-      if (font_name)
-	{
-	  style = gtk_rc_style_new ();
-	  pango_font_description_free (style->font_desc);
-	  style->font_desc = pango_font_description_from_string (font_name);
-	  gtk_widget_modify_style (calendar->window, style);
-	  g_free (font_name);
-	}
-    }
-
-  gtk_widget_destroy (calendar->font_dialog);
-}
-
-static void calendar_select_font( GtkWidget    *button,
-                                  CalendarData *calendar )
-{
-  GtkWidget *window;
-
-  if (!calendar->font_dialog) {
-    window = gtk_font_selection_dialog_new ("Font Selection Dialog");
-    g_return_if_fail (GTK_IS_FONT_SELECTION_DIALOG (window));
-    calendar->font_dialog = window;
-
-    gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
-
-    g_signal_connect (window, "destroy",
-		      G_CALLBACK (gtk_widget_destroyed),
-		      &calendar->font_dialog);
-
-    g_signal_connect (GTK_FONT_SELECTION_DIALOG (window)->ok_button,
-		      "clicked", G_CALLBACK (calendar_font_selection_ok),
-		      calendar);
-    g_signal_connect_swapped (GTK_FONT_SELECTION_DIALOG (window)->cancel_button,
-			     "clicked", G_CALLBACK (gtk_widget_destroy),
-			     calendar->font_dialog);
-  }
-  window = calendar->font_dialog;
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-}
-
-static void create_calendar( void )
-{
-  GtkWidget *window;
-  GtkWidget *vbox, *vbox2, *vbox3;
-  GtkWidget *hbox;
-  GtkWidget *hbbox;
-  GtkWidget *calendar;
-  GtkWidget *toggle;
-  GtkWidget *button;
-  GtkWidget *frame;
-  GtkWidget *separator;
-  GtkWidget *label;
-  GtkWidget *bbox;
-  static CalendarData calendar_data;
-  gint i;
-
-  struct {
-    char *label;
-  } flags[] =
-    {
-      { "Show Heading" },
-      { "Show Day Names" },
-      { "No Month Change" },
-      { "Show Week Numbers" },
-      { "Week Start Monday" }
-    };
-
-
-  calendar_data.window = NULL;
-  calendar_data.font_dialog = NULL;
-
-  for (i = 0; i < 5; i++) {
-    calendar_data.settings[i] = 0;
-  }
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example");
-  gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-  g_signal_connect (window, "destroy",
-		    G_CALLBACK (gtk_main_quit),
-		    NULL);
-  g_signal_connect (window, "delete-event",
-		    G_CALLBACK (gtk_false),
-		    NULL);
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-
-  /*
-   * The top part of the window, Calendar, flags and fontsel.
-   */
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
-  hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
-  gtk_box_set_spacing (GTK_BOX (hbbox), 5);
-
-  /* Calendar widget */
-  frame = gtk_frame_new ("Calendar");
-  gtk_box_pack_start(GTK_BOX (hbbox), frame, FALSE, TRUE, DEF_PAD);
-  calendar=gtk_calendar_new ();
-  calendar_data.window = calendar;
-  calendar_set_flags (&calendar_data);
-  gtk_calendar_mark_day (GTK_CALENDAR (calendar), 19);
-  gtk_container_add (GTK_CONTAINER (frame), calendar);
-  g_signal_connect (calendar, "month-changed",
-		    G_CALLBACK (calendar_month_changed),
-		    &calendar_data);
-  g_signal_connect (calendar, "day-selected",
-		    G_CALLBACK (calendar_day_selected),
-		    &calendar_data);
-  g_signal_connect (calendar, "day-selected-double-click",
-		    G_CALLBACK (calendar_day_selected_double_click),
-		    &calendar_data);
-  g_signal_connect (calendar, "prev-month",
-		    G_CALLBACK (calendar_prev_month),
-		    &calendar_data);
-  g_signal_connect (calendar, "next-month",
-		    G_CALLBACK (calendar_next_month),
-		    &calendar_data);
-  g_signal_connect (calendar, "prev-year",
-		    G_CALLBACK (calendar_prev_year),
-		    &calendar_data);
-  g_signal_connect (calendar, "next-year",
-		    G_CALLBACK (calendar_next_year),
-		    &calendar_data);
-
-
-  separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0);
-
-  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, DEF_PAD);
-
-  /* Build the Right frame with the flags in */
-
-  frame = gtk_frame_new ("Flags");
-  gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, DEF_PAD);
-  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
-  gtk_container_add (GTK_CONTAINER (frame), vbox3);
-
-  for (i = 0; i < 5; i++)
-    {
-      toggle = gtk_check_button_new_with_label (flags[i].label);
-      g_signal_connect (toggle,
-			"toggled",
-			G_CALLBACK (calendar_toggle_flag),
-			&calendar_data);
-      gtk_box_pack_start (GTK_BOX (vbox3), toggle, TRUE, TRUE, 0);
-      calendar_data.flag_checkboxes[i] = toggle;
-    }
-  /* Build the right font-button */
-  button = gtk_button_new_with_label ("Font...");
-  g_signal_connect (button,
-		    "clicked",
-		    G_CALLBACK (calendar_select_font),
-		    &calendar_data);
-  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-
-  /*
-   *  Build the Signal-event part.
-   */
-
-  frame = gtk_frame_new ("Signal events");
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, DEF_PAD);
-
-  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
-  gtk_container_add (GTK_CONTAINER (frame), vbox2);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.last_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.prev_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
-  label = gtk_label_new ("Second previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-  calendar_data.prev2_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
-
-  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
-
-  button = gtk_button_new_with_label ("Close");
-  g_signal_connect (button, "clicked",
-		    G_CALLBACK (gtk_main_quit),
-		    NULL);
-  gtk_container_add (GTK_CONTAINER (bbox), button);
-  gtk_widget_set_can_default (button, TRUE);
-  gtk_widget_grab_default (button);
-
-  gtk_widget_show_all (window);
-}
-
-
-int main (int   argc,
-          char *argv[])
-{
-  gtk_init (&argc, &argv);
-
-  create_calendar ();
-
-  gtk_main ();
-
-  return 0;
-}

examples/colorsel/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-colorsel: colorsel.c 
-	$(CC) colorsel.c -o colorsel `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o colorsel

examples/colorsel/colorsel.c

@@ -1,132 +0,0 @@
-
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-GtkWidget *colorseldlg = NULL;
-GtkWidget *drawingarea = NULL;
-GdkColor color;
-
-/* Color changed handler */
-
-static void color_changed_cb( GtkWidget         *widget,
-                              GtkColorSelection *colorsel )
-{
-  GdkColor ncolor;
-
-  gtk_color_selection_get_current_color (colorsel, &ncolor);
-  gtk_widget_modify_bg (drawingarea, GTK_STATE_NORMAL, &ncolor);       
-}
-
-/* Drawingarea event handler */
-
-static gboolean area_event( GtkWidget *widget,
-                            GdkEvent  *event,
-                            gpointer   client_data )
-{
-  gint handled = FALSE;
-  gint response;
-  GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
-
-  /* Check if we've received a button pressed event */
-
-  if (event->type == GDK_BUTTON_PRESS)
-    {
-      handled = TRUE;
-
-       /* Create color selection dialog */
-      if (colorseldlg == NULL)
-        colorseldlg = gtk_color_selection_dialog_new ("Select background color");
-
-      /* Get the ColorSelection widget */
-      selection_dialog = GTK_COLOR_SELECTION_DIALOG (colorseldlg);
-      colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_colorsel (selection_dialog));
-
-      gtk_color_selection_set_previous_color (colorsel, &color);
-      gtk_color_selection_set_current_color (colorsel, &color);
-      gtk_color_selection_set_has_palette (colorsel, TRUE);
-
-      /* Connect to the "color-changed" signal, set the client-data
-       * to the colorsel widget */
-      g_signal_connect (colorsel, "color-changed",
-                        G_CALLBACK (color_changed_cb),
-                        colorsel);
-
-      /* Show the dialog */
-      response = gtk_dialog_run (GTK_DIALOG (colorseldlg));
-
-      if (response == GTK_RESPONSE_OK)
-        gtk_color_selection_get_current_color (colorsel, &color);
-      else 
-        gtk_widget_modify_bg (drawingarea, GTK_STATE_NORMAL, &color);
-
-      gtk_widget_hide (colorseldlg);
-    }
-
-  return handled;
-}
-
-/* Close down and exit handler */
-
-static gboolean destroy_window( GtkWidget *widget,
-                                GdkEvent  *event,
-                                gpointer   client_data )
-{
-  gtk_main_quit ();
-  return TRUE;
-}
-
-/* Main */
-
-gint main( gint   argc,
-           gchar *argv[] )
-{
-  GtkWidget *window;
-
-  /* Initialize the toolkit, remove gtk-related commandline stuff */
-
-  gtk_init (&argc, &argv);
-
-  /* Create toplevel window, set title and policies */
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Color selection test");
-  gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-
-  /* Attach to the "delete" and "destroy" events so we can exit */
-
-  g_signal_connect (window, "delete_event",
-                    G_CALLBACK (destroy_window), (gpointer) window);
-  
-  /* Create drawingarea, set size and catch button events */
-
-  drawingarea = gtk_drawing_area_new ();
-
-  color.red = 0;
-  color.blue = 65535;
-  color.green = 0;
-  gtk_widget_modify_bg (drawingarea, GTK_STATE_NORMAL, &color);       
-
-  gtk_widget_set_size_request (GTK_WIDGET (drawingarea), 200, 200);
-
-  gtk_widget_set_events (drawingarea, GDK_BUTTON_PRESS_MASK);
-
-  g_signal_connect (drawingarea, "event",
-	            G_CALLBACK (area_event), (gpointer) drawingarea);
-  
-  /* Add drawingarea to window, then show them both */
-
-  gtk_container_add (GTK_CONTAINER (window), drawingarea);
-
-  gtk_widget_show (drawingarea);
-  gtk_widget_show (window);
-  
-  /* Enter the gtk main loop (this never returns) */
-
-  gtk_main ();
-
-  /* Satisfy grumpy compilers */
-
-  return 0;
-}

examples/entry/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-entry: entry.c 
-	$(CC) entry.c -o entry $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o entry

examples/entry/entry.c

@@ -1,100 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <gtk/gtk.h>
-
-static void enter_callback( GtkWidget *widget,
-                            GtkWidget *entry )
-{
-  const gchar *entry_text;
-  entry_text = gtk_entry_get_text (GTK_ENTRY (entry));
-  printf ("Entry contents: %s\n", entry_text);
-}
-
-static void entry_toggle_editable( GtkWidget *checkbutton,
-                                   GtkWidget *entry )
-{
-  gtk_editable_set_editable (GTK_EDITABLE (entry),
-                             GTK_TOGGLE_BUTTON (checkbutton)->active);
-}
-
-static void entry_toggle_visibility( GtkWidget *checkbutton,
-                                     GtkWidget *entry )
-{
-  gtk_entry_set_visibility (GTK_ENTRY (entry),
-			    GTK_TOGGLE_BUTTON (checkbutton)->active);
-}
-
-int main( int   argc,
-          char *argv[] )
-{
-
-    GtkWidget *window;
-    GtkWidget *vbox, *hbox;
-    GtkWidget *entry;
-    GtkWidget *button;
-    GtkWidget *check;
-    gint tmp_pos;
-
-    gtk_init (&argc, &argv);
-
-    /* create a new window */
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_size_request (GTK_WIDGET (window), 200, 100);
-    gtk_window_set_title (GTK_WINDOW (window), "GTK Entry");
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_main_quit), NULL);
-    g_signal_connect_swapped (window, "delete-event",
-                              G_CALLBACK (gtk_widget_destroy),
-                              window);
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (window), vbox);
-    gtk_widget_show (vbox);
-
-    entry = gtk_entry_new ();
-    gtk_entry_set_max_length (GTK_ENTRY (entry), 50);
-    g_signal_connect (entry, "activate",
-		      G_CALLBACK (enter_callback),
-		      (gpointer) entry);
-    gtk_entry_set_text (GTK_ENTRY (entry), "hello");
-    tmp_pos = GTK_ENTRY (entry)->text_length;
-    gtk_editable_insert_text (GTK_EDITABLE (entry), " world", -1, &tmp_pos);
-    gtk_editable_select_region (GTK_EDITABLE (entry),
-			        0, GTK_ENTRY (entry)->text_length);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
-    gtk_widget_show (entry);
-
-    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (vbox), hbox);
-    gtk_widget_show (hbox);
-
-    check = gtk_check_button_new_with_label ("Editable");
-    gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
-    g_signal_connect (check, "toggled",
-	              G_CALLBACK (entry_toggle_editable), (gpointer) entry);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-    gtk_widget_show (check);
-
-    check = gtk_check_button_new_with_label ("Visible");
-    gtk_box_pack_start (GTK_BOX (hbox), check, TRUE, TRUE, 0);
-    g_signal_connect (check, "toggled",
-	              G_CALLBACK (entry_toggle_visibility), (gpointer) entry);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
-    gtk_widget_show (check);
-
-    button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-    g_signal_connect_swapped (button, "clicked",
-			      G_CALLBACK (gtk_widget_destroy),
-			      window);
-    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
-    gtk_widget_set_can_default (button, TRUE);
-    gtk_widget_grab_default (button);
-    gtk_widget_show (button);
-
-    gtk_widget_show (window);
-
-    gtk_main();
-
-    return 0;
-}

examples/eventbox/Makefile

@@ -1,14 +0,0 @@
-
-CC = gcc
-
-CFLAGS = -Wall			 	\
-	-DG_DISABLE_DEPRECATED 	 	\
-	-DGDK_DISABLE_DEPRECATED 	\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED
-
-eventbox: eventbox.c 
-	$(CC) eventbox.c -o eventbox $(CFLAGS) `pkg-config gtk+-2.0 --cflags --libs`
-
-clean: 
-	rm -f *.o eventbox