gtk-demo: Remove now useless code in treeview/list-store demo

There's no need anymore to pulse on spinner cellrenderers, so
demo this with several rows, and no timeouts to pulse on a row.

INSTALL.in

@@ -9,23 +9,23 @@ GTK+ requires the following packages:
    GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
    and cairo @CAIRO_REQUIRED_VERSION@.
 
- - gobject-introspection 0.9.3 or newer.
+ - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
 
 Simple install procedure
 ========================
 
   % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-@GTK_VERSION@			   # change to the toplevel directory
-  % ./configure				   # run the `configure' script
-  % make				   # build GTK+
+  % cd gtk+-@GTK_VERSION@                          # change to the toplevel directory
+  % ./configure                                    # run the `configure' script
+  % make                                           # build GTK+
   [ Become root if necessary ]
-  % make install			   # install GTK+
+  % make install                                   # install GTK+
 
 The Details
 ===========
 
-Complete information about installing GTK+ and related libraries can be found 
-in the file:
+Complete information about installing GTK+ and related libraries
+can be found in the file:
 
  docs/reference/gtk/html/gtk-building.html
 

Makefile.am

@@ -55,11 +55,11 @@ MAINTAINERCLEANFILES = \
 
 
 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc: gtk+-3.0.pc
+gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc: gtk+-3.0.pc
 	rm -f $@ && \
 	cp gtk+-3.0.pc $@
 
-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc: gdk-3.0.pc
+gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc: gdk-3.0.pc
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 

Makefile.decl

@@ -1,6 +1,6 @@
 # GTK+ - The GIMP Toolkit
 
-GTESTER        = gtester		# in $PATH for non-GLIB packages
+GTESTER        = gtester -k		# in $PATH for non-GLIB packages
 GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
 
 # initialize variables for unconditional += appending

NEWS

@@ -1,3 +1,318 @@
+Overview of Changes in GTK+ 3.1.4
+=================================
+
+* GtkAssistant has received a visual refresh; as a side-effect,
+  the various image properties are no longer used
+
+* GtkTextView can now handle RGBA colors
+
+* GtkFileChooser now remembers the last opened directory
+
+* GtkLockButton is a new widget to control dialogs with
+  PolicyKit (or other) permissions
+
+* Size allocation changes:
+ - GtkPaned and GtkMenuBar now do height-for-width
+ - GtkAccelLabel is smarter about hiding the accel if too small
+ - GTK+ now warns if widgets are under-allocated; this
+   may cause considerable noise, it will be turned off
+   before the next stable release
+ - Label size allocation has been reworked, check your labels
+ - No longer try to guess the size of labels; this makes
+   it more important to give windows reasonable default
+   sizes or set width-chars/max-width-chars on labels
+ - The computation of initial window size has been reworked,
+   check your windows
+
+* A test framework for mozilla-style reftests has been added
+
+* GDK Broadway backend changes:
+ - Improved key event handling
+ - Make resize grips work
+ - Make window close buttons work
+ - Stream data over websocket
+
+* Bugs fixed:
+ 618815  mnemonics aren't displayed when Alt is already pressed...
+ 626457  Add a lock button widget
+ 626503  Critical warning in GtkTreeView
+ 642214  GTK+ 3.0 fails to compile caused by linking with libuuid...
+ 644426  GNOME-wide default to remember last folder
+ 646517  "Sending message (completed)" ellipsized in French
+ 646876  Free MenuPopulateData struct in all the cases.
+ 647284  GtkLabel does not honor width-chars anymore.
+ 647790  GtkMenuShell: don't leak a GSList
+ 647806  gtk_combo_box_set_active_id() nit picks
+ 647962  Desensitize "Select All" when GtkEntry is empty
+ 648136  design refresh for gtkassistant
+ 648419  crash in remove_capslock_feedback at gtkentry.c...
+ 648570  Mnemonics don't show under some letters
+ 648943  Drop the last remaining translated g_warning/g_error calls
+ 649295  gtkdnd: Add API that takes GIcon
+ 649313  gdk_window_set_cursor() sets cursor for random set of devices
+ 649457  probable leak in icon theme
+ 649593  GtkProgressBar theming fixes
+
+* Translation updates:
+ Galician
+ Greek
+ Lithuanian
+ Luganda
+ Spanish
+ Uighur
+
+
+Overview of Changes in GTK+ 3.1.2
+=================================
+
+* Theming fixes and enhancements
+ - GtkNotebook has an initial-gap style property
+ - GtkNotebook tab drawing fixes
+ - Fix problems with transparent backgrounds in panel applets
+ - Style classes for 'inline' and 'primary' toolbars and sidebars
+ - Dark theme information is made available to window managers via
+   the _GTK_THEME_VARIANT property
+ - Improved rendering of insensitive text
+ - Support non-uniform border withs in the default engine
+ - Fix prelight on treeview expanders
+ - Make it possible to give combo boxes, buttons, entries a
+   uniform height
+
+* GtkEntry supports 'hinting'
+
+* GtkExpander can resize toplevel windows when expanding
+
+* GtkGrid supports RTL flipping
+
+* GtkStatusIcon reads the _NET_SYSTEM_TRAY_ICON_SIZE property
+  to get information about the preferred icon size
+
+* To help with debugging of rendering problems, GDK consults
+  the GDK_RENDERING environment variable. Possible values include
+  'similar', 'image' and 'recording'
+
+* Fix some problems with XI2 and input methods
+
+* New, experimental GDK backends:
+ - broadway, which targets HTML5
+ - wayland, which targets the wayland display server
+ To build these backends, use the --enable-broadway-backend
+ and --enable-wayland-backend configure options.
+ To use them at runtime, set the GDK_BACKEND environment variable
+ to 'broadway' or 'wayland'. Other backend-specific setup may
+ still be required, such as running a wayland server.
+
+* Bugs fixed:
+ 440963 Add hinting to GtkEntry
+ 635254 Check whether a resolution is set in GtkPrintSettings...
+ 639584 initial emission of GtkWidget:style-set is not happening
+ 640692 GtkNotebook has wrong background colour when border and...
+ 642712 improve the file chooser design
+ 642918 Sensitivity of buttons sometimes screws up
+ 643805 Allow GtkExpander to resize the toplevel upon expanding...
+ 643841 Make initial gap before the first tab of the notebook...
+ 644276 paned: don't set the "pane-separator" style class...
+ 644348 notebook: make GtkNotebook respect the focus-padding...
+ 644353 Missing annotations in Gtk/Gdk Window...
+ 644355 credits toggle inconsintency
+ 644570 handles with a background image don't work
+ 644777 range: allow stepper-spacing > 0 and trough-under-...
+ 644836 gdk_keyval_to_unicode returns incorrect value...
+ 644847 GdkDeviceManagerXI2: process send_event core events
+ 644925 widget: reset widget style after applying style classes...
+ 644975 styleproperties: make sure to merge the font...
+ 644976 Fix "backspace", "enter", "escape" input.
+ 645057 ./configure fails on gtk+3.0 git head
+ 645134 switch: fix boundaries for the switch motion
+ 645172 radiobutton: don't forget to set the insensitive state...
+ 645176 Closing display causes segfault
+ 645232 symbolic status icons are the wrong size
+ 645234 Leaky calls to gdk_device_manager_list_devices()
+ 645235 Free the motion hint infos in GdkDisplay
+ 645236 Don't leak translate queue in GdkDisplay
+ 645341 pre dialog set CAPSLOCK is ignored.
+ 645354 window: Export theme variant to X11
+ 645405 themingengine: don't hardcode white to draw insensitive...
+ 645458 styleproperties: don't replace when merging...
+ 645937 Drawing model docs are outdated
+ 645960 GtkTreeSelection has no property to set mode
+ 646338 gdk_x_io_error() should call _exit(), not exit()
+ 646446 gtkprintunixdialog.c: set_cell_sensitivity_func leaks badly
+ 646457 Leak in gtkfilechooserdefault.c: search_selected_foreach...
+ 646458 Leak in gtkfilechooserdefault.c: list_row_activated
+ 646460 Weirdness in gtkfilechooserbutton.c: set_info_get_info_cb
+ 646461 Leak in gtkfilechooserbutton.c: model_free_row_data
+ 646462 Leak in gtkappchooserbutton.c: select_application_func_cb
+ 646500 GTK+ 3.1 causes terminals to start up with 0 height
+ 646815 Ref leak in gtk_color_button_clicked
+ 646882 Theming fixes for GtkButton and GtkCombobox
+ 646886 Do not leak list when drawing notebook.
+ 647086 Mismatched style_context_[save/restore] calls
+ 647152 Assertion `GTK_IS_PRINTER (printer)' failed...
+ 647244 Toggling the 'Deletable' option under the general...
+ 647275 Opening messages in Evolution and Empathy...
+ 647278 Small cleanup in statusbar
+ 647594 README link to mailing list is broken
+ 554057 Calling gtk_menu_shell_select_item() on GtkMenuBar...
+
+Updated translations:
+ Afrikaans
+ Assamese
+ Bengali
+ Brazilian Portuguese
+ British English
+ Bulgarian
+ Catalan
+ Czech
+ Danish
+ Dutch
+ French
+ Galician
+ German
+ Greek
+ Hindi
+ Hungarian
+ Indonesian
+ Japanese
+ Korean
+ Kurdish
+ Portuguese
+ Romanian
+ Russian
+ Serbian
+ Simplified Chinese
+ Slovenian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Uighur
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.0.2
+=================================
+
+* GtkSettings have been made multi-backend-safe
+
+* Many improvements to themability and the default theme
+ - GtkScale slider theming can adjust to scale marks, using style classes
+ - A new style class for 'primary' toolbars
+ - Widget style classes can now be specified in GtkBuilder files
+ - Improved scrollbar drawing
+ - Improved combobox drawing
+ - Improved spinbutton drawing
+ - Improved switch drawing
+ - Improved checkbutton drawing
+ - Improved menu drawing
+ - Improved notebook tab drawing
+
+* Bugs fixed:
+ 643041 Gtk-CRITICAL **: gtk_render_slider: assertion `height > 0'...
+ 643131 gtk_tray_icon_dispose
+ 643170 gtk_file_chooser_set_filename does not work if "Show hidden...
+ 643216 Extraneous emits of GdkScreen::monitors-changed
+ 643321 Keypresses in window contextual menu go through to app
+ 643347 consider allowing style data in builder data
+ 643370 gtk_style_context_get_font return NULL
+ 643440 gdkconfig.h included in tarball
+ 643496 GtkDialog does not use separators any more. Description is...
+ 643543 App Chooser classes abort if no content-type is given
+ 643584 crash in gdk_event_free()
+ 643630 Tabs disappear from notebook on scrolling back and resizing...
+ 643685 Normalise marks positions internally in GtkScale
+ 643911 Inactive tab content allocation should respect tab-overlap
+ 643912 Tab allocation should respect tab-curvature
+ 643925 Mouse wheel is following URLs
+ 643967 Add a style property to flip rendering order
+ 644089 treeview: propagate the selected state from the row
+
+* Translation updates:
+ Esperanto
+ German
+ Latvian
+ Portuguese
+ Russian
+ Simplified Chinese
+ Slovenian
+ Spanish
+ Ukrainian
+
+
+Overview of Changes in GTK+ 3.0.1
+=================================
+
+* A autoconf macro, GTK_CHECK_BACKEND, has been added
+  to allow easy checking for certain gdk backends
+
+* A number of memory leaks and segfaults involving accessibility
+  have been fixed
+
+* Bugs fixed:
+ 586201 GtkLinkButton doesn't implement neither HyperLink nor...
+ 599907 Gail implementation of atk_add_key_event_listener return...
+ 626730 Check menu item does not set indeterminate state
+ 630971 gailstatusbar attempts to cast a GtkHBox to a GtkBin
+ 633291 Handle Shift-keys in X11 gdk_test_simulate_key()
+ 642213 gtk_widget_render_icon_pixbuf fails with non-standard...
+ 642263 undefined reference to "GTK_IS_SOCKET" and "GTK_IS_PLUG"
+ 642541 Missing semi-colon in gtkseparatormenuitem.c
+ 642677 "migrating" guide not in sync with GTK+ 3.0
+ 642681 gtk_combo_box_text_get_active_text doesn't work as stated
+ 642751 Typo in migrating-2to3.xml
+ 642771 Fix tiny leak in tracker backend
+ 642772 GTK does not correctly process input sent via SendInput...
+ 642778 TextView broken for large files
+ 642782 gail_misc_buffer_get_run_attributes doesn't set background-gdk...
+ 642791 Fix a typo in gtk_socket_notify
+
+
+* Translation updates:
+ Bengali India
+ British English
+ Bulgarian
+ Hebrew
+ Hungarian
+ Korean
+ Norwegian bokmål
+ Punjabi
+ Spanish
+ Uighur
+ Ukranian
+ Vietnamese
+
+
+Overview of Changes in GTK+ 3.0.0
+=================================
+
+* Library sonames have been changed from libgdk-3.0 and libgtk-3.0
+  to libgdk-3 and libgtk-3.
+
+* Bugs fixed:
+ 632775 Back / Forward button's icons don't respect RTL settings
+ 639846 GdkEventScroll events are sent twice
+ 639945 Gtk.Widget does not have drag_* methods (but in pygtk it did)
+ 640801 Crash gtk_tree_view_reset_header_styles at gtktreeview.c:11871
+ 641196 Fix another GtkFixed regression, in gtk_fixed_forall()
+ 641302 show something nicer than XF86AudioMute etc
+ 641367 [region] gnome-applications ignore layout switching
+ 641409 not chaining up in ::style-updated
+ 641429 Errors creating a GtkWidget without a display
+ 641431 Apply button goes grey after two mode switching
+ 641517 "Migrating from libunique to GtkApplication" examples do not do...
+ 641558 GtkCssProvider leaks path string
+ 641621 Use faster new G_VALUE_COLLECT_INIT variant instead...
+ 641640 Update autotools configuration
+
+* Translation updates:
+ Arabic
+ English
+ Galician
+ Hebrew
+ Korean
+ Norwegian bokmål
+ Polish
+
+
 Overview of Changes in GTK+ 2.99.3
 ==================================
 

README.in

@@ -18,10 +18,29 @@ The official web site is:
   http://www.gtk.org/
 
 Information about mailing lists can be found at
-  http://www.gtk.org/mailinglists.html
+  http://www.gtk.org/mailing-lists.html
 
 
 Installation
 ============
 
 See the file 'INSTALL'
+
+
+Release notes for 3.0
+=====================
+
+* GTK+ 3 is a major new version of GTK+, which is parallel installable
+  with GTK+ 2.x. For information about porting applications from GTK+ 2.x
+  to GTK+ 3, see the file:
+
+  docs/reference/gtk/html/migrating.html
+
+  Or online at:
+
+  http://library.gnome.org/devel/gtk/3.0/migrating.html
+
+* Note that the library sonames in this release have been changed from
+  libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
+  library versions from going backwards, compared to the 2.90/91/99
+  releases. Applications will have to be recompiled.

README.win32

@@ -7,9 +7,18 @@ Building GTK+ on Win32
 ======================
 
 First you obviously need developer packages for the compile-time
-dependencies: Pango, atk, glib, gettext-runtime, libiconv, libpng,
-zlib, libtiff at least. See
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+dependencies: GDK-Pixbuf, Pango, atk, glib, gettext-runtime, libiconv at least.
+See http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies .
+
+For people compiling GTK+ with Visual C++ 2005 or later, it is
+recommended that the same compiler is used for at least GDK-Pixbuf,
+Pango, atk and glib so that crashes and errors caused by different CRTs
+can be avoided.  The VS 2008 project files and/or VS Makefiles are
+either already available or will be available in the next stable release.
+Unfortunately compiling with Microsoft's compilers versions 2003 or earlier
+is not supported as compiling the latest stable GLib (which *is* required for
+building this GTK+ release) requires features from newer compilers
+and/or Platform SDKs
 
 After installing the dependencies, there are two ways to build GTK+
 for win32.
@@ -147,11 +156,17 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.
 
+There are also VS 2008 solution and project files to build GTK+, which
+are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
+provided that the afore-mentioned dependencies are installed.  They will
+build GDK with the Win32 backend, GTK+ itself and the gtk-demo program.
+(The GAIL and GAIL-util sources are not built by this method yet)
+
 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
 Unix.
 
-I use method 1 myself. Hans Breuer has been taking care of the MSVC
+I (Tor) use method 1 myself. Hans Breuer has been taking care of the MSVC
 makefiles. At times, we disagree a bit about various issues, and for
 instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
@@ -182,3 +197,4 @@ sources. Unfortunately it seems that only Wacom tablets come with
 support for the Wintab API nowadays.
 
 --Tor Lillqvist <tml@iki.fi>, <tml@novell.com>
+--Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>

build/win32/Makefile.am

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

build/win32/vs10/Makefile.am

@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST += \
+	README.txt \
+	gtk+.sln \
+	gtk+.props \
+	gdk-win32.vcxproj \
+	gdk-win32.vcxproj.filters \
+	gdk.vcxproj \
+	gdk.vcxprojin \
+	gdk.vcxproj.filters \
+	gdk.vcxproj.filtersin \
+	gtk.vcxproj \
+	gtk.vcxprojin \
+	gtk.vcxproj.filters \
+	gtk.vcxproj.filtersin \
+	gtk-demo.vcxproj \
+	gtk-demo.vcxproj.filters \
+	install.vcxproj

build/win32/vs10/README.txt

@@ -0,0 +1,90 @@
+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)
+
+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-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 *: 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
+  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.
+
+***: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/gdk-win32.vcxproj

@@ -0,0 +1,141 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}</ProjectGuid>
+    <RootNamespace>gdkwin32</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</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.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>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-wintab.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplay-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkmain-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkproperty-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkscreen-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkselection-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdktestutils-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkvisual-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkwin32id.c" />
+    <ClCompile Include="..\..\..\gdk\win32\gdkwindow-win32.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gdk-win32.vcxproj.filters

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <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</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-wintab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdevicemanager-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplay-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdnd-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkevents-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkgeometry-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkglobals-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkinput.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkkeys-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkmain-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkproperty-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkscreen-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkselection-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdktestutils-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkvisual-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkdisplaymanager-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkwin32id.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\gdk\win32\gdkwindow-win32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk.vcxproj.filtersin

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <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</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "libgdk.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>

build/win32/vs10/gdk.vcxprojin

@@ -0,0 +1,192 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}</ProjectGuid>
+    <RootNamespace>gdk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_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>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
+      <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gdk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gdk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGdkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gdk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "libgdk.vs10.sourcefiles"
+    <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk-win32.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fa}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/gtk+.props

@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj</DefDir>
+    <GtkApiVersion>3.0</GtkApiVersion>
+    <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
+    <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
+    <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
+    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
+    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
+    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="\"Gtk\"";GTK_HOST="\"i686-pc-vs10\"";GTK_PRINT_BACKENDS="\"file\"";GTK_PRINT_PREVIEW_COMMAND="\"undefined-gtk-print-preview-command\"";$(GtkIncludedImmodulesDefines);GTK_LIBDIR="\"$(GtkDummyPrefix)/lib\"";GTK_DATADIR="\"$(GtkDummyPrefix)/share\"";GTK_DATA_PREFIX="\"$(GtkDummyPrefix)\"";GTK_SYSCONFDIR="\"$(GtkDummyPrefix)/etc\"";MULTIPRESS_CONFDIR="\"$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\"";MULTIPRESS_LOCALEDIR="\"$(GtkDummyPrefix)/share/locale\"";GTK_VERSION="\"$(GtkVersion)/etc\"";GTK_BINARY_VERSION="\"$(GtkBinaryVersion)/etc\"";GDK_DISABLE_DEPRECATED</GtkDefines>
+    <GtkDoInstall>
+echo on
+
+mkdir $(CopyDir)\bin
+
+copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
+
+
+mkdir $(CopyDir)\bin\gtk3-demo
+
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\bin\gtk3-demo
+
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\bin\gtk3-demo
+
+
+mkdir $(CopyDir)\lib
+
+copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
+
+
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+
+
+copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
+
+
+copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
+
+
+mkdir $(CopyDir)\share\glib-2.0\schemas
+
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
+
+echo "Compiling gsettings XML File(s)..."
+
+$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
+
+
+</GtkDoInstall>
+    <GtkGenerateGdkDef>echo EXPORTS &gt;"$(DefDir)\gdk.def" &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;"$(DefDir)\gdk.def"</GtkGenerateGdkDef>
+    <GtkGenerateGtkDef>echo EXPORTS &gt;"$(DefDir)\gtk.def" &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;"$(DefDir)\gtk.def"</GtkGenerateGtkDef>
+    <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
+    <GtkLibtoolCompatibleDllSuffix>-$(GtkApiVersion)-0</GtkLibtoolCompatibleDllSuffix>
+    <GtkSeparateVS10DllPrefix />
+    <GtkSeparateVS10DllSuffix>-3-vs10</GtkSeparateVS10DllSuffix>
+    <GtkDllPrefix>$(GtkSeparateVS10DllPrefix)</GtkDllPrefix>
+    <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>
+  </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>
+      <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>
+      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+if exist ..\..\..\config.h goto DONE_CONFIG_H
+
+copy ..\..\..\config.h.win32 ..\..\..\config.h
+
+:DONE_CONFIG_H
+
+
+copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h
+
+</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <BuildMacro Include="CopyDir">
+      <Value>$(CopyDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="DefDir">
+      <Value>$(DefDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkApiVersion">
+      <Value>$(GtkApiVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkBinaryVersion">
+      <Value>$(GtkBinaryVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDummyPrefix">
+      <Value>$(GtkDummyPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkPrefixDefine">
+      <Value>$(GtkPrefixDefine)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GdkDefines">
+      <Value>$(GdkDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkIncludedImmodulesDefines">
+      <Value>$(GtkIncludedImmodulesDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDefines">
+      <Value>$(GtkDefines)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDoInstall">
+      <Value>$(GtkDoInstall)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGdkDef">
+      <Value>$(GtkGenerateGdkDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkGenerateGtkDef">
+      <Value>$(GtkGenerateGtkDef)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
+      <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkLibtoolCompatibleDllSuffix">
+      <Value>$(GtkLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVS10DllPrefix">
+      <Value>$(GtkSeparateVS10DllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkSeparateVS10DllSuffix">
+      <Value>$(GtkSeparateVS10DllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllPrefix">
+      <Value>$(GtkDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GtkDllSuffix">
+      <Value>$(GtkDllSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk+.sln

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

build/win32/vs10/gtk-demo.vcxproj

@@ -0,0 +1,220 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}</ProjectGuid>
+    <RootNamespace>gtkdemo</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</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.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\button_box.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\changedisplay.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview_edit.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\images.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
+    <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\panes.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.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/gtk-demo.vcxproj.filters

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\builder.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\button_box.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\changedisplay.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\expander.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\iconview_edit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\images.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\links.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\menus.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\panes.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\printing.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\search_entry.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk.vcxproj.filtersin

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <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</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+#include "libgtk.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gtk.symbols">
+      <Filter>Resource Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>

build/win32/vs10/gtk.vcxprojin

@@ -0,0 +1,206 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}</ProjectGuid>
+    <RootNamespace>gtk</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="gtk+.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_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>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.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>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.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>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.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>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>atk-2.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>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\gdk\gtk.symbols">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating gtk.def</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkGenerateGtkDef)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)gtk.def;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
+  </ItemGroup>
+  <ItemGroup>
+#include "libgtk.vs10.sourcefiles"
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imam-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imcedilla.c" />
+    <ClCompile Include="..\..\..\modules\input\imcyrillic-translit.c" />
+    <ClCompile Include="..\..\..\modules\input\imime.c" />
+    <ClCompile Include="..\..\..\modules\input\iminuktitut.c" />
+    <ClCompile Include="..\..\..\modules\input\imipa.c" />
+    <ClCompile Include="..\..\..\modules\input\immultipress.c" />
+    <ClCompile Include="..\..\..\modules\input\imthai.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-er.c" />
+    <ClCompile Include="..\..\..\modules\input\imti-et.c" />
+    <ClCompile Include="..\..\..\modules\input\imviqr.c" />
+    <ClCompile Include="..\..\..\modules\input\thai-charprop.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

build/win32/vs10/install.vcxproj

@@ -0,0 +1,113 @@
+<?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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}</ProjectGuid>
+    <RootNamespace>install</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</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.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>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
+    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PreBuildEvent>
+      <Command>$(GtkDoInstall)</Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="gdk.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="gtk-demo.vcxproj">
+      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073fc}</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/vs9/README.txt

@@ -6,10 +6,55 @@ 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 zlib, libpng,
-proxy-libintl, fontconfig, freetype, expat.  See the corresponding
-README.txt file in glib for details where to unpack them.
+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
+(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.
+
+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
+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
+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: 
+
+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)
+-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/vs9/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>\vs9\<PlatformName>. For instance,
@@ -19,5 +64,27 @@ 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 *: 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 --at-- yahoo --dot-- com --dot-- tw>
+--Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

build/win32/vs9/gdk-win32.vcproj

@@ -139,7 +139,7 @@
 			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkwin32displaymanager.c" />
+			<File RelativePath="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
 		</Filter>

build/win32/vs9/gtk+.vsprops

@@ -8,7 +8,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\GdkPixbuf-2.0"
+		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"
 		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"
 	/>
@@ -316,10 +316,14 @@ 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)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
 
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).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;
+echo &quot;Compiling gsettings XML File(s)...&quot;&#x0D;&#x0A;
+$(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
 	/>
 	<UserMacro

build/win32/vs9/gtk.vcprojin

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.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-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.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"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.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-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
+				AdditionalDependencies="atk-2.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"

configure.ac

@@ -8,9 +8,9 @@
 # if backwards compatibility has been broken,
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
-m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [99])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_major_version], [3])
+m4_define([gtk_minor_version], [1])
+m4_define([gtk_micro_version], [5])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -38,22 +38,25 @@ AC_CONFIG_MACRO_DIR([m4])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.27.5])
-m4_define([pango_required_version], [1.20])
-m4_define([atk_required_version], [1.29.2])
+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([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.21.0])
+m4_define([gdk_pixbuf_required_version], [2.22.0])
+m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
 CAIRO_REQUIRED_VERSION=cairo_required_version
 GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version
+INTROSPECTION_REQUIRED_VERSION=introspection_required_version
+
 AC_SUBST(GLIB_REQUIRED_VERSION)
 AC_SUBST(PANGO_REQUIRED_VERSION)
 AC_SUBST(ATK_REQUIRED_VERSION)
 AC_SUBST(CAIRO_REQUIRED_VERSION)
 AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
-
+AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
@@ -170,12 +173,16 @@ dnl
 AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
 AC_LANG_PUSH([C++])
 
-AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
+                                   [[class a { int b; } c;]])],
+                  [],[CXX=])
 AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
 
 gtk_save_cxxflags="$CXXFLAGS"
 CXXFLAGS="$CXXFLAGS -x objective-c++"
-AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]],
+                                   [[]])],
+                  [OBJC=yes],[OBJC=no])
 AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
 CXXFLAGS="$gtk_save_cxxflags"
 AC_LANG_POP([C++])
@@ -233,63 +240,71 @@ m4_define([debug_default],
 
 dnl declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                             [turn on debugging @<:@default=debug_default@:>@]),,
-              enable_debug=debug_default)
+              [AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
+                              [turn on debugging @<:@default=debug_default@:>@])],,
+              [enable_debug=debug_default])
 
 AC_ARG_ENABLE(rebuilds,
-              [AC_HELP_STRING([--disable-rebuilds],
+              [AS_HELP_STRING([--disable-rebuilds],
                               [disable all source autogeneration rules])],,
               [enable_rebuilds=yes])
 
 AC_ARG_ENABLE(gtk2-dependency,
-              AC_HELP_STRING([--enable-gtk2-dependency],
-                             [Do not build gtk-update-icon-cache and other shared tools]),,
+              [AS_HELP_STRING([--enable-gtk2-dependency],
+                              [Do not build gtk-update-icon-cache and other shared tools])],,
               [enable_gtk2_dependency=no])
 
 AM_CONDITIONAL(BUILD_ICON_CACHE, [test "x$enable_gtk2_dependency" = xno])
 
 AC_ARG_ENABLE(xkb,
-              [AC_HELP_STRING([--enable-xkb],
+              [AS_HELP_STRING([--enable-xkb],
                               [support XKB extension [default=maybe]])],,
               [enable_xkb="maybe"])
 AC_ARG_ENABLE(xinerama,
-              [AC_HELP_STRING([--enable-xinerama],
+              [AS_HELP_STRING([--enable-xinerama],
 	                      [support Xinerama extension if available [default=maybe]])],,
               [enable_xinerama="maybe"])
 AC_ARG_ENABLE(xinput,
-              [AC_HELP_STRING([--enable-xinput],
+              [AS_HELP_STRING([--enable-xinput],
                               [support XInput extension if available [default=yes]])],,
               [enable_xinput="maybe"])
 AC_ARG_ENABLE(xrandr,
-              [AC_HELP_STRING([--enable-xrandr],
+              [AS_HELP_STRING([--enable-xrandr],
                               [support XRandR extension if available [default=maybe]])],,
               [enable_xrandr="maybe"])
 AC_ARG_ENABLE(xfixes,
-              [AC_HELP_STRING([--enable-xfixes],
+              [AS_HELP_STRING([--enable-xfixes],
                               [support XFixes extension if available [default=maybe]])],,
               [enable_xfixes="maybe"])
 AC_ARG_ENABLE(xcomposite,
-              [AC_HELP_STRING([--enable-xcomposite],
+              [AS_HELP_STRING([--enable-xcomposite],
                               [support X Composite extension if available [default=maybe]])],,
               [enable_xcomposite="maybe"])
 AC_ARG_ENABLE(xdamage,
-              [AC_HELP_STRING([--enable-xdamage],
+              [AS_HELP_STRING([--enable-xdamage],
                               [support X Damage extension if available [default=maybe]])],,
               [enable_xdamage="maybe"])
 
 AC_ARG_ENABLE(x11-backend,
-              [AC_HELP_STRING([--enable-x11-backend],
+              [AS_HELP_STRING([--enable-x11-backend],
                               [enable the X11 gdk backend])],
 			      [backend_set=yes])
 AC_ARG_ENABLE(win32-backend,
-              [AC_HELP_STRING([--enable-win32-backend],
+              [AS_HELP_STRING([--enable-win32-backend],
                               [enable the Win32 gdk backend])],
 			      [backend_set=yes])
 AC_ARG_ENABLE(quartz-backend,
-              [AC_HELP_STRING([--enable-quartz-backend],
+              [AS_HELP_STRING([--enable-quartz-backend],
                               [enable the quartz gdk backend])],
 			      [backend_set=yes])
+AC_ARG_ENABLE(broadway-backend,
+              [AC_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],
+                              [enable the wayland gdk backend])],
+			      [backend_set=yes])
 
 if test -z "$backend_set"; then
   if test "$platform_win32" = yes; then
@@ -308,7 +323,7 @@ GDK_WINDOWING=
 GIO_PACKAGE=gio-2.0
 PANGO_PACKAGES="pango pangocairo"
 
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
   # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
   # backend names are identical.
   cairo_backends="$cairo_backends cairo-xlib"
@@ -321,7 +336,7 @@ if test "x$enable_x11_backend" == xyes; then
 #define GDK_WINDOWING_X11"
 fi
 
-if test "x$enable_win32_backend" == xyes; then
+if test "x$enable_win32_backend" = xyes; then
   cairo_backends="$cairo_backends cairo-win32"
   GDK_BACKENDS="$GDK_BACKENDS win32"
   backend_immodules="$backend_immodules,ime"
@@ -334,7 +349,7 @@ else
   AM_CONDITIONAL(USE_WIN32, false)
 fi
 
-if test "x$enable_quartz_backend" == xyes; then
+if test "x$enable_quartz_backend" = xyes; then
   cairo_backends="$cairo_backends cairo-quartz"
   GDK_BACKENDS="$GDK_BACKENDS quartz"
   GDK_WINDOWING="$GDK_WINDOWING
@@ -345,8 +360,33 @@ else
   AM_CONDITIONAL(USE_QUARTZ, false)
 fi
 
+
+if test "x$enable_broadway_backend" == xyes; then
+  GDK_BACKENDS="$GDK_BACKENDS broadway"
+  cairo_backends="$cairo_backends cairo"
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_BROADWAY"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
+  AM_CONDITIONAL(USE_BROADWAY, true)
+else
+  AM_CONDITIONAL(USE_BROADWAY, false)
+fi
+
+if test "x$enable_wayland_backend" == "xyes"; then
+  # Wayland uses cairo-gl
+  cairo_backends="$cairo_backends cairo-gl"
+  GDK_BACKENDS="$GDK_BACKENDS wayland"
+  GIO_PACKAGE=gio-unix-2.0
+  GDK_WINDOWING="$GDK_WINDOWING
+#define GDK_WINDOWING_WAYLAND"
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
+  AM_CONDITIONAL(USE_WAYLAND, true)
+else
+  AM_CONDITIONAL(USE_WAYLAND, false)
+fi
+
 # strip leading space
-GDK_BACKENDS=${GDK_BACKENDS/# }
+GDK_BACKENDS=${GDK_BACKENDS#* }
 
 AC_SUBST(GDK_BACKENDS)
 
@@ -462,7 +502,7 @@ dnl * See whether to include shared library dependencies *
 dnl ******************************************************
 
 AC_ARG_ENABLE(explicit-deps,
-              [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
+              [AS_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
                               [use explicit dependencies in .pc files [default=auto]])],,
               [enable_explicit_deps=auto])
 
@@ -471,7 +511,7 @@ case $enable_explicit_deps in
   auto)
     export SED
     deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-    if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+    if test "x$deplibs_check_method" != xpass_all || test "x$enable_static" = xyes ; then
       enable_explicit_deps=yes
     else
       enable_explicit_deps=no
@@ -507,10 +547,10 @@ AC_CHECK_FUNCS(localtime_r)
 
 # _NL_TIME_FIRST_WEEKDAY is an enum and not a define
 AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));
-], gtk_ok=yes, gtk_ok=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+                                [[char c;
+                                  c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));]])],
+               [gtk_ok=yes], [gtk_ok=no])
 AC_MSG_RESULT($gtk_ok)
 if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
@@ -519,10 +559,10 @@ fi
 
 # _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
 AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));
-], gtk_ok=yes, gtk_ok=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+                                [[char c;
+                                  c = *((unsigned char *)  nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));]])],
+               [gtk_ok=yes], [gtk_ok=no])
 AC_MSG_RESULT($gtk_ok)
 if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
@@ -531,10 +571,10 @@ fi
 
 # _NL_PAPER_HEIGHT is an enum and not a define
 AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_PAPER_HEIGHT));
-], gtk_ok=yes, gtk_ok=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+                                [[char c;
+                                  c = *((unsigned char *)  nl_langinfo(_NL_PAPER_HEIGHT));]])],
+               [gtk_ok=yes], [gtk_ok=no])
 AC_MSG_RESULT($gtk_ok)
 if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
@@ -543,10 +583,10 @@ fi
 
 # _NL_PAPER_WIDTH is an enum and not a define
 AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
-AC_TRY_LINK([#include <langinfo.h>], [
-char c;
-c = *((unsigned char *)  nl_langinfo(_NL_PAPER_WIDTH));
-], gtk_ok=yes, gtk_ok=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
+                                [[char c;
+                                  c = *((unsigned char *)  nl_langinfo(_NL_PAPER_WIDTH));]])],
+               [gtk_ok=yes], [gtk_ok=no])
 AC_MSG_RESULT($gtk_ok)
 if test "$gtk_ok" = "yes"; then
   AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
@@ -557,9 +597,11 @@ fi
 ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
-AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*)
-        sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
-      esac])
+AC_CONFIG_COMMANDS([po-properties],
+                   [[case "$CONFIG_FILES" in *po-properties/Makefile.in*)
+                       sed -e "/POTFILES =/r po-properties/POTFILES" po-properties/Makefile.in > po-properties/Makefile
+                     esac]],
+                   [[]])
 
 dnl Snippet below is copied from AM_GLIB_GNU_GETTEXT to generate a first
 dnl po-properties/POTFILES during configure; see GNOME #573515.
@@ -589,22 +631,20 @@ AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
 
 gtk_save_LIBS=$LIBS
 LIBS="$LIBS -lm"
-AC_TRY_RUN([#include <math.h>
-             int main (void) { return (log(1) != log(1.)); }],
-     AC_MSG_RESULT(none needed),
-     gtk_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS -std1"
-     AC_TRY_RUN([#include <math.h>
-	         int main (void) { return (log(1) != log(1.)); }],
-         AC_MSG_RESULT(-std1),
-         AC_MSG_RESULT()
-         CFLAGS="$gtk_save_CFLAGS"
-         AC_MSG_WARN(
-                [No ANSI prototypes found in library. (-std1 didn't work.)]),
-	 true
-     ),
-     AC_MSG_RESULT(none needed)
-)
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
+                                int main (void) { return (log(1) != log(1.)); }]])],
+              [AC_MSG_RESULT(none needed)],
+              [gtk_save_CFLAGS="$CFLAGS"
+               CFLAGS="$CFLAGS -std1"
+               AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
+                                               int main (void) { return (log(1) != log(1.)); }]])],
+                             [AC_MSG_RESULT(-std1)],
+                             [AC_MSG_RESULT()
+                              CFLAGS="$gtk_save_CFLAGS"
+                              AC_MSG_WARN([No ANSI prototypes found in library. (-std1 did not work.)])],
+                             [true])],
+              [AC_MSG_RESULT(none needed)])
+
 LIBS=$gtk_save_LIBS
 
 AC_MSG_CHECKING(for the BeOS)
@@ -633,18 +673,6 @@ case $host_os in
   ;;
 esac
 
-dnl NeXTStep cc seems to need this
-AC_MSG_CHECKING([for extra flags for POSIX compliance])
-AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-  AC_MSG_RESULT(none needed),
-  gtk_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -posix"
-  AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-    AC_MSG_RESULT(-posix),
-    AC_MSG_RESULT()
-    CFLAGS="$gtk_save_CFLAGS"
-    AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
-
 #
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 #
@@ -689,9 +717,11 @@ AC_CHECK_HEADERS(ftw.h,
                            [Define to 1 if ftw.h is available]))
 
 AC_MSG_CHECKING([for GNU ftw extensions])
-AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
-#define _GNU_SOURCE
-#include <ftw.h>], [int flags = FTW_ACTIONRETVAL;], gtk_ok=yes, gtk_ok=no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
+                                     #define _GNU_SOURCE
+                                     #include <ftw.h>]],
+                                   [[int flags = FTW_ACTIONRETVAL;]])],
+                  [gtk_ok=yes],[gtk_ok=no])
 if test $gtk_ok = yes; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
@@ -703,42 +733,17 @@ saved_cflags="$CFLAGS"
 saved_ldflags="$LDFLAGS"
 
 
-# Checks for header files.
-AC_HEADER_STDC
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
 # Checks for library functions.
-AC_TYPE_SIGNAL
 AC_FUNC_MMAP
 
 AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 
-# Check if <sys/select.h> needs to be included for fd_set
-AC_MSG_CHECKING([for fd_set])
-AC_TRY_COMPILE([#include <sys/types.h>],
-        [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
-if test $gtk_ok = yes; then
-    AC_MSG_RESULT([yes, found in sys/types.h])
-else
-    AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
-    if test $gtk_ok = yes; then
-        AC_DEFINE(HAVE_SYS_SELECT_H, 1,
-                  [Define to 1 if sys/select.h is available])
-        AC_MSG_RESULT([yes, found in sys/select.h])
-    else
-	AC_DEFINE(NO_FD_SET, 1,
-                  [Define to 1 if fd_set is not available])
-	AC_MSG_RESULT(no)
-    fi
-fi
-
 # Check for uxtheme.h (for MS-Windows Engine)
 AC_MSG_CHECKING(for uxtheme.h)
-AC_TRY_CPP([#include <uxtheme.h>], gtk_uxtheme_h=yes, gtk_uxtheme_h=no)
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <uxtheme.h>]])],
+                  [gtk_uxtheme_h=yes], [gtk_uxtheme_h=no])
 if test $gtk_uxtheme_h = yes; then
    AC_DEFINE(HAVE_UXTHEME_H, 1, [Have uxtheme.h include file])
 fi
@@ -751,7 +756,7 @@ AC_CHECK_FUNCS(_NSGetEnviron)
 AC_MSG_CHECKING(whether to build dynamic modules)
 
 AC_ARG_ENABLE(modules,
-              [AC_HELP_STRING([--disable-modules],
+              [AS_HELP_STRING([--disable-modules],
                               [disable dynamic module loading])])
 
 dynworks=false
@@ -800,13 +805,9 @@ AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
 #
 AC_MSG_CHECKING(immodules to build)
 
-dnl due to an autoconf bug, commas in the first arg to
-dnl AC_HELP_STRING cause problems.
-dnl AC_HELP_STRING([--with-included-immodules=MODULE1 MODULE2 ...],
-dnl                [build the specified input method modules into gtk])
 AC_ARG_WITH(included_immodules,
-            AC_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
-                           [build the specified input methods into gtk]))
+            [AS_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
+                            [build the specified input methods into gtk])])
 
 if $dynworks; then
    :
@@ -863,10 +864,6 @@ AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
 
-AC_HEADER_SYS_WAIT
-
-AC_TYPE_SIGNAL
-
 # Checks to see whether we should include mediaLib
 # support.
 #
@@ -909,7 +906,7 @@ GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
 X_EXTENSIONS=
 
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
   X_PACKAGES=fontconfig
 
   #
@@ -974,17 +971,17 @@ if test "x$enable_x11_backend" == xyes; then
   # Check for xReply
 
   AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
-  AC_TRY_COMPILE([#include <X11/Xlibint.h>],
-      [xReply *rep;],
-      [AC_MSG_RESULT([no])],
-      [AC_TRY_COMPILE([#include <X11/extensions/XIproto.h>
-#include <X11/Xlibint.h>],
-           [xReply *rep;],
-           [AC_MSG_RESULT([yes])
-            AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
-                      [Define if <X11/extensions/XIproto.h> needed for xReply])],
-           [AC_MSG_RESULT([unknown])
-            AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
+                                     [[xReply *rep;]])],
+                    [AC_MSG_RESULT([no])],
+                    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
+                                                          #include <X11/Xlibint.h>]],
+                                                        [[xReply *rep;]])],
+                                       [AC_MSG_RESULT([yes])
+                                        AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1],
+                                                  [Define if <X11/extensions/XIproto.h> needed for xReply])],
+                                       [AC_MSG_RESULT([unknown])
+                                        AC_MSG_ERROR([xReply type unavailable. X11 is too old])])])
 
   # Check for XConvertCase, XInternAtoms (X11R6 specific)
 
@@ -1099,6 +1096,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
@@ -1202,7 +1203,7 @@ if test "x$enable_x11_backend" == xyes; then
   AM_CONDITIONAL(USE_X11, true)
 
   # strip leading space
-  X_EXTENSIONS=${X_EXTENSIONS/# }
+  X_EXTENSIONS=${X_EXTENSIONS#* }
 
 else
   XPACKAGES=
@@ -1244,7 +1245,7 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
+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_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
@@ -1294,7 +1295,7 @@ else
 fi
 
 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-if test "x$enable_x11_backend" == xyes; then
+if test "x$enable_x11_backend" = xyes; then
   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
@@ -1366,7 +1367,7 @@ LIBS="$old_LIBS"
 PRINT_BACKENDS="file lpr"
 
 AC_ARG_ENABLE(cups,
-              [AC_HELP_STRING([--disable-cups],
+              [AS_HELP_STRING([--disable-cups],
                               [disable cups print backend])],,
               [enable_cups=auto])
 
@@ -1408,10 +1409,11 @@ else
 
     gtk_save_cflags="$CFLAGS"
     CFLAGS="$CUPS_CFLAGS"
-    AC_TRY_COMPILE([#include <cups/http.h>],
-                   [http_t http; char *s = http.authstring;],
-                   [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [],
-                              [Define if cups http_t authstring field is accessible])],)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cups/http.h>]],
+                                       [[http_t http; char *s = http.authstring;]])],
+                      [AC_DEFINE([HAVE_HTTP_AUTHSTRING], [],
+                                 [Define if cups http_t authstring field is accessible])],
+                      [])
     CFLAGS="$gtk_save_cflags"
 
     AC_SUBST(HAVE_HTTP_AUTHSTRING)
@@ -1427,9 +1429,9 @@ fi
 #
 
 AC_ARG_ENABLE(papi,
-              [AC_HELP_STRING([--disable-papi],
+              [AS_HELP_STRING([--disable-papi],
                               [disable papi print backend])],,
-             [enable_papi=auto])
+              [enable_papi=auto])
 
 if test "x$enable_papi" = "xno"; then
   AM_CONDITIONAL(HAVE_PAPI, false)
@@ -1471,7 +1473,7 @@ CPPFLAGS="$gtk_save_cppflags"
 
 
 AC_ARG_ENABLE(test-print-backend,
-              [AC_HELP_STRING([--enable-test-print-backend],
+              [AS_HELP_STRING([--enable-test-print-backend],
                               [build test print backend])],,
               [enable_test_print_backend=no])
 if test "x$enable_test_print_backend" != "xno" ; then
@@ -1510,15 +1512,15 @@ GLIB_GSETTINGS
 # GObject introspection
 ##################################################
 
-GOBJECT_INTROSPECTION_CHECK([0.10.1])
+GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
 
 ##################################################
 # Packagekit module
 #################################################
 
 AC_ARG_ENABLE(packagekit,
-              AC_HELP_STRING([--disable-packagekit],
-                             [build packagekit open-with module]))
+              [AS_HELP_STRING([--disable-packagekit],
+                              [build packagekit open-with module])])
 
 build_packagekit=no
 if test "os_win32" != "yes"; then
@@ -1534,15 +1536,16 @@ AM_CONDITIONAL(ENABLE_PACKAGEKIT, test "x$build_packagekit" = "xyes")
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
 AC_ARG_ENABLE(man,
-              [AC_HELP_STRING([--enable-man],
-                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-              enable_man=no)
+              [AS_HELP_STRING([--enable-man],
+                              [regenerate man pages from Docbook [default=no]])],
+              [enable_man=yes],
+              [enable_man=no])
 
 if test "${enable_man}" != no; then
   dnl
@@ -1615,16 +1618,17 @@ dnl Check for -Bsymbolic-functions linker flag used to avoid
 dnl intra-library PLT jumps, if available.
 dnl
 AC_ARG_ENABLE(Bsymbolic,
-              [AC_HELP_STRING([--disable-Bsymbolic],
+              [AS_HELP_STRING([--disable-Bsymbolic],
                               [avoid linking with -Bsymbolic])],,
               [SAVED_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_TRY_LINK([], [int main (void) { return 0; }],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+                                               [[int main (void) { return 0; }]])],
+                              [AC_MSG_RESULT(yes)
+                               enable_Bsymbolic=yes],
+                              [AC_MSG_RESULT(no)
+                               enable_Bsymbolic=no])
                LDFLAGS="${SAVED_LDFLAGS}"])
 
 if test "x${enable_Bsymbolic}" = "xyes" ; then
@@ -1648,8 +1652,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/css/Makefile
+tests/css/parser/Makefile
+tests/reftests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1662,12 +1670,15 @@ docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
 build/win32/vs9/Makefile
+build/win32/vs10/Makefile
 gdk/Makefile
+gdk/broadway/Makefile
 gdk/x11/Makefile
 gdk/win32/Makefile
 gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
+gdk/wayland/Makefile
 gdk/tests/Makefile
 gtk/Makefile
 gtk/makefile.msc
@@ -1697,8 +1708,8 @@ perf/Makefile
 AC_OUTPUT
 
 # beautify the immodule list a bit
-included_immodules=${included_immodules//,/ }
-included_immodules=${included_immodules:-none}
+included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g')
+if test -z "${included_immodules}"; then included_immodules="none"; fi
 
 echo ""
 echo "        GTK+ $GTK_VERSION"

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.0.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.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

@@ -55,11 +55,11 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.0.la
+	$(top_builddir)/gtk/libgtk-3.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.0.la	\
-	$(top_builddir)/gdk/libgdk-3.0.la	\
+	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-3.la	\
 	$(GTK_DEP_LIBS)				\
 	-lm
 

demos/gtk-demo/assistant.c

@@ -1,6 +1,6 @@
 /* Assistant
  *
- * Demonstrates a sample multistep assistant. Assistants are used to divide
+ * Demonstrates a sample multi-step assistant. Assistants are used to divide
  * an operation into several simpler sequential steps, and to guide the user
  * through these steps.
  */
@@ -29,6 +29,7 @@ apply_changes_gradually (gpointer data)
     {
       /* Close automatically once changes are fully applied. */
       gtk_widget_destroy (assistant);
+      assistant = NULL;
       return FALSE;
     }
 }
@@ -92,7 +93,6 @@ static void
 create_page1 (GtkWidget *assistant)
 {
   GtkWidget *box, *label, *entry;
-  GdkPixbuf *pixbuf;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
@@ -103,46 +103,36 @@ create_page1 (GtkWidget *assistant)
   entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
   g_signal_connect (G_OBJECT (entry), "changed",
-		    G_CALLBACK (on_entry_changed), assistant);
+                    G_CALLBACK (on_entry_changed), assistant);
 
   gtk_widget_show_all (box);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
 }
 
 static void
 create_page2 (GtkWidget *assistant)
 {
   GtkWidget *box, *checkbutton;
-  GdkPixbuf *pixbuf;
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
-						 "even if you do not check this");
+                                                 "even if you do not check this");
   gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE, 0);
 
   gtk_widget_show_all (box);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
-  g_object_unref (pixbuf);
 }
 
 static void
 create_page3 (GtkWidget *assistant)
 {
   GtkWidget *label;
-  GdkPixbuf *pixbuf;
 
   label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");
 
@@ -151,10 +141,6 @@ create_page3 (GtkWidget *assistant)
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
-
-  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
-  gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
-  g_object_unref (pixbuf);
 }
 
 static void
@@ -173,7 +159,8 @@ create_page4 (GtkWidget *assistant)
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");
 
   /* This prevents the assistant window from being
-   * closed while we're "busy" applying changes. */
+   * closed while we're "busy" applying changes.
+   */
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
 }
 
@@ -184,10 +171,10 @@ do_assistant (GtkWidget *do_widget)
     {
       assistant = gtk_assistant_new ();
 
-	 gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
+         gtk_window_set_default_size (GTK_WINDOW (assistant), -1, 300);
 
       gtk_window_set_screen (GTK_WINDOW (assistant),
-			     gtk_widget_get_screen (do_widget));
+                             gtk_widget_get_screen (do_widget));
 
       create_page1 (assistant);
       create_page2 (assistant);
@@ -195,13 +182,13 @@ do_assistant (GtkWidget *do_widget)
       create_page4 (assistant);
 
       g_signal_connect (G_OBJECT (assistant), "cancel",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
       g_signal_connect (G_OBJECT (assistant), "close",
-			G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
       g_signal_connect (G_OBJECT (assistant), "apply",
-			G_CALLBACK (on_assistant_apply), NULL);
+                        G_CALLBACK (on_assistant_apply), NULL);
       g_signal_connect (G_OBJECT (assistant), "prepare",
-			G_CALLBACK (on_assistant_prepare), NULL);
+                        G_CALLBACK (on_assistant_prepare), NULL);
     }
 
   if (!gtk_widget_get_visible (assistant))

demos/gtk-demo/editable_cells.c

@@ -48,27 +48,27 @@ add_items (void)
   g_return_if_fail (articles != NULL);
 
   foo.number = 3;
-  foo.product = g_strdup ("bottles of coke");
+  foo.product = "bottles of coke";
   foo.yummy = 20;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 5;
-  foo.product = g_strdup ("packages of noodles");
+  foo.product = "packages of noodles";
   foo.yummy = 50;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 2;
-  foo.product = g_strdup ("packages of chocolate chip cookies");
+  foo.product = "packages of chocolate chip cookies";
   foo.yummy = 90;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 1;
-  foo.product = g_strdup ("can vanilla ice cream");
+  foo.product = "can vanilla ice cream";
   foo.yummy = 60;
   g_array_append_vals (articles, &foo, 1);
 
   foo.number = 6;
-  foo.product = g_strdup ("eggs");
+  foo.product = "eggs";
   foo.yummy = 10;
   g_array_append_vals (articles, &foo, 1);
 }

demos/gtk-demo/iconview.c

@@ -105,6 +105,7 @@ fill_store (GtkListStore *store)
 
       name = g_dir_read_name (dir);
     }
+  g_dir_close (dir);
 }
 
 static gint

demos/gtk-demo/images.c

@@ -432,7 +432,7 @@ do_images (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (align), frame);
       gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
+      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
 
       gtk_container_add (GTK_CONTAINER (frame), image);

demos/gtk-demo/list_store.c

@@ -11,11 +11,11 @@
 
 static GtkWidget *window = NULL;
 static GtkTreeModel *model = NULL;
-static guint timeout = 0;
 
 typedef struct
 {
   const gboolean  fixed;
+  const gboolean  active;
   const guint     number;
   const gchar    *severity;
   const gchar    *description;
@@ -28,7 +28,6 @@ enum
   COLUMN_NUMBER,
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
-  COLUMN_PULSE,
   COLUMN_ICON,
   COLUMN_ACTIVE,
   COLUMN_SENSITIVE,
@@ -37,49 +36,22 @@ enum
 
 static Bug data[] =
 {
-  { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
-  { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
-  { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
-  { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
-  { TRUE,  56355, "Normal",     "GtkLabel - Not all changes propagate correctly" },
-  { FALSE, 50055, "Normal",     "Rework width/height computations for TreeView" },
-  { FALSE, 58278, "Normal",     "gtk_dialog_set_response_sensitive () doesn't work" },
-  { FALSE, 55767, "Normal",     "Getters for all setters" },
-  { FALSE, 56925, "Normal",     "Gtkcalender size" },
-  { FALSE, 56221, "Normal",     "Selectable label needs right-click copy menu" },
-  { TRUE,  50939, "Normal",     "Add shift clicking to GtkTextView" },
-  { FALSE, 6112,  "Enhancement","netscape-like collapsable toolbars" },
-  { FALSE, 1,     "Normal",     "First bug :=)" },
+  { FALSE, TRUE,  60482, "Normal",     "scrollable notebooks and hidden tabs" },
+  { FALSE, FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
+  { FALSE, FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
+  { TRUE,  FALSE, 52877, "Major",      "GtkFileSelection needs a refresh method. " },
+  { FALSE, TRUE,  56070, "Normal",     "Can't click button after setting in sensitive" },
+  { TRUE,  FALSE, 56355, "Normal",     "GtkLabel - Not all changes propagate correctly" },
+  { FALSE, FALSE, 50055, "Normal",     "Rework width/height computations for TreeView" },
+  { FALSE, TRUE,  58278, "Normal",     "gtk_dialog_set_response_sensitive () doesn't work" },
+  { FALSE, FALSE, 55767, "Normal",     "Getters for all setters" },
+  { FALSE, TRUE,  56925, "Normal",     "Gtkcalender size" },
+  { FALSE, TRUE,  56221, "Normal",     "Selectable label needs right-click copy menu" },
+  { TRUE,  FALSE, 50939, "Normal",     "Add shift clicking to GtkTextView" },
+  { FALSE, FALSE, 6112,  "Enhancement","netscape-like collapsable toolbars" },
+  { FALSE, FALSE, 1,     "Normal",     "First bug :=)" },
 };
 
-static gboolean
-spinner_timeout (gpointer data)
-{
-  GtkTreeIter iter;
-  guint pulse;
-
-  if (model == NULL)
-    return FALSE;
-
-  gtk_tree_model_get_iter_first (model, &iter);
-  gtk_tree_model_get (model, &iter,
-                      COLUMN_PULSE, &pulse,
-                      -1);
-  if (pulse == G_MAXUINT)
-    pulse = 0;
-  else
-    pulse++;
-
-  gtk_list_store_set (GTK_LIST_STORE (model),
-                      &iter,
-                      COLUMN_PULSE, pulse,
-                      COLUMN_ACTIVE, TRUE,
-                      -1);
-
-  return TRUE;
-}
-
 static GtkTreeModel *
 create_model (void)
 {
@@ -93,7 +65,6 @@ create_model (void)
                               G_TYPE_UINT,
                               G_TYPE_STRING,
                               G_TYPE_STRING,
-                              G_TYPE_UINT,
                               G_TYPE_STRING,
                               G_TYPE_BOOLEAN,
                               G_TYPE_BOOLEAN);
@@ -118,9 +89,8 @@ create_model (void)
                           COLUMN_NUMBER, data[i].number,
                           COLUMN_SEVERITY, data[i].severity,
                           COLUMN_DESCRIPTION, data[i].description,
-                          COLUMN_PULSE, 0,
                           COLUMN_ICON, icon_name,
-                          COLUMN_ACTIVE, FALSE,
+                          COLUMN_ACTIVE, data[i].active,
                           COLUMN_SENSITIVE, sensitive,
                           -1);
     }
@@ -209,12 +179,10 @@ add_columns (GtkTreeView *treeview)
   renderer = gtk_cell_renderer_spinner_new ();
   column = gtk_tree_view_column_new_with_attributes ("Spinning",
                                                      renderer,
-                                                     "pulse",
-                                                     COLUMN_PULSE,
                                                      "active",
                                                      COLUMN_ACTIVE,
                                                      NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
+  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ACTIVE);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for symbolic icon */
@@ -238,11 +206,7 @@ window_closed (GtkWidget *widget,
 {
   model = NULL;
   window = NULL;
-  if (timeout != 0)
-    {
-      g_source_remove (timeout);
-      timeout = 0;
-    }
+
   return FALSE;
 }
 
@@ -303,22 +267,11 @@ do_list_store (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-      if (timeout == 0) {
-        /* FIXME this should use the animation-duration instead */
-        timeout = g_timeout_add (80, spinner_timeout, NULL);
-      }
-    }
+    gtk_widget_show_all (window);
   else
     {
       gtk_widget_destroy (window);
       window = NULL;
-      if (timeout != 0)
-        {
-          g_source_remove (timeout);
-          timeout = 0;
-        }
     }
 
   return window;

demos/gtk-demo/menus.c

@@ -74,47 +74,17 @@ change_orientation (GtkWidget *button,
                     GtkWidget *menubar)
 {
   GtkWidget *parent;
-  GtkWidget *box = NULL;
+  GtkOrientation orientation;
 
   parent = gtk_widget_get_parent (menubar);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (parent));
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (parent), 1 - orientation);
 
-  if (GTK_IS_VBOX (parent))
-    {
-      box = gtk_widget_get_parent (parent);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_TTB,
-		    NULL);
-    }
+  if (orientation == GTK_ORIENTATION_VERTICAL)
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_TTB, NULL);
   else
-    {
-      GList *children, *l;
+    g_object_set (menubar, "pack-direction", GTK_PACK_DIRECTION_LTR, NULL);
 
-      children = gtk_container_get_children (GTK_CONTAINER (parent));
-      for (l = children; l; l = l->next)
-	{
-	  if (GTK_IS_VBOX (l->data))
-	    {
-	      box = l->data;
-	      break;
-	    }
-	}
-      g_list_free (children);
-
-      g_object_ref (menubar);
-      gtk_container_remove (GTK_CONTAINER (parent), menubar);
-      gtk_container_add (GTK_CONTAINER (box), menubar);
-      gtk_box_reorder_child (GTK_BOX (box), menubar, 0);
-      g_object_unref (menubar);
-      g_object_set (menubar, 
-		    "pack-direction", GTK_PACK_DIRECTION_LTR,
-		    NULL);
-    }
 }
 
 static GtkWidget *window = NULL;
@@ -172,7 +142,6 @@ do_menus (GtkWidget *do_widget)
 
       menuitem = gtk_menu_item_new_with_label ("bar");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
-      gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 

demos/gtk-demo/search_entry.c

@@ -93,6 +93,7 @@ search_by_name (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by name\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "name");
 }
 
 static void
@@ -106,6 +107,7 @@ search_by_description (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by description\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "description");
 }
 
 static void
@@ -119,6 +121,7 @@ search_by_file (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by file name\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "file name");
 }
 
 GtkWidget *
@@ -246,6 +249,7 @@ do_search_entry (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkWidget *button;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
 
@@ -323,6 +327,10 @@ do_search_entry (GtkWidget *do_widget)
       /* add accessible alternatives for icon functionality */
       g_signal_connect (entry, "populate-popup",
                         G_CALLBACK (entry_populate_popup), NULL);
+
+      /* Give the focus to the close button */
+      button = gtk_dialog_get_widget_for_response (GTK_DIALOG (window), GTK_RESPONSE_NONE);
+      gtk_widget_grab_focus (button);
     }
 
   if (!gtk_widget_get_visible (window))

demos/pixbuf-demo/Makefile.am

@@ -0,0 +1,41 @@
+## Makefile.am for gtk+/demos
+include $(top_srcdir)/Makefile.decl
+
+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 = 		\
+	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/Makefile.am

@@ -16,7 +16,6 @@ EXTRA_DIST += \
 	sizing-test.txt			\
 	styles.txt			\
 	text_widget_internals.txt	\
-	text_widget.txt 		\
 	tree-column-sizing.png		\
 	tree-column-sizing.txt		\
 	widget_geometry.txt		\

docs/reference/gdk/Makefile.am

@@ -44,15 +44,14 @@ INCLUDES = 			\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS)
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\
-	version.xml		\
-	multihead.sgml
+	version.xml
 
 # Images to copy into HTML directory
 HTML_IMAGES = 				\

docs/reference/gdk/gdk-docs.sgml

@@ -6,23 +6,24 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GDK Reference Manual</title>
+    <title>GDK 3 Reference Manual</title>
     <releaseinfo>
-      for GDK &version;
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gdk/unstable/">http://library.gnome.org/devel/gdk/unstable/</ulink>.
+      This document is for the GDK 3 library, version &version;
+      The latest versions can be found online at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.
+      If you are looking for the older GDK 2 series of libraries,
+      see <ulink role="online-location" url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
   <reference id="reference">
     <title>API Reference</title>
     <xi:include href="xml/general.xml" />
-    <xi:include href="multihead.sgml" />
-    <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkdisplaymanager.xml" />
-    <xi:include href="xml/gdkdevice.xml" />
-    <xi:include href="xml/gdkdevicemanager.xml" />
+    <xi:include href="xml/gdkdisplay.xml" />
     <xi:include href="xml/gdkscreen.xml" />
+    <xi:include href="xml/gdkdevicemanager.xml" />
+    <xi:include href="xml/gdkdevice.xml" />
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/pixbufs.xml" />
     <xi:include href="xml/colors.xml" />

docs/reference/gdk/gdk3-sections.txt

@@ -949,6 +949,7 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_window_foreign_new_for_display
 gdk_x11_window_lookup_for_display
 gdk_x11_window_get_xid
+gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
 gdk_x11_get_default_root_xwindow

docs/reference/gdk/multihead.sgml

@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="multihead" revision="1 May 2002">
-  <refmeta>
-    <refentrytitle>Multi-head Support Overview</refentrytitle>
-    <manvolnum>3</manvolnum>
-    <refmiscinfo>GDK Library</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>Multi-head Support Overview</refname>
-    <refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
-  </refnamediv>
-
-  <refsect1>
-    <title>Overview</title>
-      <para>
-	Multihead support is based around two main object types:
-	<itemizedlist>
-	  <listitem><para>GdkDisplay</para></listitem>
-	  <listitem><para>GdkScreen</para></listitem>
-	</itemizedlist>
-      </para>
-      
-      <para>
-	<link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
-	representation of the X Display which can be described as <emphasis>a
-	workstation consisting of a keyboard a pointing device (such as a
-	  mouse) and one or more screens</emphasis>. 
-	It is used to open and keep track of various <link
-	  linkend="gdk-GdkScreen">GdkScreen</link> objects currently 
-	instanciated by the application. It is also used to grab and release
-	the keyboard and the mouse pointer.
-      </para>
-      <para>
-	<link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
-	representation of a physical screen. It is used throughout GDK and GTK+
-	to specify which screen the top level windows are to be displayed on. 
-	It is also used to query the screen specification and default settings such as 
-	the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
-	the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
-      </para>
-      <para> 
-	The following code samples demonstrate common usage of the objects described above.
-      </para>
-      
-      <example>
-	<title>Testing the number of screen on the current display</title>
-	<programlisting><!--
--->gint num_screen = 0;
-gchar *displayname = NULL;
-GdkScreen **screen_list;
-GdkDisplay *display;
-
-gtk_init (&amp;argc, &amp;argv);
-
-display = gdk_display_get_default ();
-num_screen = gdk_display_get_n_screens (display);
-displayname = gdk_display_get_name (display);
-if (num_screen &lt;= 1)
-  {
-    printf ("This Xserver (%s) manages only one screen. exiting...\n",
-            displayname);
-    exit (1);
-  }
-else
-  {
-    printf ("This Xserver (%s) manages %d screens.\n", displayname,
-            num_screen);
-  }<!--
-
--->     </programlisting>
-      </example>
-      <example>
-	<title>Opening a second display</title>
-	<programlisting><!--
--->gchar *second_screen_name;
-GdkDisplay *second_display;
-GdkScreen *second_screen;
-GtkWidget *window;
-
-gtk_init (&amp;argc, &amp;argv);
-
-/* screen2_name needs to be initialized before calling 
-/* gdk_display_new() */
-second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
-if (second_display)
-    second_screen = gdk_display_get_default_screen (second_display);
-else 
-  {
-	g_print ("Can't open display :\n\t%s\n\n",
-		  second_screen_name);
-    exit (1);	
-  }
-/* now GdkScreen can be assigned to GtkWindows */
-
-window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-gtk_window_set_screen (window, second_screen);<!--
-     --></programlisting>
-      </example>
-    </refsect1>
-    <refsect1>
-      <title>See Also</title>
-      <para>
-	<variablelist>
-	  <varlistentry>
-	    <term><link linkend="GdkDisplay">GdkDisplay</link></term>
-	    <listitem><para>the GDK Object used to represent and manipulate display
-		related data</para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><link linkend="GdkScreen">GdkScreen</link></term>
-	    <listitem><para>the GDK Object used to represent and query screen related
-		data</para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </refsect1>
-  </refentry>
-  
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
-End:
--->

docs/reference/gtk/Makefile.am

@@ -106,7 +106,7 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gtk/libgtk-3.0.la				\
+	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
 
@@ -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			\
@@ -178,7 +180,7 @@ HTML_IMAGES = \
 	$(top_srcdir)/gtk/stock-icons/32/gtk-dnd-multiple.png		\
 	$(top_srcdir)/gtk/stock-icons/24/gtk-edit.png			\
 	$(top_srcdir)/gtk/stock-icons/24/system-run.png			\
-	$(top_srcdir)/gtk/stock-icons/24/document-x-generic.png		\
+	$(top_srcdir)/gtk/stock-icons/24/text-x-generic.png		\
 	$(top_srcdir)/gtk/stock-icons/24/edit-find.png			\
 	$(top_srcdir)/gtk/stock-icons/24/edit-find-replace.png		\
 	$(top_srcdir)/gtk/stock-icons/24/go-bottom.png			\
@@ -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,10 @@ 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				\
 	$(srcdir)/images/menubar.png					\
 	$(srcdir)/images/messagedialog.png				\
 	$(srcdir)/images/multiline-text.png				\
@@ -326,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				\
@@ -401,7 +410,7 @@ MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
 
 EXTRA_DIST += $(man_MANS)
 
-dist-hook-local: dist-local-check-mans-enabled gtk-docs-clean all-local
+dist-hook-local: dist-local-check-mans-enabled all-local
 
 gtk-docs-clean: clean
 	cd $(srcdir) && rm -rf xml html

docs/reference/gtk/building.sgml

@@ -172,7 +172,7 @@ How to compile GTK+ itself
           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>
+          FTP site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -180,7 +180,7 @@ How to compile GTK+ itself
           <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>.
+          site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -189,7 +189,7 @@ How to compile GTK+ itself
           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>
+          url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site</ulink>.
         </para>
       </listitem>
       <listitem>
@@ -309,49 +309,60 @@ How to compile GTK+ itself
 
         <cmdsynopsis>
           <command>configure</command>
-
+          <sbr/>
           <group>
             <arg>--disable-modules</arg>
             <arg>--enable-modules</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-debug=[no/minimum/yes]</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-Bsymbolic</arg>
             <arg>--enable-Bsymbolic</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-xkb</arg>
             <arg>--enable-xkb</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-xinerama</arg>
             <arg>--enable-xinerama</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-gtk-doc</arg>
             <arg>--enable-gtk-doc</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-cups</arg>
             <arg>--enable-cups</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--disable-papi</arg>
             <arg>--enable-papi</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-xinput</arg>
             <arg>--disable-xinput</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-packagekit</arg>
             <arg>--disable-packagekit</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-x11-backend</arg>
             <arg>--disable-x11-backend</arg>
@@ -360,9 +371,11 @@ How to compile GTK+ itself
             <arg>--enable-quartz-backend</arg>
             <arg>--disable-quartz-backend</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-introspection=[no/auto/yes]</arg>
           </group>
+          <sbr/>
           <group>
             <arg>--enable-gtk2-dependency</arg>
             <arg>--disable-gtk2-dependency</arg>

docs/reference/gtk/compiling.sgml

@@ -32,7 +32,7 @@ your system may be different):
 $ pkg-config --cflags gtk+-3.0
  -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
 $ pkg-config --libs gtk+-3.0
- -pthread -lgtk-3.0 -lgdk-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
+ -pthread -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
 <para>
@@ -69,5 +69,34 @@ define the preprocessor symbol GDK_MULTIDEVICE_SAFE by using the command
 line option <literal>-DGTK_MULTIDEVICE_SAFE=1</literal>.
 </para>
 
+  <refsect2>
+    <title>Useful autotools macros</title>
+
+    <para>
+      GTK+ provides various macros for easily checking version and backends
+      supported. The macros are
+      <variablelist>
+        <varlistentry>
+          <term>AM_PATH_GTK_3_0([minimum-version], [if-found], [if-not-found], [modules])</term>
+          <listitem>This macro should be used to check that GTK+ is installed
+          and available for compilation. The four arguments are optional, and
+          they are: <emphasis>minimum-version</emphasis>, the minimum version
+          of GTK+ required for compilation; <emphasis>if-found</emphasis>, the
+          action to perform if a valid version of GTK+ has been found;
+          <emphasis>if-not-found</emphasis>, the action to perform if a valid
+          version of GTK+ has not been found; <emphasis>modules</emphasis>, a
+          list of modules to be checked along with GTK+.</listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>GTK_CHECK_BACKEND([backend-name], [minimum-version], [if-found], [if-not-found])</term>
+          <listitem>This macro should be used to check if a specific backend
+          is supported by GTK+. The <emphasis>minimum-version</emphasis>,
+          <emphasis>if-found</emphasis> and <emphasis>if-not-found</emphasis>
+          arguments are optional.</listitem>
+        </varlistentry>
+      </variablelist>
+    </para>
+  </refsect2>
+
 </refsect1>
 </refentry>

docs/reference/gtk/drawing-model.xml

@@ -78,42 +78,72 @@
       of the resources they use from the windowing system.
     </para>
 
+    <para>
+      A <link linkend="GdkWindow"><classname>GdkWindow</classname></link>
+      represents a window from the underlying windowing system on which GTK+
+      is running.  For example, on X11 it corresponds to a
+      <type>Window</type>; on Win32, it corresponds to a <type>HANDLE</type>.
+      The windowing system generates events for these windows.  The GDK
+      interface to the windowing system translates such native events into
+      <link linkend="GdkEvent"><structname>GdkEvent</structname></link>
+      structures and sends them on to the GTK layer.  In turn, the GTK layer
+      finds the widget that corresponds to a particular
+      <classname>GdkWindow</classname> and emits the corresponding event
+      signals on that widget.
+    </para>
+
+    <refsect2 id="emission of the draw event">
+      <title>Emission of the draw event</title>
+
+      <para>
+        When the program needs to redraw a region of a
+        <classname>GdkWindow</classname>, generates an event of
+        type <link
+        linkend="GDK_EVENT_EXPOSE"><constant>GDK_EVENT_EXPOSE</constant></link>
+        for that window, specifying the region to redraw in the process.
+      </para>
+
+      <para>
+        When generating the event, GDK also sets up double buffering to
+        avoid the flickering that would result from each widget drawing
+        itself in turn.  <xref linkend="double-buffering"/> describes
+        the double buffering mechanism in detail.
+      </para>
+        
+      <para>
+        When the GTK+ widget layer receives the event, it finds the widget that
+        corresponds to the window, and causes it to render itself using the
+        widget's #GtkWidget::draw signal. For this purpose it creates a
+        <link linkend="#cairo_t">cairo context</link>. It then clips the context
+        to the area that needs to be drawn. This makes sure that the minimal
+        amount of work is done if only a small part of the widget needs to be
+        repainted. After translating the context so that its (0, 0) coordinate
+        corresponds to the top left corner of the widget, it effectively calls
+        the widget's <function>gtk_widget_draw</function> function.
+      </para>
+
+      <para>
+        <function>gtk_widget_draw</function> takes care of drawing the widget
+        to the cairo context. It first checks that the widget actually needs to
+        be drawn. Widgets might for example be empty or outside of the cairo
+        context's clipped area, which would make drawing them not do anything.
+        Usually they will need to be drawn. In this case, the context will be
+        clipped to the widget's allocated size and the
+        <link linkend="GtkWidget::draw">draw signal</link> will be emitted on 
+        the widget which will finally draw the widget.
+      </para>
+    </refsect2>
+
     <refsect2 id="window-no-window-widgets">
       <title>Window and no-window widgets</title>
 
-      <para>
-	A <link linkend="GdkWindow"><classname>GdkWindow</classname></link>
-	represents a window from the underlying windowing system on which GTK+
-	is running.  For example, on X11 it corresponds to a
-	<type>Window</type>; on Win32, it corresponds to a <type>HANDLE</type>.
-	The windowing system generates events for these windows.  The GDK
-	interface to the windowing system translates such native events into
-	<link linkend="GdkEvent"><structname>GdkEvent</structname></link>
-	structures and sends them on to the GTK layer.  In turn, the GTK layer
-	finds the widget that corresponds to a particular
-	<classname>GdkWindow</classname> and emits the corresponding event
-	signals on that widget.
-      </para>
-
-      <para>
-	When the program needs to redraw a region of a
-	<classname>GdkWindow</classname>, GDK generates an event of
-	type <link
-	linkend="GDK_EVENT_EXPOSE"><constant>GDK_EVENT_EXPOSE</constant></link>
-	for that window.  The GTK+ widget layer in turn finds the
-	widget that corresponds to that window, and emits the <link
-	linkend="GtkWidget-expose-event">expose-event signal</link>
-	for that widget.
-      </para>
-
       <para>
 	In principle, each widget could have a
 	<classname>GdkWindow</classname> of its own.  With such a
 	scheme, the drawing cycle would be trivial:  when GDK notifies
 	the GTK layer about an exposure event for a
 	<classname>GdkWindow</classname>, the GTK layer would simply
-	emit the <link linkend="GtkWidget-expose-event">expose-event
-	signal</link> for that widget.  The widget's expose event
+	emit the #GtkWidget::draw signal for that widget.  The signal
 	handler would subsequently repaint the widget.  No further
 	work would be necessary; the windowing system would generate
 	exposure events for each window that needs it, and then each
@@ -293,56 +323,8 @@
 
 	<graphic fileref="figure-hierarchical-drawing.png" format="png"/>
       </figure>
-
-      <para>
-	To avoid the flickering that would result from each widget drawing
-	itself in turn, GTK+ uses a double-buffering mechanism.  The following
-	sections describe this mechanism in detail.
-      </para>
     </refsect2>
 
-    <refsect2 id="notes-on-drawing-no-window-widgets">
-      <title>Notes on drawing no-window widgets</title>
-
-      <para>
-	Remember that the coordinates in a <link
-	linkend="GdkEventExpose">GdkEventExpose</link> are relative to
-	the <classname>GdkWindow</classname> that received the event,
-	<emphasis>not</emphasis> to the widget whose expose-event
-	handler is being called.  If your widget owns the window, then
-	these coordinates are probably what you expect.  However, if
-	you have a <constant>GTK_NO_WINDOW</constant> widget that
-	shares its parent's window, then the event's coordinates will
-	be offset by your widget's allocation:  remember that the
-	allocation is always relative to the parent
-	<emphasis>window</emphasis> of the widget, not to the parent
-	<emphasis>widget</emphasis> itself.
-      </para>
-
-      <para>
-	For example, if you have a no-window widget whose allocation
-	is {&nbsp;x=5,&nbsp;y=6,
-	<replaceable>width</replaceable>,&nbsp;<replaceable>height</replaceable>&nbsp;},
-	then your drawing origin should be at (5,&nbsp;6), not at
-	(0,&nbsp;0).
-      </para>
-    </refsect2>
-
-    <refsect2 id="include-inferiors">
-      <title>Drawing over child windows</title>
-
-      <para>
-	When you draw on a <classname>GdkWindow</classname>, your
-	drawing gets clipped by any child windows that it may
-	intersect.  Sometimes you need to draw over your child windows
-	as well; for example, when drawing a drag-handle to resize
-	something.  In this case, turn on the <link
-	linkend="GDK-INCLUDE-INFERIORS:CAPS">GDK_INCLUDE_INFERIORS</link>
-	subwindow mode for the <link
-	linkend="gdk-Graphics-Contexts">GdkGC</link> which you use for
-	drawing.
-      </para>
-    </refsect2>
   </refsect1>
 
   <refsect1 id="double-buffering">
@@ -351,8 +333,8 @@
     <para>
       When the GTK layer receives an exposure event from GDK, it first finds
       the <literal>!<constant>GTK_NO_WINDOW</constant></literal> widget that
-      corresponds to the event's window.  Then, it emits the <link
-	linkend="GtkWidget-expose-event">expose-event signal</link> for that
+      corresponds to the event's window.  Then, it emits the
+      #GtkWidget::draw signal for that
       widget.  As described above, that widget will first draw its background,
       and then ask each of its <constant>GTK_NO_WINDOW</constant> children to
       draw themselves.
@@ -360,7 +342,7 @@
 
     <para>
       If each of the drawing calls made by each subwidget's
-      <literal>expose-event</literal> handler were sent directly to the
+      <literal>draw</literal> handler were sent directly to the
       windowing system, flicker could result.  This is because areas may get
       redrawn repeatedly:  the background, then decorative frames, then text
       labels, etc.  To avoid flicker, GTK+ employs a <firstterm>double
@@ -410,7 +392,7 @@
 	It would be inconvenient for all widgets to call
 	<function>gdk_window_begin_paint_region()</function> and
 	<function>gdk_window_end_paint()</function> at the beginning
-	and end of their expose-event handlers.
+	and end of their draw handlers.
       </para>
 
       <para>
@@ -419,7 +401,7 @@
 	linkend="GtkWidgetFlags">widget flag</link> turned on by
 	default.  When GTK+ encounters such a widget, it automatically
 	calls <function>gdk_window_begin_paint_region()</function>
-	before emitting the expose-event signal for the widget, and
+	before emitting the #GtkWidget::draw signal for the widget, and
 	then it calls <function>gdk_window_end_paint()</function>
 	after the signal has been emitted.  This is convenient for
 	most widgets, as they do not need to worry about creating
@@ -430,8 +412,9 @@
       <para>
 	However, some widgets may prefer to disable this kind of
 	automatic double buffering and do things on their own.  To do
-	this, turn off the <constant>GTK_DOUBLE_BUFFERED</constant>
-	flag in your widget's constructor.
+        this, call the
+        <function>gtk_widget_set_double_buffered()</function> function
+	in your widget's constructor.
       </para>
 
       <example id="disabling-double-buffering">
@@ -463,8 +446,7 @@ my_widget_init (MyWidget *widget)
       </para>
 
       <para>
-	Even if you turn off the
-	<constant>GTK_DOUBLE_BUFFERED</constant> flag on a widget, you
+	Even if you turn off double buffering on a widget, you
 	can still call
 	<function>gdk_window_begin_paint_region()</function> and
 	<function>gdk_window_end_paint()</function> by hand to use
@@ -489,69 +471,42 @@ my_widget_init (MyWidget *widget)
 
     <para>
       <classname>GtkWindow</classname> and
-      <classname>GtkEventBox</classname> are the only two widgets
-      which will draw their default contents unless you turn on the
-      <constant>GTK_APP_PAINTABLE</constant> <link
-      linkend="GtkWidgetFlags">widget flag</link>.  If you turn on
-      this flag, then they will not draw their contents and let you do
+      <classname>GtkEventBox</classname> are the two widgets that allow
+      turning off drawing of default contents by calling
+      <function>gtk_widget_set_app_paintable()</function>. If you call
+      this function, they will not draw their contents and let you do
       it instead.
     </para>
 
     <para>
-      The expose-event handler for <classname>GtkWindow</classname> is
-      implemented effectively like this:
-    </para>
-
-    <programlisting>
-static gint
-gtk_window_expose (GtkWidget      *widget,
-		   GdkEventExpose *event)
-{
-  if (!gtk_widget_get_app_paintable (widget))
-    gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, 
-                        GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1);
-
-  if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event)
-    return GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event (widget, event);
-
-  return FALSE;
-}
-    </programlisting>
-
-    <para>
-      The expose-event handler for <classname>GtkEventBox</classname>
-      is implemented in a similar fashion.
-    </para>
-
-    <para>
-      Since the <link linkend="GtkWidget-expose-event">expose-event
-	signal</link> runs user-connected handlers
+      Since the #GtkWidget::draw signal runs user-connected handlers
       <emphasis>before</emphasis> the widget's default handler, what
-      happens is this:
+      usually happens is this:
     </para>
 
     <orderedlist>
       <listitem>
 	<para>
-	  Your own expose-event handler gets run.  It paints something
+	  Your own draw handler gets run.  It paints something
 	  on the window or the event box.
 	</para>
       </listitem>
 
       <listitem>
 	<para>
-	  The widget's default expose-event handler gets run.  If
-	  <constant>GTK_APP_PAINTABLE</constant> is turned off (this
+	  The widget's default draw handler gets run.  If
+          <function>gtk_widget_set_app_paintable()</function> has not
+          been called to turn off widget drawing (this
 	  is the default), <emphasis>your drawing will be
-	  overwritten</emphasis>.  If that flag is turned on, the
-	  widget will not draw its default contents and preserve your
-	  drawing instead.
+            overwritten</emphasis>.  An app paintable widget will not
+          draw its default contents however and preserve your drawing
+          instead.
 	</para>
       </listitem>
 
       <listitem>
 	<para>
-	  The expose-event handler for the parent class gets run.
+	  The draw handler for the parent class gets run.
 	  Since both <classname>GtkWindow</classname> and
 	  <classname>GtkEventBox</classname> are descendants of
 	  <classname>GtkContainer</classname>, their no-window
@@ -565,7 +520,7 @@ gtk_window_expose (GtkWidget      *widget,
       <title>Summary of app-paintable widgets</title>
 
       <para>
-	Turn on the <constant>GTK_APP_PAINTABLE</constant> flag if you
+        Call <function>gtk_widget_set_app_paintable()</function> if you
 	intend to draw your own content directly on a
 	<classname>GtkWindow</classname> and
 	<classname>GtkEventBox</classname>.  You seldom need to draw

docs/reference/gtk/gtk-docs.sgml

@@ -10,9 +10,11 @@
   <bookinfo>
     <title>GTK+ 3 Reference Manual</title>
     <releaseinfo>
-      This document is for GTK+ 3 library; the latest version can be found online at
-      <ulink role="online-location" url="http://library.gnome.org/devel/gtk/unstable/">http://library.gnome.org/devel/gtk/unstable/</ulink>.  
-      If you're looking for the older GTK+ 2 series of libraries, they can be found under their version numbers; for example, 2.22 is available at <ulink role="online-location" url="http://library.gnome.org/devel/gtk/2.22/">http://library.gnome.org/devel/gtk/2.22/</ulink>.
+      This document is for the GTK+ 3 library, version &version;.
+      The latest versions can be found online at
+      <ulink role="online-location" url="http://library.gnome.org/devel/gtk3/">http://library.gnome.org/devel/gtk3/</ulink>.
+      If you are looking for the older GTK+ 2 series of libraries,
+      see <ulink role="online-location" url="http://library.gnome.org/devel/gtk/">http://library.gnome.org/devel/gtk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -113,6 +115,7 @@
       <xi:include href="xml/gtkscalebutton.xml" />
       <xi:include href="xml/gtkvolumebutton.xml" />
       <xi:include href="xml/gtkswitch.xml" />
+      <xi:include href="xml/gtklockbutton.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -352,6 +355,7 @@
     <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-GtkGrid.xml" />
   </part>
 
   <part>
@@ -374,6 +378,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/gtk/gtk-query-immodules-3.0.xml

@@ -5,13 +5,14 @@
 <refentry id="gtk-query-immodules-3.0">
 
 <refmeta>
-<refentrytitle>gtk-query-immodules-3.0</refentrytitle>
-<manvolnum>1</manvolnum>
+  <refentrytitle>gtk-query-immodules-3.0</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-query-immodules-3.0</refname>
-<refpurpose>Input method module registration utility</refpurpose>
+  <refname>gtk-query-immodules-3.0</refname>
+  <refpurpose>Input method module registration utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -38,8 +39,8 @@ may be absolute or relative paths.
 </para>
 <para>
 Normally, the output of <command>gtk-query-immodules-3.0</command> is written
-to <filename><replaceable>libdir</replaceable>gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
-location, the environment variable <link linkend="GTK_IM_MODULE_FILE"><envar>GTK_IM_MODULE_FILE</envar></link>
+to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
+location, the environment variable <link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link>
 can be set to point GTK+ at the file.
 </para>
 </refsect1>
@@ -56,7 +57,7 @@ can be set to point GTK+ at the file.
 
 <refsect1><title>Environment</title>
 <para>
-The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link>
+The environment variable <link linkend="gtk-path"><envar>GTK_PATH</envar></link>
 can be used to prepend directories to the input method module path.
 </para>
 </refsect1>

docs/reference/gtk/gtk-update-icon-cache.xml

@@ -5,13 +5,14 @@
 <refentry id="gtk-update-icon-cache">
 
 <refmeta>
-<refentrytitle>gtk-update-icon-cache</refentrytitle>
-<manvolnum>1</manvolnum>
+  <refentrytitle>gtk-update-icon-cache</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>gtk-update-icon-cache</refname>
-<refpurpose>Icon theme caching utility</refpurpose>
+  <refname>gtk-update-icon-cache</refname>
+  <refpurpose>Icon theme caching utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
@@ -20,28 +21,29 @@
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
 <arg choice="opt">--index-only</arg>
-<arg choice="opt">--source<arg>name</arg></arg>
+<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="opt">--validate</arg>
-<arg choice="req">iconpath</arg>
+<arg choice="plain"><replaceable>PATH</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 <para>
-  <command>gtk-update-icon-cache</command> creates mmap()able cache
+  <command>gtk-update-icon-cache</command> creates mmapable cache
   files for icon themes.
 </para>
 <para>
-  It expects to be given the path to a icon theme directory containing an
-  <filename>index.theme</filename>, e.g. <filename>/usr/share/icons/hicolor</filename>,
-  and writes a <filename>icon-theme.cache</filename> containing cached
-  information about the icons in the directory tree below the given directory.
+  It expects to be given the <replaceable>PATH</replaceable> to a icon theme
+  directory containing an <filename>index.theme</filename>, e.g.
+  <filename>/usr/share/icons/hicolor</filename>, and writes a
+  <filename>icon-theme.cache</filename> containing cached information about
+  the icons in the directory tree below the given directory.
 </para>
 <para>
   GTK+ can use the cache files created by <command>gtk-update-icon-cache</command>
   to avoid a lot of system call and disk seek overhead when the application
-  starts. Since the format of the cache files allows them to be mmap()ed
+  starts. Since the format of the cache files allows them to be mmaped
   shared between multiple applications, the overall memory consumption is
   reduced as well.
 </para>
@@ -59,8 +61,8 @@
   <varlistentry>
     <term>--ignore-theme-index</term>
     <term>-t</term>
-    <listitem><para>Don't check for the existence of 'index.theme' in the icon
-     theme directory. Without this option, <command>gtk-update-icon-cache</command>
+    <listitem><para>Don't check for the existence of <filename>index.theme</filename>
+     in the icon theme directory. Without this option, <command>gtk-update-icon-cache</command>
      refuses to create an icon cache in a directory which does not appear to
      be the toplevel directory of an icon theme.
     </para></listitem>
@@ -77,7 +79,7 @@
     <term>--source</term>
     <term>-c</term>
     <listitem><para>Output a C header file declaring a constant
-     <replaceable>name</replaceable> with the contents of the icon
+     <replaceable>NAME</replaceable> with the contents of the icon
      cache.</para></listitem>
   </varlistentry>
 

docs/reference/gtk/gtk3-sections.txt

@@ -430,8 +430,10 @@ GtkButtonBox
 gtk_button_box_new
 gtk_button_box_get_layout
 gtk_button_box_get_child_secondary
+gtk_button_box_get_child_non_homogeneous
 gtk_button_box_set_layout
 gtk_button_box_set_child_secondary
+gtk_button_box_set_child_non_homogeneous
 <SUBSECTION Standard>
 GTK_BUTTON_BOX
 GTK_IS_BUTTON_BOX
@@ -1028,6 +1030,8 @@ gtk_entry_set_width_chars
 gtk_entry_get_invisible_char
 gtk_entry_set_alignment
 gtk_entry_get_alignment
+gtk_entry_set_placeholder_text
+gtk_entry_get_placeholder_text
 gtk_entry_set_overwrite_mode
 gtk_entry_get_overwrite_mode
 gtk_entry_get_layout
@@ -1195,6 +1199,8 @@ gtk_expander_set_label_widget
 gtk_expander_get_label_widget
 gtk_expander_set_label_fill
 gtk_expander_get_label_fill
+gtk_expander_set_resize_toplevel
+gtk_expander_get_resize_toplevel
 <SUBSECTION Standard>
 GTK_TYPE_EXPANDER
 GTK_EXPANDER_CLASS
@@ -2058,6 +2064,8 @@ gtk_menu_item_deselect
 gtk_menu_item_activate
 gtk_menu_item_toggle_size_request
 gtk_menu_item_toggle_size_allocate
+gtk_menu_item_get_reserve_indicator
+gtk_menu_item_set_reserve_indicator
 <SUBSECTION Standard>
 GTK_MENU_ITEM
 GTK_IS_MENU_ITEM
@@ -4202,6 +4210,7 @@ gtk_tree_view_column_set_clickable
 gtk_tree_view_column_get_clickable
 gtk_tree_view_column_set_widget
 gtk_tree_view_column_get_widget
+gtk_tree_view_column_get_button
 gtk_tree_view_column_set_alignment
 gtk_tree_view_column_get_alignment
 gtk_tree_view_column_set_reorderable
@@ -4286,6 +4295,7 @@ gtk_tree_view_row_expanded
 gtk_tree_view_set_reorderable
 gtk_tree_view_get_reorderable
 gtk_tree_view_get_path_at_pos
+gtk_tree_view_is_blank_at_pos
 gtk_tree_view_get_cell_area
 gtk_tree_view_get_background_area
 gtk_tree_view_get_visible_rect
@@ -4465,6 +4475,8 @@ gtk_cell_area_activate_cell
 gtk_cell_area_stop_editing
 gtk_cell_area_inner_cell_area
 gtk_cell_area_request_renderer
+gtk_cell_area_set_animation_id
+gtk_cell_area_forget_animation_id
 <SUBSECTION Standard>
 GTK_CELL_AREA
 GTK_IS_CELL_AREA
@@ -4556,6 +4568,7 @@ gtk_cell_renderer_set_alignment
 gtk_cell_renderer_get_padding
 gtk_cell_renderer_set_padding
 gtk_cell_renderer_get_state
+gtk_cell_renderer_apply_style
 gtk_cell_renderer_is_activatable
 
 <SUBSECTION Width-for-height>
@@ -5432,6 +5445,7 @@ gtk_widget_path_iter_set_object_type
 gtk_widget_path_length
 gtk_widget_path_new
 gtk_widget_path_prepend_type
+gtk_widget_path_to_string
 
 <SUBSECTION Standard>
 GTK_TYPE_WIDGET_PATH
@@ -5476,6 +5490,8 @@ gtk_style_properties_map_color
 gtk_style_properties_merge
 gtk_style_properties_new
 GtkStylePropertyParser
+gtk_style_param_set_inherit
+gtk_style_param_get_inherit
 gtk_style_properties_register_property
 gtk_style_properties_set
 gtk_style_properties_set_property
@@ -5530,7 +5546,9 @@ GTK_STYLE_CLASS_MENUITEM
 GTK_STYLE_CLASS_PROGRESSBAR
 GTK_STYLE_CLASS_SPINNER
 GTK_STYLE_CLASS_TOOLBAR
+GTK_STYLE_CLASS_PRIMARY_TOOLBAR
 GTK_STYLE_CLASS_PANE_SEPARATOR
+GTK_STYLE_CLASS_SEPARATOR
 GTK_STYLE_CLASS_DND
 GTK_STYLE_CLASS_ERROR
 GTK_STYLE_CLASS_EXPANDER
@@ -5649,6 +5667,7 @@ 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 Standard>
@@ -5715,6 +5734,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
@@ -5733,6 +5753,7 @@ gtk_gradient_add_color_stop
 gtk_gradient_ref
 gtk_gradient_unref
 gtk_gradient_resolve
+gtk_gradient_to_string
 
 <SUBSECTION Standard>
 GTK_TYPE_GRADIENT
@@ -5749,6 +5770,7 @@ gtk_style_new
 gtk_style_copy
 gtk_style_attach
 gtk_style_detach
+gtk_style_has_context
 gtk_style_set_background
 gtk_style_apply_default_background
 gtk_style_lookup_color
@@ -5980,12 +6002,14 @@ gtk_drag_set_icon_pixbuf
 gtk_drag_set_icon_stock
 gtk_drag_set_icon_surface
 gtk_drag_set_icon_name
+gtk_drag_set_icon_gicon
 gtk_drag_set_icon_default
 gtk_drag_check_threshold
 gtk_drag_source_set
 gtk_drag_source_set_icon_pixbuf
 gtk_drag_source_set_icon_stock
 gtk_drag_source_set_icon_name
+gtk_drag_source_set_icon_gicon
 gtk_drag_source_unset
 gtk_drag_source_set_target_list
 gtk_drag_source_get_target_list
@@ -7032,3 +7056,25 @@ GTK_APP_CHOOSER_WIDGET_GET_CLASS
 GtkAppChooserWidgetPrivate
 gtk_app_chooser_widget_get_type
 </SECTION>
+
+<SECTION>
+<FILE>gtklockbutton</FILE>
+<TITLE>GtkLockButton</TITLE>
+GtkLockButton
+
+gtk_lock_button_new
+gtk_lock_button_get_permission
+gtk_lock_button_set_permission
+
+<SUBSECTION Standard>
+GtkLockButtonClass
+GTK_TYPE_LOCK_BUTTON
+GTK_LOCK_BUTTON
+GTK_IS_LOCK_BUTTON
+GTK_LOCK_BUTTON_CLASS
+GTK_IS_LOCK_BUTTON_CLASS
+GTK_LOCK_BUTTON_GET_CLASS
+<SUBSECTION Private>
+gtk_lock_button_get_type
+GtkLockButtonPrivate
+</SECTION>

docs/reference/gtk/gtk3.types

@@ -92,6 +92,7 @@ gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type
 gtk_list_store_get_type
+gtk_lock_button_get_type
 gtk_menu_bar_get_type
 gtk_menu_get_type
 gtk_menu_item_get_type

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

@@ -144,8 +144,8 @@
         GAppLaunchContext *context;
         GError *error = NULL;
 
-        info = g_desktop_app_info_new ("epiphany.desktop");
-        context = gdk_display_get_app_launch_context (display);
+        info = (GAppInfo*) g_desktop_app_info_new ("epiphany.desktop");
+        context = (GAppLaunchContext*) gdk_display_get_app_launch_context (display);
         g_app_info_launch (info, NULL, context, &error);
 
         if (error)
@@ -157,6 +157,10 @@
         g_object_unref (info);
         g_object_unref (context);
         </programlisting></informalexample>
+        Remember that you have to include
+        <filename>gio/gdesktopappinfo.h</filename>
+        and use the <filename>gio-unix-2.0</filename> pkg-config file
+        when using g_desktop_app_info_new().
         </listitem>
         <listitem>If you are launching a custom commandline, you can
         still use g_app_info_launch() with a GAppInfo that is constructed
@@ -195,7 +199,7 @@
        <title>Drawing a GdkPixbuf onto a GdkWindow</title>
          <para>
            Drawing a pixbuf onto a drawable used to be done like this:
-<programlisting><![CDATA[
+           <informalexample><programlisting>
 gdk_draw_pixbuf (window,
                  gtk_widget_get_style (widget)->black_gc,
                  pixbuf,
@@ -205,16 +209,17 @@ gdk_draw_pixbuf (window,
                  gdk_pixbuf_get_height (pixbuf),
                  GDK_RGB_DITHER_NORMAL,
                  0, 0);
-]]></programlisting>
+           </programlisting></informalexample>
            Doing the same thing with cairo:
-<programlisting><![CDATA[
+           <informalexample><programlisting>
 cairo_t *cr = gdk_cairo_create (window);
 gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
 cairo_paint (cr);
 cairo_destroy (cr);
-]]></programlisting>
-           Note that very similar code can be used for drawing pixmaps
-           by using gdk_cairo_set_source_pixmap() instead of
+           </programlisting></informalexample>
+           Note that very similar code can be used when porting code
+           using GdkPixmap to #cairo_surface_t by calling
+           cairo_set_source_surface() instead of
            gdk_cairo_set_source_pixbuf().
          </para>
       </example>
@@ -223,7 +228,7 @@ cairo_destroy (cr);
         <para>
           Tiled pixmaps are often used for drawing backgrounds.
           Old code looked something like this:
-          <programlisting><![CDATA[
+          <informalexample><programlisting>
 GdkGCValues gc_values;
 GdkGC *gc;
 
@@ -233,26 +238,30 @@ gdk_gc_set_tile (gc, pixmap);
 gdk_gc_set_fill (gc, GDK_TILED);
 gdk_gc_set_ts_origin (gc, x_origin, y_origin);
 /* use */
-gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);
+gdk_draw_rectangle (window, gc, TRUE, 0, 0, width, height);
 /* restore */
 gdk_gc_set_tile (gc, NULL);
 gdk_gc_set_fill (gc, GDK_SOLID);
 gdk_gc_set_ts_origin (gc, 0, 0);
-]]></programlisting>
-          The equivalent cairo code looks like this:
-<programlisting><![CDATA[
+          </programlisting></informalexample>
+          The equivalent cairo code to draw a tiled surface looks
+          like this:
+          <informalexample><programlisting>
 cairo_t *cr;
+cairo_surface_t *surface;
 
-cr = gdk_cairo_create (drawable);
-gdk_cairo_set_source_pixmap (cr, pixmap, x_origin, y_origin);
+surface = ...
+cr = gdk_cairo_create (window);
+cairo_set_source_surface (cr, surface, x_origin, y_origin);
 cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
 cairo_rectangle (cr, 0, 0, width, height);
 cairo_fill (cr);
 cairo_destroy (cr);
-]]></programlisting>
-          Again, you can exchange pixbufs and pixmaps by using
-          gdk_cairo_set_source_pixbuf() instead of
-          gdk_cairo_set_source_pixmap().
+          </programlisting></informalexample>
+The surface here can be either an image surface or a X surface,
+and can either be created on the spot or kept around for caching purposes.
+Another alternative is to use pixbufs instead of surfaces with
+gdk_cairo_set_source_pixbuf() instead of cairo_set_source_surface().
         </para>
       </example>
       <example>
@@ -260,32 +269,38 @@ cairo_destroy (cr);
         <para>
           Drawing layouts clipped is often used to avoid overdraw or to
           allow drawing selections. Code would have looked like this:
-<programlisting><![CDATA[
+	  <informalexample><programlisting>
 GdkGC *gc;
 
 /* setup */
 gc = gtk_widget_get_style (widget)->text_gc[state];
-gdk_gc_set_clip_rectangle (gc, &area);
+gdk_gc_set_clip_rectangle (gc, &amp;area);
 /* use */
 gdk_draw_layout (drawable, gc, x, y, layout);
 /* restore */
 gdk_gc_set_clip_rectangle (gc, NULL);
-]]></programlisting>
+          </programlisting></informalexample>
           With cairo, the same effect can be achieved using:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
+GtkStyleContext *context;
+GtkStateFlags flags;
+GdkRGBA rgba;
 cairo_t *cr;
 
 cr = gdk_cairo_create (drawable);
 /* clip */
-gdk_cairo_rectangle (cr, &area);
+gdk_cairo_rectangle (cr, &amp;area);
 cairo_clip (cr);
 /* set the correct source color */
-gdk_cairo_set_source_color (cr, &gtk_widget_get_style (widget)->text[state]);
+context = gtk_widget_get_style_context (widget));
+state = gtk_widget_get_state_flags (widget);
+gtk_style_context_get_color (context, state, &amp;rgba);
+gdk_cairo_set_source_rgba (cr, &amp;rgba);
 /* draw the text */
 cairo_move_to (cr, x, y);
 pango_cairo_show_layout (cr, layout);
 cairo_destroy (cr);
-]]></programlisting>
+          </programlisting></informalexample>
           Clipping using cairo_clip() is of course not restricted to text
           rendering and can be used everywhere where GC clips were used.
           And using gdk_cairo_set_source_color() with style colors should
@@ -301,7 +316,7 @@ cairo_destroy (cr);
           It was often used to achieve a checkerboard effect. You can use
           cairo_mask() to achieve this effect. To get a checkerbox mask,
           you can use code like this:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
 static cairo_pattern_t *
 gtk_color_button_get_checkered (void)
 {
@@ -322,44 +337,50 @@ gtk_color_button_get_checkered (void)
 
     return pattern;
 }
-]]></programlisting>
+          </programlisting></informalexample>
           Note that stippling looks very outdated in UIs, and is rarely
           used in modern applications. All properties that made use of
           stippling have been removed from GTK+ 3. Most prominently,
           stippling is absent from text rendering, in particular #GtkTextTag.
         </para>
       </formalpara>
-      <formalpara><title>Using the the target drawable also as source or mask</title>
+      <formalpara><title>Using the target also as source or mask</title>
         <para>
           The gdk_draw_drawable() function allowed using the same drawable
           as source and target. This was often used to achieve a scrolling
           effect. Cairo does not allow this yet. You can however use
           cairo_push_group() to get a different intermediate target that
           you can copy to. So you can replace this code:
-<programlisting><![CDATA[
+          <informalexample><programlisting>
 gdk_draw_drawable (pixmap,
                    gc,
                    pixmap,
                    area.x + dx, area.y + dy,
                    area.x, area.y,
                    area.width, area.height);
-]]></programlisting>
+          </programlisting></informalexample>
           By using this code:
-<programlisting><![CDATA[
-cairo_t *cr = gdk_cairo_create (pixmap);
+          <informalexample><programlisting>
+cairo_t *cr = cairo_create (surface);
 /* clipping restricts the intermediate surface's size, so it's a good idea
  * to use it. */
-gdk_cairo_rectangle (cr, &area);
+gdk_cairo_rectangle (cr, &amp;area);
 cairo_clip (cr);
 /* Now push a group to change the target */
 cairo_push_group (cr);
-gdk_cairo_set_source_pixmap (cr, pixmap, dx, dy);
+cairo_set_source_surface (cr, surface, dx, dy);
 cairo_paint (cr);
 /* Now copy the intermediate target back */
 cairo_pop_group_to_source (cr);
 cairo_paint (cr);
 cairo_destroy (cr);
-]]></programlisting>
+          </programlisting></informalexample>
+The surface here can be either an image surface or a X surface,
+and can either be created on the spot or kept around for caching purposes.
+Another alternative is to use pixbufs instead of surfaces with
+gdk_cairo_set_source_pixbuf() instead of cairo_set_source_surface().
+        </para>
+        <para>
           The cairo developers plan to add self-copies in the future to allow
           exactly this effect, so you might want to keep up on cairo
           development to be able to change your code.
@@ -652,7 +673,7 @@ gtk_fixed_get_preferred_height (GtkWidget *widget,
       <para>
         One place where pixmaps were commonly used is to create custom
         cursors:
-      <programlisting>
+      <informalexample><programlisting>
 GdkCursor *cursor;
 GdkPixmap *pixmap;
 cairo_t *cr;
@@ -668,10 +689,10 @@ cairo_destroy (cr);
 cursor = gdk_cursor_new_from_pixmap (pixmap, pixmap, &amp;fg, &amp;fg, 0, 0);
 
 g_object_unref (pixmap);
-      </programlisting>
+      </programlisting></informalexample>
       The same can be achieved without pixmaps, by drawing onto
       an image surface:
-      <programlisting>
+      <informalexample><programlisting>
 GdkCursor *cursor;
 cairo_surface_t *s;
 cairo_t *cr;
@@ -692,7 +713,7 @@ cairo_surface_destroy (s);
 cursor = gdk_cursor_new_from_pixbuf (display, pixbuf, 0, 0);
 
 g_object_unref (pixbuf);
-      </programlisting>
+      </programlisting></informalexample>
       </para>
     </example>
   </section>
@@ -711,7 +732,7 @@ g_object_unref (pixbuf);
     <para>You might have a screen-changed handler like the following
      to set up a translucent window with an alpha-channel:
     </para>
-    <programlisting>
+    <informalexample><programlisting>
 static void
 on_alpha_screen_changed (GtkWidget *widget,
                          GdkScreen *old_screen,
@@ -725,11 +746,11 @@ on_alpha_screen_changed (GtkWidget *widget,
 
   gtk_widget_set_colormap (widget, colormap);
 }
-    </programlisting>
+    </programlisting></informalexample>
     <para>
     With visuals instead of colormaps, this will look as follows:
     </para>
-    <programlisting>
+    <informalexample><programlisting>
 static void
 on_alpha_screen_changed (GtkWindow *window,
                          GdkScreen *old_screen,
@@ -743,7 +764,7 @@ on_alpha_screen_changed (GtkWindow *window,
 
   gtk_widget_set_visual (window, visual);
 }
-    </programlisting>
+    </programlisting></informalexample>
     </example>
   </section>
 
@@ -753,8 +774,8 @@ on_alpha_screen_changed (GtkWindow *window,
     <para>
       #GdkDrawable has been removed in GTK+ 3, together with #GdkPixmap
       and #GdkImage. The only remaining drawable class is #GdkWindow.
-      For dealing with image data, you should use cairo surfaces or
-      #GdkPixbufs.
+      For dealing with image data, you should use a #cairo_surface_t or
+      a #GdkPixbuf.
     </para>
 
     <para>
@@ -779,6 +800,73 @@ on_alpha_screen_changed (GtkWindow *window,
     </para>
   </section>
 
+  <section>
+    <title>Event filtering</title>
+
+    <para>
+      If your application uses the low-level event filtering facilities in GDK,
+      there are some changes you need to be aware of.
+    </para>
+
+    <para>
+      The special-purpose GdkEventClient events and the gdk_add_client_message_filter() and gdk_display_add_client_message_filter() functions have been
+      removed. Receiving X11 ClientMessage events is still possible, using
+      the general gdk_window_add_filter() API. A client message filter like
+<informalexample><programlisting>
+static GdkFilterReturn
+message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XClientMessageEvent *evt = (XClientMessageEvent *)xevent;
+
+  /* do something with evt ... */
+}
+
+ ...
+
+message_type = gdk_atom_intern ("MANAGER", FALSE);
+gdk_display_add_client_message_filter (display, message_type, message_filter, NULL);
+</programlisting></informalexample>
+    then looks like this:
+    <informalexample><programlisting>
+static GdkFilterReturn
+event_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+  XClientMessageEvent *evt;
+  GdkAtom message_type;
+
+  if (((XEvent *)xevent)->type != ClientMessage)
+    return GDK_FILTER_CONTINUE;
+
+  evt = (XClientMessageEvent *)xevent;
+  message_type = XInternAtom (evt->display, "MANAGER", FALSE);
+
+  if (evt->message_type != message_type)
+    return GDK_FILTER_CONTINUE;
+
+  /* do something with evt ... */
+}
+
+ ...
+
+gdk_window_add_filter (NULL, message_filter, NULL);
+</programlisting></informalexample>
+      One advantage of using an event filter is that you can actually
+      remove the filter when you don't need it anymore, using
+      gdk_window_remove_filter().
+    </para>
+
+    <para>
+      The other difference to be aware of when working with event filters
+      in GTK+ 3 is that GDK now uses XI2 by default when available. That
+      means that your application does not receive core X11 key or button
+      events. Instead, all input events are delivered as XIDeviceEvents.
+      As a short-term workaround for this, you can force your application
+      to not use XI2, with gdk_disable_multidevice(). In the long term,
+      you probably want to rewrite your event filter to deal with
+      XIDeviceEvents.
+    </para>
+  </section>
+
   <section>
     <title>Backend-specific code</title>
     <para>
@@ -820,6 +908,30 @@ on_alpha_screen_changed (GtkWindow *window,
        }
       </programlisting></informalexample>
     </para>
+    <para>
+      If you used the pkg-config variable <varname>target</varname> to
+      conditionally build part of your project depending on the GDK backend,
+      for instance like this:
+      <informalexample><programlisting>
+AM_CONDITIONAL(BUILD_X11, test `$PKG_CONFIG --variable=target gtk+-2.0` = "x11")
+      </programlisting></informalexample>
+      then you should now use the M4 macro provided by GTK+ itself:
+      <informalexample><programlisting>
+GTK_CHECK_BACKEND([x11], [3.0.2], [have_x11=yes], [have_x11=no])
+AM_CONDITIONAL(BUILD_x11, [test "x$have_x11" = "xyes"])
+      </programlisting></informalexample>
+    </para>
+  </section>
+
+  <section>
+    <title>GtkPlug and GtkSocket</title>
+
+    <para>
+      The #GtkPlug and #GtkSocket widgets are now X11-specific, and you
+      have to include the <filename>&lt;gtk/gtkx.h&gt;</filename> header
+      to use them. The previous section about proper handling of
+      backend-specific code applies, if you care about other backends.
+    </para>
   </section>
 
   <section>
@@ -840,7 +952,7 @@ on_alpha_screen_changed (GtkWindow *window,
       is available via the new gtk_widget_get_allocated_width() and
       gtk_widget_get_allocated_height() functions. It is not necessary to
       check for GTK_WIDGET_IS_DRAWABLE(), since GTK+ already does this check
-      before emitting the ::draw signal.
+      before emitting the #GtkWidget::draw signal.
     </para>
     <para>
       There are some special considerations for widgets with multiple windows.
@@ -859,7 +971,7 @@ on_alpha_screen_changed (GtkWindow *window,
         }
       ...
       </programlisting></informalexample>
-      In contrast, the ::draw signal handler may have to draw multiple
+      In contrast, the #GtkWidget::draw signal handler may have to draw multiple
       windows in one call. GTK+ has a convenience function
       gtk_cairo_should_draw_window() that can be used to find out if
       a window needs to be drawn. With that, the example above would look
@@ -892,10 +1004,13 @@ gboolean
 gtk_arrow_draw (GtkWidget *widget,
                 cairo_t   *cr)
 {
+  GtkStyleContext *context;
   gint x, y;
   gint width, height;
   gint extent;
 
+  context = gtk_widget_get_style_context (widget);
+
   width = gtk_widget_get_allocated_width (widget);
   height = gtk_widget_get_allocated_height (widget);
 
@@ -903,15 +1018,7 @@ gtk_arrow_draw (GtkWidget *widget,
   x = PAD;
   y = PAD;
 
-  gtk_paint_arrow (gtk_widget_get_style (widget),
-                   cr,
-                   gtk_widget_get_state (widget),
-                   GTK_SHADOW_OUT,
-                   widget,
-                   "arrow",
-                   widget->priv->arrow_type,
-                   TRUE,
-                   x, y, extent, extent);
+  gtk_render_arrow (context, rc, G_PI / 2, x, y, extent);
 }
     </programlisting>
     </example>
@@ -996,7 +1103,7 @@ gtk_arrow_draw (GtkWidget *widget,
       classes that are directly derived from GtkObject, you have to make
       them derive from #GInitiallyUnowned (or, if you don't need the floating
       functionality, #GObject). If you have widgets that override the
-      destroy class handler, you have to adust your class_init function,
+      destroy class handler, you have to adjust your class_init function,
       since destroy is now a member of GtkWidgetClass:
       <informalexample><programlisting>
       GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);

docs/reference/gtk/migrating-GtkApplication.xml

@@ -59,11 +59,21 @@ The same application using GtkApplication:
 static void
 activate (GtkApplication *app)
 {
+  GList *list;
   GtkWidget *window;
 
-  window = create_my_window ();
-  gtk_window_set_application (GTK_WINDOW (window), app);
-  gtk_widget_show (window);
+  list = gtk_application_get_windows (app);
+
+  if (list)
+    {
+      gtk_window_present (GTK_WINDOW (list->data));
+    }
+  else
+    {
+      window = create_my_window ();
+      gtk_window_set_application (GTK_WINDOW (window), app);
+      gtk_widget_show (window);
+    }
 }
 
 int

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/objects_grouped.sgml

@@ -127,7 +127,6 @@
 
 <emphasis>Misc. Objects</emphasis>
     <link linkend="GtkAdjustment">GtkAdjustment</link>
-    <link linkend="GtkItemFactory">GtkItemFactory</link>
     <link linkend="GtkInvisible">GtkInvisible</link>
 </literallayout></entry>
 

docs/reference/gtk/question_index.sgml

@@ -35,11 +35,11 @@ How do I get started with GTK+?
 </para></question>
 
 <answer><para>
-The GTK+ <ulink url="http://www.gtk.org">website</ulink> offers a
-<ulink url="http://www.gtk.org/tutorial">tutorial</ulink> and a
-<ulink url="http://www.gtk.org/faq">FAQ</ulink>. More documentation ranging
-from whitepapers to online books can be found at the
-<ulink url="http://library.gnome.org/devel/">GNOME developer's site</ulink>.
+The GTK+ <ulink url="http://www.gtk.org">website</ulink> offers some
+<ulink url="http://www.gtk.org/documentation">tutorials</ulink> and other
+documentation (most of it about GTK+ 2.x, but mostly still applicable).
+More documentation ranging from whitepapers to online books can be found at
+the <ulink url="http://library.gnome.org/devel/">GNOME developer's site</ulink>.
 After studying these materials you should be well prepared to come back to
 this reference manual for details.
 </para></answer>

docs/reference/gtk/running.sgml

@@ -199,9 +199,13 @@ additional environment variables.
   <para>
     A list of modules to load. Note that GTK+ also allows to specify modules to load via a commandline option (<option>--gtk-module</option>) and with the <literal>gtk-modules</literal> setting.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 2.x too,
+    which may not have the same set of modules available for loading.
+  </warning>
 </formalpara>
 
-<formalpara>
+<formalpara id="gtk-path">
   <title><envar>GTK_PATH</envar></title>
 
   <para>
@@ -211,7 +215,7 @@ additional environment variables.
     modules, file system backends and print backends. If the path to
     the dynamically loaded object is given as an absolute path name,
     then GTK+ loads it directly.
-    Otherwise, GTK+ goes in turn through the directories in GTK_PATH,
+    Otherwise, GTK+ goes in turn through the directories in <envar>GTK_PATH</envar>,
     followed by the directory <filename>.gtk-3.0</filename> in the user's
     home directory, followed by the system default directory,
     which is <filename><replaceable>libdir</replaceable>/gtk-3.0/modules</filename>.
@@ -241,6 +245,12 @@ additional environment variables.
     The components of GTK_PATH are separated by the ':' character on
     Linux and Unix, and the ';' character on Windows.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 2.x too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see incompatible modules.
+  </warning>
 </formalpara>
 
 <formalpara>
@@ -255,7 +265,7 @@ additional environment variables.
   </para>
 </formalpara>
 
-<formalpara id="im-module-file">
+<formalpara id="gtk-im-module-file">
   <title><envar>GTK_IM_MODULE_FILE</envar></title>
 
   <para>
@@ -268,6 +278,12 @@ additional environment variables.
     The <filename>immodules.cache</filename> file is generated by the
     <command>gtk-query-immodules-3.0</command> utility.
   </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 2.x too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see the wrong list of IM modules.
+  </warning>
 </formalpara>
 
 <formalpara>
@@ -366,12 +382,65 @@ nevertheless.
 </formalpara>
 
 <formalpara>
-  <title><envar>GDK_NATIVE_WINDOWS</envar></title>
+  <title><envar>GDK_RENDERING</envar></title>
 
   <para>
-    If set, GDK creates all windows as native windows. This can help
-    applications that make assumptions about 1-1 correspondence between
-    GDK windows and X11 windows.
+    If set, selects the way how GDK creates similar surfaces. This affects both the
+    functionality of the function gdk_window_create_similar_surface() as well as the
+    way GDK creates backing surfaces for double buffering. The following values can
+    be used:
+    <variablelist>
+
+      <varlistentry>
+        <term>similar</term>
+        <listitem><para>Create similar surfaces to the window in use. This is the
+          default behavior when the variable is not set.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>image</term>
+        <listitem><para>Always create image surfaces. This essentially turns off
+          all hardware acceleration inside GTK.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>recording</term>
+        <listitem><para>Always create recording surfaces. This causes bare rendering
+          to the backend without the creation of intermediate surfaces (Pixmaps in X)
+          and will likely cause flicker.</para></listitem>
+      </varlistentry>
+
+    </variablelist>
+    All other values will be ignored and fall back to the default behavior. More
+    values might be added in the future. 
+  </para>
+</formalpara>
+
+<formalpara>
+  <title><envar>GDK_BACKEND</envar></title>
+
+  <para>
+    If set, selects the GDK backend to use. Selecting a backend requires that GTK is compiled
+    with support for that backend. The following backends can be selected:
+    <variablelist>
+
+      <varlistentry>
+        <term>quartz</term>
+        <listitem><para>Selects the native Quartz backend</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>win32</term>
+        <listitem><para>Selects the native backend for Microsoft Windows</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>x11</term>
+        <listitem><para>Selects the native backend for connecting to X11 servers.</para></listitem>
+      </varlistentry>
+
+    </variablelist>
+    For more information about selecting backends, see the gdk_display_manager_get() function.
   </para>
 </formalpara>
 

docs/reference/gtk/text_widget.sgml

@@ -152,8 +152,8 @@ There are two ways to affect text attributes in #GtkTextView.
 You can change the default attributes for a given #GtkTextView, and you can 
 apply tags that change the attributes for a region of text.  For text features 
 that come from the theme — such as font and foreground color — use 
-standard #GtkWidget functions such as gtk_widget_modify_font() or 
-gtk_widget_modify_text(). For other attributes there are dedicated methods on 
+standard #GtkWidget functions such as gtk_widget_modify_font() or
+gtk_widget_override_text(). For other attributes there are dedicated methods on
 #GtkTextView such as gtk_text_view_set_tabs().
 
 <informalexample><programlisting>
@@ -161,7 +161,7 @@ gtk_widget_modify_text(). For other attributes there are dedicated methods on
   GtkTextBuffer *buffer;
   GtkTextIter start, end;
   PangoFontDescription *font_desc;
-  GdkColor color;
+  GdkRGBA rgba;
   GtkTextTag *tag;
 
   view = gtk_text_view_new (<!-- -->);
@@ -176,8 +176,8 @@ gtk_widget_modify_text(). For other attributes there are dedicated methods on
   pango_font_description_free (font_desc);
 
   /* Change default color throughout the widget */
-  gdk_color_parse ("green", &amp;color);
-  gtk_widget_modify_text (view, GTK_STATE_NORMAL, &amp;color);
+  gdk_rgba_parse ("green", &amp;rgba);
+  gtk_widget_override_color (view, GTK_STATE_FLAG_NORMAL, &amp;rgba);
 
   /* Change left margin throughout the widget */
   gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 30);

docs/reference/gtk/tmpl/.gitignore

@@ -11,14 +11,25 @@ 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
@@ -28,19 +39,43 @@ 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
@@ -48,13 +83,19 @@ 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
@@ -70,24 +111,36 @@ 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/gtk/tmpl/gtkcellrendereraccel.sgml

@@ -1,90 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererAccel
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a keyboard accelerator in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererAccel displays a keyboard accelerator (i.e. a 
-key combination like &lt;Control&gt;-a). If the cell renderer is editable, the 
-accelerator can be changed by simply typing the new combination.
-</para>
-
-<para>
-The #GtkCellRendererAccel cell renderer was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererAccel ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRendererAccel::accel-cleared ##### -->
-<para>
-
-</para>
-
-@cellrendereraccel: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkCellRendererAccel::accel-edited ##### -->
-<para>
-
-</para>
-
-@cellrendereraccel: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-<!-- ##### ARG GtkCellRendererAccel:accel-key ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:accel-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:accel-mods ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererAccel:keycode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkCellRendererAccelMode ##### -->
-<para>
-
-</para>
-
-@GTK_CELL_RENDERER_ACCEL_MODE_GTK: 
-@GTK_CELL_RENDERER_ACCEL_MODE_OTHER: 
-
-<!-- ##### FUNCTION gtk_cell_renderer_accel_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcellrenderercombo.sgml

@@ -1,78 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererCombo
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a combobox in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererCombo renders text in a cell like #GtkCellRendererText from 
-which it is derived. But while #GtkCellRendererText offers a simple entry to 
-edit the text, #GtkCellRendererCombo offers a #GtkComboBox or #GtkComboBoxEntry
-widget to edit the text. The values to display in the combo box are taken from 
-the tree model specified in the 
-<link linkend="GtkCellRendererCombo--model">model</link> property.
-</para>
-
-<para>
-The combo cell renderer takes care of adding a text cell renderer to the combo 
-box and sets it to display the column specified by its 
-<link linkend="GtkCellRendererCombo--text-column">text-column</link> 
-property. Further properties of the comnbo box can be set in a handler for the 
-editing-started signal.
-</para>
-
-<para>
-The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererCombo ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRendererCombo::changed ##### -->
-<para>
-
-</para>
-
-@cellrenderercombo: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkCellRendererCombo:has-entry ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererCombo:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererCombo:text-column ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_combo_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcellrendererpixbuf.sgml

@@ -1,98 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererPixbuf
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a pixbuf in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkCellRendererPixbuf can be used to render an image in a cell. It allows to render 
-either a given #GdkPixbuf (set via the 
-<link linkend="GtkCellRendererPixbuf--pixbuf">pixbuf</link> property) or a stock icon 
-(set via the <link linkend="GtkCellRendererPixbuf--stock-id">stock-id</link> property).
-</para>
-
-<para>
-To support the tree view, #GtkCellRendererPixbuf also supports rendering two alternative 
-pixbufs, when the <link linkend="GtkCellRenderer--is-expander">is-expander</link> property 
-is %TRUE. If the <link linkend="GtkCellRenderer--is-expanded">is-expanded</link> property 
-is %TRUE and the 
-<link linkend="GtkCellRendererPixbuf--pixbuf-expander-open">pixbuf-expander-open</link> 
-property is set to a pixbuf, it renders that pixbuf, if the 
-<link linkend="GtkCellRenderer--is-expanded">is-expanded</link> property is %FALSE and
-the 
-<link linkend="GtkCellRendererPixbuf--pixbuf-expander-closed">pixbuf-expander-closed</link> 
-property is set to a pixbuf, it renders that one. 
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererPixbuf ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkCellRendererPixbuf:follow-state ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:gicon ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:icon-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:pixbuf ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:pixbuf-expander-closed ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:pixbuf-expander-open ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:stock-detail ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:stock-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererPixbuf:stock-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_pixbuf_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcellrendererprogress.sgml

@@ -1,72 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererProgress
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders numbers as progress bars
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererProgress renders a numeric value as a progress par in a cell.
-Additionally, it can display a text on top of the progress bar.
-</para>
-
-<para>
-The #GtkCellRendererProgress cell renderer was added in GTK+ 2.6.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererProgress ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkCellRendererProgress:inverted ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererProgress:pulse ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererProgress:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererProgress:text-xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererProgress:text-yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererProgress:value ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_progress_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcellrendererspin.sgml

@@ -1,68 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererSpin
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a spin button in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererSpin renders text in a cell like #GtkCellRendererText from 
-which it is derived. But while #GtkCellRendererText offers a simple entry to 
-edit the text, #GtkCellRendererSpin offers a #GtkSpinButton widget. Of course,
-that means that the text has to be parseable as a floating point number.
-</para>
-
-<para>
-The range of the spinbutton is taken from the adjustment property of the
-cell renderer, which can be set explicitly or mapped to a column in the 
-tree model, like all properties of cell renders. #GtkCellRendererSpin
-also has properties for the climb rate and the number of digits to
-display. Other #GtkSpinButton properties can be set in a handler for the
-start-editing signal.
-</para>
-
-<para>
-The #GtkCellRendererSpin cell renderer was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkCellRendererText, #GtkSpinButton
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererSpin ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkCellRendererSpin:adjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererSpin:climb-rate ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererSpin:digits ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_spin_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml

@@ -1,127 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererToggle
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders a toggle button in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCellRendererToggle renders a toggle button in a cell. The 
-button is drawn as a radio- or checkbutton, depending on the 
-<link linkend="GtkCellRendererToggle--radio">radio</link> 
-property. When activated, it emits the toggled signal.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererToggle ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRendererToggle::toggled ##### -->
-<para>
-
-</para>
-
-@cellrenderertoggle: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GtkCellRendererToggle:activatable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:inconsistent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:indicator-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererToggle:radio ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_get_radio ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_set_radio ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@radio: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_get_active ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_set_active ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@setting: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_get_activatable ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_toggle_set_activatable ##### -->
-<para>
-
-</para>
-
-@toggle: 
-@setting: 
-
-

docs/reference/gtk/tmpl/gtkcheckbutton.sgml

@@ -1,85 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCheckButton
-
-<!-- ##### SECTION Short_Description ##### -->
-Create widgets with a discrete toggle button
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkCheckButton places a discrete #GtkToggleButton next to a widget, (usually a #GtkLabel). See the section on #GtkToggleButton widgets for more information about toggle/check buttons.
-</para>
-<para>
-The important signal ('toggled') is also inherited from #GtkToggleButton.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkCheckMenuItem</term>
-<listitem><para>add check buttons to your menus.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkButton</term>
-<listitem><para>a more general button.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkToggleButton</term>
-<listitem><para>#GtkCheckButton's parent.</para></listitem>
-</varlistentry>
-<varlistentry>
-<term>#GtkRadioButton</term>
-<listitem><para>group check buttons together.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCheckButton ##### -->
-<para>
-<structfield>toggle_button</structfield> is a #GtkToggleButton representing the actual toggle button that composes the check button.
-</para>
-
-
-<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_check_button_new ##### -->
-<para>
-Creates a new #GtkCheckButton.
-</para>
-
-@void: 
-@Returns: a #GtkWidget.
-
-
-<!-- ##### FUNCTION gtk_check_button_new_with_label ##### -->
-<para>
-Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
-</para>
-
-@label: the text for the check button.
-@Returns: a #GtkWidget.
-
-
-<!-- ##### FUNCTION gtk_check_button_new_with_mnemonic ##### -->
-<para>
-
-</para>
-
-@label: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml

@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCheckMenuItem
-
-<!-- ##### SECTION Short_Description ##### -->
-A menu item with a check box
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkCheckMenuItem is a menu item that maintains the state of a boolean 
-value in addition to a #GtkMenuItem's usual role in activating application
-code.
-</para>
-
-<para>
-A check box indicating the state of the boolean value is displayed
-at the left side of the #GtkMenuItem.  Activating the #GtkMenuItem 
-toggles the value.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCheckMenuItem ##### -->
-<para>
-The #GtkCheckMenuItem-struct struct contains only private fields that
-should not be directly accessed.
-</para>
-
-
-<!-- ##### SIGNAL GtkCheckMenuItem::toggled ##### -->
-<para>
-This signal is emitted when the state of the check box is changed.
-</para>
-
-<para>
-A signal handler can use gtk_check_menu_item_get_active()
-to discover the new state.
-</para>
-
-@checkmenuitem: the object which received the signal.
-
-<!-- ##### ARG GtkCheckMenuItem:active ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckMenuItem:draw-as-radio ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckMenuItem:inconsistent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCheckMenuItem:indicator-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_check_menu_item_new ##### -->
-<para>
-Creates a new #GtkCheckMenuItem.
-</para>
-
-@void: 
-@Returns: a new #GtkCheckMenuItem.
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_new_with_label ##### -->
-<para>
-Creates a new #GtkCheckMenuItem with a label.
-</para>
-
-@label: the string to use for the label.
-@Returns: a new #GtkCheckMenuItem.
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_new_with_mnemonic ##### -->
-<para>
-
-</para>
-
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_get_active ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_set_active ##### -->
-<para>
-Sets the active state of the menu item's check box.
-</para>
-
-@check_menu_item: a #GtkCheckMenuItem.
-@is_active: boolean value indicating whether the check box is active.
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_toggled ##### -->
-<para>
-Emits the GtkCheckMenuItem::toggled signal.
-</para>
-
-@check_menu_item: a #GtkCheckMenuItem.
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_get_inconsistent ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_set_inconsistent ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@setting: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_set_draw_as_radio ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@draw_as_radio: 
-
-
-<!-- ##### FUNCTION gtk_check_menu_item_get_draw_as_radio ##### -->
-<para>
-
-</para>
-
-@check_menu_item: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkclipboard.sgml

@@ -1,499 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Clipboards
-
-<!-- ##### SECTION Short_Description ##### -->
-Storing data on clipboards
-
-<!-- ##### SECTION Long_Description ##### -->
-  <para>
-    The #GtkClipboard object represents a clipboard of data shared
-    between different processes or between different widgets in
-    the same process. Each clipboard is identified by a name encoded as a
-    #GdkAtom. (Conversion to and from strings can be done with
-    gdk_atom_intern() and gdk_atom_name().) The default clipboard
-    corresponds to the "CLIPBOARD" atom; another commonly used clipboard
-    is the "PRIMARY" clipboard, which, in X, traditionally contains
-    the currently selected text.
-  </para>
-  <para>
-    To support having a number of different formats on the clipboard
-    at the same time, the clipboard mechanism allows providing
-    callbacks instead of the actual data.  When you set the contents
-    of the clipboard, you can either supply the data directly (via
-    functions like gtk_clipboard_set_text()), or you can supply a
-    callback to be called at a later time when the data is needed (via
-    gtk_clipboard_set_with_data() or gtk_clipboard_set_with_owner().)
-    Providing a callback also avoids having to make copies of the data
-    when it is not needed.
-  </para>
-  <para>
-    gtk_clipboard_set_with_data() and gtk_clipboard_set_with_owner()
-    are quite similar; the choice between the two depends mostly on
-    which is more convenient in a particular situation.
-    The former is most useful when you want to have a blob of data
-    with callbacks to convert it into the various data types that you
-    advertise. When the @clear_func you provided is called, you
-    simply free the data blob. The latter is more useful when the
-    contents of clipboard reflect the internal state of a #GObject
-    (As an example, for the PRIMARY clipboard, when an entry widget
-    provides the clipboard's contents the contents are simply the
-    text within the selected region.) If the contents change, the
-    entry widget can call gtk_clipboard_set_with_owner() to update
-    the timestamp for clipboard ownership, without having to worry
-    about @clear_func being called.
-  </para>
-  <para>
-    Requesting the data from the clipboard is essentially
-    asynchronous. If the contents of the clipboard are provided within
-    the same process, then a direct function call will be made to
-    retrieve the data, but if they are provided by another process,
-    then the data needs to be retrieved from the other process, which
-    may take some time. To avoid blocking the user interface, the call
-    to request the selection, gtk_clipboard_request_contents() takes a
-    callback that will be called when the contents are received (or
-    when the request fails.) If you don't want to deal with providing
-    a separate callback, you can also use gtk_clipboard_wait_for_contents().
-    What this does is run the GLib main loop recursively waiting for
-    the contents. This can simplify the code flow, but you still have
-    to be aware that other callbacks in your program can be called
-    while this recursive mainloop is running.
-  </para>
-  <para>
-    Along with the functions to get the clipboard contents as an
-    arbitrary data chunk, there are also functions to retrieve
-    it as text, gtk_clipboard_request_text() and
-    gtk_clipboard_wait_for_text(). These functions take care of
-    determining which formats are advertised by the clipboard
-    provider, asking for the clipboard in the best available format
-    and converting the results into the UTF-8 encoding. (The standard
-    form for representing strings in GTK+.)
-  </para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkSelection</term>
-<listitem><para>#GtkClipboard provides a high-level wrapper around the
-	    lower level routines that deal with X selections. It is
-	    also possibly to directly manipulate the X selections,
-	    though it is seldom necessary to do so.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkClipboard ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkClipboard::owner-change ##### -->
-<para>
-
-</para>
-
-@clipboard: the object which received the signal.
-@event: 
-
-<!-- ##### USER_FUNCTION GtkClipboardReceivedFunc ##### -->
-<para>
-    A function to be called when the results of gtk_clipboard_request_contents()
-    are received, or when the request fails.
-</para>
-
-@clipboard: the #GtkClipboard
-@selection_data: a #GtkSelectionData containing the data was received.
-                 If retrieving the data failed, then then length field
-                 of @selection_data will be negative.
-@data: the @user_data supplied to gtk_clipboard_request_contents().
-
-
-<!-- ##### USER_FUNCTION GtkClipboardTextReceivedFunc ##### -->
-<para>
-    A function to be called when the results of gtk_clipboard_request_text()
-    are received, or when the request fails.
-</para>
-
-@clipboard: the #GtkClipboard
-@text: the text received, as a UTF-8 encoded string, or %NULL
-            if retrieving the data failed.
-@data: the @user_data supplied to gtk_clipboard_request_text().
-
-
-<!-- ##### USER_FUNCTION GtkClipboardImageReceivedFunc ##### -->
-<para>
-    A function to be called when the results of gtk_clipboard_request_image()
-    are received, or when the request fails.
-</para>
-
-@clipboard: the #GtkClipboard
-@pixbuf: the received image
-@data: the @user_data supplied to gtk_clipboard_request_image().
-@Since: 2.6
-
-
-<!-- ##### USER_FUNCTION GtkClipboardTargetsReceivedFunc ##### -->
-<para>
-    A function to be called when the results of gtk_clipboard_request_targets()
-    are received, or when the request fails.
-</para>
-
-@clipboard: the #GtkClipboard
-@atoms: the supported targets, as array of #GdkAtom, or %NULL 
-            if retrieving the data failed.
-@n_atoms: the length of the @atoms array.
-@data: the @user_data supplied to gtk_clipboard_request_targets().
-@Since: 2.4
-
-
-<!-- ##### USER_FUNCTION GtkClipboardRichTextReceivedFunc ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@format: 
-@text: 
-@length: 
-@data: 
-
-
-<!-- ##### USER_FUNCTION GtkClipboardURIReceivedFunc ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@uris: 
-@data: 
-
-
-<!-- ##### USER_FUNCTION GtkClipboardGetFunc ##### -->
-<para>
-A function that will be called to provide the contents of the selection.
-If multiple types of data were advertised, the requested type can
-be determined from the @info parameter or by checking the target field
-of @selection_data. If the data could successfully be converted into
-then it should be stored into the @selection_data object by
-calling gtk_selection_data_set() (or related functions such
-as gtk_selection_data_set_text()). If no data is set, the requestor
-will be informed that the attempt to get the data failed.    
-</para>
-
-@clipboard: the #GtkClipboard
-@selection_data: a #GtkSelectionData argument in which the requested
-                     data should be stored.
-@info: the info field corresponding to the requested
-                     target from the #GtkTargetEntry array passed to
-                     gtk_clipboard_set_with_data() or gtk_clipboard_set_with_owner().
-@user_data_or_owner: the @user_data argument passed to gtk_clipboard_set_with_data(), or
-                     the @owner argument passed to gtk_clipboard_set_with_owner()
-
-
-<!-- ##### USER_FUNCTION GtkClipboardClearFunc ##### -->
-<para>
-A function that will be called when the contents of the clipboard are changed
-or cleared. Once this has called, the @user_data_or_owner argument
-will not be used again.
-</para>
-
-@clipboard: the #GtkClipboard
-@user_data_or_owner: the @user_data argument passed to gtk_clipboard_set_with_data(), or
-                     the @owner argument passed to gtk_clipboard_set_with_owner()
-
-
-<!-- ##### FUNCTION gtk_clipboard_get ##### -->
-<para>
-
-</para>
-
-@selection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_get_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@selection: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_get_display ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_set_with_data ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@targets: 
-@n_targets: 
-@get_func: 
-@clear_func: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_set_with_owner ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@targets: 
-@n_targets: 
-@get_func: 
-@clear_func: 
-@owner: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_get_owner ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_clear ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_set_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@text: 
-@len: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_set_image ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_contents ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@target: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_image ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_targets ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_rich_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_request_uris ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@callback: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_contents ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@target: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_image ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_rich_text ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@format: 
-@length: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_uris ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_is_text_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_is_image_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_is_rich_text_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_is_uris_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_for_targets ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@targets: 
-@n_targets: 
-@Returns: 
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gtk-docs.sgml" "book" "refsect2" "")
-End:
--->
-
-
-<!-- ##### FUNCTION gtk_clipboard_wait_is_target_available ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@target: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_set_can_store ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-@targets: 
-@n_targets: 
-
-
-<!-- ##### FUNCTION gtk_clipboard_store ##### -->
-<para>
-
-</para>
-
-@clipboard: 
-
-

docs/reference/gtk/tmpl/gtkcolorseldlg.sgml

@@ -1,117 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkColorSelectionDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-A standard dialog box for selecting a color
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkColorSelectionDialog provides a standard dialog which
-allows the user to select a color much like the #GtkFileSelection
-provides a standard dialog for file selection.
-</para>
-
-<refsect2 id="GtkColorSelectionDialog-BUILDER-UI">
-<title>GtkColorSelectionDialog as GtkBuildable</title>
-<para>
-The GtkColorSelectionDialog implementation of the GtkBuildable interface
-exposes the embedded #GtkColorSelection as internal child with the
-name "color_selection". It also exposes the buttons with the names
-"ok_button", "cancel_button" and "help_button".
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkColorSelectionDialog ##### -->
-<para>
-The #GtkColorSelectionDialog-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#GtkWidget *colorsel;</entry>
-<entry>The #GtkColorSelection widget contained within the
-dialog.  Use this widget and its gtk_color_selection_get_current_color()
-function to gain access to the selected color.  Connect a handler 
-for this widget's color_changed signal to be notified when the
-color changes.
-</entry>
-</row>
-
-<row>
-<entry>#GtkWidget *ok_button;</entry>
-<entry>The OK button widget contained within the dialog.  
-Connect a handler for the clicked event.
-</entry>
-</row>
-
-<row>
-<entry>#GtkWidget *cancel_button;</entry>
-<entry>The cancel button widget contained within the dialog.  
-Connect a handler for the clicked event.
-</entry>
-</row>
-
-<row>
-<entry>#GtkWidget *help_button;</entry>
-<entry>The help button widget contained within the dialog.  
-Connect a handler for the clicked event.
-</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-</para>
-
-
-<!-- ##### ARG GtkColorSelectionDialog:cancel-button ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelectionDialog:color-selection ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelectionDialog:help-button ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelectionDialog:ok-button ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_color_selection_dialog_new ##### -->
-<para>
-Creates a new #GtkColorSelectionDialog.
-</para>
-
-@title: a string containing the title text for the dialog.
-@Returns: a #GtkColorSelectionDialog.
-
-
-<!-- ##### FUNCTION gtk_color_selection_dialog_get_color_selection ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -1,424 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Drag and Drop
-
-<!-- ##### SECTION Short_Description ##### -->
-Functions for controlling drag and drop handling
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GTK+ has a rich set of functions for doing inter-process
-communication via the drag-and-drop metaphor. GTK+
-can do drag-and-drop (DND) via multiple protocols.
-The currently supported protocols are the Xdnd and
-Motif protocols.
-
-As well as the functions listed here, applications
-may need to use some facilities provided for
-<link linkend="gtk-Selections">Selections</link>.
-Also, the Drag and Drop API makes use of signals
-in the #GtkWidget class.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM GtkDestDefaults ##### -->
-<para>
-The #GtkDestDefaults enumeration specifies the various
-types of action that will be taken on behalf
-of the user for a drag destination site.
-</para>
-
-@GTK_DEST_DEFAULT_MOTION: 
-   If set for a widget, GTK+, during a drag over this
-   widget will check if the drag matches this widget's
-   list of possible targets and actions.
-   GTK+ will then call gdk_drag_status() as appropriate.
-@GTK_DEST_DEFAULT_HIGHLIGHT: 
-   If set for a widget, GTK+ will draw a highlight on
-   this widget as long as a drag is over this widget
-   and the widget drag format and action are acceptable.
-@GTK_DEST_DEFAULT_DROP: 
-   If set for a widget, when a drop occurs, GTK+ will
-   will check if the drag matches this widget's
-   list of possible targets and actions. If so, 
-   GTK+ will call gtk_drag_get_data() on behalf 
-   of the widget. Whether or not the drop is successful,
-   GTK+ will call gtk_drag_finish(). If the action
-   was a move, then if the drag was successful, then
-   %TRUE will be passed for the @delete parameter
-   to gtk_drag_finish().
-@GTK_DEST_DEFAULT_ALL: 
-   If set, specifies that all default actions should
-   be taken.
-
-<!-- ##### ENUM GtkTargetFlags ##### -->
-<para>
-The #GtkTargetFlags enumeration is used to specify
-constraints on an entry in a #GtkTargetTable. 
-</para>
-
-@GTK_TARGET_SAME_APP: 
-   If this is set, the target will only be selected
-   for drags within a single application.
-@GTK_TARGET_SAME_WIDGET: 
-   If this is set, the target will only be selected
-   for drags within a single widget.
-@GTK_TARGET_OTHER_APP: 
-   If this is set, the target will not be selected
-   for drags within a single application. Since 2.12
-@GTK_TARGET_OTHER_WIDGET: 
-   If this is set, the target will not be selected
-   for drags withing a single widget. Since 2.12
-
-<!-- ##### FUNCTION gtk_drag_dest_set ##### -->
-<para>
-</para>
-
-@widget: 
-@flags: 
-@targets: 
-@n_targets: 
-@actions: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_set_proxy ##### -->
-<para>
-Sets this widget as a proxy for drops to another window.
-</para>
-
-@widget: a #GtkWidget
-@proxy_window: the window to which to forward drag events
-@protocol: the drag protocol which the @proxy_window accepts
-           (You can use gdk_drag_get_protocol() to determine this)
-@use_coordinates: If %TRUE, send the same coordinates to the
-                  destination, because it is an embedded 
-                  subwindow.
-
-
-<!-- ##### FUNCTION gtk_drag_dest_unset ##### -->
-<para>
-Clears information about a drop destination set with
-gtk_drag_dest_set(). The widget will no longer receive
-notification of drags.
-</para>
-
-@widget: a #GtkWidget
-
-
-<!-- ##### FUNCTION gtk_drag_dest_find_target ##### -->
-<para>
-
-</para>
-
-@widget: 
-@context: 
-@target_list: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_get_target_list ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_set_target_list ##### -->
-<para>
-
-</para>
-
-@widget: 
-@target_list: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_add_text_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_add_image_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_add_uri_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_set_track_motion ##### -->
-<para>
-
-</para>
-
-@widget: 
-@track_motion: 
-
-
-<!-- ##### FUNCTION gtk_drag_dest_get_track_motion ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_finish ##### -->
-<para>
-Informs the drag source that the drop is finished, and
-that the data of the drag will no longer be required.
-</para>
-
-@context: the drag context.
-@success: a flag indicating whether the drop was successful
-@del: a flag indicating whether the source should delete the
-      original data. (This should be %TRUE for a move)
-@time_: the timestamp from the "drag_data_drop" signal.
-
-
-<!-- ##### FUNCTION gtk_drag_get_data ##### -->
-<para>
-Gets the data associated with a drag. When the data
-is received or the retrieval fails, GTK+ will emit a 
-"drag_data_received" signal. Failure of the retrieval
-is indicated by the length field of the @selection_data
-signal parameter being negative. However, when gtk_drag_get_data() 
-is called implicitely because the %GTK_DEST_DEFAULT_DROP was set, 
-then the widget will not receive notification of failed
-drops.
-</para>
-
-@widget: the widget that will receive the "drag_data_received"
- signal.
-@context: the drag context
-@target: the target (form of the data) to retrieve.
-@time_: a timestamp for retrieving the data. This will
-       generally be the time received in a "drag_data_motion"
-       or "drag_data_drop" signal.
-
-
-<!-- ##### FUNCTION gtk_drag_get_source_widget ##### -->
-<para>
-
-</para>
-
-@context: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_highlight ##### -->
-<para>
-Draws a highlight around a widget. This will attach
-handlers to  "expose_event" and "draw", so the highlight
-will continue to be displayed until gtk_drag_unhighlight()
-is called.
-</para>
-
-@widget: a widget to highlight
-
-
-<!-- ##### FUNCTION gtk_drag_unhighlight ##### -->
-<para>
-Removes a highlight set by gtk_drag_highlight() from
-a widget.
-</para>
-
-@widget: a widget to remove the highlight from.
-
-
-<!-- ##### FUNCTION gtk_drag_begin ##### -->
-<para>
-
-</para>
-
-@widget: 
-@targets: 
-@actions: 
-@button: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_widget ##### -->
-<para>
-</para>
-
-@context: 
-@widget: 
-@hot_x: 
-@hot_y: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_pixbuf ##### -->
-<para>
-
-</para>
-
-@context: 
-@pixbuf: 
-@hot_x: 
-@hot_y: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_stock ##### -->
-<para>
-
-</para>
-
-@context: 
-@stock_id: 
-@hot_x: 
-@hot_y: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_surface ##### -->
-<para>
-
-</para>
-
-@context: 
-@surface: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_name ##### -->
-<para>
-
-</para>
-
-@context: 
-@icon_name: 
-@hot_x: 
-@hot_y: 
-
-
-<!-- ##### FUNCTION gtk_drag_set_icon_default ##### -->
-<para>
-</para>
-
-@context: 
-
-
-<!-- ##### FUNCTION gtk_drag_check_threshold ##### -->
-<para>
-
-</para>
-
-@widget: 
-@start_x: 
-@start_y: 
-@current_x: 
-@current_y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_set ##### -->
-<para>
-
-</para>
-
-@widget: 
-@start_button_mask: 
-@targets: 
-@n_targets: 
-@actions: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_set_icon_pixbuf ##### -->
-<para>
-
-</para>
-
-@widget: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_set_icon_stock ##### -->
-<para>
-
-</para>
-
-@widget: 
-@stock_id: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_set_icon_name ##### -->
-<para>
-
-</para>
-
-@widget: 
-@icon_name: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_unset ##### -->
-<para>
-Undoes the effects of gtk_drag_source_set().
-</para>
-
-@widget: a #GtkWidget
-
-
-<!-- ##### FUNCTION gtk_drag_source_set_target_list ##### -->
-<para>
-
-</para>
-
-@widget: 
-@target_list: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_get_target_list ##### -->
-<para>
-
-</para>
-
-@widget: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_add_text_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_add_image_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-
-<!-- ##### FUNCTION gtk_drag_source_add_uri_targets ##### -->
-<para>
-
-</para>
-
-@widget: 
-
-

docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml

@@ -1,162 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFileChooserButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button to launch a file selection dialog
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkFileChooserButton is a widget that lets the user select a
-file.  It implements the #GtkFileChooser interface.  Visually, it is a
-file name with a button to bring up a #GtkFileChooserDialog.
-The user can then use that dialog to change the file associated with
-that button.  This widget does not support setting the "select-multiple"
-property to %TRUE.
-</para>
-
-<example>
-<title>Create a button to let the user select a file in /etc</title>
-<programlisting>
-{
-  GtkWidget *button;
-
-  button = gtk_file_chooser_button_new (_("Select a file"),
-                                        GTK_FILE_CHOOSER_ACTION_OPEN);
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (button),
-                                       "/etc");
-}
-</programlisting>
-</example>
-
-<para>
-The #GtkFileChooserButton supports the #GtkFileChooserAction<!--
--->s %GTK_FILE_CHOOSER_ACTION_OPEN and %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER.
-</para>
-
-<important>
-<para>
-The #GtkFileChooserButton will ellipsize the label,
-and thus will thus request little horizontal space.  To give the button
-more space, you should call gtk_widget_get_preferred_size(),
-gtk_file_chooser_button_set_width_chars(), or pack the button in
-such a way that other interface elements give space to the widget.
-</para>
-</important>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkFileChooserDialog
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFileChooserButton ##### -->
-<para>
-This should not be accessed directly.  Use the accessor functions below. 
-</para>
-
-
-<!-- ##### SIGNAL GtkFileChooserButton::file-set ##### -->
-<para>
-
-</para>
-
-@filechooserbutton: the object which received the signal.
-
-<!-- ##### ARG GtkFileChooserButton:dialog ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooserButton:focus-on-click ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooserButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFileChooserButton:width-chars ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_file_chooser_button_new ##### -->
-<para>
-
-</para>
-
-@title: 
-@action: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_new_with_dialog ##### -->
-<para>
-
-</para>
-
-@dialog: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_get_title ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_set_title ##### -->
-<para>
-
-</para>
-
-@button: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_get_width_chars ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_set_width_chars ##### -->
-<para>
-
-</para>
-
-@button: 
-@n_chars: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_get_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_file_chooser_button_set_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@focus_on_click: 
-
-

docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml

@@ -1,174 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFileChooserDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-A file chooser dialog, suitable for "File/Open" or "File/Save" commands
-
-<!-- ##### SECTION Long_Description ##### -->
-    <para>
-      #GtkFileChooserDialog is a dialog box suitable for use with
-      "File/Open" or "File/Save as" commands.  This widget works by
-      putting a #GtkFileChooserWidget inside a #GtkDialog.  It exposes
-      the #GtkFileChooserIface interface, so you can use all of the
-      #GtkFileChooser functions on the file chooser dialog as well as
-      those for #GtkDialog.
-    </para>
-
-    <para>
-      Note that #GtkFileChooserDialog does not have any methods of its
-      own.  Instead, you should use the functions that work on a
-      #GtkFileChooser.
-    </para>
-
-    <example id="gtkfilechooser-typical-usage">
-      <title>Typical usage</title>
-
-      <para>
-	In the simplest of cases, you can the following code to use
-	#GtkFileChooserDialog to select a file for opening:
-      </para>
-
-      <programlisting>
-GtkWidget *dialog;
-
-dialog = gtk_file_chooser_dialog_new ("Open File",
-				      parent_window,
-				      GTK_FILE_CHOOSER_ACTION_OPEN,
-				      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-				      NULL);
-
-if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-  {
-    char *filename;
-
-    filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-    open_file (filename);
-    g_free (filename);
-  }
-
-gtk_widget_destroy (dialog);
-      </programlisting>
-
-      <para>
-        To use a dialog for saving, you can use this:
-      </para>
-
-      <programlisting>
-GtkWidget *dialog;
-
-dialog = gtk_file_chooser_dialog_new ("Save File",
-				      parent_window,
-				      GTK_FILE_CHOOSER_ACTION_SAVE,
-				      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-				      NULL);
-gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
-
-if (user_edited_a_new_document)
-  {
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), default_folder_for_saving);
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), "Untitled document");
-  }
-else
-  gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document);
-
-
-if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-  {
-    char *filename;
-
-    filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-    save_to_file (filename);
-    g_free (filename);
-  }
-
-gtk_widget_destroy (dialog);
-      </programlisting>
-    </example>
-
-  <section id="gtkfilechooserdialog-response-codes">
-    <title>Response Codes</title>
-
-    <para>
-      #GtkFileChooserDialog inherits from #GtkDialog, so buttons that
-      go in its action area have response codes such as
-      #GTK_RESPONSE_ACCEPT and #GTK_RESPONSE_CANCEL.  For example, you
-      could call gtk_file_chooser_dialog_new() as follows:
-    </para>
-
-    <programlisting>
-GtkWidget *dialog;
-
-dialog = gtk_file_chooser_dialog_new ("Open File",
-				      parent_window,
-				      GTK_FILE_CHOOSER_ACTION_OPEN,
-				      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-				      NULL);
-    </programlisting>
-
-    <para>
-      This will create buttons for "Cancel" and "Open" that use stock
-      response identifiers from #GtkResponseType.  For most dialog
-      boxes you can use your own custom response codes rather than the
-      ones in #GtkResponseType, but #GtkFileChooserDialog assumes that
-      its "accept"-type action, e.g. an "Open" or "Save" button,
-      <emphasis>will</emphasis> have one of the following response
-      codes:
-      <simplelist id="gtkfilechooserdialog-responses">
-	<member>#GTK_RESPONSE_ACCEPT</member>
-	<member>#GTK_RESPONSE_OK</member>
-	<member>#GTK_RESPONSE_YES</member>
-	<member>#GTK_RESPONSE_APPLY</member>
-      </simplelist>
-    </para>
-
-    <para>
-      This is because #GtkFileChooserDialog must intercept responses
-      and switch to folders if appropriate, rather than letting the
-      dialog terminate &mdash; the implementation uses these known
-      response codes to know which responses can be blocked if
-      appropriate.
-    </para>
-
-    <note>
-      <para>
-	To summarize, make sure you use a <link
-	linkend="gtkfilechooserdialog-responses">stock response
-	code</link> when you use #GtkFileChooserDialog to ensure
-	proper operation.
-      </para>
-    </note>
-  </section>
-
-<!-- ##### SECTION See_Also ##### -->
-    <para>
-      #GtkFileChooser, #GtkDialog
-    </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFileChooserDialog ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_file_chooser_dialog_new ##### -->
-<para>
-
-</para>
-
-@title: 
-@parent: 
-@action: 
-@first_button_text: 
-@Varargs: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkfilechooserwidget.sgml

@@ -1,57 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFileChooserWidget
-
-<!-- ##### SECTION Short_Description ##### -->
-File chooser widget that can be embedded in other widgets
-
-<!-- ##### SECTION Long_Description ##### -->
-    <para>
-      #GtkFileChooserWidget is a widget suitable for selecting files.
-      It is the main building block of a #GtkFileChooserDialog.  Most
-      applications will only need to use the latter; you can use
-      #GtkFileChooserWidget as part of a larger window if you have
-      special needs.
-    </para>
-
-    <para>
-      Note that #GtkFileChooserWidget does not have any methods of its
-      own.  Instead, you should use the functions that work on a
-      #GtkFileChooser.
-    </para>
-
-<!-- ##### SECTION See_Also ##### -->
-    <para>
-      #GtkFileChooser, #GtkFileChooserDialog
-    </para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFileChooserWidget ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_file_chooser_widget_new ##### -->
-<para>
-
-</para>
-
-@action: 
-@Returns: 
-
-
-
-
-<!--
-Local variables:
-mode: sgml
-sgml-parent-document: ("../gtk-docs.sgml" "book" "refentry")
-End:
--->
-
-

docs/reference/gtk/tmpl/gtkfontbutton.sgml

@@ -1,194 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFontButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button to launch a font selection dialog
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkFontButton is a button which displays the currently selected font an allows to open a font selection 
-dialog to change the font. It is suitable widget for selecting a font in a preference dialog.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkFontSelectionDialog, #GtkColorButton.
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFontButton ##### -->
-<para>
-The GtkFontButton struct has only private members and should not be used
-directly.
-</para>
-
-
-<!-- ##### SIGNAL GtkFontButton::font-set ##### -->
-<para>
-
-</para>
-
-@fontbutton: the object which received the signal.
-
-<!-- ##### ARG GtkFontButton:font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:show-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-font ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontButton:use-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_font_button_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_new_with_font ##### -->
-<para>
-
-</para>
-
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_font_name ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_font_name ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_show_style ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@show_style: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_show_style ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_show_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@show_size: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_show_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_use_font ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@use_font: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_use_font ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_use_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@use_size: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_use_size ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_button_set_title ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_font_button_get_title ##### -->
-<para>
-
-</para>
-
-@font_button: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkfontsel.sgml

@@ -1,176 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFontSelection
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget for selecting fonts
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkFontSelection widget lists the available fonts, styles and sizes,
-allowing the user to select a font.
-It is used in the #GtkFontSelectionDialog widget to provide a dialog box for
-selecting fonts.
-</para>
-<para>
-To set the font which is initially selected, use
-gtk_font_selection_set_font_name().
-</para>
-<para>
-To get the selected font use gtk_font_selection_get_font_name().
-</para>
-<para>
-To change the text which is shown in the preview area, use
-gtk_font_selection_set_preview_text().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkFontSelectionDialog</term>
-<listitem><para>a dialog box which uses #GtkFontSelection.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFontSelection ##### -->
-<para>
-The #GtkFontSelection struct contains private data only, and should
-only be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkFontSelection:font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFontSelection:preview-text ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_font_selection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_font_name ##### -->
-<para>
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_set_font_name ##### -->
-<para>
-</para>
-
-@fontsel: 
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_preview_text ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_set_preview_text ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_face ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_face_list ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_family ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_size ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_family_list ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_preview_entry ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_size_entry ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_get_size_list ##### -->
-<para>
-
-</para>
-
-@fontsel: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkfontseldlg.sgml

@@ -1,129 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFontSelectionDialog
-
-<!-- ##### SECTION Short_Description ##### -->
-A dialog box for selecting fonts
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkFontSelectionDialog widget is a dialog box for selecting a font.
-</para>
-<para>
-To set the font which is initially selected, use
-gtk_font_selection_dialog_set_font_name().
-</para>
-<para>
-To get the selected font use gtk_font_selection_dialog_get_font_name().
-</para>
-<para>
-To change the text which is shown in the preview area, use
-gtk_font_selection_dialog_set_preview_text().
-</para>
-
-<refsect2 id="GtkFontSelectionDialog-BUILDER-UI">
-<title>GtkFontSelectionDialog as GtkBuildable</title>
-<para>
-The GtkFontSelectionDialog implementation of the GtkBuildable interface
-exposes the embedded #GtkFontSelection as internal child with the
-name "font_selection". It also exposes the buttons with the names
-"ok_button", "cancel_button" and "apply_button".
-</para>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkFontSelection</term>
-<listitem><para>the underlying widget for selecting
-fonts.</para></listitem>
-<term>#GtkDialog</term>
-<listitem><para>the parent class of GtkFontSelectionDialog</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFontSelectionDialog ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_new ##### -->
-<para>
-
-</para>
-
-@title: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_name ##### -->
-<para>
-</para>
-
-@fsd: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_set_font_name ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@fontname: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_preview_text ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_set_preview_text ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_cancel_button ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_ok_button ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_selection ##### -->
-<para>
-
-</para>
-
-@fsd: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkframe.sgml

@@ -1,160 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkFrame
-
-<!-- ##### SECTION Short_Description ##### -->
-A bin with a decorative frame and optional label
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The frame widget is a Bin that surrounds its child
-with a decorative frame and an optional label.
-If present, the label is drawn in a gap in the
-top side of the frame. The position of the
-label can be controlled with gtk_frame_set_label_align().
-</para>
-
-<refsect2 id="GtkFrame-BUILDER-UI">
-<title>GtkFrame as GtkBuildable</title>
-<para>
-The GtkFrame implementation of the GtkBuildable interface
-supports placing a child in the label position by specifying
-"label" as the "type" attribute of a &lt;child&gt; element.
-A normal content child can be specified without specifying 
-a &lt;child&gt; type attribute.
-</para> 
-<example>
-<title>A UI definition fragment with GtkFrame</title>
-<programlisting><![CDATA[
-<object class="GtkFrame">
-  <child type="label">
-    <object class="GtkLabel" id="frame-label"/>
-  </child>
-  <child>
-    <object class="GtkEntry" id="frame-content"/>
-  </child>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkFrame ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkFrame:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:label-yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkFrame:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_frame_new ##### -->
-<para>
-</para>
-
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_frame_set_label ##### -->
-<para>
-</para>
-
-@frame: 
-@label: 
-
-
-<!-- ##### FUNCTION gtk_frame_set_label_widget ##### -->
-<para>
-
-</para>
-
-@frame: 
-@label_widget: 
-
-
-<!-- ##### FUNCTION gtk_frame_set_label_align ##### -->
-<para>
-</para>
-
-@frame: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_frame_set_shadow_type ##### -->
-<para>
-</para>
-
-@frame: 
-@type: 
-
-
-<!-- ##### FUNCTION gtk_frame_get_label ##### -->
-<para>
-
-</para>
-
-@frame: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_frame_get_label_align ##### -->
-<para>
-
-</para>
-
-@frame: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_frame_get_label_widget ##### -->
-<para>
-
-</para>
-
-@frame: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_frame_get_shadow_type ##### -->
-<para>
-
-</para>
-
-@frame: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkhandlebox.sgml

@@ -1,220 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkHandleBox
-
-<!-- ##### SECTION Short_Description ##### -->
-a widget for detachable window portions
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkHandleBox widget allows a portion of a window to be "torn
-off". It is a bin widget which displays its child and a handle that
-the user can drag to tear off a separate window (the <firstterm>float
-window</firstterm>) containing the child widget. A thin
-<firstterm>ghost</firstterm> is drawn in the original location of the
-handlebox. By dragging the separate window back to its original
-location, it can be reattached.
-</para>
-<para>
-When reattaching, the ghost and float window, must be aligned
-along one of the edges, the <firstterm>snap edge</firstterm>.
-This either can be specified by the application programmer
-explicitely, or GTK+ will pick a reasonable default based
-on the handle position.
-</para>
-<para>
-To make detaching and reattaching the handlebox as minimally confusing
-as possible to the user, it is important to set the snap edge so that
-the snap edge does not move when the handlebox is deattached. For
-instance, if the handlebox is packed at the bottom of a VBox, then
-when the handlebox is detached, the bottom edge of the handlebox's
-allocation will remain fixed as the height of the handlebox shrinks,
-so the snap edge should be set to %GTK_POS_BOTTOM.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkHandleBox ##### -->
-<para>
-The #GtkHandleBox-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>GtkShadowType shadow_type;</entry>
-<entry>The shadow type for the entry. (See gtk_handle_box_set_shadow_type()).</entry>
-</row>
-
-<row>
-<entry>GtkPositionType handle_position;</entry>
-<entry>The position of the handlebox's handle with respect
-to the child. (See gtk_handle_box_set_handle_position())</entry>
-</row>
-
-<row>
-<entry>gint snap_edge;</entry>
-<entry>A value of type #GtkPosition type indicating snap edge for the widget.
-(See gtk_handle_box_set_snap_edge). The value of -1 indicates
-that this value has not been set.</entry>
-</row>
-
-<row>
-<entry>#gboolean child_detached;</entry>
-<entry>A boolean value indicating whether the handlebox's
-child is attached or detached.</entry>
-</row>
-
-</tbody>
-</tgroup>
-</informaltable>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkHandleBox::child-attached ##### -->
-<para>
-This signal is emitted when the contents of the
-handlebox are reattached to the main window.
-</para>
-
-@handlebox: the object which received the signal.
-@widget: the child widget of the handlebox.
-         (this argument provides no extra information
-          and is here only for backwards-compatibility)
-
-<!-- ##### SIGNAL GtkHandleBox::child-detached ##### -->
-<para>
-This signal is emitted when the contents of the
-handlebox are detached from the main window.
-</para>
-
-@handlebox: the object which received the signal.
-@widget: the child widget of the handlebox. 
-         (this argument provides no extra information
-          and is here only for backwards-compatibility)
-
-<!-- ##### ARG GtkHandleBox:child-detached ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:handle-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:snap-edge ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkHandleBox:snap-edge-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_handle_box_new ##### -->
-<para>
-Create a new handle box.
-</para>
-
-@void: 
-@Returns: a new #GtkHandleBox.
-
-
-<!-- ##### FUNCTION gtk_handle_box_set_shadow_type ##### -->
-<para>
-Sets the type of shadow to be drawn around the border 
-of the handle box.
-</para>
-
-@handle_box: a #GtkHandleBox
-@type: the shadow type.
-
-
-<!-- ##### FUNCTION gtk_handle_box_set_handle_position ##### -->
-<para>
-Sets the side of the handlebox where the handle is drawn.
-</para>
-
-@handle_box: a #GtkHandleBox
-@position: the side of the handlebox where the handle should be drawn.
-
-
-<!-- ##### FUNCTION gtk_handle_box_set_snap_edge ##### -->
-<para>
-Sets the snap edge of a handlebox. The snap edge is
-the edge of the detached child that must be aligned
-with the corresponding edge of the "ghost" left
-behind when the child was detached to reattach
-the torn-off window. Usually, the snap edge should
-be chosen so that it stays in the same place on
-the screen when the handlebox is torn off.
-</para>
-<para>
-If the snap edge is not set, then an appropriate value
-will be guessed from the handle position. If the
-handle position is %GTK_POS_RIGHT or %GTK_POS_LEFT,
-then the snap edge will be %GTK_POS_TOP, otherwise
-it will be %GTK_POS_LEFT.
-</para>
-
-@handle_box: a #GtkHandleBox
-@edge: the snap edge, or -1 to unset the value; in which
-case GTK+ will try to guess an appropriate value
-in the future.
-
-
-<!-- ##### FUNCTION gtk_handle_box_get_handle_position ##### -->
-<para>
-
-</para>
-
-@handle_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_handle_box_get_shadow_type ##### -->
-<para>
-
-</para>
-
-@handle_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_handle_box_get_snap_edge ##### -->
-<para>
-
-</para>
-
-@handle_box: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_handle_box_get_child_detached ##### -->
-<para>
-
-</para>
-
-@handle_box: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkhbbox.sgml

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

docs/reference/gtk/tmpl/gtkhpaned.sgml

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

docs/reference/gtk/tmpl/gtkhruler.sgml

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

docs/reference/gtk/tmpl/gtkhscale.sgml

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

docs/reference/gtk/tmpl/gtkhscrollbar.sgml

@@ -1,44 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkHScrollbar
-
-<!-- ##### SECTION Short_Description ##### -->
-A horizontal scrollbar
-
-<!-- ##### SECTION Long_Description ##### -->
-
-<para>
-The #GtkHScrollbar widget is a widget arranged horizontally creating a
-scrollbar. See #GtkScrollbar for details on
-scrollbars. #GtkAdjustment pointers may be added to handle the
-adjustment of the scrollbar or it may be left %NULL in which case one
-will be created for you. See #GtkScrollbar for a description of what the
-fields in an adjustment represent for a scrollbar.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkScrollbar, #GtkScrolledWindow
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkHScrollbar ##### -->
-<para>
-The #GtkHScrollbar struct contains private data and should be accessed
-using the functions below.
-</para>
-
-
-<!-- ##### FUNCTION gtk_hscrollbar_new ##### -->
-<para>
-
-</para>
-
-@adjustment: 
-@Returns: 
-
-