Make setting fontname work, independent of a screen

When repopulating the list of fonts, don't loose the current
selection, unless the font is no longer in the list.

COPYING

@@ -1,15 +1,15 @@
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 [This is the first released version of the library GPL.  It is
  numbered 2 because it goes with version 2 of the ordinary GPL.]
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -99,7 +99,7 @@ works together with the library.
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
 
-                  GNU LIBRARY GENERAL PUBLIC LICENSE
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library which
@@ -411,7 +411,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,7 +434,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -463,8 +463,9 @@ convey the exclusion of warranty; and each file should have at least the
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, write to the 
+    Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+    Boston, MA  02111-1307  USA.
 
 Also add information on how to contact you by electronic and paper mail.
 

INSTALL.in

@@ -9,21 +9,17 @@ GTK+ requires the following packages:
    GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
    and cairo @CAIRO_REQUIRED_VERSION@.
 
- - Each GDK backend has its own backend-specific requirements. For
-   the X11 backend, X11 R6 and XInput version 2 (as well as a number
-   of other extensions) are required.
-
  - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
 
 Simple install procedure
 ========================
 
-  % tar xf gtk+-@GTK_VERSION@.tar.xz   # unpack the sources
-  % cd gtk+-@GTK_VERSION@              # change to the toplevel directory
-  % ./configure                        # run the `configure' script
-  % make                               # build GTK+
+  % 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+
   [ Become root if necessary ]
-  % make install                       # install GTK+
+  % make install                                   # install GTK+
 
 The Details
 ===========

Makefile.am

@@ -63,6 +63,10 @@ gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-waylan
 	rm -f $@ && \
 	cp gdk-3.0.pc $@
 
+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
 
@@ -80,6 +84,8 @@ DISTCLEANFILES = \
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt
 
 distclean-local:

Makefile.decl

@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules
 
 # Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
    491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
    991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
@@ -29,7 +29,7 @@ endif
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY

README.in

@@ -11,15 +11,14 @@ licensing terms for GTK+, the GNU LGPL, allow it to be used by all
 developers, including those developing proprietary software, without any
 license fees or royalties.
 
-The official download locations are:
+The official ftp site is:
   ftp://ftp.gtk.org/pub/gtk
-  http://download.gnome.org/sources/gtk+
 
 The official web site is:
   http://www.gtk.org/
 
 Information about mailing lists can be found at
-  http://www.gtk.org/mailing-lists.php
+  http://www.gtk.org/mailing-lists.html
 
 
 Installation
@@ -28,114 +27,6 @@ Installation
 See the file 'INSTALL'
 
 
-How to report bugs
-==================
-
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product glib.) You will need
-to create an account for yourself.
-
-In the bug report please include:
-
-* Information about your system. For instance:
-
-   - What operating system and version
-   - For Linux, what version of the C library
-
-  And anything else you think is relevant.
-
-* How to reproduce the bug.
-
-  If you can reproduce it with one of the test programs that are built
-  in the tests/ subdirectory, that will be most convenient.  Otherwise,
-  please include a short test program that exhibits the behavior.
-  As a last resort, you can also provide a pointer to a larger piece
-  of software that can be downloaded.
-
-* If the bug was a crash, the exact text that was printed out
-  when the crash occured.
-
-* Further information such as stack traces may be useful, but
-  is not necessary.
-
-
-Patches
-=======
-
-Patches should also be submitted to bugzilla.gnome.org. If the
-patch fixes an existing bug, add the patch as an attachment
-to that bug report.
-
-Otherwise, enter a new bug report that describes the patch,
-and attach the patch to that bug report.
-
-Patches should be in unified diff form. (The -up option to GNU diff.)
-
-
-Release notes for 3.6
-=====================
-
-* The accessibility bridge code that exports accessible objects
-  on the bus is now used by default; atk-bridge has been converted
-  into a library that GTK+ links against. To void the linking,
-  pass --without-atk-bridge when configuring GTK+.
-
-* GDK threading support has been deprecated. It is recommended to
-  use g_idle_add(), g_main_context_invoke() and similar funtions
-  to make all GTK+ calls from the main thread.
-
-* GTK+ now follows the XDG Base Directory specification for
-  user configuration and data files. In detail,
-  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
-    for $HOME/.gtk-custom-papers
-  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
-    for $HOME/.gtk-bookmarks
-  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
-  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
-  Existing files from the old location will still be read
-  if the new location does not exist.
-
-* $HOME/.gtk-3.0 is no longer in the default module load path.
-  If you want to load modules from there, add it to the GTK_PATH
-  environment variable.
-
-Release notes for 3.4
-=====================
-
-* Scroll events have been separated from button events, and smooth
-  scrolling has been added with a separate event mask. Widgets now
-  need to have either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK in
-  their event mask to receive scroll events. In addition, the
-  GdkScrollDirection enumeration has gained a new member,
-  GDK_SCROLL_SMOOTH, so switch statements will have to be amended
-  to cover this case.
-
-* GTK+ now uses <Primary> instead of <Control> in keyboard accelerators,
-  for improved cross-platform handling. This should not affect
-  applications, unless they parse or create these accelerator
-  manually.
-
-* The tacit assumption that the Alt key corresponds to the MOD1
-  modifier under X11 is now a hard requirement.
-
-* The beagle search backend for the file chooser has been dropped.
-  Tracker is the only supported search backend on Linux now.
-
-* GtkNotebook has been changed to destroy its action widgets when
-  it gets destroyed itself. If your application is using action
-  widgets in notebooks, you may have to adjust your code to take
-  this into account.
-
-* GtkApplication no longer uses the gtk mainloop wrappers, so
-  it is no longer possible to use gtk_main_quit() to stop it.
-
-* The -uninstalled variants of the pkg-config files have been dropped.
-
-* Excessive dependencies have been culled from Requires: lines
-  in .pc files. Dependent modules may have to declare dependencies
-  that there were getting 'for free' in the past.
-
-
 Release notes for 3.2
 =====================
 

README.win32

@@ -156,17 +156,11 @@ 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/2010 solution and project files to build GTK+, which
+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 (with GAIL/a11y built in),
-the GAIL-Util library and the gtk-demo program.
-
-Please refer to the following GNOME Live! page for a more detailed ouline
-on the process of building the GTK+ stack and its dependencies with Visual
-C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+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

autogen.sh

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

build/win32/vs10/README.txt

@@ -1,11 +1,4 @@
-Please do not compile this package (GTK+) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-A more detailed outline for instructions on building the GTK+ with Visual
-C++ can be found in the following GNOME Live! page:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+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

build/win32/vs10/gailutil.vcxproj

@@ -26,17 +26,16 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-	<WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -63,10 +62,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -86,7 +86,7 @@
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -110,7 +110,7 @@
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -132,7 +132,7 @@
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -157,7 +157,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gdk-win32.vcxproj

@@ -27,7 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -36,7 +35,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -116,7 +114,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c" />
-    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-virtual.c" />
     <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c" />
     <ClCompile Include="..\..\..\gdk\win32\gdkdevice-wintab.c" />
     <ClCompile Include="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />

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

@@ -18,9 +18,6 @@
     <ClCompile Include="..\..\..\gdk\win32\gdkcursor-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\gdk\win32\gdkdevice-virtual.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\gdk\win32\gdkdevice-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs10/gdk.vcxprojin

@@ -27,7 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -36,7 +35,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -64,9 +62,9 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -83,11 +81,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -103,13 +101,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <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)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -128,11 +126,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -148,13 +146,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <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)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk+.props

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>3.0</GtkApiVersion>
-    <GtkBinaryVersion>3.0.0</GtkBinaryVersion>
+    <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
     <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
     <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
     <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
@@ -18,24 +18,22 @@ mkdir $(CopyDir)\bin
 
 copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
 
+mkdir $(CopyDir)\bin\gtk3-demo
 
-mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
-
-copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\bin\gtk3-demo
 
 
 mkdir $(CopyDir)\lib
@@ -97,8 +95,6 @@ copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
-copy ..\..\..\gdk\gdkversionmacros.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
@@ -106,23 +102,6 @@ copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk
 
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32
-
-
 mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -143,8 +122,6 @@ copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -161,8 +138,6 @@ copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\
 
 copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -225,13 +200,9 @@ copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -241,8 +212,6 @@ copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -279,11 +248,7 @@ copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
+copy ..\..\..\gtk\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
@@ -291,6 +256,22 @@ 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
@@ -303,8 +284,6 @@ copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -319,8 +298,6 @@ copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -333,8 +310,6 @@ copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -377,8 +352,6 @@ copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -391,6 +364,8 @@ copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\g
 
 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
@@ -415,8 +390,6 @@ copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -445,6 +418,8 @@ 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
@@ -455,6 +430,10 @@ 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
@@ -521,16 +500,26 @@ copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gt
 
 copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtktypes.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
@@ -538,51 +527,6 @@ copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated
-
-
 mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
 
 copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util
@@ -597,14 +541,14 @@ copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
 
 copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
 
+copy $(Configuration)\$(Platform)\bin\gailutil.lib $(CopyDir)\lib
+
 
 mkdir $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 
-copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-
-echo "Compiling gsettings XML Files..."
+echo "Compiling gsettings XML File(s)..."
 
 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 
@@ -627,7 +571,7 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>

build/win32/vs10/gtk.vcxprojin

@@ -12,12 +12,10 @@
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -64,14 +62,14 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,17 +81,17 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,20 +101,20 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <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)-$(GtkApiVersion).lib</ImportLibrary>
+      <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;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -128,17 +126,17 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -148,13 +146,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <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)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-demo.vcxproj

@@ -164,7 +164,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\assistant.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\builder.c" />
@@ -173,12 +172,6 @@
     <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\css_accordion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_basics.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -208,10 +201,7 @@
     <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\theming_custom_css.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c" />
   </ItemGroup>

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

@@ -11,9 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\appwindow.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -38,24 +35,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_accordion.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_basics.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -143,18 +122,9 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_custom_css.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs10/libgail.vcxprojin

@@ -26,17 +26,16 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>

build/win32/vs9/README.txt

@@ -1,11 +1,4 @@
-Please do not compile this package (GTK+) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-A more detailed outline for instructions on building the GTK+ with Visual
-C++ can be found in the following GNOME Live! page:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+Note that all this is rather experimental.
 
 This VS9 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you

build/win32/vs9/gailutil.vcproj

@@ -23,7 +23,7 @@
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -42,12 +42,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -77,11 +77,11 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -89,7 +89,7 @@
 			Name="Release|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -114,7 +114,7 @@
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -126,7 +126,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -144,13 +143,13 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gdk-win32.vcproj

@@ -46,7 +46,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -88,7 +87,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -125,7 +123,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdevice-virtual.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdevice-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdevice-wintab.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkdevicemanager-win32.c" />

build/win32/vs9/gdk.vcprojin

@@ -43,12 +43,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -57,7 +57,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -74,14 +73,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -109,12 +108,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -123,7 +122,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -140,14 +138,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gtk+.vsprops

@@ -9,7 +9,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
@@ -27,21 +27,13 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs9\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
 	<UserMacro
 		Name="GtkApiVersion"
 		Value="3.0"
 	/>
 	<UserMacro
 		Name="GtkBinaryVersion"
-		Value="3.0.0"
+		Value="2.10.0"
 	/>
 	<UserMacro
 		Name="GtkDummyPrefix"
@@ -67,310 +59,279 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 		Name="GtkDoInstall"
 		Value="
 echo on&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
+mkdir $(OutDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+mkdir $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk3-demo&#x0D;&#x0A;
 
-copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(GtkApiVersion)\demo&#x0D;&#x0A;
+mkdir $(OutDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcairo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkcursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevice.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdevicemanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrectangle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkrgba.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkthreads.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelgroupprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccellabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkappchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkapplication.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkborder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareabox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellareacontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendereraccel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcomboboxtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcssprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkdrawingarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrybuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkentrycompletion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkenums.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkeventbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkexpander.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgradient.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkgrid.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinfobar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkinvisible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtklockbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenushell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmenutoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmessagedialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtknumerableicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoverlay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkplug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkscrolledwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatormenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkseparatortoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksizerequest.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstylecontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleproperties.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkstyleprovider.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkswitch.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtksymboliccolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextattributes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextiter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextlayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkthemingengine.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreednd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreemodelsort.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreesortable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gdk\win32&#x0D;&#x0A;
+mkdir $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gail-util.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailmisc.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
+copy ..\..\..\libgail-util\gailtextutil.h $(OutDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgradient.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksymboliccolor.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;;
-copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib&#x0D;&#x0A;
 
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(GtkApiVersion)\libgail-util&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
-
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
-$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#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
@@ -407,4 +368,8 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&
 		Name="GtkDllSuffix"
 		Value="$(GtkSeparateVS9DllSuffix)"
 	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="..\..\..\..\..\vs9\$(PlatformName)"
+	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk.vcprojin

@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -43,12 +43,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -57,14 +57,13 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -74,14 +73,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -97,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -109,12 +108,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -123,14 +122,13 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="2"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -140,14 +138,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
+				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
+				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gtk3-demo.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
@@ -160,7 +160,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File RelativePath="..\..\..\demos\gtk-demo\application.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
@@ -169,12 +168,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -204,10 +197,7 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\theming_custom_css.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
 		</Filter>

build/win32/vs9/libgail.vcprojin

@@ -23,7 +23,7 @@
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -67,7 +67,7 @@
 			Name="Release|Win32"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -91,7 +91,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"

config.h.win32.in

@@ -5,11 +5,8 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* define to enable packagekit */
-/* #undef ENABLE_PACKAGEKIT */
-
-/* Whether to use EGL in Wayland backend */
-/* #undef GDK_WAYLAND_USE_EGL */
+/* Define if gio can sniff image data */
+/* #undef GDK_PIXBUF_USE_GIO_MIME */
 
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
@@ -23,8 +20,8 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 
-/* define if we have colord */
-/* #undef HAVE_COLORD */
+/* Is the wctype implementation broken */
+/* #undef HAVE_BROKEN_WCTYPE */
 
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */
@@ -35,18 +32,6 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#ifndef _MSC_VER
-#define HAVE_DECL_ISINF 1
-#endif
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#ifndef _MSC_VER
-#define HAVE_DECL_ISNAN 1
-#endif
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
@@ -72,9 +57,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
-/* Define if gio-unix is available */
-/* #undef HAVE_GIO_UNIX */
-
 /* Have GNU ftw */
 /* #undef HAVE_GNU_FTW */
 
@@ -91,17 +73,12 @@
 /* #undef HAVE_INTTYPES_H */
 #endif
 
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#define HAVE_IPRINTDIALOGCALLBACK 1
+/* Define to 1 if ipc.h is available */
+/* #undef HAVE_IPC_H */
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
-/* Define to 1 if you have the `m' library (-lm). */
-#ifndef _MSC_VER
-#define HAVE_LIBM 1
-#endif
-
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -123,29 +100,23 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* Define to 1 if nearbyint() is available */
-#ifndef _MSC_VER
-#define HAVE_NEARBYINT 1
-#endif
-
 /* Define to 1 if libpapi available */
 /* #undef HAVE_PAPI */
 
+/* Define to 1 is libjpeg supports progressive JPEG */
+/* #undef HAVE_PROGRESSIVE_JPEG */
+
 /* Define to 1 if you have the <pwd.h> header file. */
 /* #undef HAVE_PWD_H */
 
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
-/* Define to 1 if rint() is available */
-#ifndef _MSC_VER
-#define HAVE_RINT 1
-#endif
+/* Define to 1 if shm.h is available */
+/* #undef HAVE_SHM_H */
 
-/* Define to 1 if round() is available */
-#ifndef _MSC_VER
-#define HAVE_ROUND 1
-#endif
+/* Define to 1 if sigsetjmp is available */
+/* #undef HAVE_SIGSETJMP */
 
 /* Have the sockaddr_un.sun_len member */
 /* #undef HAVE_SOCKADDR_UN_SUN_LEN */
@@ -157,9 +128,6 @@
 #ifndef _MSC_VER
 #define HAVE_STDINT_H 1
 #else
-#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
-#define HAVE_STDINT_H 1
-#endif
 /* #undef HAVE_STDINT_H */
 #endif
 
@@ -167,15 +135,13 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
 #define HAVE_STRINGS_H 1
-#endif
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
+/* Define to 1 if sys/select.h is available */
+/* #undef HAVE_SYS_SELECT_H */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
@@ -196,6 +162,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
@@ -203,9 +172,24 @@
 /* #undef HAVE_UNISTD_H */
 #endif
 
+/* Have uxtheme.h include file */
+#define HAVE_UXTHEME_H 1
+
+/* Have wchar.h include file */
+#define HAVE_WCHAR_H 1
+
+/* Have wctype.h include file */
+#define HAVE_WCTYPE_H 1
+
+/* Define if we have X11R6 */
+/* #undef HAVE_X11R6 */
+
 /* Have the XCOMPOSITE X extension */
 /* #undef HAVE_XCOMPOSITE */
 
+/* Define to 1 if you have the `XConvertCase' function. */
+/* #undef HAVE_XCONVERTCASE */
+
 /* Have the Xcursor library */
 /* #undef HAVE_XCURSOR */
 
@@ -218,15 +202,18 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Have XGenericEvent */
-/* #undef HAVE_XGENERICEVENTS */
-
 /* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
+/* Define to 1 if you have the `XInternAtoms' function. */
+/* #undef HAVE_XINTERNATOMS */
+
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
+/* Define to 1 if xshm.h is available */
+/* #undef HAVE_XSHM_H */
+
 /* Have the SYNC extension library */
 /* #undef HAVE_XSYNC */
 
@@ -252,6 +239,9 @@
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
+/* Define to 1 if fd_set is not available */
+#define NO_FD_SET 1
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #ifndef _MSC_VER
 /* #undef NO_MINUS_C_MINUS_O */
@@ -271,15 +261,11 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gtk+"
 
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
 
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-/* #undef QUARTZ_RELOCATION */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -287,26 +273,34 @@
 /* Define to 1 if gmodule works and should be used */
 #define USE_GMODULE 1
 
-/* Define to 1 if XInput 2.0 is available */
-/* #undef XINPUT_2 */
+/* Whether to load modules via .la files rather than directly */
+/* #undef USE_LA_MODULES */
 
-/* Define to 1 if XInput 2.2 is available */
-/* #undef XINPUT_2_2 */
+/* Define to 1 if XXM is available and should be used */
+#ifndef _MSC_VER
+#  define USE_MMX 1
+#else
+#  undef USE_MMX
+#endif
+
+/* Define to 1 if no XInput should be used */
+/* #undef XINPUT_NONE */
+
+/* Define to 1 if XFree XInput should be used */
+/* #undef XINPUT_XFREE */
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
 

configure.ac

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [7])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [1])
+m4_define([gtk_micro_version], [11])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -39,12 +39,12 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.35.0])
-m4_define([pango_required_version], [1.30.0])
-m4_define([atk_required_version], [2.5.3])
+m4_define([glib_required_version], [2.29.14])
+m4_define([pango_required_version], [1.29.0])
+m4_define([atk_required_version], [1.30])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.26.0])
-m4_define([introspection_required_version], [1.32.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
@@ -62,7 +62,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
 # Support silent build rules. Disable
@@ -125,7 +125,6 @@ AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 AC_PROG_CC
 AC_PROG_CC_C_O
 AC_PROG_CC_STDC
-AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
@@ -141,11 +140,8 @@ MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
 EXE_MANIFEST_ARCHITECTURE=X86
-DISABLE_ON_W32=''
 case "$host" in
   *-*-mingw*)
-    dnl Comment-out certain gtk3.types.in lines
-    DISABLE_ON_W32='%'
     os_win32=yes
     gio_can_sniff=no
     MATH_LIB=
@@ -162,7 +158,6 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])
 
-AC_SUBST(DISABLE_ON_W32)
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
 AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
@@ -170,6 +165,9 @@ case $host in
   *-*-linux*)
     os_linux=yes
     ;;
+  *-*-openbsd*)
+    os_openbsd=yes
+    ;;
 esac
 
 dnl
@@ -268,23 +266,27 @@ AC_ARG_ENABLE(xkb,
               [enable_xkb="maybe"])
 AC_ARG_ENABLE(xinerama,
               [AS_HELP_STRING([--enable-xinerama],
-	                      [support Xinerama extension [default=maybe]])],,
+	                      [support Xinerama extension if available [default=maybe]])],,
               [enable_xinerama="maybe"])
+AC_ARG_ENABLE(xinput,
+              [AS_HELP_STRING([--enable-xinput],
+                              [support XInput extension if available [default=yes]])],,
+              [enable_xinput="maybe"])
 AC_ARG_ENABLE(xrandr,
               [AS_HELP_STRING([--enable-xrandr],
-                              [support XRandR extension [default=maybe]])],,
+                              [support XRandR extension if available [default=maybe]])],,
               [enable_xrandr="maybe"])
 AC_ARG_ENABLE(xfixes,
               [AS_HELP_STRING([--enable-xfixes],
-                              [support XFixes extension [default=maybe]])],,
+                              [support XFixes extension if available [default=maybe]])],,
               [enable_xfixes="maybe"])
 AC_ARG_ENABLE(xcomposite,
               [AS_HELP_STRING([--enable-xcomposite],
-                              [support X Composite extension [default=maybe]])],,
+                              [support X Composite extension if available [default=maybe]])],,
               [enable_xcomposite="maybe"])
 AC_ARG_ENABLE(xdamage,
               [AS_HELP_STRING([--enable-xdamage],
-                              [support X Damage extension [default=maybe]])],,
+                              [support X Damage extension if available [default=maybe]])],,
               [enable_xdamage="maybe"])
 
 AC_ARG_ENABLE(x11-backend,
@@ -316,40 +318,29 @@ if test -z "$backend_set"; then
   fi
 fi
 
-AC_ARG_ENABLE(quartz-relocation,
-              [AS_HELP_STRING([--enable-quartz-relocation],
-                              [enable bundle-based relocation functions])],
-                              [quartz_relocation=yes])
-
-AC_ARG_ENABLE(wayland-cairo-gl,
-              AS_HELP_STRING([--enable-wayland-cairo-gl],
-                             [enable the use of Cairo GL in the Wayland backend]),
-              [enable_wayland_cairo_gl=yes])
-
-
 cairo_backends=
 backend_immodules=
-have_gio_unix=no
 GDK_BACKENDS=
 GDK_EXTRA_LIBS=
 GDK_EXTRA_CFLAGS=
 GDK_WINDOWING=
+GIO_PACKAGE=gio-2.0
 PANGO_PACKAGES="pango pangocairo"
 
-if test "$enable_x11_backend" = "yes"; 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"
   GDK_BACKENDS="$GDK_BACKENDS x11"
   # Pull in gio-unix for GDesktopAppInfo usage, see at least
   # gdkapplaunchcontext-x11.c
-  have_gio_unix=yes
+  GIO_PACKAGE=gio-unix-2.0
   backend_immodules="$backend_immodules,xim"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_X11"
 fi
 
-if test "$enable_win32_backend" = "yes"; 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"
@@ -362,28 +353,19 @@ else
   AM_CONDITIONAL(USE_WIN32, false)
 fi
 
-DISABLE_ON_QUARTZ=''
 if test "x$enable_quartz_backend" = xyes; then
   cairo_backends="$cairo_backends cairo-quartz"
   GDK_BACKENDS="$GDK_BACKENDS quartz"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
-  DISABLE_ON_QUARTZ='%'
   AM_CONDITIONAL(USE_QUARTZ, true)
-  if test "x$quartz_relocation" = xyes; then
-    AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
-  fi
-  # Pull in gio-unix for GDesktopAppInfo usage, see at least
-  # gdkapplaunchcontext-x11.c
-  have_gio_unix=yes
-
 else
   AM_CONDITIONAL(USE_QUARTZ, false)
 fi
-AC_SUBST(DISABLE_ON_QUARTZ)
 
-if test "x$enable_broadway_backend" = xyes; then
+
+if test "x$enable_broadway_backend" == xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
   GDK_WINDOWING="$GDK_WINDOWING
@@ -394,23 +376,14 @@ else
   AM_CONDITIONAL(USE_BROADWAY, false)
 fi
 
-if test "x$enable_wayland_backend" = "xyes"; then
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    # Wayland can use cairo-gl
-    cairo_backends="$cairo_backends cairo-gl"
-    AC_DEFINE(GDK_WAYLAND_USE_EGL, [1], [Whether to use EGL in Wayland backend])
-  else
-    # For the cairo image backend
-    cairo_backends="$cairo_backends cairo"
-  fi
+if test "x$enable_wayland_backend" == "xyes"; then
+  # Wayland uses cairo-gl
+  cairo_backends="$cairo_backends cairo-gl"
   GDK_BACKENDS="$GDK_BACKENDS wayland"
-  have_gio_unix=yes
+  GIO_PACKAGE=gio-unix-2.0
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
-    WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
-  fi
+  WAYLAND_PACKAGES="wayland-client xkbcommon wayland-egl"
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
@@ -427,12 +400,12 @@ fi
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
 else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
   else
-    GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+    GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
   fi
 fi
 
@@ -465,6 +438,8 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
@@ -516,8 +491,6 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
 
 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-
 if test "$os_win32" != yes; then
     # libtool option to control which symbols are exported
     # right now, symbols starting with _ are not exported
@@ -708,12 +681,25 @@ esac
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 #
 
+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
+
 AM_PATH_GLIB_2_0(glib_required_version, :,
   AC_MSG_ERROR([
 *** GLIB glib_required_version or better is required. The latest version of
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule-no-export)
+  gobject gmodule-no-export gthread)
 
+# See if it's safe to turn G_DISABLE_DEPRECATED on.
+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+fi
+
+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+
+
+dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
 gtk_save_LIBS=$LIBS
@@ -747,19 +733,6 @@ else
     AC_MSG_RESULT([no])
 fi
 
-#
-# Disable deprecation checks for all libraries we depend on on stable branches.
-# This is so newer versions of those libraries don't cause more warnings with
-# a stable GTK version.
-# We don't ever want to turn off deprecation warnings for master however, because
-# that's where we get rid of deprecated API we use.
-#
-if test m4_eval(gtk_minor_version % 2) = 0 ; then
-  AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
-                     [Disable deprecation warnings from glib])
-fi
-
-dnl
 saved_cflags="$CFLAGS"
 saved_ldflags="$LDFLAGS"
 
@@ -771,10 +744,14 @@ AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 
-# Check for round(), rint(), isnan(), isinf() and nearbyint()
-AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint)
-AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
+# Check for uxtheme.h (for MS-Windows Engine)
+AC_MSG_CHECKING(for uxtheme.h)
+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
+AC_MSG_RESULT($gtk_uxtheme_h)
 
 # Checks for gdkspawn
 AC_CHECK_HEADERS(crt_externs.h)
@@ -991,27 +968,43 @@ if test "x$enable_x11_backend" = xyes; then
   # Xext is optional, the chances a system has *none* of these things is so
   # small that we just unconditionally require it.
   AC_CHECK_FUNC(XOpenDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
+                AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
   AC_CHECK_FUNC(XextFindDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
+                AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
 
   # Check for xReply
 
   AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
-                                     [[xReply *rep = NULL;
-                                       rep = rep;]])],
+                                     [[xReply *rep;]])],
                     [AC_MSG_RESULT([no])],
                     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
                                                           #include <X11/Xlibint.h>]],
-                                                        [[xReply *rep = NULL;
-                                                          rep = rep;]])],
+                                                        [[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)
+
+  AC_CHECK_FUNCS(XConvertCase XInternAtoms)
+
+  # Generic X11R6 check needed for XIM support; we could
+  # probably use this to replace the above, but we'll
+  # leave the separate checks for XConvertCase and XInternAtoms
+  # for clarity
+
+  have_x11r6=false
+  AC_CHECK_FUNC(XAddConnectionWatch,
+      have_x11r6=true)
+
+  if $have_x11r6; then
+    AC_DEFINE(HAVE_X11R6, 1, [Define if we have X11R6])
+  fi
+  AM_CONDITIONAL(HAVE_X11R6, $have_x11r6)
+
   # Check for XKB support.
 
   if test "x$enable_xkb" = "xyes"; then
@@ -1112,37 +1105,33 @@ if test "x$enable_x11_backend" = xyes; then
                 AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
 
   # set up things for XInput
-  if $PKG_CONFIG --exists "xi" ; then
+  if test "x$enable_xinput" != "xno" && $PKG_CONFIG --exists "xi" ; then
+    have_xinput=yes
+
+    AC_DEFINE(XINPUT_XFREE, 1,
+              [Define to 1 if XFree XInput should be used])
 
     X_PACKAGES="$X_PACKAGES xi"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
 
     AC_CHECK_HEADER(X11/extensions/XInput2.h,
                     have_xinput2=yes
-                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
+                    X_EXTENSIONS="$X_EXTENSIONS XI2"
+                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
+                    X_EXTENSIONS="$X_EXTENSIONS XInput")
 
-    gtk_save_LIBS="$LIBS"
-    LIBS="$LIBS -lXi"
-
-    # Note that we also check that the XIScrollClassInfo struct is defined,
-    # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct.
-    AC_CHECK_FUNC([XIAllowTouchEvents],
-      [AC_CHECK_MEMBER([XIScrollClassInfo.number],
-                       have_xinput2_2=yes
-                       AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]),
-                       have_xinput2_2=no,
-                       [[#include <X11/extensions/XInput2.h>]])])
-    LIBS="$gtk_save_LIBS"
-
-    if test "x$have_xinput2_2" = "xyes"; then
-      X_EXTENSIONS="$X_EXTENSIONS XI2.2"
-    else
-      X_EXTENSIONS="$X_EXTENSIONS XI2"
-    fi
+  else
+    AC_DEFINE(XINPUT_NONE, 1,
+              [Define to 1 if no XInput should be used])
   fi
 
-  AS_IF([test "x$have_xinput2" != "xyes"],
-        [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
+  AM_CONDITIONAL(XINPUT_XFREE, test "x$have_xinput" = "xyes")
+  AM_CONDITIONAL(XINPUT_2,     test "x$have_xinput2" = "xyes")
+
+  if test "x$enable_xinput" = "xyes" ; then
+    if test "x$have_xinput" != "xyes" -a "x$have_xinput2" != "xyes" ; then
+      AC_MSG_ERROR([*** XInput extension not found. Check 'config.log' for more details.])
+    fi
+  fi
 
   # Check for the RANDR extension
   if test x"$enable_xrandr" != xno; then
@@ -1223,16 +1212,10 @@ if test "x$enable_x11_backend" = xyes; then
 else
   XPACKAGES=
 
+  AM_CONDITIONAL(XINPUT_XFREE, false)
+  AM_CONDITIONAL(XINPUT_2, false)
   AM_CONDITIONAL(USE_X11, false)
-fi
-
-# Check for gio-unix
-if test "$have_gio_unix" = "yes"; then
-  GDK_GIO_PACKAGE=gio-unix-2.0
-  AC_DEFINE([HAVE_GIO_UNIX], [1],
-            [Define if gio-unix is available])
-else
-  GDK_GIO_PACKAGE=gio-2.0
+  AM_CONDITIONAL(HAVE_X11R6, false)
 fi
 
 # Check for Pango flags
@@ -1266,25 +1249,20 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
-if test "x$enable_x11_backend" = xyes; then
-  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
-fi
+GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
 
-PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS"
+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"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 # into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
   GDK_EXTRA_LIBS=
 fi
 
 AC_SUBST(GDK_PACKAGES)
-AC_SUBST(GDK_PRIVATE_PACKAGES)
 AC_SUBST(GDK_EXTRA_LIBS)
 AC_SUBST(GDK_EXTRA_CFLAGS)
 AC_SUBST(GDK_DEP_LIBS)
@@ -1295,28 +1273,43 @@ AC_SUBST(GDK_DEP_CFLAGS)
 # Check for Accessibility Toolkit flags
 ########################################
 
-if test x$enable_x11_backend = xyes; then
-   ATK_PACKAGES="atk atk-bridge-2.0"
+ATK_PACKAGES=atk
+AC_MSG_CHECKING(ATK flags)
+if $PKG_CONFIG --exists $ATK_PACKAGES ; then
+        ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
+        ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
+
+        AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
 else
-   ATK_PACKAGES="atk"
+        AC_MSG_ERROR([
+*** Accessibility Toolkit not found. Accessibility Toolkit is required
+*** to build GTK+.
+])
 fi
 
-PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
+        :
+else
+	gtk_save_LIBS="$LIBS"
+        LIBS="$ATK_LIBS $LIBS"
+        AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
+                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
+                *** to build GTK+]))
+        LIBS="$gtk_save_LIBS"
+fi
 
 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
-fi
-if test "$have_gio_unix" = "yes"; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0"
+  GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
+if test x"$os_openbsd" = xyes; then
+  GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm"
+fi
 
 GTK_EXTRA_CFLAGS=
-PKG_CHECK_MODULES(GTK_DEP, $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES)
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GTK_DEP_LIBS $GTK_EXTRA_LIBS $MATH_LIB"
-GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
@@ -1328,7 +1321,6 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
 
 AC_SUBST(GTK_PACKAGES)
-AC_SUBST(GTK_PRIVATE_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)
 AC_SUBST(GTK_DEP_LIBS)
@@ -1408,14 +1400,9 @@ else
     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
 
     if test $CUPS_API_MAJOR -gt 1 -o \
-            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 1.2 not found])
-    fi
-    if test $CUPS_API_MAJOR -gt 1 -o \
-	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
-      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
-                [Define to 1 if CUPS 1.6 API is available])
-
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 2; then
+      AC_DEFINE(HAVE_CUPS_API_1_2, 1,
+                [Define to 1 if CUPS 1.2 API is available])
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1502,9 +1489,6 @@ if test "x$enable_test_print_backend" != "xno" ; then
 fi
 AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
 
-if test "$os_win32" = "yes"; then
-  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
-fi
 
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
@@ -1544,7 +1528,7 @@ GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
 
 AC_ARG_ENABLE(packagekit,
               [AS_HELP_STRING([--enable-packagekit=@<:@yes/no/auto@:>@],
-                              [build PackageKit open-with module [default=auto]])],
+                              [build packagekit open-with module [default=auto]])],
               [enable_packagekit="$enableval"],
               [enable_packagekit=auto])
 if test "$enable_packagekit" = "auto"; then
@@ -1555,7 +1539,7 @@ if test "$enable_packagekit" = "auto"; then
   fi
 fi
 
-AC_MSG_CHECKING([whether to use PackageKit])
+AC_MSG_CHECKING([Whether to use PackageKit])
 build_packagekit=no
 if test "x$enable_packagekit" != "xno"; then
   if test "$os_win32" != "yes"; then
@@ -1578,26 +1562,22 @@ AC_ARG_ENABLE(colord,
                               [build colord support code [default=auto]])],
               [enable_colord="$enableval"],
               [enable_colord=auto])
-
-AC_MSG_CHECKING([whether to use colord])
 if test "$enable_colord" = "auto"; then
   if test "$os_win32" = "yes"; then
     enable_colord=no
+  else
+    enable_colord=yes
   fi
 fi
-if test "$enable_colord" != "no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
 
+AC_MSG_CHECKING([Whether to use colord])
 have_colord=no
-if test "$enable_colord" != "no"; then
+if test "x$enable_colord" != "xno"; then
         if test "$os_win32" != "yes"; then
                 PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
                                   have_colord=yes, have_colord=no)
-                if test "$enable_colord" = "yes"; then
-                        if test "$have_colord" = "no"; then
+                if test "enable_colord" = "yes"; then
+                        if test "have_colord" = "no"; then
                                 AC_MSG_ERROR([--enable-colord specified, but not available])
                         fi
                 fi
@@ -1605,8 +1585,9 @@ if test "$enable_colord" != "no"; then
                 AC_MSG_ERROR([colord support is not available on win32])
         fi
 fi
+AC_MSG_RESULT([$have_colord])
 
-if test "$have_colord" = "yes"; then
+if test "have_colord" = "yes"; then
         AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
@@ -1617,53 +1598,33 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 
 GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
 
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
 AC_ARG_ENABLE(man,
               [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=auto]])],,
-              enable_man=maybe)
+                              [regenerate man pages from Docbook [default=no]])],
+              [enable_man=yes],
+              [enable_man=no])
 
-if test "$enable_man" != no; then
+if test "${enable_man}" != no; then
+  dnl
+  dnl Check for xsltproc
+  dnl
   AC_PATH_PROG([XSLTPROC], [xsltproc])
   if test -z "$XSLTPROC"; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([xsltproc is required for --enable-man])
-    fi
     enable_man=no
   fi
-fi
 
-if test "$enable_man" != no; then
-  dnl check for DocBook DTD in the local catalog
+  dnl check for DocBook DTD and stylesheets in the local catalog.
   JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-     [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook DTD is required for --enable-man])
-    fi
-    enable_man=no
-  fi
-fi
-
-if test "$enable_man" != no; then
-  dnl check for DocBook XSL stylesheets in the local catalog
+     [DocBook XML DTD V4.1.2],,enable_man=no)
   JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-     [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
-    fi
-    enable_man=no
-  fi
+     [DocBook XSL Stylesheets],,enable_man=no)
 fi
 
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
-AC_MSG_CHECKING([whether to generate man pages])
-if test "$enable_man" != no; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
 
 ##################################################
 # Output commands
@@ -1743,6 +1704,8 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
+gtk+-3.0-uninstalled.pc
+gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -1750,20 +1713,17 @@ demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
-demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
 tests/a11y/Makefile
 tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
-tests/visuals/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
 docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
-docs/reference/gtk/gtk3.types
 docs/reference/gtk/version.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
@@ -1781,7 +1741,6 @@ gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
 gdk/tests/Makefile
-gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
 gtk/gtkversion.h
@@ -1792,6 +1751,9 @@ libgail-util/Makefile
 modules/Makefile
 modules/engines/Makefile
 modules/engines/pixbuf/Makefile
+modules/engines/ms-windows/Makefile
+modules/engines/ms-windows/Theme/Makefile
+modules/engines/ms-windows/Theme/gtk-3.0/Makefile
 modules/input/Makefile
 modules/printbackends/Makefile
 modules/printbackends/cups/Makefile
@@ -1813,7 +1775,7 @@ echo "        GTK+ $GTK_VERSION"
 echo "        ==========="
 echo ""
 echo "        GDK backends:         $GDK_BACKENDS"
-if test "$enable_x11_backend" = "yes"; then
+if test "x$enable_x11_backend" = "xyes"; then
 echo "        X11 extensions:       $X_EXTENSIONS"
 fi
 echo "        Print backends:       $PRINT_BACKENDS"

debian/README.debian

@@ -0,0 +1,18 @@
+libgtk1 for Debian
+----------------------
+
+The GIMP Tool Kit (gtk) is a set of widgets to help you program
+programs for the X Windowing System easily and powerfully.
+
+gtk is the moving force behind The GNU Image Manipulation Program (The
+GIMP) -- the number one freely-available image editing and creation
+program available. 
+
+gtk is rapidly under development, and the source tree has officially
+been separated from The GIMP now, as other teams of programmers
+are beginning to write software using its great widget set -- like
+GNOME, a desktop interface for X, and gzilla, a freely available
+web browser for X.
+
+Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
+

debian/build

@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+				# Adjust debian/changelog and build a new
+				# Debian package of a CVS archive.
+
+				# Written 17 November 1998 by Ben Gertzfield
+				# <che@debian.org>
+
+				# This work is released under the GNU
+				# General Public License, version 2 or
+				# later.
+
+use strict;
+use diagnostics;
+use File::Copy;
+
+my $maintainer = 'Ben Gertzfield <che@debian.org>';
+
+my @date = localtime;
+
+my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
+my $revision = '01';
+
+open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
+
+$_ = <CHANGELOG>;
+chomp;
+
+close CHANGELOG;
+
+my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
+
+if ($last_date eq $datestr) {
+  $revision = sprintf("%.2d", $last_revision + 1);
+}
+
+my $new_version = "$datestr.$revision";
+
+copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
+
+open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
+
+print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
+
+open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
+
+while (<OLDCHANGELOG>) {
+  print NEWCHANGELOG;
+}
+
+close OLDCHANGELOG;
+close NEWCHANGELOG;
+
+unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
+
+open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
+print NEWVERSION "$new_version\n";
+close NEWVERSION;
+
+system('dpkg-buildpackage -b -rfakeroot -us -uc');
+unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
+

debian/changelog

@@ -0,0 +1,10 @@
+gtk+-cvs (19981116.01) unstable; urgency=low
+
+  * First test build from CVS
+
+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address: "che@debian.org"
+End:

debian/control

@@ -0,0 +1,81 @@
+Source: gtk+-cvs
+Priority: extra
+Section: libs
+Maintainer: Ben Gertzfield <che@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: libgtk-cvs-1.1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
+Description: CVS build of the GIMP Toolkit set of widgets for X
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ . 
+ The GIMP Toolkit is a freely available set of widgets for X.
+ GTK is easy to use, and has been implemented in such projects as
+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
+ desktop set of utilities for X, and gzilla, a GNU web-browser.
+ .
+ This is the unstable 1.1 branch of GTK. It is not intended for use
+ with stable projects!
+
+Package: libgtk-cvs-dev
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
+Suggests: libgtk-cvs-doc
+Provides: libgtk1.1-dev
+Replaces: libgtk1.1-dev
+Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
+Description: CVS build of development files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the header files and static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to develop your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
+ The GIMP.
+
+Package: libgtk-cvs-doc
+Architecture: all
+Section: doc
+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
+Description: CVS build of documentation for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains lots of info-files, HTML docs, FAQs, and
+ other handy documentation about the GIMP Toolkit set of widgets
+ for X. 
+ .
+ This package documents the unstable 1.1 release of the GIMP Toolkit.
+ . 
+ Install this package if you want to have lots of info about the
+ GIMP toolkit when you're programming.
+
+Package: libgtk-cvs-dbg
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
+Suggests: libgtk-cvs-doc
+Conflicts: libgtk1.1-dbg
+Description: CVS build of debugging files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the debugging static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to debug your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
+ The GIMP.

debian/copyright

@@ -0,0 +1,8 @@
+This package was debianized by Ben Gertzfield <che@debian.org> on
+Tue, 17 Nov 1998 12:07:17 -0800
+
+It was produced from the CVS repository at cvs.gimp.org.
+
+It may be redistributed under the terms of the GNU LGPL, Version 2 or
+later, found on Debian systems in the file /usr/doc/copyright/LGPL.
+

debian/libgtk-cvs-dev.files

@@ -0,0 +1,9 @@
+usr/lib/libgdk.so
+usr/lib/libgdk.a
+usr/lib/libgtk.so
+usr/lib/libgtk.a
+usr/include/gdk/
+usr/include/gtk/
+usr/bin/gtk-config
+usr/man/man1/gtk-config.1
+usr/share/aclocal/gtk.m4

debian/libgtk-cvs-dev.postinst

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#

debian/libgtk-cvs-dev.prerm

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+
+#DEBHELPER#

debian/libgtk-cvs-doc.files

@@ -0,0 +1,8 @@
+usr/info/gdk.info
+usr/info/gtk.info
+usr/info/gtk.info-1
+usr/info/gtk.info-2
+usr/info/gtk.info-3
+usr/info/gtk.info-4
+usr/info/gtk.info-5
+

debian/libgtk-cvs-doc.postinst

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+install-info --quiet --description="The GIMP Toolkit." \
+ --section "The GIMP" "The GIMP" /usr/info/gtk.info.gz
+
+install-info --quiet --description="The GIMP Drawing Kit." \
+ --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
+
+#DEBHELPER#

debian/libgtk-cvs-doc.prerm

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+install-info --quiet --remove gdk
+
+#DEBHELPER#

debian/postinst

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+ldconfig
+
+#DEBHELPER#

debian/rules

@@ -0,0 +1,160 @@
+#!/usr/bin/make -f
+
+# debian/rules file for gtk+ Debian package
+# written April 1998 by Ben Gertzfield <che@debian.org
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh --prefix=/usr --with-xinput=xfree
+	$(MAKE)
+	cd docs && make distdocs
+	cd ..
+	touch build-stamp
+
+build-dbg: build-dbg-stamp
+build-dbg-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
+	$(MAKE)
+	touch build-dbg-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs 
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean
+
+clean-dbg:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean -k
+
+install: install-stamp
+install-stamp: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	touch install-stamp
+
+install-dbg: install-dbg-stamp
+install-dbg-stamp: build-dbg
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
+	touch install-dbg-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install libgtk-cvs-doc
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
+
+libgtk-cvs-1.1: build
+	dh_testdir -plibgtk-cvs-1.1 
+	dh_testroot -plibgtk-cvs-1.1
+	dh_installdirs -plibgtk-cvs-1.1
+	# Add here commands to install the files into debian/tmp
+	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
+	dh_installdocs -plibgtk-cvs-1.1
+	dh_installchangelogs -plibgtk-cvs-1.1
+	dh_strip -plibgtk-cvs-1.1
+	dh_compress -plibgtk-cvs-1.1
+	dh_fixperms -plibgtk-cvs-1.1
+	dh_installdeb -plibgtk-cvs-1.1
+	dh_shlibdeps -plibgtk-cvs-1.1
+	dh_gencontrol -plibgtk-cvs-1.1
+	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
+	dh_md5sums -plibgtk-cvs-1.1
+	dh_builddeb -plibgtk-cvs-1.1
+
+libgtk-cvs-dev: build
+	dh_testdir -plibgtk-cvs-dev
+	dh_testroot -plibgtk-cvs-dev
+	dh_clean -plibgtk-cvs-dev -k
+	dh_installdirs -plibgtk-cvs-dev
+	# Add here commands to install the files into debian/tmp
+	dh_movefiles -plibgtk-cvs-dev
+	cp gtk-config debian/tmp/usr/bin
+	dh_installdocs -plibgtk-cvs-dev 
+	dh_installchangelogs -plibgtk-cvs-dev
+	dh_strip -plibgtk-cvs-dev
+	dh_compress -plibgtk-cvs-dev
+	dh_fixperms -plibgtk-cvs-dev
+	dh_installdeb -plibgtk-cvs-dev
+	dh_shlibdeps -plibgtk-cvs-dev
+	dh_gencontrol -plibgtk-cvs-dev
+	dh_md5sums -plibgtk-cvs-dev
+	dh_builddeb -plibgtk-cvs-dev
+
+libgtk-cvs-doc:
+	dh_testdir -plibgtk-cvs-doc
+	dh_testroot -plibgtk-cvs-doc
+	dh_clean -plibgtk-cvs-doc -k
+	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
+	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
+	dh_movefiles -plibgtk-cvs-doc
+	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
+	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
+	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
+
+	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
+	dh_installchangelogs -plibgtk-cvs-doc
+	dh_strip -plibgtk-cvs-doc
+	dh_compress -plibgtk-cvs-doc
+	dh_fixperms -plibgtk-cvs-doc
+	dh_installdeb -plibgtk-cvs-doc
+	dh_shlibdeps -plibgtk-cvs-doc
+	dh_gencontrol -plibgtk-cvs-doc
+	dh_md5sums -plibgtk-cvs-doc
+	dh_builddeb -plibgtk-cvs-doc
+
+libgtk-cvs-dbg: clean-dbg install-dbg
+	dh_testdir -plibgtk-cvs-dbg
+	dh_testroot -plibgtk-cvs-dbg
+	dh_installdirs -plibgtk-cvs-dbg
+	# Add here commands to install the files into debian/libgtk-cvs-dbg
+	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
+	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
+	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
+        done
+	dh_installdocs -plibgtk-cvs-dbg
+	dh_installchangelogs -plibgtk-cvs-dbg
+	dh_compress -plibgtk-cvs-dbg
+	dh_fixperms -plibgtk-cvs-dbg
+	dh_installdeb -plibgtk-cvs-dbg
+	dh_shlibdeps -plibgtk-cvs-dbg
+	dh_gencontrol -plibgtk-cvs-dbg
+	dh_md5sums -plibgtk-cvs-dbg
+	dh_builddeb -plibgtk-cvs-dbg
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary

demos/Makefile.am

@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gtk-demo widget-factory pixbuf-demo
+SUBDIRS = gtk-demo pixbuf-demo
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -6,7 +6,6 @@ democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
-	application.c				\
 	appwindow.c				\
 	assistant.c				\
 	builder.c				\
@@ -15,11 +14,6 @@ demos =						\
 	clipboard.c				\
 	colorsel.c				\
 	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -48,10 +42,7 @@ demos =						\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
-	theming_style_classes.c			\
-	theming_custom_css.c			\
 	toolpalette.c				\
-	transparent.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -73,29 +64,20 @@ LDADDS = \
 	$(GTK_DEP_LIBS)				\
 	-lm
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk3-demo
 
-BUILT_SOURCES = demos.h demo_resources.c
+BUILT_SOURCES = demos.h
 
-EXTRA_DIST += 				\
-	$(IMAGEFILES)			\
-	demo.ui				\
-	demo.gresource.xml		\
-	$(RESOURCES)			\
-	org.gtk.Demo.gschema.xml
-
-gsettings_SCHEMAS = \
-	org.gtk.Demo.gschema.xml
-
-@GSETTINGS_RULES@
+EXTRA_DIST += 		\
+	$(IMAGEFILES)	\
+	demo.ui
 
 demos.h: @REBUILD@ $(demos) geninclude.pl
-	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
+	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
-	demo_resources.c	\
 	main.c			\
 	demos.h
 
@@ -103,31 +85,8 @@ gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
-	application-standalone.c \
-	demo_resources.c
-
-gtk3_demo_application_LDADD = $(LDADDS)
-
-demo_resources.c: demo.gresource.xml $(RESOURCES)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
-
-RESOURCES=	application.ui			\
-		menus.ui			\
-		theming.ui			\
-		gtk-logo-24.png			\
-		gtk-logo-48.png			\
-		css_accordion.css		\
-		css_basics.css			\
-		css_multiplebgs.css		\
-		css_pixbufs.css			\
-		css_shadows.css			\
-		cssview.css			\
-		fancy.css			\
-		reset.css
-
 IMAGEFILES=	alphatest.png		\
-		apple-red.png		\
+	        apple-red.png		\
 		background.jpg		\
 		floppybuddy.gif		\
 		gnome-applets.png	\
@@ -141,11 +100,7 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif
 
-democode_DATA = \
-	$(demos)		\
-	$(IMAGEFILES)		\
-	$(RESOURCES)		\
-	demo.ui
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 
 DISTCLEANFILES = demos.h
 

demos/gtk-demo/application-standalone.c

@@ -1,3 +0,0 @@
-#define STANDALONE
-
-#include "application.c"

demos/gtk-demo/application.c

@@ -1,485 +0,0 @@
-/* Application class :: menus.ui application.ui
- *
- * Demonstrates a simple application.
- *
- * This examples uses GtkApplication, GtkApplicationWindow, GtkBuilder
- * as well as GMenu and GResource. Due to the way GtkApplication is structured,
- * it is run as a separate process.
- */
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#ifdef STANDALONE
-
-static void
-show_action_dialog (GSimpleAction *action)
-{
-  const gchar *name;
-  GtkWidget *dialog;
-
-  name = g_action_get_name (G_ACTION (action));
-
-  dialog = gtk_message_dialog_new (NULL,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "You activated action: \"%s\"",
-                                    name);
-
-  g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_widget_destroy), NULL);
-
-  gtk_widget_show (dialog);
-}
-
-static void
-show_action_infobar (GSimpleAction *action,
-                     GVariant      *parameter,
-                     gpointer       window)
-{
-  GtkWidget *infobar;
-  GtkWidget *message;
-  gchar *text;
-  const gchar *name;
-  const gchar *value;
-
-  name = g_action_get_name (G_ACTION (action));
-  value = g_variant_get_string (parameter, NULL);
-
-  message = g_object_get_data (G_OBJECT (window), "message");
-  infobar = g_object_get_data (G_OBJECT (window), "infobar");
-  text = g_strdup_printf ("You activated radio action: \"%s\".\n"
-                          "Current value: %s", name, value);
-  gtk_label_set_text (GTK_LABEL (message), text);
-  gtk_widget_show (infobar);
-  g_free (text);
-}
-
-static void
-activate_action (GSimpleAction  *action,
-                 GVariant       *parameter,
-                 gpointer        user_data)
-{
-  show_action_dialog (action);
-}
-
-static void
-activate_toggle (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  GVariant *state;
-
-  show_action_dialog (action);
-
-  state = g_action_get_state (G_ACTION (action));
-  g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
-  g_variant_unref (state);
-}
-
-static void
-activate_radio (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  show_action_infobar (action, parameter, user_data);
-
-  g_action_change_state (G_ACTION (action), parameter);
-}
-
-static void
-activate_about (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       user_data)
-{
-  GtkWidget *window = user_data;
-  GdkPixbuf *pixbuf;
-
-  const gchar *authors[] = {
-    "Peter Mattis",
-    "Spencer Kimball",
-    "Josh MacDonald",
-    "and many more...",
-    NULL
-  };
-
-  const gchar *documentors[] = {
-    "Owen Taylor",
-    "Tony Gale",
-    "Matthias Clasen <mclasen@redhat.com>",
-    "and many more...",
-    NULL
-  };
-
-  pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-48.png", NULL);
-
-  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2009 The GTK+ Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
-                         "authors", authors,
-                         "documenters", documentors,
-                         "logo", pixbuf,
-                         "title", "About GTK+ Code Demos",
-                         NULL);
-  g_object_unref (pixbuf);
-}
-
-static void
-activate_quit (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GtkApplication *app = user_data;
-  GtkWidget *win;
-  GList *list, *next;
-
-  list = gtk_application_get_windows (app);
-  while (list)
-    {
-      win = list->data;
-      next = list->next;
-
-      gtk_widget_destroy (GTK_WIDGET (win));
-
-      list = next;
-    }
-}
-
-static void
-register_stock_icons (void)
-{
-  static gboolean registered = FALSE;
-
-  if (!registered)
-    {
-      GdkPixbuf *pixbuf;
-      GtkIconFactory *factory;
-      GtkIconSet *icon_set;
-
-      static GtkStockItem items[] = {
-        { "demo-gtk-logo", "_GTK!", 0, 0, NULL }
-      };
-
-      registered = TRUE;
-
-      gtk_stock_add (items, G_N_ELEMENTS (items));
-
-      factory = gtk_icon_factory_new ();
-      gtk_icon_factory_add_default (factory);
-
-      pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-24.png", NULL);
-
-      icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-      gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
-      gtk_icon_set_unref (icon_set);
-      g_object_unref (pixbuf);
-
-      /* Drop our reference to the factory, GTK will hold a reference. */
-      g_object_unref (factory);
-    }
-}
-
-static void
-update_statusbar (GtkTextBuffer *buffer,
-                  GtkStatusbar  *statusbar)
-{
-  gchar *msg;
-  gint row, col;
-  gint count;
-  GtkTextIter iter;
-
-  /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (statusbar, 0);
-
-  count = gtk_text_buffer_get_char_count (buffer);
-
-  gtk_text_buffer_get_iter_at_mark (buffer,
-                                    &iter,
-                                    gtk_text_buffer_get_insert (buffer));
-
-  row = gtk_text_iter_get_line (&iter);
-  col = gtk_text_iter_get_line_offset (&iter);
-
-  msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
-                         row, col, count);
-
-  gtk_statusbar_push (statusbar, 0, msg);
-
-  g_free (msg);
-}
-
-static void
-mark_set_callback (GtkTextBuffer     *buffer,
-                   const GtkTextIter *new_location,
-                   GtkTextMark       *mark,
-                   gpointer           data)
-{
-  update_statusbar (buffer, GTK_STATUSBAR (data));
-}
-
-static void
-change_theme_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  GtkSettings *settings = gtk_settings_get_default ();
-
-  g_object_set (G_OBJECT (settings),
-                "gtk-application-prefer-dark-theme",
-                g_variant_get_boolean (state),
-                NULL);
-
-  g_simple_action_set_state (action, state);
-}
-
-static void
-change_titlebar_state (GSimpleAction *action,
-                       GVariant      *state,
-                       gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window),
-                                               g_variant_get_boolean (state));
-
-  g_simple_action_set_state (action, state);
-}
-
-static void
-change_radio_state (GSimpleAction *action,
-                    GVariant      *state,
-                    gpointer       user_data)
-{
-  g_simple_action_set_state (action, state);
-}
-
-static GActionEntry app_entries[] = {
-  { "new", activate_action, NULL, NULL, NULL },
-  { "open", activate_action, NULL, NULL, NULL },
-  { "save", activate_action, NULL, NULL, NULL },
-  { "save-as", activate_action, NULL, NULL, NULL },
-  { "quit", activate_quit, NULL, NULL, NULL },
-  { "dark", activate_toggle, NULL, "false", change_theme_state }
-};
-
-static GActionEntry win_entries[] = {
-  { "titlebar", activate_toggle, NULL, "false", change_titlebar_state },
-  { "shape", activate_radio, "s", "'oval'", change_radio_state },
-  { "bold", activate_toggle, NULL, "false", NULL },
-  { "about", activate_about, NULL, NULL, NULL },
-  { "file1", activate_action, NULL, NULL, NULL },
-  { "logo", activate_action, NULL, NULL, NULL }
-};
-
-static void
-clicked_cb (GtkWidget *widget, GtkWidget *info)
-{
-  gtk_widget_hide (info);
-}
-
-static void
-startup (GApplication *app)
-{
-  GtkBuilder *builder;
-  GMenuModel *appmenu;
-  GMenuModel *menubar;
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application/ui/menus.ui", NULL);
-
-  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
-
-  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
-
-  g_object_unref (builder);
-}
-
-static void
-activate (GApplication *app)
-{
-  GtkBuilder *builder;
-  GtkWidget *window;
-  GtkWidget *grid;
-  GtkWidget *contents;
-  GtkWidget *status;
-  GtkWidget *message;
-  GtkWidget *button;
-  GtkWidget *infobar;
-  GtkWidget *menutool;
-  GMenuModel *toolmenu;
-  GtkTextBuffer *buffer;
-
-  window = gtk_application_window_new (GTK_APPLICATION (app));
-  gtk_window_set_title (GTK_WINDOW (window), "Application Class");
-  gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
-  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (window),
-                                   win_entries, G_N_ELEMENTS (win_entries),
-                                   window);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application/ui/application.ui", NULL);
-
-  grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
-  contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
-  status = (GtkWidget *)gtk_builder_get_object (builder, "status");
-  message = (GtkWidget *)gtk_builder_get_object (builder, "message");
-  button = (GtkWidget *)gtk_builder_get_object (builder, "button");
-  infobar = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  menutool = (GtkWidget *)gtk_builder_get_object (builder, "menutool");
-  toolmenu = (GMenuModel *)gtk_builder_get_object (builder, "toolmenu");
-
-  g_object_set_data (G_OBJECT (window), "message", message);
-  g_object_set_data (G_OBJECT (window), "infobar", infobar);
-
-  gtk_container_add (GTK_CONTAINER (window), grid);
-
-  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (menutool),
-                                 gtk_menu_new_from_model (toolmenu));
-
-  gtk_widget_grab_focus (contents);
-  g_signal_connect (button, "clicked", G_CALLBACK (clicked_cb), infobar);
-
-  /* Show text widget info in the statusbar */
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-  g_signal_connect_object (buffer, "changed",
-                           G_CALLBACK (update_statusbar), status, 0);
-  g_signal_connect_object (buffer, "mark-set",
-                           G_CALLBACK (mark_set_callback), status, 0);
-
-  update_statusbar (buffer, GTK_STATUSBAR (status));
-
-  gtk_widget_show_all (window);
-
-  g_object_unref (builder);
-}
-
-int
-main (int argc, char *argv[])
-{
-  GtkApplication *app;
-  GSettings *settings;
-  GAction *action;
-
-  gtk_init (NULL, NULL);
-
-  register_stock_icons ();
-
-  app = gtk_application_new ("org.gtk.Demo", 0);
-  settings = g_settings_new ("org.gtk.Demo");
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-
-  action = g_settings_create_action (settings, "color");
-
-  g_action_map_add_action (G_ACTION_MAP (app), action);
-
-  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
-  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
-
-  g_application_run (G_APPLICATION (app), 0, NULL);
-
-  return 0;
-}
-
-#else /* !STANDALONE */
-
-static gboolean name_seen;
-static GtkWidget *placeholder;
-
-static void
-on_name_appeared (GDBusConnection *connection,
-                  const gchar     *name,
-                  const gchar     *name_owner,
-                  gpointer         user_data)
-{
-  name_seen = TRUE;
-}
-
-static void
-on_name_vanished (GDBusConnection *connection,
-                  const gchar     *name,
-                  gpointer         user_data)
-{
-  if (!name_seen)
-    return;
-
-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
-}
-
-#ifdef G_OS_WIN32
-#define APP_EXTENSION ".exe"
-#else
-#define APP_EXTENSION
-#endif
-
-GtkWidget *
-do_application (GtkWidget *toplevel)
-{
-  static guint watch = 0;
-
-  if (watch == 0)
-    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo",
-                              0,
-                              on_name_appeared,
-                              on_name_vanished,
-                              NULL, NULL);
-
-  if (placeholder == NULL)
-    {
-      const gchar *command;
-      GError *error = NULL;
-
-      if (g_file_test ("./gtk3-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk3-demo-application" APP_EXTENSION;
-      else
-        command = "gtk3-demo-application";
-
-      if (!g_spawn_command_line_async (command, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-        }
-
-      placeholder = gtk_label_new ("");
-      g_object_ref_sink (placeholder);
-    }
-  else
-    {
-      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                              "org.gtk.Demo",
-                              "/org/gtk/Demo",
-                              "org.gtk.Actions",
-                              "Activate",
-                              g_variant_new ("(sava{sv})", "quit", NULL, NULL),
-                              NULL,
-                              0,
-                              G_MAXINT,
-                              NULL, NULL);
-    }
-
-  return placeholder;
-}
-
-#endif

demos/gtk-demo/application.ui

@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <object class="GtkGrid" id="grid">
-    <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="orientation">horizontal</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <child>
-          <object class="GtkMenuToolButton" id="menutool">
-            <property name="stock-id">gtk-open</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="quit">
-            <property name="stock-id">gtk-quit</property>
-            <property name="action-name">app.quit</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparatorToolItem" id="sep"/>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="logo">
-            <property name="stock-id">demo-gtk-logo</property>
-            <property name="action-name">win.logo</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkInfoBar" id="infobar">
-        <property name="no-show-all">True</property>
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <child internal-child="content_area">
-          <object class="GtkBox" id="content_area">
-            <child>
-              <object class="GtkLabel" id="message">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
-                <property name="halign">fill</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkBox" id="action_area">
-            <child>
-              <object class="GtkButton" id="button">
-                <property name="visible">True</property>
-                <property name="valign">center</property>
-                <property name="label">gtk-ok</property>
-                <property name="use-stock">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow" id="sw">
-        <property name="shadow-type">in</property>
-        <child>
-          <object class="GtkTextView" id="contents">
-            <property name="halign">fill</property>
-            <property name="valign">fill</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkStatusbar" id="status">
-        <property name="halign">fill</property>
-        <property name="hexpand">True</property>
-        <property name="visible">True</property>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">3</property>
-      </packing>
-    </child>
-  </object>
-  <menu id="toolmenu">
-    <item>
-      <attribute name="label">File1</attribute>
-      <attribute name="action">win.file1</attribute>
-    </item>
-  </menu>
-</interface>

demos/gtk-demo/appwindow.c

@@ -1,8 +1,6 @@
-/* Application window
+/* Application main window
  *
  * Demonstrates a typical application window with menubar, toolbar, statusbar.
- *
- * This example uses GtkUIManager and GtkActionGroup.
  */
 
 #include <gtk/gtk.h>
@@ -27,18 +25,10 @@ activate_action (GtkAction *action)
       GtkSettings *settings = gtk_settings_get_default ();
 
       g_object_set (G_OBJECT (settings),
-                    "gtk-application-prefer-dark-theme", value,
-                    NULL);
+		    "gtk-application-prefer-dark-theme", value,
+		    NULL);
       return;
     }
-
-  if (g_str_equal (name, "HideTitlebar"))
-    {
-      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-      gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), value);
-      return;
-    }
-
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -79,7 +69,7 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)
 
 static void
 about_cb (GtkAction *action,
-          GtkWidget *window)
+	  GtkWidget *window)
 {
   GdkPixbuf *pixbuf, *transparent;
   gchar *filename;
@@ -112,21 +102,21 @@ about_cb (GtkAction *action,
     }
 
   gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2009 The GTK+ Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
-                         "authors", authors,
-                         "documenters", documentors,
-                         "logo", transparent,
+			 "program-name", "GTK+ Code Demos",
+			 "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+						     PACKAGE_VERSION,
+						     gtk_get_major_version (),
+						     gtk_get_minor_version (),
+						     gtk_get_micro_version ()),
+			 "copyright", "(C) 1997-2009 The GTK+ Team",
+			 "license-type", GTK_LICENSE_LGPL_2_1,
+			 "website", "http://www.gtk.org",
+			 "comments", "Program to demonstrate GTK+ functions.",
+			 "authors", authors,
+			 "documenters", documentors,
+			 "logo", transparent,
                          "title", "About GTK+ Code Demos",
-                         NULL);
+			 NULL);
 
   g_object_unref (transparent);
 }
@@ -204,11 +194,6 @@ static GtkToggleActionEntry toggle_entries[] = {
     "Prefer Dark Theme",                       /* tooltip */
     G_CALLBACK (activate_action),
     FALSE },                                   /* is_active */
-  { "HideTitlebar", NULL,
-    "_Hide Titlebar when maximized", NULL,
-    "Hide Titlebar when maximized",
-    G_CALLBACK (activate_action),
-    FALSE }
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
 
@@ -263,11 +248,10 @@ static const gchar *ui_info =
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
 "      <menuitem action='DarkTheme'/>"
-"      <menuitem action='HideTitlebar'/>"
 "      <menu action='ColorMenu'>"
-"       <menuitem action='Red'/>"
-"       <menuitem action='Green'/>"
-"       <menuitem action='Blue'/>"
+"	<menuitem action='Red'/>"
+"	<menuitem action='Green'/>"
+"	<menuitem action='Blue'/>"
 "      </menu>"
 "      <menu action='ShapeMenu'>"
 "        <menuitem action='Square'/>"
@@ -333,10 +317,10 @@ register_stock_icons (void)
       pixbuf = NULL;
       filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
       if (filename)
-        {
-          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-          g_free (filename);
-        }
+	{
+	  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+	  g_free (filename);
+	}
 
       /* Register icon to accompany stock item */
       if (pixbuf != NULL)
@@ -371,8 +355,8 @@ update_statusbar (GtkTextBuffer *buffer,
   GtkTextIter iter;
 
   gtk_statusbar_pop (statusbar, 0); /* clear any previous message,
-                                     * underflow is allowed
-                                     */
+				     * underflow is allowed
+				     */
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -423,7 +407,7 @@ do_appwindow (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
       gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
 
@@ -432,7 +416,7 @@ do_appwindow (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed),
                         &window);
 
-      table = gtk_grid_new ();
+      table = gtk_table_new (1, 5, FALSE);
 
       gtk_container_add (GTK_CONTAINER (window), table);
 
@@ -441,52 +425,60 @@ do_appwindow (GtkWidget *do_widget)
 
       action_group = gtk_action_group_new ("AppWindowActions");
       open_action = g_object_new (tool_menu_action_get_type (),
-                                  "name", "Open",
-                                  "label", "_Open",
-                                  "tooltip", "Open a file",
-                                  "stock-id", GTK_STOCK_OPEN,
-                                  NULL);
+				  "name", "Open",
+				  "label", "_Open",
+				  "tooltip", "Open a file",
+				  "stock-id", GTK_STOCK_OPEN,
+				  NULL);
       gtk_action_group_add_action (action_group, open_action);
       g_object_unref (open_action);
       gtk_action_group_add_actions (action_group,
-                                    entries, n_entries,
-                                    window);
+				    entries, n_entries,
+				    window);
       gtk_action_group_add_toggle_actions (action_group,
-                                           toggle_entries, n_toggle_entries,
-                                           NULL);
+					   toggle_entries, n_toggle_entries,
+					   NULL);
       gtk_action_group_add_radio_actions (action_group,
-                                          color_entries, n_color_entries,
-                                          COLOR_RED,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
+					  color_entries, n_color_entries,
+					  COLOR_RED,
+					  G_CALLBACK (activate_radio_action),
+					  NULL);
       gtk_action_group_add_radio_actions (action_group,
-                                          shape_entries, n_shape_entries,
-                                          SHAPE_SQUARE,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
+					  shape_entries, n_shape_entries,
+					  SHAPE_SQUARE,
+					  G_CALLBACK (activate_radio_action),
+					  NULL);
 
       merge = gtk_ui_manager_new ();
       g_object_set_data_full (G_OBJECT (window), "ui-manager", merge,
-                              g_object_unref);
+			      g_object_unref);
       gtk_ui_manager_insert_action_group (merge, action_group, 0);
       gtk_window_add_accel_group (GTK_WINDOW (window),
-                                  gtk_ui_manager_get_accel_group (merge));
+				  gtk_ui_manager_get_accel_group (merge));
 
       if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
-        {
-          g_message ("building menus failed: %s", error->message);
-          g_error_free (error);
-        }
+	{
+	  g_message ("building menus failed: %s", error->message);
+	  g_error_free (error);
+	}
 
       bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
       gtk_widget_show (bar);
-      gtk_widget_set_halign (bar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), bar, 0, 0, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+			bar,
+                        /* X direction */          /* Y direction */
+                        0, 1,                      0, 1,
+                        GTK_EXPAND | GTK_FILL,     0,
+                        0,                         0);
 
       bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
       gtk_widget_show (bar);
-      gtk_widget_set_halign (bar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), bar, 0, 1, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+			bar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   1, 2,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
 
       /* Create document
        */
@@ -503,8 +495,12 @@ do_appwindow (GtkWidget *do_widget)
       g_signal_connect (infobar, "response",
                         G_CALLBACK (gtk_widget_hide), NULL);
 
-      gtk_widget_set_halign (infobar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), infobar, 0, 2, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        infobar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   2, 3,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
 
@@ -515,11 +511,12 @@ do_appwindow (GtkWidget *do_widget)
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                            GTK_SHADOW_IN);
 
-      gtk_widget_set_halign (sw, GTK_ALIGN_FILL);
-      gtk_widget_set_valign (sw, GTK_ALIGN_FILL);
-      gtk_widget_set_hexpand (sw, TRUE);
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_grid_attach (GTK_GRID (table), sw, 0, 3, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        sw,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   3, 4,
+                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
+                        0,                      0);
 
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    200, 200);
@@ -533,12 +530,16 @@ do_appwindow (GtkWidget *do_widget)
       /* Create statusbar */
 
       statusbar = gtk_statusbar_new ();
-      gtk_widget_set_halign (sw, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), statusbar, 0, 4, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        statusbar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   4, 5,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);
 
       /* Show text widget info in the statusbar */
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-
+      
       g_signal_connect_object (buffer,
                                "changed",
                                G_CALLBACK (update_statusbar),
@@ -568,3 +569,4 @@ do_appwindow (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/assistant.c

@@ -23,14 +23,14 @@ apply_changes_gradually (gpointer data)
   if (fraction < 1.0)
     {
       gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return G_SOURCE_CONTINUE;
+      return TRUE;
     }
   else
     {
       /* Close automatically once changes are fully applied. */
       gtk_widget_destroy (assistant);
       assistant = NULL;
-      return G_SOURCE_REMOVE;
+      return FALSE;
     }
 }
 
@@ -101,7 +101,6 @@ create_page1 (GtkWidget *assistant)
   gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
 
   entry = gtk_entry_new ();
-  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
   gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);
@@ -147,19 +146,22 @@ create_page3 (GtkWidget *assistant)
 static void
 create_page4 (GtkWidget *assistant)
 {
-  progress_bar = gtk_progress_bar_new ();
-  gtk_widget_set_halign (progress_bar, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (progress_bar, GTK_ALIGN_CENTER);
+  GtkWidget *page;
 
-  gtk_widget_show (progress_bar);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
+  page = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
+
+  progress_bar = gtk_progress_bar_new ();
+  gtk_container_add (GTK_CONTAINER (page), progress_bar);
+
+  gtk_widget_show_all (page);
+  gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
+  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.
    */
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), progress_bar, FALSE);
+  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
 }
 
 GtkWidget*

demos/gtk-demo/builder.c

@@ -1,4 +1,4 @@
-/* Builder :: demo.ui
+/* Builder
  *
  * Demonstrates an interface loaded from a XML description.
  */
@@ -27,19 +27,13 @@ about_activate (GtkAction *action)
   gtk_widget_hide (about_dlg);
 }
 
-G_MODULE_EXPORT void
-help_activate (GtkAction *action)
-{
-  g_print ("Help not available\n");
-}
-
 GtkWidget *
 do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GError *err = NULL;
   gchar *filename;
-
+  
   if (!window)
     {
       builder = gtk_builder_new ();
@@ -47,16 +41,16 @@ do_builder (GtkWidget *do_widget)
       gtk_builder_add_from_file (builder, filename, &err);
       g_free (filename);
       if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
+	{
+	  g_error ("ERROR: %s\n", err->message);
+	  return NULL;
+	}
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -64,7 +58,7 @@ do_builder (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {
+    {	 
       gtk_widget_destroy (window);
       window = NULL;
     }

demos/gtk-demo/button_box.c

@@ -7,14 +7,14 @@
 
 static GtkWidget *
 create_bbox (gint  horizontal,
-             char *title,
-             gint  spacing,
-             gint  layout)
+	     char *title, 
+	     gint  spacing,
+	     gint  layout)
 {
   GtkWidget *frame;
   GtkWidget *bbox;
   GtkWidget *button;
-
+	
   frame = gtk_frame_new (title);
 
   if (horizontal)
@@ -27,13 +27,13 @@ create_bbox (gint  horizontal,
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-
+  
   button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
-
+  
   button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
   gtk_container_add (GTK_CONTAINER (bbox), button);
-
+  
   button = gtk_button_new_from_stock (GTK_STOCK_HELP);
   gtk_container_add (GTK_CONTAINER (bbox), button);
 
@@ -49,68 +49,68 @@ do_button_box (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *frame_horz;
   GtkWidget *frame_vert;
-
+	
   if (!window)
   {
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_window_set_screen (GTK_WINDOW (window),
-                           gtk_widget_get_screen (do_widget));
+			   gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-
+    
     g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
-
+		      G_CALLBACK (gtk_widget_destroyed),
+		      &window);
+    
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
     main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
+    
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
-
+    
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
+			TRUE, TRUE, 0);
 
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-                        TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
-
+    
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
+			TRUE, TRUE, 0);
 
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);
 
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);
 
-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);
   }
 
   if (!gtk_widget_get_visible (window))
@@ -118,7 +118,7 @@ do_button_box (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {
+    {	 
       gtk_widget_destroy (window);
       window = NULL;
     }

demos/gtk-demo/changedisplay.c

@@ -78,8 +78,7 @@ find_toplevel_at_pointer (GdkDisplay *display)
   GdkWindow *pointer_window;
   GtkWidget *widget = NULL;
 
-  pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (),
-                                                      NULL, NULL);
+  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);
 
   /* The user data field of a GdkWindow is used to store a pointer
    * to the widget that created it.
@@ -96,8 +95,8 @@ find_toplevel_at_pointer (GdkDisplay *display)
 
 static gboolean
 button_release_event_cb (GtkWidget       *widget,
-                         GdkEventButton  *event,
-                         gboolean        *clicked)
+			 GdkEventButton  *event,
+			 gboolean        *clicked)
 {
   *clicked = TRUE;
   return TRUE;
@@ -109,7 +108,7 @@ button_release_event_cb (GtkWidget       *widget,
  */
 static GtkWidget *
 query_for_toplevel (GdkScreen  *screen,
-                    const char *prompt)
+		    const char *prompt)
 {
   GdkDisplay *display = gdk_screen_get_display (screen);
   GtkWidget *popup, *label, *frame;
@@ -132,34 +131,32 @@ query_for_toplevel (GdkScreen  *screen,
   gtk_widget_show_all (popup);
   cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
-  if (gdk_device_grab (gtk_get_current_event_device (),
-                       gtk_widget_get_window (popup),
-                       GDK_OWNERSHIP_NONE,
-                       FALSE,
-                       GDK_BUTTON_RELEASE_MASK,
-                       cursor,
-                       GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
+  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
+			GDK_BUTTON_RELEASE_MASK,
+			NULL,
+			cursor,
+			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
     {
       gboolean clicked = FALSE;
 
       g_signal_connect (popup, "button-release-event",
-                        G_CALLBACK (button_release_event_cb), &clicked);
+			G_CALLBACK (button_release_event_cb), &clicked);
 
       /* Process events until clicked is set by button_release_event_cb.
        * We pass in may_block=TRUE since we want to wait if there
        * are no events currently.
        */
       while (!clicked)
-        g_main_context_iteration (NULL, TRUE);
+	g_main_context_iteration (NULL, TRUE);
 
       toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
       if (toplevel == popup)
-        toplevel = NULL;
+	toplevel = NULL;
     }
 
   g_object_unref (cursor);
   gtk_widget_destroy (popup);
-  gdk_flush ();                 /* Really release the grab */
+  gdk_flush ();			/* Really release the grab */
 
   return toplevel;
 }
@@ -174,8 +171,8 @@ query_change_display (ChangeDisplayInfo *info)
   GtkWidget *toplevel;
 
   toplevel = query_for_toplevel (screen,
-                                 "Please select the toplevel\n"
-                                 "to move to the new screen");
+				 "Please select the toplevel\n"
+				 "to move to the new screen");
 
   if (toplevel)
     gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
@@ -196,19 +193,19 @@ fill_screens (ChangeDisplayInfo *info)
       gint i;
 
       for (i = 0; i < n_screens; i++)
-        {
-          GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
-          GtkTreeIter iter;
+	{
+	  GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
+	  GtkTreeIter iter;
 
-          gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
-          gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
-                              SCREEN_COLUMN_NUMBER, i,
-                              SCREEN_COLUMN_SCREEN, screen,
-                              -1);
+	  gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
+	  gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
+			      SCREEN_COLUMN_NUMBER, i,
+			      SCREEN_COLUMN_SCREEN, screen,
+			      -1);
 
-          if (i == 0)
-            gtk_tree_selection_select_iter (info->screen_selection, &iter);
-        }
+	  if (i == 0)
+	    gtk_tree_selection_select_iter (info->screen_selection, &iter);
+	}
     }
 }
 
@@ -218,8 +215,8 @@ fill_screens (ChangeDisplayInfo *info)
  */
 static void
 response_cb (GtkDialog         *dialog,
-             gint               response_id,
-             ChangeDisplayInfo *info)
+	     gint               response_id,
+	     ChangeDisplayInfo *info)
 {
   if (response_id == GTK_RESPONSE_OK)
     query_change_display (info);
@@ -233,7 +230,7 @@ response_cb (GtkDialog         *dialog,
  */
 static void
 open_display_cb (GtkWidget         *button,
-                 ChangeDisplayInfo *info)
+		 ChangeDisplayInfo *info)
 {
   GtkWidget *content_area;
   GtkWidget *dialog;
@@ -243,11 +240,11 @@ open_display_cb (GtkWidget         *button,
   GdkDisplay *result = NULL;
 
   dialog = gtk_dialog_new_with_buttons ("Open Display",
-                                        GTK_WINDOW (info->window),
-                                        GTK_DIALOG_MODAL,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
-                                        NULL);
+					GTK_WINDOW (info->window),
+					GTK_DIALOG_MODAL,
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_OK, GTK_RESPONSE_OK,
+					NULL);
 
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   display_entry = gtk_entry_new ();
@@ -267,25 +264,25 @@ open_display_cb (GtkWidget         *button,
     {
       gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
       if (response_id != GTK_RESPONSE_OK)
-        break;
+	break;
 
       new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
-                                                0, -1);
+						0, -1);
 
       if (strcmp (new_screen_name, "") != 0)
-        {
-          result = gdk_display_open (new_screen_name);
-          if (!result)
-            {
-              gchar *error_msg =
-                g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
-                                  new_screen_name);
-              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
-              g_free (error_msg);
-            }
+	{
+	  result = gdk_display_open (new_screen_name);
+	  if (!result)
+	    {
+	      gchar *error_msg =
+		g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
+				  new_screen_name);
+	      gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
+	      g_free (error_msg);
+	    }
 
-          g_free (new_screen_name);
-        }
+	  g_free (new_screen_name);
+	}
     }
 
   gtk_widget_destroy (dialog);
@@ -296,7 +293,7 @@ open_display_cb (GtkWidget         *button,
  */
 static void
 close_display_cb (GtkWidget         *button,
-                  ChangeDisplayInfo *info)
+		  ChangeDisplayInfo *info)
 {
   if (info->current_display)
     gdk_display_close (info->current_display);
@@ -308,7 +305,7 @@ close_display_cb (GtkWidget         *button,
  */
 static void
 display_changed_cb (GtkTreeSelection  *selection,
-                    ChangeDisplayInfo *info)
+		    ChangeDisplayInfo *info)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -317,8 +314,8 @@ display_changed_cb (GtkTreeSelection  *selection,
     g_object_unref (info->current_display);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
-                        DISPLAY_COLUMN_DISPLAY, &info->current_display,
-                        -1);
+			DISPLAY_COLUMN_DISPLAY, &info->current_display,
+			-1);
   else
     info->current_display = NULL;
 
@@ -330,7 +327,7 @@ display_changed_cb (GtkTreeSelection  *selection,
  */
 static void
 screen_changed_cb (GtkTreeSelection  *selection,
-                   ChangeDisplayInfo *info)
+		   ChangeDisplayInfo *info)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -339,8 +336,8 @@ screen_changed_cb (GtkTreeSelection  *selection,
     g_object_unref (info->current_screen);
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     gtk_tree_model_get (model, &iter,
-                        SCREEN_COLUMN_SCREEN, &info->current_screen,
-                        -1);
+			SCREEN_COLUMN_SCREEN, &info->current_screen,
+			-1);
   else
     info->current_screen = NULL;
 }
@@ -352,10 +349,10 @@ screen_changed_cb (GtkTreeSelection  *selection,
  */
 static void
 create_frame (ChangeDisplayInfo *info,
-              const char        *title,
-              GtkWidget        **frame,
-              GtkWidget        **tree_view,
-              GtkWidget        **button_vbox)
+	      const char        *title,
+	      GtkWidget        **frame,
+	      GtkWidget        **tree_view,
+	      GtkWidget        **button_vbox)
 {
   GtkTreeSelection *selection;
   GtkWidget *scrollwin;
@@ -369,9 +366,9 @@ create_frame (ChangeDisplayInfo *info,
 
   scrollwin = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
-                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
-                                       GTK_SHADOW_IN);
+				       GTK_SHADOW_IN);
   gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
 
   *tree_view = gtk_tree_view_new ();
@@ -400,8 +397,7 @@ left_align_button_new (const char *label)
   GtkWidget *button = gtk_button_new_with_mnemonic (label);
   GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
 
-  gtk_widget_set_halign (child, GTK_ALIGN_START);
-  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
+  gtk_misc_set_alignment (GTK_MISC (child), 0., 0.5);
 
   return button;
 }
@@ -429,20 +425,20 @@ create_display_frame (ChangeDisplayInfo *info)
   gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
 
   info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
-                                                            G_TYPE_STRING,
-                                                            GDK_TYPE_DISPLAY);
+							    G_TYPE_STRING,
+							    GDK_TYPE_DISPLAY);
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);
 
   column = gtk_tree_view_column_new_with_attributes ("Name",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", DISPLAY_COLUMN_NAME,
-                                                     NULL);
+						     gtk_cell_renderer_text_new (),
+						     "text", DISPLAY_COLUMN_NAME,
+						     NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
   g_signal_connect (selection, "changed",
-                    G_CALLBACK (display_changed_cb), info);
+		    G_CALLBACK (display_changed_cb), info);
 
   return frame;
 }
@@ -460,20 +456,20 @@ create_screen_frame (ChangeDisplayInfo *info)
   create_frame (info, "Screen", &frame, &tree_view, &button_vbox);
 
   info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
-                                                           G_TYPE_INT,
-                                                           GDK_TYPE_SCREEN);
+							   G_TYPE_INT,
+							   GDK_TYPE_SCREEN);
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);
 
   column = gtk_tree_view_column_new_with_attributes ("Number",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", SCREEN_COLUMN_NUMBER,
-                                                     NULL);
+						     gtk_cell_renderer_text_new (),
+						     "text", SCREEN_COLUMN_NUMBER,
+						     NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 
   info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
   g_signal_connect (info->screen_selection, "changed",
-                    G_CALLBACK (screen_changed_cb), info);
+		    G_CALLBACK (screen_changed_cb), info);
 
   return frame;
 }
@@ -483,8 +479,8 @@ create_screen_frame (ChangeDisplayInfo *info)
  */
 static void
 display_closed_cb (GdkDisplay        *display,
-                   gboolean           is_error,
-                   ChangeDisplayInfo *info)
+		   gboolean           is_error,
+		   ChangeDisplayInfo *info)
 {
   GtkTreeIter iter;
   gboolean valid;
@@ -496,13 +492,13 @@ display_closed_cb (GdkDisplay        *display,
       GdkDisplay *tmp_display;
 
       gtk_tree_model_get (info->display_model, &iter,
-                          DISPLAY_COLUMN_DISPLAY, &tmp_display,
-                          -1);
+			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
+			  -1);
       if (tmp_display == display)
-        {
-          gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
-          break;
-        }
+	{
+	  gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
+	  break;
+	}
     }
 }
 
@@ -512,27 +508,27 @@ display_closed_cb (GdkDisplay        *display,
  */
 static void
 add_display (ChangeDisplayInfo *info,
-             GdkDisplay        *display)
+	     GdkDisplay        *display)
 {
   const gchar *name = gdk_display_get_name (display);
   GtkTreeIter iter;
 
   gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
   gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
-                      DISPLAY_COLUMN_NAME, name,
-                      DISPLAY_COLUMN_DISPLAY, display,
-                      -1);
+		      DISPLAY_COLUMN_NAME, name,
+		      DISPLAY_COLUMN_DISPLAY, display,
+		      -1);
 
   g_signal_connect (display, "closed",
-                    G_CALLBACK (display_closed_cb), info);
+		    G_CALLBACK (display_closed_cb), info);
 }
 
 /* Called when a new display is opened
  */
 static void
 display_opened_cb (GdkDisplayManager *manager,
-                   GdkDisplay        *display,
-                   ChangeDisplayInfo *info)
+		   GdkDisplay        *display,
+		   ChangeDisplayInfo *info)
 {
   add_display (info, display);
 }
@@ -554,7 +550,7 @@ initialize_displays (ChangeDisplayInfo *info)
   g_slist_free (tmp_list);
 
   g_signal_connect (manager, "display-opened",
-                    G_CALLBACK (display_opened_cb), info);
+		    G_CALLBACK (display_opened_cb), info);
 }
 
 /* Cleans up when the toplevel is destroyed; we remove the
@@ -569,13 +565,13 @@ destroy_info (ChangeDisplayInfo *info)
   GSList *tmp_list;
 
   g_signal_handlers_disconnect_by_func (manager,
-                                        display_opened_cb,
-                                        info);
+					display_opened_cb,
+					info);
 
   for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
     g_signal_handlers_disconnect_by_func (tmp_list->data,
-                                          display_closed_cb,
-                                          info);
+					  display_closed_cb,
+					  info);
 
   g_slist_free (tmp_list);
 
@@ -593,7 +589,7 @@ destroy_info (ChangeDisplayInfo *info)
 
 static void
 destroy_cb (GObject            *object,
-            ChangeDisplayInfo **info)
+	    ChangeDisplayInfo **info)
 {
   destroy_info (*info);
   *info = NULL;
@@ -616,18 +612,18 @@ do_changedisplay (GtkWidget *do_widget)
       info = g_new0 (ChangeDisplayInfo, 1);
 
       info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
-                                            "Change",         GTK_RESPONSE_OK,
-                                            NULL);
+					    GTK_WINDOW (do_widget),
+					    0,
+					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
+					    "Change",         GTK_RESPONSE_OK,
+					    NULL);
 
       gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
 
       g_signal_connect (info->window, "response",
-                        G_CALLBACK (response_cb), info);
+			G_CALLBACK (response_cb), info);
       g_signal_connect (info->window, "destroy",
-                        G_CALLBACK (destroy_cb), &info);
+			G_CALLBACK (destroy_cb), &info);
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
 

demos/gtk-demo/clipboard.c

@@ -172,7 +172,7 @@ button_press (GtkWidget      *widget,
   GtkWidget *menu;
   GtkWidget *item;
 
-  if (button->button != GDK_BUTTON_SECONDARY)
+  if (button->button != 3)
     return FALSE;
 
   menu = gtk_menu_new ();

demos/gtk-demo/colorsel.c

@@ -1,9 +1,8 @@
-/* Color Chooser
+/* Color Selector
+ *
+ * GtkColorSelection lets the user choose a color. GtkColorSelectionDialog is
+ * a prebuilt dialog containing a GtkColorSelection.
  *
- * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK+. The
- * GtkColorChooserDialog is a prebuilt dialog containing a
- * GtkColorChooserWidget.
  */
 
 #include <gtk/gtk.h>
@@ -31,35 +30,36 @@ draw_callback (GtkWidget *widget,
   return TRUE;
 }
 
-static void
-response_cb (GtkDialog *dialog,
-             gint       response_id,
-             gpointer   user_data)
-{
-  if (response_id == GTK_RESPONSE_OK)
-    {
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-      gtk_widget_override_background_color (da, 0, &color);
-    }
-
-  gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
 static void
 change_color_callback (GtkWidget *button,
                        gpointer   data)
 {
   GtkWidget *dialog;
+  GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
+  gint response;
 
-  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+  dialog = gtk_color_selection_dialog_new ("Changing color");
 
-  g_signal_connect (dialog,
-                    "response",
-                    G_CALLBACK (response_cb),
-                    NULL);
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
 
-  gtk_widget_show_all (dialog);
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (colorsel, &color);
+  gtk_color_selection_set_has_palette (colorsel, TRUE);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
+      gtk_widget_override_background_color (da, 0, &color);
+    }
+
+  gtk_widget_destroy (dialog);
 }
 
 GtkWidget *
@@ -78,7 +78,7 @@ do_colorsel (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
+      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/combobox.c

@@ -1,15 +1,15 @@
-/* Combo boxes
+/* Combo boxes 
  *
  * The ComboBox widget allows to select one option out of a list.
  * The ComboBoxEntry additionally allows the user to enter a value
- * that is not in the list of options.
+ * that is not in the list of options. 
  *
  * How the options are displayed is controlled by cell renderers.
  */
 
 #include <gtk/gtk.h>
 
-enum
+enum 
 {
   PIXBUF_COL,
   TEXT_COL
@@ -20,16 +20,16 @@ strip_underscore (const gchar *text)
 {
   gchar *p, *q;
   gchar *result;
-
+  
   result = g_strdup (text);
   p = q = result;
-  while (*p)
+  while (*p) 
     {
       if (*p != '_')
-        {
-          *q = *p;
-          q++;
-        }
+	{
+	  *q = *p;
+	  q++;
+	}
       p++;
     }
   *q = '\0';
@@ -46,7 +46,7 @@ create_stock_icon_store (void)
     GTK_STOCK_NEW,
     GTK_STOCK_CLEAR,
     NULL,
-    GTK_STOCK_OPEN
+    GTK_STOCK_OPEN    
   };
 
   GtkStockItem item;
@@ -58,50 +58,50 @@ create_stock_icon_store (void)
   gint i;
 
   cellview = gtk_cell_view_new ();
-
+  
   store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
 
   for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
     {
       if (stock_id[i])
-        {
-          pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
-                                                  GTK_ICON_SIZE_BUTTON);
-          gtk_stock_lookup (stock_id[i], &item);
-          label = strip_underscore (item.label);
-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              PIXBUF_COL, pixbuf,
-                              TEXT_COL, label,
-                              -1);
-          g_object_unref (pixbuf);
-          g_free (label);
-        }
+	{
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
+	  gtk_stock_lookup (stock_id[i], &item);
+	  label = strip_underscore (item.label);
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, pixbuf,
+			      TEXT_COL, label,
+			      -1);
+	  g_object_unref (pixbuf);
+	  g_free (label);
+	}
       else
-        {
-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              PIXBUF_COL, NULL,
-                              TEXT_COL, "separator",
-                              -1);
-        }
+	{
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, NULL,
+			      TEXT_COL, "separator",
+			      -1);
+	}
     }
 
   gtk_widget_destroy (cellview);
-
+  
   return GTK_TREE_MODEL (store);
 }
 
 /* A GtkCellLayoutDataFunc that demonstrates how one can control
- * sensitivity of rows. This particular function does nothing
+ * sensitivity of rows. This particular function does nothing 
  * useful and just makes the second row insensitive.
  */
 static void
 set_sensitive (GtkCellLayout   *cell_layout,
-               GtkCellRenderer *cell,
-               GtkTreeModel    *tree_model,
-               GtkTreeIter     *iter,
-               gpointer         data)
+	       GtkCellRenderer *cell,
+	       GtkTreeModel    *tree_model,
+	       GtkTreeIter     *iter,
+	       gpointer         data)
 {
   GtkTreePath *path;
   gint *indices;
@@ -116,13 +116,13 @@ set_sensitive (GtkCellLayout   *cell_layout,
 }
 
 /* A GtkTreeViewRowSeparatorFunc that demonstrates how rows can be
- * rendered as separators. This particular function does nothing
+ * rendered as separators. This particular function does nothing 
  * useful and just turns the fourth row into a separator.
  */
 static gboolean
 is_separator (GtkTreeModel *model,
-              GtkTreeIter  *iter,
-              gpointer      data)
+	      GtkTreeIter  *iter,
+	      gpointer      data)
 {
   GtkTreePath *path;
   gboolean result;
@@ -141,11 +141,11 @@ create_capital_store (void)
     gchar *group;
     gchar *capital;
   } capitals[] = {
-    { "A - B", NULL },
+    { "A - B", NULL }, 
     { NULL, "Albany" },
     { NULL, "Annapolis" },
     { NULL, "Atlanta" },
-    { NULL, "Augusta" },
+    { NULL, "Augusta" }, 
     { NULL, "Austin" },
     { NULL, "Baton Rouge" },
     { NULL, "Bismarck" },
@@ -199,36 +199,36 @@ create_capital_store (void)
     { NULL, "Trenton" },
     { NULL, NULL }
   };
-
+  
   GtkTreeIter iter, iter2;
   GtkTreeStore *store;
   gint i;
 
   store = gtk_tree_store_new (1, G_TYPE_STRING);
-
+  
   for (i = 0; capitals[i].group || capitals[i].capital; i++)
     {
       if (capitals[i].group)
-        {
-          gtk_tree_store_append (store, &iter, NULL);
-          gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
-        }
+	{
+	  gtk_tree_store_append (store, &iter, NULL);
+	  gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
+	}
       else if (capitals[i].capital)
-        {
-          gtk_tree_store_append (store, &iter2, &iter);
-          gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
-        }
+	{
+	  gtk_tree_store_append (store, &iter2, &iter);
+	  gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
+	}
     }
-
+  
   return GTK_TREE_MODEL (store);
 }
 
 static void
 is_capital_sensitive (GtkCellLayout   *cell_layout,
-                      GtkCellRenderer *cell,
-                      GtkTreeModel    *tree_model,
-                      GtkTreeIter     *iter,
-                      gpointer         data)
+		      GtkCellRenderer *cell,
+		      GtkTreeModel    *tree_model,
+		      GtkTreeIter     *iter,
+		      gpointer         data)
 {
   gboolean sensitive;
 
@@ -274,8 +274,8 @@ struct _MaskEntryClass
 static void mask_entry_editable_init (GtkEditableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                                mask_entry_editable_init));
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+						mask_entry_editable_init));
 
 
 static void
@@ -286,10 +286,10 @@ mask_entry_set_background (MaskEntry *entry)
   if (entry->mask)
     {
       if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
-        {
-          gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
-          return;
-        }
+	{
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
+	  return;
+	}
     }
 
   gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
@@ -338,58 +338,58 @@ do_combobox (GtkWidget *do_widget)
     gtk_window_set_screen (GTK_WINDOW (window),
                            gtk_widget_get_screen (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
-
+   
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed),
                       &window);
-
+    
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
-     *  insensitive rows
+     *  insensitive rows 
      */
     frame = gtk_frame_new ("Some stock icons");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
+    
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
     model = create_stock_icon_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
     gtk_container_add (GTK_CONTAINER (box), combo);
-
+    
     renderer = gtk_cell_renderer_pixbuf_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
     gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "pixbuf", PIXBUF_COL,
-                                    NULL);
+				    "pixbuf", PIXBUF_COL, 
+				    NULL);
 
     gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        set_sensitive,
-                                        NULL, NULL);
-
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+    
     renderer = gtk_cell_renderer_text_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
     gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "text", TEXT_COL,
-                                    NULL);
+				    "text", TEXT_COL,
+				    NULL);
 
     gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        set_sensitive,
-                                        NULL, NULL);
-
-    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
-                                          is_separator, NULL, NULL);
+					renderer,
+					set_sensitive,
+					NULL, NULL);
 
+    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
+					  is_separator, NULL, NULL);
+    
     gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-
+    
     /* A combobox demonstrating trees.
      */
     frame = gtk_frame_new ("Where are we ?");
@@ -398,7 +398,7 @@ do_combobox (GtkWidget *do_widget)
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
     model = create_capital_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
@@ -407,12 +407,12 @@ do_combobox (GtkWidget *do_widget)
     renderer = gtk_cell_renderer_text_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
     gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "text", 0,
-                                    NULL);
+				    "text", 0,
+				    NULL);
     gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        is_capital_sensitive,
-                                        NULL, NULL);
+					renderer,
+					is_capital_sensitive,
+					NULL, NULL);
 
     path = gtk_tree_path_new_from_indices (0, 8, -1);
     gtk_tree_model_get_iter (model, &iter, path);
@@ -423,18 +423,18 @@ do_combobox (GtkWidget *do_widget)
      */
     frame = gtk_frame_new ("Editable");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
+    
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
     combo = gtk_combo_box_text_new_with_entry ();
     fill_combo_entry (combo);
     gtk_container_add (GTK_CONTAINER (box), combo);
-
+    
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
-
+     
     gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
     gtk_container_add (GTK_CONTAINER (combo), entry);
 
@@ -464,7 +464,7 @@ do_combobox (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {
+    {    
       gtk_widget_destroy (window);
       window = NULL;
     }

demos/gtk-demo/css_accordion.c

@@ -1,78 +0,0 @@
-/* CSS Theming/CSS Accordion :: css_accordion.css
- *
- * A simple accordion demo written using CSS transitions and multiple backgrounds
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
-{
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
-}
-
-GtkWidget *
-do_css_accordion (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *container, *child;
-      GtkStyleProvider *provider;
-      GBytes *bytes;
-      gsize data_size;
-      const guint8 *data;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      
-      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (container, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (window), container);
-
-      child = gtk_button_new_with_label ("This");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new_with_label ("Is");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new_with_label ("A");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new_with_label ("CSS");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new_with_label ("Accordion");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new_with_label (":-)");
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      bytes = g_resources_lookup_data ("/css_accordion/gtk.css", 0, NULL);
-      data = g_bytes_get_data (bytes, &data_size);
-
-      gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider), (gchar *)data, data_size, NULL);
-      g_bytes_unref (bytes);
-
-      apply_css (window, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/css_accordion.css

@@ -1,52 +0,0 @@
-@import url("resource:///reset.css");
-
-* {
-    transition-property: color, background-color, border-color, background-image, padding, border-width;
-    transition-duration: 1s;
-
-    font: Cantarell 20px;
-}
-
-GtkWindow {
-    background: linear-gradient(153deg, #151515, #151515 5px, transparent 5px) 0 0,
-                linear-gradient(333deg, #151515, #151515 5px, transparent 5px) 10px 5px,
-                linear-gradient(153deg, #222, #222 5px, transparent 5px) 0 5px,
-                linear-gradient(333deg, #222, #222 5px, transparent 5px) 10px 10px,
-                linear-gradient(90deg, #1b1b1b, #1b1b1b 10px, transparent 10px),
-                linear-gradient(#1d1d1d, #1d1d1d 25%, #1a1a1a 25%, #1a1a1a 50%, transparent 50%, transparent 75%, #242424 75%, #242424);
-    background-color: #131313;
-    background-size: 20px 20px;
-}
-
-.button {
-    color: black;
-    background-color: #bbb;
-    border-style: solid;
-    border-width: 2px 0 2px 2px;
-    border-color: #333;
-
-    padding: 12px 4px;
-}
-
-.button:first-child {
-    border-radius: 5px 0 0 5px;
-}
-
-.button:last-child {
-    border-radius: 0 5px 5px 0;
-    border-width: 2px;
-}
-
-.button:hover {
-    padding: 12px 48px;
-    background-color: #4870bc;
-}
-
-.button *:hover {
-    color: white;
-}
-
-.button:hover:active,
-.button:active {
-    background-color: #993401;
-}

demos/gtk-demo/css_basics.c

@@ -1,122 +0,0 @@
-/* CSS Theming/CSS Basics :: css_basics.css
- *
- * Gtk themes are written using CSS. Every widget is build of multiple items
- * that you can style very similarly to a regular website.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-show_parsing_error (GtkCssProvider *provider,
-                    GtkCssSection  *section,
-                    const GError   *error,
-                    GtkTextBuffer  *buffer)
-{
-  GtkTextIter start, end;
-  const char *tag_name;
-
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &start,
-                                          gtk_css_section_get_start_line (section),
-                                          gtk_css_section_get_start_position (section));
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &end,
-                                          gtk_css_section_get_end_line (section),
-                                          gtk_css_section_get_end_position (section));
-
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
-    tag_name = "warning";
-  else
-    tag_name = "error";
-
-  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
-}
-                    
-static void
-css_text_changed (GtkTextBuffer  *buffer,
-                  GtkCssProvider *provider)
-{
-  GtkTextIter start, end;
-  char *text;
-
-  gtk_text_buffer_get_start_iter (buffer, &start);
-  gtk_text_buffer_get_end_iter (buffer, &end);
-  gtk_text_buffer_remove_all_tags (buffer, &start, &end);
-
-  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
-  g_free (text);
-
-  gtk_style_context_reset_widgets (gdk_screen_get_default ());
-}
-
-static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
-{
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
-}
-
-GtkWidget *
-do_css_basics (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *container, *child;
-      GtkStyleProvider *provider;
-      GtkTextBuffer *text;
-      GBytes *bytes;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      text = gtk_text_buffer_new (NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "warning",
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "error",
-                                  "underline", PANGO_UNDERLINE_ERROR,
-                                  NULL);
-
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), container);
-      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
-
-      bytes = g_resources_lookup_data ("/css_basics/gtk.css", 0, NULL);
-      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-      g_bytes_unref (bytes);
-
-      g_signal_connect (provider,
-                        "parsing-error",
-                        G_CALLBACK (show_parsing_error),
-                        gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
-
-      apply_css (window, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/css_basics.css

@@ -1,22 +0,0 @@
-/* You can edit the text in this window to change the
- * appearance of this Window.
- * Be careful, if you screw it up, nothing might be visible
- * anymore. :)
- */
-
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-
-/* Set a very futuristic style by default */
-* {
-  color: green;
-  font-family: Monospace;
-  border: 1px solid;
-}
-
-/* Make sure selections are visible */
-:selected {
-  background-color: darkGreen;
-  color: black;
-}

demos/gtk-demo/css_multiplebgs.c

@@ -1,171 +0,0 @@
-/* CSS Theming/Multiple Backgrounds :: css_multiplebgs.css cssview.css
- *
- * Gtk themes are written using CSS. Every widget is build of multiple items
- * that you can style very similarly to a regular website.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-show_parsing_error (GtkCssProvider *provider,
-                    GtkCssSection  *section,
-                    const GError   *error,
-                    GtkTextBuffer  *buffer)
-{
-  GtkTextIter start, end;
-  const char *tag_name;
-
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &start,
-                                          gtk_css_section_get_start_line (section),
-                                          gtk_css_section_get_start_position (section));
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &end,
-                                          gtk_css_section_get_end_line (section),
-                                          gtk_css_section_get_end_position (section));
-
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
-    tag_name = "warning";
-  else
-    tag_name = "error";
-
-  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
-}
-                    
-static void
-css_text_changed (GtkTextBuffer  *buffer,
-                  GtkCssProvider *provider)
-{
-  GtkTextIter start, end;
-  char *text;
-
-  gtk_text_buffer_get_start_iter (buffer, &start);
-  gtk_text_buffer_get_end_iter (buffer, &end);
-  gtk_text_buffer_remove_all_tags (buffer, &start, &end);
-
-  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
-  g_free (text);
-
-  gtk_style_context_reset_widgets (gdk_screen_get_default ());
-}
-
-static gboolean
-drawing_area_draw (GtkWidget *widget,
-                   cairo_t *cr)
-{
-  GtkStyleContext *context = gtk_widget_get_style_context (widget);
-
-  gtk_render_background (context, cr,
-                         0, 0,
-                         gtk_widget_get_allocated_width (widget),
-                         gtk_widget_get_allocated_height (widget));
-  gtk_render_frame (context, cr,
-                    0, 0,
-                    gtk_widget_get_allocated_width (widget),
-                    gtk_widget_get_allocated_height (widget));
-
-  return FALSE;
-}
-
-static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
-{
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
-}
-
-GtkWidget *
-do_css_multiplebgs (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *paned, *container, *child;
-      GtkStyleProvider *provider;
-      GtkTextBuffer *text;
-      GBytes *bytes;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      container = gtk_overlay_new ();
-      gtk_widget_add_events (container,
-                             GDK_ENTER_NOTIFY_MASK |
-                             GDK_LEAVE_NOTIFY_MASK |
-                             GDK_POINTER_MOTION_MASK);
-      gtk_container_add (GTK_CONTAINER (window), container);
-
-      child = gtk_drawing_area_new ();
-      gtk_widget_set_name (child, "canvas");
-      g_signal_connect (child, "draw",
-                        G_CALLBACK (drawing_area_draw), NULL);
-      gtk_container_add (GTK_CONTAINER (container), child);
-
-      child = gtk_button_new ();
-      gtk_widget_add_events (child,
-                             GDK_ENTER_NOTIFY_MASK |
-                             GDK_LEAVE_NOTIFY_MASK |
-                             GDK_POINTER_MOTION_MASK);
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
-      gtk_widget_set_name (child, "bricks-button");
-      gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
-      gtk_widget_set_size_request (child, 200, 80);
-
-      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);
-
-      /* Need a filler so we get a handle */
-      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
-
-      text = gtk_text_buffer_new (NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "warning",
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "error",
-                                  "underline", PANGO_UNDERLINE_ERROR,
-                                  NULL);
-
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
-      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
-
-      bytes = g_resources_lookup_data ("/css_multiplebgs/gtk.css", 0, NULL);
-      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-      g_bytes_unref (bytes);
-
-      g_signal_connect (provider,
-                        "parsing-error",
-                        G_CALLBACK (show_parsing_error),
-                        gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
-
-      apply_css (window, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/css_multiplebgs.css

@@ -1,136 +0,0 @@
-/* You can edit the text in this window to change the
- * appearance of this Window.
- * Be careful, if you screw it up, nothing might be visible
- * anymore. :)
- */
-
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
-
-#canvas {
-    transition-property: background-color, background-image;
-    transition-duration: 0.5s;
-
-    background-color: #4870bc;
-}
-
-/* The gradients below are adapted versions of Lea Verou's CSS3 patterns,
- * licensed under the MIT license:
- * Copyright (c) 2011 Lea Verou, http://lea.verou.me/
- *
- * See https://github.com/LeaVerou/CSS3-Patterns-Gallery
- */
-
-/**********
- * Bricks *
- **********/
-/*
-@define-color brick_hi #d42;
-@define-color brick_lo #b42;
-@define-color brick_hi_backdrop #888;
-@define-color brick_lo_backdrop #999;
-
-#canvas {
-    background-color: #999;
-    background-image: linear-gradient(205deg, @brick_lo, @brick_lo 23px, transparent 23px),
-                      linear-gradient(25deg, @brick_hi, @brick_hi 23px, transparent 23px),
-                      linear-gradient(205deg, @brick_lo, @brick_lo 23px, transparent 23px),
-                      linear-gradient(25deg, @brick_hi, @brick_hi 23px, transparent 23px);
-    background-size: 58px 58px;
-    background-position: 0px 6px, 4px 31px, 29px 35px, 34px 2px;
-}
-
-#canvas:backdrop {
-    background-color: #444;
-    background-image: linear-gradient(205deg, @brick_lo_backdrop, @brick_lo_backdrop 23px, transparent 23px),
-                      linear-gradient(25deg, @brick_hi_backdrop, @brick_hi_backdrop 23px, transparent 23px),
-	              linear-gradient(205deg, @brick_lo_backdrop, @brick_lo_backdrop 23px, transparent 23px),
-	              linear-gradient(25deg, @brick_hi_backdrop, @brick_hi_backdrop 23px, transparent 23px);
-    background-size: 58px 58px;
-    background-position: 0px 6px, 4px 31px, 29px 35px, 34px 2px;
-}
-*/
-
-/*
-#bricks-button {
-    background-color: #eef;
-    background-image: url('resource:///css_multiplebgs/brick.png');
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
-*/
-/**********
- * Tartan *
- **********/
-/*
-@define-color tartan_bg #662e2c;
-@define-color tartan_bg_backdrop #333;
-
-#canvas {
-    background-color: @tartan_bg;
-    background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px,
-                                                rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px,
-                                                rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px,
-                                                transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px,
-                                                rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px,
-                                                rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px,
-                                                rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),
-                      repeating-linear-gradient(90deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px,
-                                                transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px,
-                                                transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px,
-                                                rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px,
-                                                rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px,
-                                                rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),
-                      repeating-linear-gradient(-55deg, transparent, transparent 1px, rgba(0,0,0,.2) 1px, rgba(0,0,0,.2) 4px,
-                                                transparent 4px, transparent 19px, rgba(0,0,0,.2) 19px,
-                                                rgba(0,0,0,.2) 24px, transparent 24px, transparent 51px, rgba(0,0,0,.2) 51px,
-                                                rgba(0,0,0,.2) 54px, transparent 54px, transparent 74px);
-}
-
-#canvas:backdrop {
-    background-color: @tartan_bg_backdrop;
-}
-*/
-
-/***********
- * Stripes *
- ***********/
-
-/*
-@define-color base_bg #4870bc;
-@define-color backdrop_bg #555;
-
-#canvas {
-  background-color: @base_bg;
-  background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
-                    linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
-                    linear-gradient(to left, transparent, transparent 50%, rgba(255,255,255,.17) 50%),
-                    linear-gradient(to left, transparent, transparent 50%, rgba(255,255,255,.19) 50%);
-  background-size: 29px, 59px, 73px, 109px;
-}
-
-#canvas:backdrop {
-  background-color: @backdrop_bg;
-}
-*/
-
-/***************
- * Lined Paper *
- ***************/
-/*
-#canvas {
-    background-color: #fff;
-    background-image: linear-gradient(90deg, transparent 79px, alpha(#f98195, 0.40) 79px, #f98195 80px, alpha(#f98195, 0.40) 81px, transparent 81px),
-                      linear-gradient(alpha(#77c5cf, 0.60), alpha(#77c5cf, 0.60) 1px, transparent 1px);
-    background-size: 100% 36px;
-}
-
-#canvas:backdrop {
-    background-color: #f1f2f4;
-    background-image: linear-gradient(90deg, transparent 79px, alpha(#999, 0.40) 79px, #999 80px, alpha(#999, 0.40) 81px, transparent 81px),
-                      linear-gradient(alpha(#bbb, 0.60), alpha(#bbb, 0.60) 1px, transparent 1px);
-}
-*/

demos/gtk-demo/css_pixbufs.c

@@ -1,127 +0,0 @@
-/* CSS Theming/Animated backgrounds
- *
- * This demo is done in honour of the Pixbufs demo further down. It is done exclusively
- * with CSS as the background of the window.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-show_parsing_error (GtkCssProvider *provider,
-                    GtkCssSection  *section,
-                    const GError   *error,
-                    GtkTextBuffer  *buffer)
-{
-  GtkTextIter start, end;
-  const char *tag_name;
-
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &start,
-                                          gtk_css_section_get_start_line (section),
-                                          gtk_css_section_get_start_position (section));
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &end,
-                                          gtk_css_section_get_end_line (section),
-                                          gtk_css_section_get_end_position (section));
-
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
-    tag_name = "warning";
-  else
-    tag_name = "error";
-
-  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
-}
-                    
-static void
-css_text_changed (GtkTextBuffer  *buffer,
-                  GtkCssProvider *provider)
-{
-  GtkTextIter start, end;
-  char *text;
-
-  gtk_text_buffer_get_start_iter (buffer, &start);
-  gtk_text_buffer_get_end_iter (buffer, &end);
-  gtk_text_buffer_remove_all_tags (buffer, &start, &end);
-
-  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
-  g_free (text);
-
-  gtk_style_context_reset_widgets (gdk_screen_get_default ());
-}
-
-static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
-{
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
-}
-
-GtkWidget *
-do_css_pixbufs (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *paned, *container, *child;
-      GtkStyleProvider *provider;
-      GtkTextBuffer *text;
-      GBytes *bytes;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
-
-      /* Need a filler so we get a handle */
-      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
-
-      text = gtk_text_buffer_new (NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "warning",
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "error",
-                                  "underline", PANGO_UNDERLINE_ERROR,
-                                  NULL);
-
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
-      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
-
-      bytes = g_resources_lookup_data ("/css_pixbufs/gtk.css", 0, NULL);
-      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-
-      g_signal_connect (provider,
-                        "parsing-error",
-                        G_CALLBACK (show_parsing_error),
-                        gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
-
-      apply_css (window, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/css_pixbufs.css

@@ -1,76 +0,0 @@
-/* You can edit the text in this window to change the
- * appearance of this Window.
- * Be careful, if you screw it up, nothing might be visible
- * anymore. :)
- */
-
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
-
-@keyframes move-the-image {
-0% { background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%; }
-3.125% { background-position: 55.19% 76.11%, 72.14% 64.79%, 76.11% 44.81%, 64.79% 27.86%, 44.81% 23.89%, 27.86% 35.21%, 23.89% 55.19%, 35.21% 72.14%, 0% 0%; }
-6.25% { background-position: 60.79% 76.04%, 76.04% 60.79%, 76.04% 39.21%, 60.79% 23.96%, 39.21% 23.96%, 23.96% 39.21%, 23.96% 60.79%, 39.21% 76.04%, 0% 0%; }
-9.375% { background-position: 66.46% 74.64%, 79.06% 55.78%, 74.64% 33.54%, 55.78% 20.94%, 33.54% 25.36%, 20.94% 44.22%, 25.36% 66.46%, 44.22% 79.06%, 0% 0%; }
-12.5% { background-position: 71.84% 71.84%, 80.89% 50.00%, 71.84% 28.16%, 50.00% 19.11%, 28.16% 28.16%, 19.11% 50.00%, 28.16% 71.84%, 50.00% 80.89%, 0% 0%; }
-15.625% { background-position: 76.55% 67.74%, 81.32% 43.77%, 67.74% 23.45%, 43.77% 18.68%, 23.45% 32.26%, 18.68% 56.23%, 32.26% 76.55%, 56.23% 81.32%, 0% 0%; }
-18.75% { background-position: 80.21% 62.51%, 80.21% 37.49%, 62.51% 19.79%, 37.49% 19.79%, 19.79% 37.49%, 19.79% 62.51%, 37.49% 80.21%, 62.51% 80.21%, 0% 0%; }
-21.875% { background-position: 82.54% 56.47%, 77.58% 31.57%, 56.47% 17.46%, 31.57% 22.42%, 17.46% 43.53%, 22.42% 68.43%, 43.53% 82.54%, 68.43% 77.58%, 0% 0%; }
-25% { background-position: 83.33% 50.00%, 73.57% 26.43%, 50.00% 16.67%, 26.43% 26.43%, 16.67% 50.00%, 26.43% 73.57%, 50.00% 83.33%, 73.57% 73.57%, 0% 0%; }
-28.125% { background-position: 82.54% 43.53%, 68.43% 22.42%, 43.53% 17.46%, 22.42% 31.57%, 17.46% 56.47%, 31.57% 77.58%, 56.47% 82.54%, 77.58% 68.43%, 0% 0%; }
-31.25% { background-position: 80.21% 37.49%, 62.51% 19.79%, 37.49% 19.79%, 19.79% 37.49%, 19.79% 62.51%, 37.49% 80.21%, 62.51% 80.21%, 80.21% 62.51%, 0% 0%; }
-34.375% { background-position: 76.55% 32.26%, 56.23% 18.68%, 32.26% 23.45%, 18.68% 43.77%, 23.45% 67.74%, 43.77% 81.32%, 67.74% 76.55%, 81.32% 56.23%, 0% 0%; }
-37.5% { background-position: 71.84% 28.16%, 50.00% 19.11%, 28.16% 28.16%, 19.11% 50.00%, 28.16% 71.84%, 50.00% 80.89%, 71.84% 71.84%, 80.89% 50.00%, 0% 0%; }
-40.625% { background-position: 66.46% 25.36%, 44.22% 20.94%, 25.36% 33.54%, 20.94% 55.78%, 33.54% 74.64%, 55.78% 79.06%, 74.64% 66.46%, 79.06% 44.22%, 0% 0%; }
-43.75% { background-position: 60.79% 23.96%, 39.21% 23.96%, 23.96% 39.21%, 23.96% 60.79%, 39.21% 76.04%, 60.79% 76.04%, 76.04% 60.79%, 76.04% 39.21%, 0% 0%; }
-46.875% { background-position: 55.19% 23.89%, 35.21% 27.86%, 23.89% 44.81%, 27.86% 64.79%, 44.81% 76.11%, 64.79% 72.14%, 76.11% 55.19%, 72.14% 35.21%, 0% 0%; }
-50% { background-position: 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 0% 0%; }
-53.125% { background-position: 45.44% 27.07%, 30.57% 37.01%, 27.07% 54.56%, 37.01% 69.43%, 54.56% 72.93%, 69.43% 62.99%, 72.93% 45.44%, 62.99% 30.57%, 0% 0%; }
-56.25% { background-position: 41.65% 29.85%, 29.85% 41.65%, 29.85% 58.35%, 41.65% 70.15%, 58.35% 70.15%, 70.15% 58.35%, 70.15% 41.65%, 58.35% 29.85%, 0% 0%; }
-59.375% { background-position: 38.68% 33.06%, 30.02% 46.03%, 33.06% 61.32%, 46.03% 69.98%, 61.32% 66.94%, 69.98% 53.97%, 66.94% 38.68%, 53.97% 30.02%, 0% 0%; }
-62.5% { background-position: 36.49% 36.49%, 30.89% 50.00%, 36.49% 63.51%, 50.00% 69.11%, 63.51% 63.51%, 69.11% 50.00%, 63.51% 36.49%, 50.00% 30.89%, 0% 0%; }
-65.625% { background-position: 34.97% 39.96%, 32.28% 53.53%, 39.96% 65.03%, 53.53% 67.72%, 65.03% 60.04%, 67.72% 46.47%, 60.04% 34.97%, 46.47% 32.28%, 0% 0%; }
-68.75% { background-position: 34.02% 43.38%, 34.02% 56.62%, 43.38% 65.98%, 56.62% 65.98%, 65.98% 56.62%, 65.98% 43.38%, 56.62% 34.02%, 43.38% 34.02%, 0% 0%; }
-71.875% { background-position: 33.50% 46.72%, 36.01% 59.35%, 46.72% 66.50%, 59.35% 63.99%, 66.50% 53.28%, 63.99% 40.65%, 53.28% 33.50%, 40.65% 36.01%, 0% 0%; }
-75% { background-position: 33.33% 50.00%, 38.21% 61.79%, 50.00% 66.67%, 61.79% 61.79%, 66.67% 50.00%, 61.79% 38.21%, 50.00% 33.33%, 38.21% 38.21%, 0% 0%; }
-78.125% { background-position: 33.50% 53.28%, 40.65% 63.99%, 53.28% 66.50%, 63.99% 59.35%, 66.50% 46.72%, 59.35% 36.01%, 46.72% 33.50%, 36.01% 40.65%, 0% 0%; }
-81.25% { background-position: 34.02% 56.62%, 43.38% 65.98%, 56.62% 65.98%, 65.98% 56.62%, 65.98% 43.38%, 56.62% 34.02%, 43.38% 34.02%, 34.02% 43.38%, 0% 0%; }
-84.375% { background-position: 34.97% 60.04%, 46.47% 67.72%, 60.04% 65.03%, 67.72% 53.53%, 65.03% 39.96%, 53.53% 32.28%, 39.96% 34.97%, 32.28% 46.47%, 0% 0%; }
-87.5% { background-position: 36.49% 63.51%, 50.00% 69.11%, 63.51% 63.51%, 69.11% 50.00%, 63.51% 36.49%, 50.00% 30.89%, 36.49% 36.49%, 30.89% 50.00%, 0% 0%; }
-90.625% { background-position: 38.68% 66.94%, 53.97% 69.98%, 66.94% 61.32%, 69.98% 46.03%, 61.32% 33.06%, 46.03% 30.02%, 33.06% 38.68%, 30.02% 53.97%, 0% 0%; }
-93.75% { background-position: 41.65% 70.15%, 58.35% 70.15%, 70.15% 58.35%, 70.15% 41.65%, 58.35% 29.85%, 41.65% 29.85%, 29.85% 41.65%, 29.85% 58.35%, 0% 0%; }
-96.875% { background-position: 45.44% 72.93%, 62.99% 69.43%, 72.93% 54.56%, 69.43% 37.01%, 54.56% 27.07%, 37.01% 30.57%, 27.07% 45.44%, 30.57% 62.99%, 0% 0%; }
-100% { background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%; }
-}
-
-@keyframes size-the-image {
-    0% { background-size: 96px, 12px, 96px, 12px, 96px, 12px, 96px, 12px, auto }
-    100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto }
-}
-
-GtkWindow {
-    background-image: url("resource:///css_pixbufs/apple-red.png"),
-                      url("resource:///css_pixbufs/gnome-applets.png"),
-                      url("resource:///css_pixbufs/gnome-calendar.png"),
-                      url("resource:///css_pixbufs/gnome-foot.png"),
-                      url("resource:///css_pixbufs/gnome-gmush.png"),
-                      url("resource:///css_pixbufs/gnome-gimp.png"),
-                      url("resource:///css_pixbufs/gnome-gsame.png"),
-                      url("resource:///css_pixbufs/gnu-keys.png"),
-                      url("resource:///css_pixbufs/background.jpg");
-    background-position: 50.00% 75.00%, 67.68% 67.68%, 75.00% 50.00%, 67.68% 32.32%, 50.00% 25.00%, 32.32% 32.32%, 25.00% 50.00%, 32.32% 67.68%, 0% 0%;
-    background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, repeat;
-    animation: move-the-image infinite linear 3s, size-the-image infinite alternate ease-in-out 0.75s;
-}
-
-/* Make the text editor has a nice style */
-.view, .scrollbar, .pane-separator {
-  color: black;
-  background-color: rgba(255,255,255,0.5);
-}
-
-.view:selected {
-  background-color: rgba(127,127,255,0.5);
-}

demos/gtk-demo/css_shadows.c

@@ -1,147 +0,0 @@
-/* CSS Theming/Shadows
- *
- * This demo shows how to use CSS shadows.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-show_parsing_error (GtkCssProvider *provider,
-                    GtkCssSection  *section,
-                    const GError   *error,
-                    GtkTextBuffer  *buffer)
-{
-  GtkTextIter start, end;
-  const char *tag_name;
-
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &start,
-                                          gtk_css_section_get_start_line (section),
-                                          gtk_css_section_get_start_position (section));
-  gtk_text_buffer_get_iter_at_line_index (buffer,
-                                          &end,
-                                          gtk_css_section_get_end_line (section),
-                                          gtk_css_section_get_end_position (section));
-
-  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
-    tag_name = "warning";
-  else
-    tag_name = "error";
-
-  gtk_text_buffer_apply_tag_by_name (buffer, tag_name, &start, &end);
-}
-                    
-static void
-css_text_changed (GtkTextBuffer  *buffer,
-                  GtkCssProvider *provider)
-{
-  GtkTextIter start, end;
-  char *text;
-
-  gtk_text_buffer_get_start_iter (buffer, &start);
-  gtk_text_buffer_get_end_iter (buffer, &end);
-  gtk_text_buffer_remove_all_tags (buffer, &start, &end);
-
-  text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1, NULL);
-  g_free (text);
-
-  gtk_style_context_reset_widgets (gdk_screen_get_default ());
-}
-
-static void
-apply_css (GtkWidget *widget, GtkStyleProvider *provider)
-{
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
-}
-
-GtkWidget *
-create_toolbar (void)
-{
-  GtkWidget *toolbar;
-  GtkToolItem *item;
-
-  toolbar = gtk_toolbar_new ();
-  gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  item = gtk_tool_button_new (NULL, "Hello World");
-  gtk_tool_item_set_is_important (item, TRUE);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  return toolbar;
-}
-
-GtkWidget *
-do_css_shadows (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *paned, *container, *child;
-      GtkStyleProvider *provider;
-      GtkTextBuffer *text;
-      GBytes *bytes;
-      
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
-
-      child = create_toolbar ();
-      gtk_container_add (GTK_CONTAINER (paned), child);
-
-      text = gtk_text_buffer_new (NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "warning",
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
-      gtk_text_buffer_create_tag (text,
-                                  "error",
-                                  "underline", PANGO_UNDERLINE_ERROR,
-                                  NULL);
-
-      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
-      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
-      g_signal_connect (text,
-                        "changed",
-                        G_CALLBACK (css_text_changed),
-                        provider);
-
-      bytes = g_resources_lookup_data ("/css_shadows/gtk.css", 0, NULL);
-      gtk_text_buffer_set_text (text, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-
-      g_signal_connect (provider,
-                        "parsing-error",
-                        G_CALLBACK (show_parsing_error),
-                        gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
-
-      apply_css (window, provider);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/css_shadows.css

@@ -1,44 +0,0 @@
-/* You can edit the text in this window to change the
- * appearance of this Window.
- * Be careful, if you screw it up, nothing might be visible
- * anymore. :)
- */
-
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource:///reset.css");
-@import url("resource:///cssview.css");
-
-/* Get a nice background for the window */
-.background {
-  background-color: #4870bc;
-  background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
-                    linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
-                    linear-gradient(to left, transparent, transparent 50%, rgba(255,255,255,.17) 50%),
-                    linear-gradient(to left, transparent, transparent 50%, rgba(255,255,255,.19) 50%);
-  background-size: 29px, 59px, 73px, 109px;
-}
-
-.button {
-  color: black;
-  padding: 10px;
-  border-radius: 5px;
-  transition: all 250ms ease-in;
-  border: 1px transparent solid;
-}
-
-.button:hover {
-  text-shadow: 3px 3px 5px alpha(black, 0.75);
-  icon-shadow: 3px 3px 5px alpha(black, 0.75);
-  box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
-  border: solid 1px alpha(black, 0.75);
-}
-
-.button:active {
-  padding: 11px 9px 9px 11px;
-  text-shadow: 1px 1px 2.5px alpha(black, 0.6);
-  icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
-}
-
-
-

demos/gtk-demo/cssview.css

@@ -1,41 +0,0 @@
-/* Make the text editor has a nice style */
-.view {
-  color: #2e3436;
-  font: Monospace;
-  background-color: alpha(white, 0.30);
-}
-
-.view:selected {
-  color: white;
-  background-color: #4a90d9;
-}
-
-.scrollbar.trough,
-.scrollbars-junction {
-  background-color: alpha(white, 0.80);
-}
-
-.scrollbar.slider {
-  border-width: 3px;
-  border-style: solid;
-  border-radius: 10px;
-  border-color: transparent;
-  background-clip: padding-box;
-  background-color: #999;
-}
-
-.scrollbar.slider:prelight {
-  background-color: #555;
-}
-
-.pane-separator {
-  background-color: alpha(white, 0.80);
-  background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
-  background-size: 40px auto;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.pane-separator:prelight {
-  background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
-}

demos/gtk-demo/demo.gresource.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/application/logos">
-    <file preprocess="to-pixdata">gtk-logo-24.png</file>
-    <file preprocess="to-pixdata">gtk-logo-48.png</file>
-  </gresource>
-  <gresource prefix="/application/ui">
-    <file preprocess="xml-stripblanks">application.ui</file>
-    <file preprocess="xml-stripblanks">menus.ui</file>
-  </gresource>
-  <gresource prefix="/">
-    <file>cssview.css</file>
-    <file>reset.css</file>
-  </gresource>
-  <gresource prefix="/css_accordion">
-    <file alias="gtk.css">css_accordion.css</file>
-  </gresource>
-  <gresource prefix="/css_basics">
-    <file alias="gtk.css">css_basics.css</file>
-  </gresource>
-  <gresource prefix="/css_multiplebgs">
-    <file alias="gtk.css">css_multiplebgs.css</file>
-    <file>brick.png</file>
-  </gresource>
-  <gresource prefix="/theming_custom_css">
-    <file alias="gtk.css">fancy.css</file>
-  </gresource>
-  <gresource prefix="/theming_style_classes">
-    <file preprocess="xml-stripblanks">theming.ui</file>
-  </gresource>
-  <gresource prefix="/css_pixbufs">
-    <file alias="gtk.css">css_pixbufs.css</file>
-    <file>background.jpg</file>
-    <file>apple-red.png</file>
-    <file>gnome-applets.png</file>
-    <file>gnome-calendar.png</file>
-    <file>gnome-foot.png</file>
-    <file>gnome-gmush.png</file>
-    <file>gnome-gimp.png</file>
-    <file>gnome-gsame.png</file>
-    <file>gnu-keys.png</file>
-  </gresource>
-  <gresource prefix="/css_shadows">
-    <file alias="gtk.css">css_shadows.css</file>
-  </gresource>
-</gresources>

demos/gtk-demo/demo.ui

@@ -107,14 +107,7 @@
                         <property name="stock_id">gtk-about</property>
                         <signal handler="about_activate" name="activate"/>
                     </object>
-                    <accelerator key="F7"/>
-                </child>
-                <child>
-                    <object class="GtkAction" id="Help">
-                        <property name="name">Help</property>
-                        <property name="stock_id">gtk-help</property>
-                        <signal handler="help_activate" name="activate"/>
-                    </object>
+                    <accelerator key="F1"/>
                 </child>
             </object>
         </child>
@@ -134,7 +127,6 @@
               <menuitem action="Paste" name="Paste"/>
             </menu>
             <menu action="HelpMenu" name="HelpMenu">
-              <menuitem action="Help" name="Help"/>
               <menuitem action="About" name="About"/>
             </menu>
           </menubar>

demos/gtk-demo/dialog.c

@@ -11,17 +11,17 @@ static GtkWidget *entry2 = NULL;
 
 static void
 message_dialog_clicked (GtkButton *button,
-                        gpointer   user_data)
+			gpointer   user_data)
 {
   GtkWidget *dialog;
   static gint i = 1;
 
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
-                                   "This message box has been popped up the following\n"
-                                   "number of times:");
+				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				   GTK_MESSAGE_INFO,
+				   GTK_BUTTONS_OK,
+				   "This message box has been popped up the following\n"
+				   "number of times:");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "%d", i);
   gtk_dialog_run (GTK_DIALOG (dialog));
@@ -31,7 +31,7 @@ message_dialog_clicked (GtkButton *button,
 
 static void
 interactive_dialog_clicked (GtkButton *button,
-                            gpointer   user_data)
+			    gpointer   user_data)
 {
   GtkWidget *content_area;
   GtkWidget *dialog;
@@ -44,13 +44,13 @@ interactive_dialog_clicked (GtkButton *button,
   gint response;
 
   dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
-                                        GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_STOCK_OK,
-                                        GTK_RESPONSE_OK,
+					GTK_WINDOW (window),
+					GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
+					GTK_STOCK_OK,
+					GTK_RESPONSE_OK,
                                         "_Non-stock Button",
                                         GTK_RESPONSE_CANCEL,
-                                        NULL);
+					NULL);
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
@@ -61,25 +61,29 @@ interactive_dialog_clicked (GtkButton *button,
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
 
-  table = gtk_grid_new ();
-  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
-  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
   gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
-  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table),
+			     label,
+			     0, 1, 0, 1);
   local_entry1 = gtk_entry_new ();
   gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
-  gtk_grid_attach (GTK_GRID (table), local_entry1, 1, 0, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), local_entry1, 1, 2, 0, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);
 
   label = gtk_label_new_with_mnemonic ("E_ntry 2");
-  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table),
+			     label,
+			     0, 1, 1, 2);
 
   local_entry2 = gtk_entry_new ();
   gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
-  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), local_entry2, 1, 2, 1, 2);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
-
+  
   gtk_widget_show_all (hbox);
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -102,12 +106,12 @@ do_dialog (GtkWidget *do_widget)
   GtkWidget *button;
   GtkWidget *table;
   GtkWidget *label;
-
+  
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
@@ -125,7 +129,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
-                        G_CALLBACK (message_dialog_clicked), NULL);
+			G_CALLBACK (message_dialog_clicked), NULL);
       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
       gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
@@ -138,27 +142,33 @@ do_dialog (GtkWidget *do_widget)
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",
-                        G_CALLBACK (interactive_dialog_clicked), NULL);
+			G_CALLBACK (interactive_dialog_clicked), NULL);
       gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
       gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
 
-      table = gtk_grid_new ();
-      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+      table = gtk_table_new (2, 2, FALSE);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
       gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");
-      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table),
+				 label,
+				 0, 1, 0, 1);
 
       entry1 = gtk_entry_new ();
-      gtk_grid_attach (GTK_GRID (table), entry1, 1, 0, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table), entry1, 1, 2, 0, 1);
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);
 
       label = gtk_label_new_with_mnemonic ("E_ntry 2");
-      gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
+      
+      gtk_table_attach_defaults (GTK_TABLE (table),
+				 label,
+				 0, 1, 1, 2);
 
       entry2 = gtk_entry_new ();
-      gtk_grid_attach (GTK_GRID (table), entry2, 1, 1, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table), entry2, 1, 2, 1, 2);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -166,7 +176,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_widget_show_all (window);
     }
   else
-    {
+    {	 
       gtk_widget_destroy (window);
       window = NULL;
     }

demos/gtk-demo/drawingarea.c

@@ -97,7 +97,7 @@ scribble_button_press_event (GtkWidget      *widget,
   if (surface == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
-  if (event->button == GDK_BUTTON_PRIMARY)
+  if (event->button == 1)
     draw_brush (widget, event->x, event->y);
 
   /* We've handled the event, stop processing */
@@ -126,7 +126,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
    * can cope.
    */
 
-  gdk_window_get_device_position (event->window, event->device, &x, &y, &state);
+  gdk_window_get_pointer (event->window, &x, &y, &state);
 
   if (state & GDK_BUTTON1_MASK)
     draw_brush (widget, x, y);

demos/gtk-demo/editable_cells.c

@@ -6,7 +6,7 @@
  * GtkCellRenderer::editing-started signal to do custom setup of the
  * editable widget.
  *
- * The cell renderers used in this demo are GtkCellRendererText,
+ * The cell renderers used in this demo are GtkCellRendererText, 
  * GtkCellRendererCombo and GtkCellRendererProgress.
  */
 
@@ -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);
 }
@@ -205,7 +205,7 @@ editing_started (GtkCellRenderer *cell,
                  const gchar     *path,
                  gpointer         data)
 {
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable),
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable), 
                                         separator_row, NULL, NULL);
 }
 
@@ -259,7 +259,7 @@ cell_edited (GtkCellRendererText *cell,
 }
 
 static void
-add_columns (GtkTreeView  *treeview,
+add_columns (GtkTreeView  *treeview, 
              GtkTreeModel *items_model,
              GtkTreeModel *numbers_model)
 {
@@ -306,6 +306,8 @@ add_columns (GtkTreeView  *treeview,
                                                -1, "Yummy", renderer,
                                                "value", COLUMN_ITEM_YUMMY,
                                                NULL);
+  
+
 }
 
 GtkWidget *

demos/gtk-demo/entry_buffer.c

@@ -20,17 +20,17 @@ do_entry_buffer (GtkWidget *do_widget)
   if (!window)
   {
     window = gtk_dialog_new_with_buttons ("GtkEntryBuffer",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
     g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
+		      G_CALLBACK (gtk_widget_destroy), NULL);
     g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+		      G_CALLBACK (gtk_widget_destroyed), &window);
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
@@ -64,3 +64,5 @@ do_entry_buffer (GtkWidget *do_widget)
 
   return window;
 }
+
+

demos/gtk-demo/entry_completion.c

@@ -15,7 +15,7 @@ create_completion_model (void)
 {
   GtkListStore *store;
   GtkTreeIter iter;
-
+  
   store = gtk_list_store_new (1, G_TYPE_STRING);
 
   /* Append one word */
@@ -29,7 +29,7 @@ create_completion_model (void)
   /* And another word */
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter, 0, "totally", -1);
-
+  
   return GTK_TREE_MODEL (store);
 }
 
@@ -43,51 +43,51 @@ do_entry_completion (GtkWidget *do_widget)
   GtkWidget *entry;
   GtkEntryCompletion *completion;
   GtkTreeModel *completion_model;
-
+  
   if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+  {
+    window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+    g_signal_connect (window, "response",
+		      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+    label = gtk_label_new (NULL);
+    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+    /* Create our entry */
+    entry = gtk_entry_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
-      /* Create the completion object */
-      completion = gtk_entry_completion_new ();
+    /* Create the completion object */
+    completion = gtk_entry_completion_new ();
 
-      /* Assign the completion to the entry */
-      gtk_entry_set_completion (GTK_ENTRY (entry), completion);
-      g_object_unref (completion);
-
-      /* Create a tree model and use it as the completion model */
-      completion_model = create_completion_model ();
-      gtk_entry_completion_set_model (completion, completion_model);
-      g_object_unref (completion_model);
-
-      /* Use model column 0 as the text column */
-      gtk_entry_completion_set_text_column (completion, 0);
-    }
+    /* Assign the completion to the entry */
+    gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+    g_object_unref (completion);
+    
+    /* Create a tree model and use it as the completion model */
+    completion_model = create_completion_model ();
+    gtk_entry_completion_set_model (completion, completion_model);
+    g_object_unref (completion_model);
+    
+    /* Use model column 0 as the text column */
+    gtk_entry_completion_set_text_column (completion, 0);
+  }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
@@ -96,3 +96,5 @@ do_entry_completion (GtkWidget *do_widget)
 
   return window;
 }
+
+

demos/gtk-demo/expander.c

@@ -17,21 +17,21 @@ do_expander (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *expander;
-
+  
   if (!window)
   {
     window = gtk_dialog_new_with_buttons ("GtkExpander",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
     g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
+		      G_CALLBACK (gtk_widget_destroy), NULL);
     g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+		      G_CALLBACK (gtk_widget_destroyed), &window);
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
@@ -57,3 +57,5 @@ do_expander (GtkWidget *do_widget)
 
   return window;
 }
+
+

demos/gtk-demo/fancy.css

@@ -1,65 +0,0 @@
-GtkButton#fancy {
-    transition: none;
-    background-image: linear-gradient(to bottom,
-                                      alpha(white, 0.7),
-                                      alpha(white, 0) 30%),
-                      linear-gradient(to top,
-                                      alpha(#babdb6, 0.4),
-                                      alpha(#babdb6, 0) 50%),
-                      linear-gradient(135deg,
-                                      #eeeeec,
-                                      white 20%,
-                                      #d3d7cf,
-                                      white 80%,
-                                      #babdb6);
-    color: #3465a4;
-    font-weight: bold;
-    text-shadow: 0 1px white;
-}
-
-GtkButton#fancy:hover {
-    transition: all 250ms linear;
-    background-image: linear-gradient(to bottom,
-                                      alpha(white, 1),
-                                      alpha(white, 0)),
-                      linear-gradient(135deg,
-                                      #eeeeec 10%,
-                                      white 40%,
-                                      #d3d7cf,
-                                      white 70%,
-                                      #babdb6);
-    color: #204a87;
-}
-
-GtkButton#fancy:active,
-GtkButton#fancy:active:hover {
-    transition: none;
-    background-image: linear-gradient(to bottom,
-                                      alpha(#555753, 0.5),
-                                      alpha(#babdb6, 0.3)),
-                      linear-gradient(135deg,
-                                      #eeeeec,
-                                      white 20%,
-                                      #d3d7cf,
-                                      white 80%,
-                                      #babdb6);
-    color: white;
-    text-shadow: 0 1px black;
-}
-
-GtkButton#fancy:backdrop,
-GtkButton#fancy:backdrop:hover {
-    transition: none;
-    background-image: linear-gradient(135deg,
-                                      alpha(#eeeeec, 0.5) 10%,
-                                      alpha(white, 0.5) 40%,
-                                      alpha(#d3d7cf, 0.5),
-                                      alpha(white, 0.5) 70%,
-                                      alpha(#babdb6, 0.5));
-    color: #babdb6;
-}
-
-GtkButton#fancy * {
-    /* Yeah this should be inherited by default */
-    color: inherit;
-}

demos/gtk-demo/geninclude.pl.in

@@ -7,7 +7,6 @@ typedef struct _Demo Demo;
 
 struct _Demo 
 {
-  gchar *name;
   gchar *title;
   gchar *filename;
   GDoDemoFunc func;
@@ -24,20 +23,13 @@ for $file (@ARGV) {
     open INFO_FILE, $file or die "Cannot open '$file'\n";
     $title = <INFO_FILE>;
     $title =~ s@^\s*/\*\s*@@;
-    $extra = "";
-    if ($title =~ /^(.*)::(.*)$/) {
-        $title = $1;
-        $extra = " $2";
-    }
     $title =~ s@\s*$@@;
-    $extra =~ s@^\s*@@;
-    $extra =~ s@\s*$@@;
 
     close INFO_FILE;
 
     print "GtkWidget *do_$basename (GtkWidget *do_widget);\n";
 
-    push @demos, {"name" => $basename, "title" => $title, "file" => "$file $extra",
+    push @demos, {"title" => $title, "file" => $file,
 		  "func"  => "do_$basename"};
 }
 
@@ -65,7 +57,7 @@ foreach $href (@demos) {
 	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
 	push @child_arrays, "child$tmp";
 
-	push @demos, {"name" => "NULL", "title" => $parent_name, "file" => "NULL",
+	push @demos, {"title" => $parent_name, "file" => "NULL",
 		      "func" => "NULL"};
     }
 }
@@ -92,7 +84,7 @@ if (defined @parents) {
 		    print ",\n";
 		}
 		
-		print qq (  { "$demos[$j]{name}", "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
+		print qq (  { "$1", "$demos[$j]{file}", $demos[$j]{func}, NULL });
 
 		# hack ... ugly
 		$demos[$j]{"title"} = "foo";
@@ -124,7 +116,7 @@ if (defined @child_arrays) {
 }
 
 # toplevel
-print "\nDemo gtk_demos[] = {\n";
+print "\nDemo testgtk_demos[] = {\n";
 
 $first = 1;
 foreach $href (@demos) {
@@ -146,9 +138,9 @@ foreach $href (@demos) {
 	    if ($parents[$i] eq $href->{title}) {
 
 		if ($href->{file} eq 'NULL') {
-		    print qq (  { NULL, "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
+		    print qq (  { "$href->{title}", NULL, $href->{func}, $child_arrays[$i] });
 		} else {
-		    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
+		    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, $child_arrays[$i] });
 		}
 		
 		$handled = 1;
@@ -161,7 +153,7 @@ foreach $href (@demos) {
 	next;
     }
     
-    print qq (  { "$href->{name}", "$href->{title}", "$href->{file}", $href->{func}, NULL });
+    print qq (  { "$href->{title}", "$href->{file}", $href->{func}, NULL });
 }
 
 print ",\n";

demos/gtk-demo/hypertext.c

@@ -1,8 +1,8 @@
 /* Text Widget/Hypertext
  *
- * Usually, tags modify the appearance of text in the view, e.g. making it
- * bold or colored or underlined. But tags are not restricted to appearance.
- * They can also affect the behavior of mouse and key presses, as this demo
+ * Usually, tags modify the appearance of text in the view, e.g. making it 
+ * bold or colored or underlined. But tags are not restricted to appearance. 
+ * They can also affect the behavior of mouse and key presses, as this demo 
  * shows.
  */
 
@@ -12,19 +12,19 @@
 /* Inserts a piece of text into the buffer, giving it the usual
  * appearance of a hyperlink in a web browser: blue and underlined.
  * Additionally, attaches some data on the tag, to make it recognizable
- * as a link.
+ * as a link. 
  */
-static void
-insert_link (GtkTextBuffer *buffer,
-             GtkTextIter   *iter,
-             gchar         *text,
+static void 
+insert_link (GtkTextBuffer *buffer, 
+             GtkTextIter   *iter, 
+             gchar         *text, 
              gint           page)
 {
   GtkTextTag *tag;
-
-  tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                    "foreground", "blue",
-                                    "underline", PANGO_UNDERLINE_SINGLE,
+  
+  tag = gtk_text_buffer_create_tag (buffer, NULL, 
+                                    "foreground", "blue", 
+                                    "underline", PANGO_UNDERLINE_SINGLE, 
                                     NULL);
   g_object_set_data (G_OBJECT (tag), "page", GINT_TO_POINTER (page));
   gtk_text_buffer_insert_with_tags (buffer, iter, text, -1, tag, NULL);
@@ -34,7 +34,7 @@ insert_link (GtkTextBuffer *buffer,
  * hypertext app, this method would parse a file to identify the links.
  */
 static void
-show_page (GtkTextBuffer *buffer,
+show_page (GtkTextBuffer *buffer, 
            gint           page)
 {
   GtkTextIter iter;
@@ -51,7 +51,7 @@ show_page (GtkTextBuffer *buffer,
     }
   else if (page == 2)
     {
-      gtk_text_buffer_insert (buffer, &iter,
+      gtk_text_buffer_insert (buffer, &iter, 
                               "A tag is an attribute that can be applied to some range of text. "
                               "For example, a tag might be called \"bold\" and make the text inside "
                               "the tag bold. However, the tag concept is more general than that; "
@@ -60,27 +60,27 @@ show_page (GtkTextBuffer *buffer,
                               "user can't edit it, or countless other things.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
     }
-  else if (page == 3)
+  else if (page == 3) 
     {
       GtkTextTag *tag;
-
-      tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                        "weight", PANGO_WEIGHT_BOLD,
+  
+      tag = gtk_text_buffer_create_tag (buffer, NULL, 
+                                        "weight", PANGO_WEIGHT_BOLD, 
                                         NULL);
       gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext:\n", -1, tag, NULL);
-      gtk_text_buffer_insert (buffer, &iter,
+      gtk_text_buffer_insert (buffer, &iter, 
                               "machine-readable text that is not sequential but is organized "
                               "so that related items of information are connected.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
     }
 }
 
-/* Looks at all tags covering the position of iter in the text view,
+/* Looks at all tags covering the position of iter in the text view, 
  * and if one of them is a link, follow it by showing the page identified
  * by the data attached to it.
  */
 static void
-follow_if_link (GtkWidget   *text_view,
+follow_if_link (GtkWidget   *text_view, 
                 GtkTextIter *iter)
 {
   GSList *tags = NULL, *tagp = NULL;
@@ -98,7 +98,7 @@ follow_if_link (GtkWidget   *text_view,
         }
     }
 
-  if (tags)
+  if (tags) 
     g_slist_free (tags);
 }
 
@@ -113,10 +113,10 @@ key_press_event (GtkWidget *text_view,
 
   switch (event->keyval)
     {
-      case GDK_KEY_Return:
+      case GDK_KEY_Return: 
       case GDK_KEY_KP_Enter:
         buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
-        gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
                                           gtk_text_buffer_get_insert (buffer));
         follow_if_link (text_view, &iter);
         break;
@@ -144,7 +144,7 @@ event_after (GtkWidget *text_view,
 
   event = (GdkEventButton *)ev;
 
-  if (event->button != GDK_BUTTON_PRIMARY)
+  if (event->button != 1)
     return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -154,7 +154,7 @@ event_after (GtkWidget *text_view,
   if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
     return FALSE;
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                          GTK_TEXT_WINDOW_WIDGET,
                                          event->x, event->y, &x, &y);
 
@@ -169,7 +169,7 @@ static gboolean hovering_over_link = FALSE;
 static GdkCursor *hand_cursor = NULL;
 static GdkCursor *regular_cursor = NULL;
 
-/* Looks at all tags covering the position (x, y) in the text view,
+/* Looks at all tags covering the position (x, y) in the text view, 
  * and if one of them is a link, change the cursor to the "hands" cursor
  * typically used by web browsers.
  */
@@ -183,14 +183,14 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
   gboolean hovering = FALSE;
 
   gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
-
+  
   tags = gtk_text_iter_get_tags (&iter);
   for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
     {
       GtkTextTag *tag = tagp->data;
       gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
 
-      if (page != 0)
+      if (page != 0) 
         {
           hovering = TRUE;
           break;
@@ -207,11 +207,11 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
         gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
     }
 
-  if (tags)
+  if (tags) 
     g_slist_free (tags);
 }
 
-/* Update the cursor image if the pointer moved.
+/* Update the cursor image if the pointer moved. 
  */
 static gboolean
 motion_notify_event (GtkWidget      *text_view,
@@ -219,12 +219,35 @@ motion_notify_event (GtkWidget      *text_view,
 {
   gint x, y;
 
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                          GTK_TEXT_WINDOW_WIDGET,
                                          event->x, event->y, &x, &y);
 
   set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
 
+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          NULL, NULL, NULL);
+  return FALSE;
+}
+
+/* Also update the cursor image if the window becomes visible
+ * (e.g. when a window covering it got iconified).
+ */
+static gboolean
+visibility_notify_event (GtkWidget          *text_view,
+                         GdkEventVisibility *event)
+{
+  gint wx, wy, bx, by;
+
+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          &wx, &wy, NULL);
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         wx, wy, &bx, &by);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
+
   return FALSE;
 }
 
@@ -241,13 +264,13 @@ do_hypertext (GtkWidget *do_widget)
 
       hand_cursor = gdk_cursor_new (GDK_HAND2);
       regular_cursor = gdk_cursor_new (GDK_XTERM);
-
+      
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    450, 450);
-
+      
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
@@ -256,15 +279,17 @@ do_hypertext (GtkWidget *do_widget)
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      g_signal_connect (view, "key-press-event",
+      g_signal_connect (view, "key-press-event", 
                         G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (view, "event-after",
+      g_signal_connect (view, "event-after", 
                         G_CALLBACK (event_after), NULL);
-      g_signal_connect (view, "motion-notify-event",
+      g_signal_connect (view, "motion-notify-event", 
                         G_CALLBACK (motion_notify_event), NULL);
+      g_signal_connect (view, "visibility-notify-event", 
+                        G_CALLBACK (visibility_notify_event), NULL);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
+      
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
@@ -289,3 +314,4 @@ do_hypertext (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/iconview.c

@@ -85,23 +85,23 @@ fill_store (GtkListStore *store)
 
       /* We ignore hidden files that start with a '.' */
       if (name[0] != '.')
-        {
-          path = g_build_filename (parent, name, NULL);
+	{
+	  path = g_build_filename (parent, name, NULL);
 
-          is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
+	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
 
-          display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
+	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
 
-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              COL_PATH, path,
-                              COL_DISPLAY_NAME, display_name,
-                              COL_IS_DIRECTORY, is_dir,
-                              COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
-                              -1);
-          g_free (path);
-          g_free (display_name);
-        }
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      COL_PATH, path,
+			      COL_DISPLAY_NAME, display_name,
+			      COL_IS_DIRECTORY, is_dir,
+			      COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
+			      -1);
+	  g_free (path);
+	  g_free (display_name);
+	}
 
       name = g_dir_read_name (dir);
     }
@@ -110,9 +110,9 @@ fill_store (GtkListStore *store)
 
 static gint
 sort_func (GtkTreeModel *model,
-           GtkTreeIter  *a,
-           GtkTreeIter  *b,
-           gpointer      user_data)
+	   GtkTreeIter  *a,
+	   GtkTreeIter  *b,
+	   gpointer      user_data)
 {
   gboolean is_dir_a, is_dir_b;
   gchar *name_a, *name_b;
@@ -124,14 +124,14 @@ sort_func (GtkTreeModel *model,
 
 
   gtk_tree_model_get (model, a,
-                      COL_IS_DIRECTORY, &is_dir_a,
-                      COL_DISPLAY_NAME, &name_a,
-                      -1);
+		      COL_IS_DIRECTORY, &is_dir_a,
+		      COL_DISPLAY_NAME, &name_a,
+		      -1);
 
   gtk_tree_model_get (model, b,
-                      COL_IS_DIRECTORY, &is_dir_b,
-                      COL_DISPLAY_NAME, &name_b,
-                      -1);
+		      COL_IS_DIRECTORY, &is_dir_b,
+		      COL_DISPLAY_NAME, &name_b,
+		      -1);
 
   if (!is_dir_a && is_dir_b)
     ret = 1;
@@ -154,26 +154,26 @@ create_store (void)
   GtkListStore *store;
 
   store = gtk_list_store_new (NUM_COLS,
-                              G_TYPE_STRING,
-                              G_TYPE_STRING,
-                              GDK_TYPE_PIXBUF,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_STRING,
+			      G_TYPE_STRING,
+			      GDK_TYPE_PIXBUF,
+			      G_TYPE_BOOLEAN);
 
   /* Set sort column and function */
   gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
-                                           sort_func,
-                                           NULL, NULL);
+					   sort_func,
+					   NULL, NULL);
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-                                        GTK_SORT_ASCENDING);
+					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+					GTK_SORT_ASCENDING);
 
   return store;
 }
 
 static void
 item_activated (GtkIconView *icon_view,
-                GtkTreePath *tree_path,
-                gpointer     user_data)
+		GtkTreePath *tree_path,
+		gpointer     user_data)
 {
   GtkListStore *store;
   gchar *path;
@@ -183,11 +183,11 @@ item_activated (GtkIconView *icon_view,
   store = GTK_LIST_STORE (user_data);
 
   gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
-                           &iter, tree_path);
+			   &iter, tree_path);
   gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
-                      COL_PATH, &path,
-                      COL_IS_DIRECTORY, &is_dir,
-                      -1);
+		      COL_PATH, &path,
+		      COL_IS_DIRECTORY, &is_dir,
+		      -1);
 
   if (!is_dir)
     {
@@ -207,7 +207,7 @@ item_activated (GtkIconView *icon_view,
 
 static void
 up_clicked (GtkToolItem *item,
-            gpointer     user_data)
+	    gpointer     user_data)
 {
   GtkListStore *store;
   gchar *dir_name;
@@ -223,12 +223,12 @@ up_clicked (GtkToolItem *item,
 
   /* Maybe de-sensitize the up button */
   gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-                            strcmp (parent, "/") != 0);
+			    strcmp (parent, "/") != 0);
 }
 
 static void
 home_clicked (GtkToolItem *item,
-              gpointer     user_data)
+	      gpointer     user_data)
 {
   GtkListStore *store;
 
@@ -241,7 +241,7 @@ home_clicked (GtkToolItem *item,
 
   /* Sensitize the up button */
   gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-                            TRUE);
+			    TRUE);
 }
 
 static void close_window(void)
@@ -267,96 +267,96 @@ do_iconview (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (close_window), NULL);
+			G_CALLBACK (close_window), NULL);
 
       error = NULL;
       if (!load_pixbufs (&error))
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load an image: %s",
-                                           error->message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load an image: %s",
+					   error->message);
 
-          g_error_free (error);
+	  g_error_free (error);
 
-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
 
-          gtk_widget_show (dialog);
-        }
+	  gtk_widget_show (dialog);
+	}
       else
-        {
-          GtkWidget *sw;
-          GtkWidget *icon_view;
-          GtkListStore *store;
-          GtkWidget *vbox;
-          GtkWidget *tool_bar;
-          GtkToolItem *home_button;
+	{
+	  GtkWidget *sw;
+	  GtkWidget *icon_view;
+	  GtkListStore *store;
+	  GtkWidget *vbox;
+	  GtkWidget *tool_bar;
+	  GtkToolItem *home_button;
 
-          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-          gtk_container_add (GTK_CONTAINER (window), vbox);
+	  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	  gtk_container_add (GTK_CONTAINER (window), vbox);
 
-          tool_bar = gtk_toolbar_new ();
-          gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
+	  tool_bar = gtk_toolbar_new ();
+	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
 
-          up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-          gtk_tool_item_set_is_important (up_button, TRUE);
-          gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-          gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
+	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
+	  gtk_tool_item_set_is_important (up_button, TRUE);
+	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
 
-          home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
-          gtk_tool_item_set_is_important (home_button, TRUE);
-          gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
+	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+	  gtk_tool_item_set_is_important (home_button, TRUE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
 
 
-          sw = gtk_scrolled_window_new (NULL, NULL);
-          gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                               GTK_SHADOW_ETCHED_IN);
-          gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                          GTK_POLICY_AUTOMATIC,
-                                          GTK_POLICY_AUTOMATIC);
+	  sw = gtk_scrolled_window_new (NULL, NULL);
+	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+					       GTK_SHADOW_ETCHED_IN);
+	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+					  GTK_POLICY_AUTOMATIC,
+					  GTK_POLICY_AUTOMATIC);
 
-          gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
-          /* Create the store and fill it with the contents of '/' */
-          parent = g_strdup ("/");
-          store = create_store ();
-          fill_store (store);
+	  /* Create the store and fill it with the contents of '/' */
+	  parent = g_strdup ("/");
+	  store = create_store ();
+	  fill_store (store);
 
-          icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
-          gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-                                            GTK_SELECTION_MULTIPLE);
-          g_object_unref (store);
+	  icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
+	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
+					    GTK_SELECTION_MULTIPLE);
+	  g_object_unref (store);
 
-          /* Connect to the "clicked" signal of the "Up" tool button */
-          g_signal_connect (up_button, "clicked",
-                            G_CALLBACK (up_clicked), store);
+	  /* Connect to the "clicked" signal of the "Up" tool button */
+	  g_signal_connect (up_button, "clicked",
+			    G_CALLBACK (up_clicked), store);
 
-          /* Connect to the "clicked" signal of the "Home" tool button */
-          g_signal_connect (home_button, "clicked",
-                            G_CALLBACK (home_clicked), store);
+	  /* Connect to the "clicked" signal of the "Home" tool button */
+	  g_signal_connect (home_button, "clicked",
+			    G_CALLBACK (home_clicked), store);
 
-          /* We now set which model columns that correspond to the text
-           * and pixbuf of each item
-           */
-          gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
-          gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
+	  /* We now set which model columns that correspond to the text
+	   * and pixbuf of each item
+	   */
+	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
+	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
 
-          /* Connect to the "item-activated" signal */
-          g_signal_connect (icon_view, "item-activated",
-                            G_CALLBACK (item_activated), store);
-          gtk_container_add (GTK_CONTAINER (sw), icon_view);
+	  /* Connect to the "item-activated" signal */
+	  g_signal_connect (icon_view, "item-activated",
+			    G_CALLBACK (item_activated), store);
+	  gtk_container_add (GTK_CONTAINER (sw), icon_view);
 
-          gtk_widget_grab_focus (icon_view);
-        }
+	  gtk_widget_grab_focus (icon_view);
+	}
     }
 
   if (!gtk_widget_get_visible (window))
@@ -369,3 +369,4 @@ do_iconview (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/iconview_edit.c

@@ -47,10 +47,10 @@ create_store (void)
 
 static void
 set_cell_color (GtkCellLayout   *cell_layout,
-                GtkCellRenderer *cell,
-                GtkTreeModel    *tree_model,
-                GtkTreeIter     *iter,
-                gpointer         data)
+		GtkCellRenderer *cell,
+		GtkTreeModel    *tree_model,
+		GtkTreeIter     *iter,
+		gpointer         data)
 {
   gchar *text;
   GdkColor color;
@@ -76,9 +76,9 @@ set_cell_color (GtkCellLayout   *cell_layout,
 
 static void
 edited (GtkCellRendererText *cell,
-        gchar               *path_string,
-        gchar               *text,
-        gpointer             data)
+	gchar               *path_string,
+	gchar               *text,
+	gpointer             data)
 {
   GtkTreeModel *model;
   GtkTreeIter iter;
@@ -89,7 +89,7 @@ edited (GtkCellRendererText *cell,
 
   gtk_tree_model_get_iter (model, &iter, path);
   gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                      COL_TEXT, text, -1);
+		      COL_TEXT, text, -1);
 
   gtk_tree_path_free (path);
 }
@@ -106,11 +106,11 @@ do_iconview_edit (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
 
       store = create_store ();
       fill_store (store);
@@ -119,29 +119,29 @@ do_iconview_edit (GtkWidget *do_widget)
       g_object_unref (store);
 
       gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-                                        GTK_SELECTION_SINGLE);
+					GTK_SELECTION_SINGLE);
       gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
-                                          GTK_ORIENTATION_HORIZONTAL);
+				          GTK_ORIENTATION_HORIZONTAL);
       gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
       gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);
 
       renderer = gtk_cell_renderer_pixbuf_new ();
       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-                                  renderer, TRUE);
+				  renderer, TRUE);
       gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (icon_view),
-                                          renderer,
-                                          set_cell_color,
-                                          NULL, NULL);
+					  renderer,
+					  set_cell_color,
+					  NULL, NULL);
 
       renderer = gtk_cell_renderer_text_new ();
       gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-                                  renderer, TRUE);
+				  renderer, TRUE);
       g_object_set (renderer, "editable", TRUE, NULL);
       g_signal_connect (renderer, "edited", G_CALLBACK (edited), icon_view);
       gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-                                      renderer,
-                                      "text", COL_TEXT,
-                                      NULL);
+				      renderer,
+				      "text", COL_TEXT,
+				      NULL);
 
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
@@ -156,3 +156,4 @@ do_iconview_edit (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/images.c

@@ -25,7 +25,7 @@ static FILE* image_stream = NULL;
 
 static void
 progressive_prepared_callback (GdkPixbufLoader *loader,
-                               gpointer         data)
+			       gpointer		data)
 {
   GdkPixbuf *pixbuf;
   GtkWidget *image;
@@ -44,11 +44,11 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
 
 static void
 progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint                 x,
-                              gint                 y,
-                              gint                 width,
-                              gint                 height,
-                              gpointer     data)
+                              gint		   x,
+                              gint		   y,
+                              gint		   width,
+                              gint		   height,
+                              gpointer	   data)
 {
   GtkWidget *image;
 
@@ -86,97 +86,97 @@ progressive_timeout (gpointer data)
       bytes_read = fread (buf, 1, 256, image_stream);
 
       if (ferror (image_stream))
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failure reading image file 'alphatest.png': %s",
-                                           g_strerror (errno));
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failure reading image file 'alphatest.png': %s",
+					   g_strerror (errno));
 
-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
 
-          fclose (image_stream);
-          image_stream = NULL;
+	  fclose (image_stream);
+	  image_stream = NULL;
 
-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);
 
-          load_timeout = 0;
+	  load_timeout = 0;
 
-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}
 
       if (!gdk_pixbuf_loader_write (pixbuf_loader,
-                                    buf, bytes_read,
-                                    &error))
-        {
-          GtkWidget *dialog;
+				    buf, bytes_read,
+				    &error))
+	{
+	  GtkWidget *dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load image: %s",
-                                           error->message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load image: %s",
+					   error->message);
 
-          g_error_free (error);
+	  g_error_free (error);
 
-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
 
-          fclose (image_stream);
-          image_stream = NULL;
+	  fclose (image_stream);
+	  image_stream = NULL;
 
-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);
 
-          load_timeout = 0;
+	  load_timeout = 0;
 
-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}
 
       if (feof (image_stream))
-        {
-          fclose (image_stream);
-          image_stream = NULL;
+	{
+	  fclose (image_stream);
+	  image_stream = NULL;
 
-          /* Errors can happen on close, e.g. if the image
-           * file was truncated we'll know on close that
-           * it was incomplete.
-           */
-          error = NULL;
-          if (!gdk_pixbuf_loader_close (pixbuf_loader,
-                                        &error))
-            {
-              GtkWidget *dialog;
+	  /* Errors can happen on close, e.g. if the image
+	   * file was truncated we'll know on close that
+	   * it was incomplete.
+	   */
+	  error = NULL;
+	  if (!gdk_pixbuf_loader_close (pixbuf_loader,
+					&error))
+	    {
+	      GtkWidget *dialog;
 
-              dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                                               GTK_MESSAGE_ERROR,
-                                               GTK_BUTTONS_CLOSE,
-                                               "Failed to load image: %s",
-                                               error->message);
+	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					       GTK_DIALOG_DESTROY_WITH_PARENT,
+					       GTK_MESSAGE_ERROR,
+					       GTK_BUTTONS_CLOSE,
+					       "Failed to load image: %s",
+					       error->message);
 
-              g_error_free (error);
+	      g_error_free (error);
 
-              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+	      g_signal_connect (dialog, "response",
+				G_CALLBACK (gtk_widget_destroy), NULL);
 
-              gtk_widget_show (dialog);
+	      gtk_widget_show (dialog);
 
-              g_object_unref (pixbuf_loader);
-              pixbuf_loader = NULL;
+	      g_object_unref (pixbuf_loader);
+	      pixbuf_loader = NULL;
 
-              load_timeout = 0;
+	      load_timeout = 0;
 
-              return FALSE; /* uninstall the timeout */
-            }
+	      return FALSE; /* uninstall the timeout */
+	    }
 
-          g_object_unref (pixbuf_loader);
-          pixbuf_loader = NULL;
-        }
+	  g_object_unref (pixbuf_loader);
+	  pixbuf_loader = NULL;
+	}
     }
   else
     {
@@ -190,55 +190,55 @@ progressive_timeout (gpointer data)
        */
       filename = demo_find_file ("alphatest.png", &error);
       if (error)
-        {
-          error_message = g_strdup (error->message);
-          g_error_free (error);
-        }
+	{
+	  error_message = g_strdup (error->message);
+	  g_error_free (error);
+	}
       else
-        {
-          image_stream = g_fopen (filename, "rb");
-          g_free (filename);
+	{
+	  image_stream = g_fopen (filename, "rb");
+	  g_free (filename);
 
-          if (!image_stream)
-            error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
-                                             g_strerror (errno));
-        }
+	  if (!image_stream)
+	    error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
+					     g_strerror (errno));
+	}
 
       if (image_stream == NULL)
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "%s", error_message);
-          g_free (error_message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "%s", error_message);
+	  g_free (error_message);
 
-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
 
-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);
 
-          load_timeout = 0;
+	  load_timeout = 0;
 
-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}
 
       if (pixbuf_loader)
-        {
-          gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-          g_object_unref (pixbuf_loader);
-          pixbuf_loader = NULL;
-        }
+	{
+	  gdk_pixbuf_loader_close (pixbuf_loader, NULL);
+	  g_object_unref (pixbuf_loader);
+	  pixbuf_loader = NULL;
+	}
 
       pixbuf_loader = gdk_pixbuf_loader_new ();
 
       g_signal_connect (pixbuf_loader, "area-prepared",
-                        G_CALLBACK (progressive_prepared_callback), image);
+			G_CALLBACK (progressive_prepared_callback), image);
 
       g_signal_connect (pixbuf_loader, "area-updated",
-                        G_CALLBACK (progressive_updated_callback), image);
+			G_CALLBACK (progressive_updated_callback), image);
     }
 
   /* leave timeout installed */
@@ -256,13 +256,13 @@ start_progressive_loading (GtkWidget *image)
    * pauses in the reading process.
    */
   load_timeout = gdk_threads_add_timeout (150,
-                                progressive_timeout,
-                                image);
+				progressive_timeout,
+				image);
 }
 
 static void
 cleanup_callback (GObject   *object,
-                  gpointer   data)
+		  gpointer   data)
 {
   if (load_timeout)
     {
@@ -314,6 +314,7 @@ do_images (GtkWidget *do_widget)
   GtkWidget *vbox;
   GtkWidget *image;
   GtkWidget *label;
+  GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
   GIcon     *gicon;
@@ -324,13 +325,13 @@ do_images (GtkWidget *do_widget)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (cleanup_callback), NULL);
+			G_CALLBACK (cleanup_callback), NULL);
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
@@ -340,14 +341,17 @@ do_images (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Image loaded from a file</u>");
+			    "<u>Image loaded from a file</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
       /* demo_find_file() looks in the current directory first,
        * so you can run gtk-demo without installing GTK, then looks
@@ -356,34 +360,34 @@ do_images (GtkWidget *do_widget)
       pixbuf = NULL;
       filename = demo_find_file ("gtk-logo-rgb.gif", &error);
       if (filename)
-        {
-          pixbuf = gdk_pixbuf_new_from_file (filename, &error);
-          g_free (filename);
-        }
+	{
+	  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
+	  g_free (filename);
+	}
 
       if (error)
-        {
-          /* This code shows off error handling. You can just use
-           * gtk_image_new_from_file() instead if you don't want to report
-           * errors to the user. If the file doesn't load when using
-           * gtk_image_new_from_file(), a "missing image" icon will
-           * be displayed instead.
-           */
-          GtkWidget *dialog;
+	{
+	  /* This code shows off error handling. You can just use
+	   * gtk_image_new_from_file() instead if you don't want to report
+	   * errors to the user. If the file doesn't load when using
+	   * gtk_image_new_from_file(), a "missing image" icon will
+	   * be displayed instead.
+	   */
+	  GtkWidget *dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Unable to open image file 'gtk-logo-rgb.gif': %s",
-                                           error->message);
-          g_error_free (error);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
+					   error->message);
+	  g_error_free (error);
 
-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
 
-          gtk_widget_show (dialog);
-        }
+	  gtk_widget_show (dialog);
+	}
 
       image = gtk_image_new_from_pixbuf (pixbuf);
 
@@ -394,14 +398,17 @@ do_images (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Animation loaded from a file</u>");
+			    "<u>Animation loaded from a file</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
       filename = demo_find_file ("floppybuddy.gif", NULL);
       image = gtk_image_new_from_file (filename);
@@ -413,14 +420,17 @@ do_images (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Symbolic themed icon</u>");
+			    "<u>Symbolic themed icon</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
@@ -432,14 +442,17 @@ do_images (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Progressive image loading</u>");
+			    "<u>Progressive image loading</u>");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
 
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.

demos/gtk-demo/infobar.c

@@ -15,19 +15,14 @@ on_bar_response (GtkInfoBar *info_bar,
   GtkWidget *dialog;
 
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
-                                   "You clicked a button on an info bar");
+				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				   GTK_MESSAGE_INFO,
+				   GTK_BUTTONS_OK,
+				   "You clicked a button on an info bar");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "Your response has id %d", response_id);
-
-  g_signal_connect_swapped (dialog,
-                            "response",
-                            G_CALLBACK (gtk_widget_destroy),
-                            dialog);
-
-  gtk_widget_show_all (dialog);
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 GtkWidget *

demos/gtk-demo/links.c

@@ -54,22 +54,16 @@ do_links (GtkWidget *do_widget)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
       gtk_container_set_border_width (GTK_CONTAINER (window), 12);
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
 
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                              "title=\"plain text\">text</a> may be marked up\n"
                              "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>\n"
-                             "and they work fine with other markup, like when\n"
-                             "searching on <a href=\"http://www.google.com/\">"
-                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
-                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
-                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
-                             "</a>.");
+                             "or activated via <a href=\"keynav\">keynav</a>");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
       gtk_container_add (GTK_CONTAINER (window), label);

demos/gtk-demo/list_store.c

@@ -60,7 +60,7 @@ spinner_timeout (gpointer data)
   guint pulse;
 
   if (model == NULL)
-    return G_SOURCE_REMOVE;
+    return FALSE;
 
   gtk_tree_model_get_iter_first (model, &iter);
   gtk_tree_model_get (model, &iter,
@@ -77,7 +77,7 @@ spinner_timeout (gpointer data)
                       COLUMN_ACTIVE, TRUE,
                       -1);
 
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 static GtkTreeModel *

demos/gtk-demo/main.c

@@ -14,7 +14,6 @@ static GtkTextBuffer *source_buffer;
 
 static gchar *current_file = NULL;
 
-static GtkWidget *notebook;
 
 enum {
   TITLE_COLUMN,
@@ -44,9 +43,9 @@ get_democodedir (void)
     {
       result = g_win32_get_package_installation_directory_of_module (NULL);
       if (result == NULL)
-        result = "unknown-location";
+	result = "unknown-location";
 
-      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
+      result = g_strconcat (result, "\\share\\gtk-2.0\\demo", NULL);
     }
 
   return result;
@@ -60,19 +59,19 @@ get_democodedir (void)
  * demo_find_file:
  * @base: base filename
  * @err:  location to store error, or %NULL.
- *
+ * 
  * Looks for @base first in the current directory, then in the
  * location GTK+ where it will be installed on make install,
  * returns the first file found.
- *
+ * 
  * Return value: the filename, if found or %NULL
- */
+ **/
 gchar *
 demo_find_file (const char *base,
-                GError    **err)
+		GError    **err)
 {
   g_return_val_if_fail (err == NULL || *err == NULL, NULL);
-
+  
   if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
       g_file_test (base, G_FILE_TEST_EXISTS))
     return g_strdup (base);
@@ -80,12 +79,12 @@ demo_find_file (const char *base,
     {
       char *filename = g_build_filename (DEMOCODEDIR, base, NULL);
       if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-        {
-          g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-                       "Cannot find demo data file \"%s\"", base);
-          g_free (filename);
-          return NULL;
-        }
+	{
+	  g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
+		       "Cannot find demo data file \"%s\"", base);
+	  g_free (filename);
+	  return NULL;
+	}
       return filename;
     }
 }
@@ -99,12 +98,12 @@ window_closed_cb (GtkWidget *window, gpointer data)
 
   gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
   gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-                      STYLE_COLUMN, &style,
-                      -1);
+		      STYLE_COLUMN, &style,
+		      -1);
   if (style == PANGO_STYLE_ITALIC)
     gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-                        STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                        -1);
+			STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			-1);
 
   gtk_tree_path_free (cbdata->path);
   g_free (cbdata);
@@ -114,17 +113,17 @@ gboolean
 read_line (FILE *stream, GString *str)
 {
   int n_read = 0;
-
+  
 #ifdef HAVE_FLOCKFILE
   flockfile (stream);
 #endif
 
   g_string_truncate (str, 0);
-
+  
   while (1)
     {
       int c;
-
+      
 #ifdef HAVE_FLOCKFILE
       c = getc_unlocked (stream);
 #else
@@ -132,31 +131,31 @@ read_line (FILE *stream, GString *str)
 #endif
 
       if (c == EOF)
-        goto done;
+	goto done;
       else
-        n_read++;
+	n_read++;
 
       switch (c)
-        {
-        case '\r':
-        case '\n':
-          {
+	{
+	case '\r':
+	case '\n':
+	  {
 #ifdef HAVE_FLOCKFILE
-            int next_c = getc_unlocked (stream);
+	    int next_c = getc_unlocked (stream);
 #else
-            int next_c = getc (stream);
+	    int next_c = getc (stream);
 #endif
-
-            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);
-        }
+	    
+	    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:
@@ -334,10 +333,10 @@ static gchar *control[] =
 };
 void
 parse_chars (gchar     *text,
-             gchar    **end_ptr,
-             gint      *state,
-             gchar    **tag,
-             gboolean   start)
+	     gchar    **end_ptr,
+	     gint      *state,
+	     gchar    **tag,
+	     gboolean   start)
 {
   gint i;
   gchar *next_token;
@@ -347,11 +346,11 @@ parse_chars (gchar     *text,
     {
       *end_ptr = strstr (text, "*/");
       if (*end_ptr)
-        {
-          *end_ptr += 2;
-          *state = STATE_NORMAL;
-          *tag = "comment";
-        }
+	{
+	  *end_ptr += 2;
+	  *state = STATE_NORMAL;
+	  *tag = "comment";
+	}
       return;
     }
 
@@ -363,9 +362,9 @@ parse_chars (gchar     *text,
     {
       *end_ptr = strstr (text, "*/");
       if (*end_ptr)
-        *end_ptr += 2;
+	*end_ptr += 2;
       else
-        *state = STATE_IN_COMMENT;
+	*state = STATE_IN_COMMENT;
       *tag = "comment";
       return;
     }
@@ -382,29 +381,29 @@ parse_chars (gchar     *text,
   if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
     {
       if (strstr (text, "("))
-        {
-          *end_ptr = strstr (text, "(");
-          *tag = "function";
-          return;
-        }
+	{
+	  *end_ptr = strstr (text, "(");
+	  *tag = "function";
+	  return;
+	}
     }
   /* check for types */
   for (i = 0; types[i] != NULL; i++)
     if (!strncmp (text, types[i], strlen (types[i])) ||
         (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
       {
-        *end_ptr = text + strlen (types[i]);
-        *tag = "type";
-        return;
+	*end_ptr = text + strlen (types[i]);
+	*tag = "type";
+	return;
       }
 
   /* check for control */
   for (i = 0; control[i] != NULL; i++)
     if (!strncmp (text, control[i], strlen (control[i])))
       {
-        *end_ptr = text + strlen (control[i]);
-        *tag = "control";
-        return;
+	*end_ptr = text + strlen (control[i]);
+	*tag = "control";
+	return;
       }
 
   /* check for string */
@@ -415,18 +414,18 @@ parse_chars (gchar     *text,
       *end_ptr = text + 1;
       *tag = "string";
       while (**end_ptr != '\000')
-        {
-          if (**end_ptr == '\"' && !maybe_escape)
-            {
-              *end_ptr += 1;
-              return;
-            }
-          if (**end_ptr == '\\')
-            maybe_escape = TRUE;
-          else
-            maybe_escape = FALSE;
-          *end_ptr += 1;
-        }
+	{
+	  if (**end_ptr == '\"' && !maybe_escape)
+	    {
+	      *end_ptr += 1;
+	      return;
+	    }
+	  if (**end_ptr == '\\')
+	    maybe_escape = TRUE;
+	  else
+	    maybe_escape = FALSE;
+	  *end_ptr += 1;
+	}
       return;
     }
 
@@ -435,36 +434,36 @@ parse_chars (gchar     *text,
     {
       next_token = strstr (text, tokens[i]);
       if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
     }
 
   for (i = 0; types[i] != NULL; i++)
     {
       next_token = strstr (text, types[i]);
       if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
     }
 
   for (i = 0; control[i] != NULL; i++)
     {
       next_token = strstr (text, control[i]);
       if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
     }
 }
 
@@ -489,25 +488,25 @@ fontify (void)
       start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);
 
       do
-        {
-          parse_chars (start_ptr, &end_ptr, &state, &tag, start);
+	{
+	  parse_chars (start_ptr, &end_ptr, &state, &tag, start);
 
-          start = FALSE;
-          if (end_ptr)
-            {
-              tmp_iter = start_iter;
-              gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-            }
-          else
-            {
-              tmp_iter = next_iter;
-            }
-          if (tag)
-            gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
+	  start = FALSE;
+	  if (end_ptr)
+	    {
+	      tmp_iter = start_iter;
+	      gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
+	    }
+	  else
+	    {
+	      tmp_iter = next_iter;
+	    }
+	  if (tag)
+	    gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
 
-          start_iter = tmp_iter;
-          start_ptr = end_ptr;
-        }
+	  start_iter = tmp_iter;
+	  start_ptr = end_ptr;
+	}
       while (end_ptr);
 
       g_free (text);
@@ -515,47 +514,6 @@ fontify (void)
     }
 }
 
-static GtkWidget *create_text (GtkTextBuffer **buffer, gboolean is_source);
-
-static void
-add_data_tab (const gchar *filename)
-{
-  GtkTextBuffer *buffer = NULL;
-  gchar *full_filename;
-  GError *err = NULL;
-  gchar *text;
-  GtkWidget *widget, *label;
-
-  full_filename = demo_find_file (filename, &err);
-  if (!full_filename ||
-      !g_file_get_contents (full_filename, &text, NULL, &err))
-    {
-      g_warning ("%s", err->message);
-      g_error_free (err);
-      return;
-    }
-
-  widget = create_text (&buffer, FALSE);
-  gtk_widget_show_all (widget);
-  label = gtk_label_new (filename);
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
-
-  gtk_text_buffer_set_text (buffer, text, -1);
-
-  g_free (full_filename);
-  g_free (text);
-}
-
-static void
-remove_data_tabs (void)
-{
-  gint i;
-
-  for (i = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) - 1; i > 1; i--)
-    gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), i);
-}
-
 void
 load_file (const gchar *filename)
 {
@@ -566,36 +524,28 @@ load_file (const gchar *filename)
   GString *buffer = g_string_new (NULL);
   int state = 0;
   gboolean in_para = 0;
-  gchar **names;
-  gint i;
 
-  remove_data_tabs ();
-
-  names = g_strsplit (filename, " ", -1);
-
-  for (i = 1; names[i]; i++) {
-    if (strlen (names[i]) > 0)
-      add_data_tab (names[i]);
-  }
-
-  if (current_file && !strcmp (current_file, names[0]))
-    goto out;
+  if (current_file && !strcmp (current_file, filename))
+    {
+      g_string_free (buffer, TRUE);
+      return;
+    }
 
   g_free (current_file);
-  current_file = g_strdup (names[0]);
-
+  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);
 
-  full_filename = demo_find_file (names[0], &err);
+  full_filename = demo_find_file (filename, &err);
   if (!full_filename)
     {
       g_warning ("%s", err->message);
       g_error_free (err);
-      goto out;
+      return;
     }
 
   file = g_fopen (full_filename, "r");
@@ -606,7 +556,7 @@ load_file (const gchar *filename)
   g_free (full_filename);
 
   if (!file)
-    goto out;
+    return;
 
   gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
   while (read_line (file, buffer))
@@ -614,124 +564,110 @@ load_file (const gchar *filename)
       gchar *p = buffer->str;
       gchar *q;
       gchar *r;
-
+      
       switch (state)
-        {
-        case 0:
-          /* Reading title */
-          while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
-            p++;
-          r = p;
-          while (*r != '\0')
-            {
-              while (*r != '/' && *r != ':' && *r != '\0')
-                r++;
-              if (*r == '/')
-                {
-                  r++;
-                  p = r;
-                }
-              if (r[0] == ':' && r[1] == ':')
-                *r = '\0';
-            }
-          q = p + strlen (p);
-          while (q > p && g_ascii_isspace (*(q - 1)))
-            q--;
+	{
+	case 0:
+	  /* Reading title */
+	  while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
+	    p++;
+	  r = p;
+	  while (*r != '/' && strlen (r))
+	    r++;
+	  if (strlen (r) > 0)
+	    p = r + 1;
+	  q = p + strlen (p);
+	  while (q > p && g_ascii_isspace (*(q - 1)))
+	    q--;
 
+	  if (q > p)
+	    {
+	      int len_chars = g_utf8_pointer_to_offset (p, q);
 
-          if (q > p)
-            {
-              int len_chars = g_utf8_pointer_to_offset (p, q);
+	      end = start;
 
-              end = start;
+	      g_assert (strlen (p) >= q - p);
+	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
+	      start = end;
 
-              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);
 
-              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 (g_ascii_isspace (*p))
+	    p++;
+	  if (*p == '*' && *(p + 1) == '/')
+	    {
+	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
+	      state++;
+	    }
+	  else
+	    {
+	      int len;
+	      
+	      while (*p == '*' || g_ascii_isspace (*p))
+		p++;
 
-              start = end;
+	      len = strlen (p);
+	      while (g_ascii_isspace (*(p + len - 1)))
+		len--;
+	      
+	      if (len > 0)
+		{
+		  if (in_para)
+		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
 
-              while (*p && *p != '\n') p++;
+		  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;
 
-              state++;
-            }
-          break;
-
-        case 1:
-          /* Reading body of info section */
-          while (g_ascii_isspace (*p))
-            p++;
-          if (*p == '*' && *(p + 1) == '/')
-            {
-              gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-              state++;
-            }
-          else
-            {
-              int len;
-
-              while (*p == '*' || g_ascii_isspace (*p))
-                p++;
-
-              len = strlen (p);
-              while (g_ascii_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 (g_ascii_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 (source_buffer, &start, "\n", 1);
-          break;
-        }
+	case 2:
+	  /* Skipping blank lines */
+	  while (g_ascii_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 (source_buffer, &start, "\n", 1);
+	  break;
+	}
     }
 
   fclose (file);
-
+  
   fontify ();
 
-out:
   g_string_free (buffer, TRUE);
-
-  g_strfreev (names);
 }
 
 void
 row_activated_cb (GtkTreeView       *tree_view,
                   GtkTreePath       *path,
-                  GtkTreeViewColumn *column)
+		  GtkTreeViewColumn *column)
 {
   GtkTreeIter iter;
   PangoStyle style;
@@ -740,49 +676,49 @@ row_activated_cb (GtkTreeView       *tree_view,
   GtkTreeModel *model;
 
   model = gtk_tree_view_get_model (tree_view);
-
+  
   gtk_tree_model_get_iter (model, &iter, path);
   gtk_tree_model_get (GTK_TREE_MODEL (model),
-                      &iter,
-                      FUNC_COLUMN, &func,
-                      STYLE_COLUMN, &style,
-                      -1);
+		      &iter,
+		      FUNC_COLUMN, &func,
+		      STYLE_COLUMN, &style,
+		      -1);
 
   if (func)
     {
       gtk_tree_store_set (GTK_TREE_STORE (model),
-                          &iter,
-                          STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
-                          -1);
+			  &iter,
+			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+			  -1);
       window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
-
+      
       if (window != NULL)
-        {
-          CallbackData *cbdata;
-
-          cbdata = g_new (CallbackData, 1);
-          cbdata->model = model;
-          cbdata->path = gtk_tree_path_copy (path);
-
-          g_signal_connect (window, "destroy",
-                            G_CALLBACK (window_closed_cb), cbdata);
-        }
+	{
+	  CallbackData *cbdata;
+	  
+	  cbdata = g_new (CallbackData, 1);
+	  cbdata->model = model;
+	  cbdata->path = gtk_tree_path_copy (path);
+	  
+	  g_signal_connect (window, "destroy",
+			    G_CALLBACK (window_closed_cb), cbdata);
+	}
     }
 }
 
 static void
 selection_cb (GtkTreeSelection *selection,
-              GtkTreeModel     *model)
+	      GtkTreeModel     *model)
 {
   GtkTreeIter iter;
-  GValue value = G_VALUE_INIT;
+  GValue value = {0, };
 
   if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
     return;
 
   gtk_tree_model_get_value (model, &iter,
-                            FILENAME_COLUMN,
-                            &value);
+			    FILENAME_COLUMN,
+			    &value);
   if (g_value_get_string (&value))
     load_file (g_value_get_string (&value));
   g_value_unset (&value);
@@ -790,7 +726,7 @@ selection_cb (GtkTreeSelection *selection,
 
 static GtkWidget *
 create_text (GtkTextBuffer **buffer,
-             gboolean        is_source)
+	     gboolean        is_source)
 {
   GtkWidget *scrolled_window;
   GtkWidget *text_view;
@@ -798,20 +734,20 @@ create_text (GtkTextBuffer **buffer,
 
   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_POLICY_AUTOMATIC,
+				  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-                                       GTK_SHADOW_IN);
-
+				       GTK_SHADOW_IN);
+  
   text_view = gtk_text_view_new ();
-
+  
   *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);
 
   gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-
+  
   if (is_source)
     {
       font_desc = pango_font_description_from_string ("monospace");
@@ -831,7 +767,7 @@ create_text (GtkTextBuffer **buffer,
       gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
                                             2);
     }
-
+  
   return scrolled_window;
 }
 
@@ -846,7 +782,7 @@ create_tree (void)
   GtkTreeIter iter;
   GtkWidget *box, *label, *scrolled_window;
 
-  Demo *d = gtk_demos;
+  Demo *d = testgtk_demos;
 
   model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
   tree_view = gtk_tree_view_new ();
@@ -854,7 +790,7 @@ create_tree (void)
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
 
   gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
-                               GTK_SELECTION_BROWSE);
+			       GTK_SELECTION_BROWSE);
   gtk_widget_set_size_request (tree_view, 200, -1);
 
   /* this code only supports 1 level of children. If we
@@ -867,46 +803,46 @@ create_tree (void)
       gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);
 
       gtk_tree_store_set (GTK_TREE_STORE (model),
-                          &iter,
-                          TITLE_COLUMN, d->title,
-                          FILENAME_COLUMN, d->filename,
-                          FUNC_COLUMN, d->func,
-                          STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                          -1);
+			  &iter,
+			  TITLE_COLUMN, d->title,
+			  FILENAME_COLUMN, d->filename,
+			  FUNC_COLUMN, d->func,
+			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			  -1);
 
       d++;
 
       if (!children)
-        continue;
-
+	continue;
+      
       while (children->title)
-        {
-          GtkTreeIter child_iter;
+	{
+	  GtkTreeIter child_iter;
 
-          gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
-
-          gtk_tree_store_set (GTK_TREE_STORE (model),
-                              &child_iter,
-                              TITLE_COLUMN, children->title,
-                              FILENAME_COLUMN, children->filename,
-                              FUNC_COLUMN, children->func,
-                              STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                              -1);
-
-          children++;
-        }
+	  gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
+	  
+	  gtk_tree_store_set (GTK_TREE_STORE (model),
+			      &child_iter,
+			      TITLE_COLUMN, children->title,
+			      FILENAME_COLUMN, children->filename,
+			      FUNC_COLUMN, children->func,
+			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			      -1);
+	  
+	  children++;
+	}
     }
 
   cell = gtk_cell_renderer_text_new ();
 
   column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
-                                                     cell,
-                                                     "text", TITLE_COLUMN,
-                                                     "style", STYLE_COLUMN,
-                                                     NULL);
-
+						     cell,
+						     "text", TITLE_COLUMN,
+						     "style", STYLE_COLUMN,
+						     NULL);
+  
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-                               GTK_TREE_VIEW_COLUMN (column));
+			       GTK_TREE_VIEW_COLUMN (column));
 
   gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
   gtk_tree_selection_select_iter (GTK_TREE_SELECTION (selection), &iter);
@@ -916,11 +852,11 @@ create_tree (void)
 
   gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
-
+  				    
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER,
+				  GTK_POLICY_AUTOMATIC);
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
 
   label = gtk_label_new ("Widget (double click for demo)");
@@ -959,21 +895,21 @@ setup_default_icon (void)
   if (err)
     {
       GtkWidget *dialog;
-
+      
       dialog = gtk_message_dialog_new (NULL, 0,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Failed to read icon file: %s",
-                                       err->message);
+				       GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_CLOSE,
+				       "Failed to read icon file: %s",
+				       err->message);
       g_error_free (err);
 
       g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
     }
 
   if (pixbuf)
     {
-      GList *list;
+      GList *list;      
       GdkPixbuf *transparent;
 
       /* The gtk-logo-rgb icon has a white background, make it transparent */
@@ -992,6 +928,7 @@ int
 main (int argc, char **argv)
 {
   GtkWidget *window;
+  GtkWidget *notebook;
   GtkWidget *hbox;
   GtkWidget *tree;
 
@@ -999,20 +936,22 @@ main (int argc, char **argv)
    * these few lines, which are just a hack so gtk-demo will work
    * in the GTK tree without installing it.
    */
-  if (g_file_test ("../../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
+                   G_FILE_TEST_EXISTS))
     {
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
       g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
     }
   /* -- End of hack -- */
-
+  
   gtk_init (&argc, &argv);
 
   setup_default_icon ();
-
+  
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
   g_signal_connect_after (window, "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
+		    G_CALLBACK (gtk_main_quit), NULL);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
@@ -1024,8 +963,8 @@ main (int argc, char **argv)
   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_with_mnemonic ("_Info"));
+			    create_text (&info_buffer, FALSE),
+			    gtk_label_new_with_mnemonic ("_Info"));
 
   gtk_text_buffer_create_tag (info_buffer, "title",
                               "font", "Sans 18",
@@ -1033,8 +972,8 @@ main (int argc, char **argv)
   g_object_unref (info_buffer);
 
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&source_buffer, TRUE),
-                            gtk_label_new_with_mnemonic ("_Source"));
+			    create_text (&source_buffer, TRUE),
+			    gtk_label_new_with_mnemonic ("_Source"));
 
 
   gtk_text_buffer_create_tag (source_buffer, "comment",
@@ -1059,12 +998,13 @@ main (int argc, char **argv)
                               "foreground", "DarkGoldenrod4",
                               NULL);
   g_object_unref (source_buffer);
-
+  
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);
+  
 
-  load_file (gtk_demos[0].filename);
-
+  load_file (testgtk_demos[0].filename);
+  
   gtk_main ();
 
   return 0;

demos/gtk-demo/menus.c

@@ -30,7 +30,8 @@
 #include <stdio.h>
 
 static GtkWidget *
-create_menu (gint     depth)
+create_menu (gint     depth,
+	     gboolean tearoff)
 {
   GtkWidget *menu;
   GtkWidget *menuitem;
@@ -44,6 +45,13 @@ create_menu (gint     depth)
   menu = gtk_menu_new ();
   group = NULL;
 
+  if (tearoff)
+    {
+      menuitem = gtk_tearoff_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+    }
+
   for (i = 0, j = 1; i < 5; i++, j++)
     {
       sprintf (buf, "item %2d - %d", depth, j);
@@ -53,9 +61,9 @@ create_menu (gint     depth)
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
       gtk_widget_show (menuitem);
       if (i == 3)
-        gtk_widget_set_sensitive (menuitem, FALSE);
+	gtk_widget_set_sensitive (menuitem, FALSE);
 
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
     }
 
   return menu;
@@ -98,10 +106,10 @@ do_menus (GtkWidget *do_widget)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Menus");
       g_signal_connect (window, "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &window);
+			G_CALLBACK(gtk_widget_destroyed), &window);
 
       accel_group = gtk_accel_group_new ();
       gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
@@ -120,7 +128,7 @@ do_menus (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
       gtk_widget_show (menubar);
 
-      menu = create_menu (2);
+      menu = create_menu (2, TRUE);
 
       menuitem = gtk_menu_item_new_with_label ("test\nline2");
       gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
@@ -128,12 +136,12 @@ do_menus (GtkWidget *do_widget)
       gtk_widget_show (menuitem);
 
       menuitem = gtk_menu_item_new_with_label ("foo");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
       menuitem = gtk_menu_item_new_with_label ("bar");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
@@ -144,13 +152,13 @@ do_menus (GtkWidget *do_widget)
 
       button = gtk_button_new_with_label ("Flip");
       g_signal_connect (button, "clicked",
-                        G_CALLBACK (change_orientation), menubar);
+			G_CALLBACK (change_orientation), menubar);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
-                                G_CALLBACK(gtk_widget_destroy), window);
+				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);

demos/gtk-demo/menus.ui

@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_New</attribute>
-        <attribute name="action">app.new</attribute>
-        <attribute name="accel">&lt;Primary&gt;n</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Open</attribute>
-        <attribute name="action">app.open</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Save</attribute>
-        <attribute name="action">app.save</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Save _As...</attribute>
-        <attribute name="action">app.save-as</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="menubar">
-    <submenu>
-      <attribute name="label" translatable="yes">_Preferences</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
-          <attribute name="action">app.dark</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
-          <attribute name="action">win.titlebar</attribute>
-        </item>
-        <submenu>
-          <attribute name="label" translatable="yes">_Color</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Red</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">red</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Green</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">green</attribute>
-              <attribute name="accel">&lt;Primary&gt;g</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Blue</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">blue</attribute>
-              <attribute name="accel">&lt;Primary&gt;b</attribute>
-            </item>
-          </section>
-        </submenu>
-        <submenu>
-          <attribute name="label" translatable="yes">_Shape</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Square</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">square</attribute>
-              <attribute name="accel">&lt;Primary&gt;s</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Rectangle</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">rectangle</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Oval</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">oval</attribute>
-              <attribute name="accel">&lt;Primary&gt;o</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">_Bold</attribute>
-          <attribute name="action">win.bold</attribute>
-          <attribute name="accel">&lt;Primary&gt;b</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.about</attribute>
-        <attribute name="accel">&lt;Primary&gt;a</attribute>
-      </item>
-    </submenu>
-  </menu>
-</interface>

demos/gtk-demo/offscreen_window.c

@@ -613,3 +613,4 @@ do_offscreen_window (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/offscreen_window2.c

@@ -524,3 +524,4 @@ do_offscreen_window2 (GtkWidget *do_widget)
 
   return window;
 }
+

demos/gtk-demo/org.gtk.Demo.gschema.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<schemalist>
-
-  <enum id='org.gtk.Demo.Color'>
-    <value nick='red'   value='0'/>
-    <value nick='green' value='1'/>
-    <value nick='blue'  value='2'/>
-  </enum>
-
-  <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
-    <key name='color' enum='org.gtk.Demo.Color'>
-      <default>'red'</default>
-    </key>
-  </schema>
-
-</schemalist>

demos/gtk-demo/overlay.c

@@ -23,7 +23,7 @@ do_overlay (GtkWidget *do_widget)
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
                                    450, 450);
-
+      
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 

demos/gtk-demo/panes.c

@@ -15,7 +15,7 @@
 
 void
 toggle_resize (GtkWidget *widget,
-               GtkWidget *child)
+	       GtkWidget *child)
 {
   GtkWidget *parent;
   GtkPaned *paned;
@@ -43,7 +43,7 @@ toggle_resize (GtkWidget *widget,
 
 void
 toggle_shrink (GtkWidget *widget,
-               GtkWidget *child)
+	       GtkWidget *child)
 {
   GtkWidget *parent;
   GtkPaned *paned;
@@ -70,10 +70,10 @@ toggle_shrink (GtkWidget *widget,
 }
 
 GtkWidget *
-create_pane_options (GtkPaned    *paned,
-                     const gchar *frame_label,
-                     const gchar *label1,
-                     const gchar *label2)
+create_pane_options (GtkPaned	 *paned,
+		     const gchar *frame_label,
+		     const gchar *label1,
+		     const gchar *label2)
 {
   GtkWidget *child1, *child2;
   GtkWidget *frame;
@@ -86,38 +86,47 @@ create_pane_options (GtkPaned    *paned,
 
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
-
-  table = gtk_grid_new ();
+  
+  table = gtk_table_new (3, 2, TRUE);
   gtk_container_add (GTK_CONTAINER (frame), table);
-
+  
   label = gtk_label_new (label1);
-  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
-
+  gtk_table_attach_defaults (GTK_TABLE (table), label,
+			     0, 1, 0, 1);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_grid_attach (GTK_GRID (table), check_button, 0, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     0, 1, 1, 2);
   g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_resize), child1);
+		    G_CALLBACK (toggle_resize), child1);
 
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_grid_attach (GTK_GRID (table), check_button, 0, 2, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     0, 1, 2, 3);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
   g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_shrink), child1);
+		    G_CALLBACK (toggle_shrink), child1);
 
   label = gtk_label_new (label2);
-  gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
-
+  gtk_table_attach_defaults (GTK_TABLE (table), label,
+			     1, 2, 0, 1);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_grid_attach (GTK_GRID (table), check_button, 1, 1, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     1, 2, 1, 2);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
   g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_resize), child2);
+		    G_CALLBACK (toggle_resize), child2);
 
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_grid_attach (GTK_GRID (table), check_button, 1, 2, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     1, 2, 2, 3);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
   g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_shrink), child2);
+		    G_CALLBACK (toggle_shrink), child2);
 
   return frame;
 }
@@ -136,10 +145,10 @@ do_panes (GtkWidget *do_widget)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -158,7 +167,7 @@ do_panes (GtkWidget *do_widget)
       gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
       gtk_widget_set_size_request (frame, 60, 60);
       gtk_paned_add1 (GTK_PANED (hpaned), frame);
-
+      
       button = gtk_button_new_with_mnemonic ("_Hi there");
       gtk_container_add (GTK_CONTAINER(frame), button);
 
@@ -175,18 +184,18 @@ do_panes (GtkWidget *do_widget)
       /* Now create toggle buttons to control sizing */
 
       gtk_box_pack_start (GTK_BOX (vbox),
-                          create_pane_options (GTK_PANED (hpaned),
-                                               "Horizontal",
-                                               "Left",
-                                               "Right"),
-                          FALSE, FALSE, 0);
+			  create_pane_options (GTK_PANED (hpaned),
+					       "Horizontal",
+					       "Left",
+					       "Right"),
+			  FALSE, FALSE, 0);
 
       gtk_box_pack_start (GTK_BOX (vbox),
-                          create_pane_options (GTK_PANED (vpaned),
-                                               "Vertical",
-                                               "Top",
-                                               "Bottom"),
-                          FALSE, FALSE, 0);
+			  create_pane_options (GTK_PANED (vpaned),
+					       "Vertical",
+					       "Top",
+					       "Bottom"),
+			  FALSE, FALSE, 0);
 
       gtk_widget_show_all (vbox);
     }

demos/gtk-demo/pickers.c

@@ -25,54 +25,45 @@ do_pickers (GtkWidget *do_widget)
 
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    table = gtk_grid_new ();
-    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+    table = gtk_table_new (5, 2, FALSE);
+    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
     gtk_container_add (GTK_CONTAINER (window), table);
 
     gtk_container_set_border_width (GTK_CONTAINER (table), 10);
 
     label = gtk_label_new ("Color:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     picker = gtk_color_button_new ();
-    gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);
 
     label = gtk_label_new ("Font:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     picker = gtk_font_button_new ();
-    gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);
 
     label = gtk_label_new ("File:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);
 
     label = gtk_label_new ("Folder:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     picker = gtk_file_chooser_button_new ("Pick a Folder",
                                           GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
 
     label = gtk_label_new ("Mail:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
     picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
     gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 4, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 4, 5);
   }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/pixbufs.c

@@ -71,7 +71,7 @@ load_pixbufs (GError **error)
 
   background = gdk_pixbuf_new_from_file (filename, error);
   g_free (filename);
-
+  
   if (!background)
     return FALSE; /* Note that "error" was filled with a GError */
 
@@ -83,10 +83,10 @@ load_pixbufs (GError **error)
       filename = demo_find_file (image_names[i], error);
       if (!filename)
         return FALSE; /* Note that "error" was filled with a GError */
-
+      
       images[i] = gdk_pixbuf_new_from_file (filename, error);
       g_free (filename);
-
+      
       if (!images[i])
         return FALSE; /* Note that "error" was filled with a GError */
     }
@@ -175,10 +175,12 @@ timeout (gpointer data)
                                : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
     }
 
+  GDK_THREADS_ENTER ();
   gtk_widget_queue_draw (da);
+  GDK_THREADS_LEAVE ();
 
   frame_num++;
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }
 
 static guint timeout_id;

demos/gtk-demo/printing.c

@@ -26,8 +26,8 @@ typedef struct
 
 static void
 begin_print (GtkPrintOperation *operation,
-             GtkPrintContext   *context,
-             gpointer           user_data)
+	     GtkPrintContext   *context,
+	     gpointer           user_data)
 {
   PrintData *data = (PrintData *)user_data;
   char *contents;
@@ -55,9 +55,9 @@ begin_print (GtkPrintOperation *operation,
 
 static void
 draw_page (GtkPrintOperation *operation,
-           GtkPrintContext   *context,
-           gint               page_nr,
-           gpointer           user_data)
+	   GtkPrintContext   *context,
+	   gint               page_nr,
+	   gpointer           user_data)
 {
   PrintData *data = (PrintData *)user_data;
   cairo_t *cr;
@@ -132,8 +132,8 @@ draw_page (GtkPrintOperation *operation,
 
 static void
 end_print (GtkPrintOperation *operation,
-           GtkPrintContext   *context,
-           gpointer           user_data)
+	   GtkPrintContext   *context,
+	   gpointer           user_data)
 {
   PrintData *data = (PrintData *)user_data;
 
@@ -149,6 +149,8 @@ do_printing (GtkWidget *do_widget)
   GtkPrintOperation *operation;
   GtkPrintSettings *settings;
   PrintData *data;
+  gchar *uri, *ext;
+  const gchar *dir;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();
@@ -157,39 +159,50 @@ do_printing (GtkWidget *do_widget)
   data->font_size = 12.0;
 
   g_signal_connect (G_OBJECT (operation), "begin-print",
-                    G_CALLBACK (begin_print), data);
+		    G_CALLBACK (begin_print), data);
   g_signal_connect (G_OBJECT (operation), "draw-page",
-                    G_CALLBACK (draw_page), data);
+		    G_CALLBACK (draw_page), data);
   g_signal_connect (G_OBJECT (operation), "end-print",
-                    G_CALLBACK (end_print), data);
+		    G_CALLBACK (end_print), data);
 
   gtk_print_operation_set_use_full_page (operation, FALSE);
   gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS);
   gtk_print_operation_set_embed_page_setup (operation, TRUE);
 
   settings = gtk_print_settings_new ();
+  dir = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+  if (dir == NULL)
+    dir = g_get_home_dir ();
+  if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "ps") == 0)
+    ext = ".ps";
+  else if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "svg") == 0)
+    ext = ".svg";
+  else
+    ext = ".pdf";
 
-  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BASENAME, "gtk-demo");
+  uri = g_strconcat ("file://", dir, "/", "gtk-demo", ext, NULL);
+  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
   gtk_print_operation_set_print_settings (operation, settings);
 
   gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
 
   g_object_unref (operation);
   g_object_unref (settings);
+  g_free (uri);
 
   if (error)
     {
       GtkWidget *dialog;
 
       dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "%s", error->message);
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_CLOSE,
+				       "%s", error->message);
       g_error_free (error);
 
       g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
 
       gtk_widget_show (dialog);
     }

demos/gtk-demo/reset.css

@@ -1,68 +0,0 @@
-/* @import this colorsheet to get the default values for every property.
- * This is useful when writing special CSS tests that should not be
- * inluenced by themes - not even the default ones.
- * Keep in mind that the output will be very ugly and not look like
- * anything GTK.
- * Also, when adding new style properties, please add them here.
- */
-
-* {
-  color: inherit;
-  font-size: inherit;
-  background-color: initial;
-  font-family: inherit;
-  font-style: inherit;
-  font-variant: inherit;
-  font-weight: inherit;
-  text-shadow: inherit;
-  icon-shadow: inherit;
-  box-shadow: initial;
-  margin-top: initial;
-  margin-left: initial;
-  margin-bottom: initial;
-  margin-right: initial;
-  padding-top: initial;
-  padding-left: initial;
-  padding-bottom: initial;
-  padding-right: initial;
-  border-top-style: initial;
-  border-top-width: initial;
-  border-left-style: initial;
-  border-left-width: initial;
-  border-bottom-style: initial;
-  border-bottom-width: initial;
-  border-right-style: initial;
-  border-right-width: initial;
-  border-top-left-radius: initial;
-  border-top-right-radius: initial;
-  border-bottom-right-radius: initial;
-  border-bottom-left-radius: initial;
-  outline-style: initial;
-  outline-width: initial;
-  outline-offset: initial;
-  background-clip: initial;
-  background-origin: initial;
-  background-size: initial;
-  background-position: initial;
-  border-top-color: initial;
-  border-right-color: initial;
-  border-bottom-color: initial;
-  border-left-color: initial;
-  outline-color:  initial;
-  background-repeat: initial;
-  background-image: initial;
-  border-image-source: initial;
-  border-image-repeat: initial;
-  border-image-slice: initial;
-  border-image-width: initial;
-  transition-property: initial;
-  transition-duration: initial;
-  transition-timing-function: initial;
-  transition-delay: initial;
-  engine: initial;
-  gtk-key-bindings: initial;
-
-  -GtkWidget-focus-line-width: 0;
-  -GtkWidget-focus-padding: 0;
-  -GtkNotebook-initial-gap: 0;
-}

demos/gtk-demo/rotated_text.c

@@ -75,7 +75,7 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
   for (p = text; (p = strstr (p, HEART)); p += strlen (HEART))
     {
       PangoAttribute *attr;
-
+      
       attr = pango_attr_shape_new_with_data (&ink_rect,
                                              &logical_rect,
                                              GUINT_TO_POINTER (g_utf8_get_char (p)),
@@ -152,7 +152,7 @@ rotated_text_draw (GtkWidget *widget,
 
       /* Inform Pango to re-layout the text with the new transformation matrix */
       pango_cairo_update_layout (cr, layout);
-
+    
       pango_layout_get_pixel_size (layout, &width, &height);
       cairo_move_to (cr, - width / 2, - RADIUS * .9);
       pango_cairo_show_layout (cr, layout);
@@ -166,7 +166,7 @@ rotated_text_draw (GtkWidget *widget,
   g_object_unref (layout);
   g_object_unref (context);
   cairo_pattern_destroy (pattern);
-
+  
   return FALSE;
 }
 

demos/gtk-demo/search_entry.c

@@ -29,7 +29,8 @@ static gboolean
 search_progress (gpointer data)
 {
   gtk_entry_progress_pulse (GTK_ENTRY (data));
-  return G_SOURCE_CONTINUE;
+
+  return TRUE;
 }
 
 static void
@@ -170,6 +171,22 @@ icon_press_cb (GtkEntry       *entry,
   if (position == GTK_ENTRY_ICON_PRIMARY)
     gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
                     event->button, event->time);
+  else
+    clear_entry (entry);
+}
+
+static void
+text_changed_cb (GtkEntry   *entry,
+                 GParamSpec *pspec,
+                 GtkWidget  *button)
+{
+  gboolean has_text;
+
+  has_text = gtk_entry_get_text_length (entry) > 0;
+  gtk_entry_set_icon_sensitive (entry,
+                                GTK_ENTRY_ICON_SECONDARY,
+                                has_text);
+  gtk_widget_set_sensitive (button, has_text);
 }
 
 static void
@@ -266,7 +283,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
       /* Create our entry */
-      entry = gtk_search_entry_new ();
+      entry = gtk_entry_new ();
       gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
 
       /* Create the find and cancel buttons */
@@ -291,8 +308,15 @@ do_search_entry (GtkWidget *do_widget)
       search_by_name (NULL, GTK_ENTRY (entry));
 
       /* Set up the clear icon */
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     GTK_STOCK_CLEAR);
+      text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
+
       g_signal_connect (entry, "icon-press",
                         G_CALLBACK (icon_press_cb), NULL);
+      g_signal_connect (entry, "notify::text",
+                        G_CALLBACK (text_changed_cb), find_button);
       g_signal_connect (entry, "activate",
                         G_CALLBACK (activate_cb), NULL);
 

demos/gtk-demo/sizegroup.c

@@ -2,9 +2,9 @@
  *
  * GtkSizeGroup provides a mechanism for grouping a number of
  * widgets together so they all request the same amount of space.
- * This is typically useful when you want a column of widgets to
+ * This is typically useful when you want a column of widgets to 
  * have the same size, but you can't use a GtkTable widget.
- *
+ * 
  * Note that size groups only affect the amount of space requested,
  * not the size that the widgets finally receive. If you want the
  * widgets in a GtkSizeGroup to actually be the same size, you need
@@ -26,7 +26,7 @@ create_combo_box (const char **strings)
   const char **str;
 
   combo_box = gtk_combo_box_text_new ();
-
+  
   for (str = strings; *str; str++)
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);
 
@@ -36,30 +36,34 @@ create_combo_box (const char **strings)
 }
 
 static void
-add_row (GtkGrid      *table,
-         int           row,
-         GtkSizeGroup *size_group,
-         const char   *label_text,
-         const char  **options)
+add_row (GtkTable     *table,
+	 int           row,
+	 GtkSizeGroup *size_group,
+	 const char   *label_text,
+	 const char  **options)
 {
   GtkWidget *combo_box;
   GtkWidget *label;
 
   label = gtk_label_new_with_mnemonic (label_text);
-  gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_END);
-  gtk_widget_set_hexpand (label, TRUE);
-  gtk_grid_attach (table, label, 0, row, 1, 1);
-
+  gtk_misc_set_alignment (GTK_MISC (label), 0, 1);
+  gtk_table_attach (GTK_TABLE (table), label,
+		    0, 1,                  row, row + 1,
+		    GTK_EXPAND | GTK_FILL, 0,
+		    0,                     0);
+  
   combo_box = create_combo_box (options);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
   gtk_size_group_add_widget (size_group, combo_box);
-  gtk_grid_attach (table, combo_box, 1, row, 1, 1);
+  gtk_table_attach (GTK_TABLE (table), combo_box,
+		    1, 2,                  row, row + 1,
+		    0,                     0,
+		    0,                     0);
 }
 
 static void
 toggle_grouping (GtkToggleButton *check_button,
-                 GtkSizeGroup    *size_group)
+		 GtkSizeGroup    *size_group)
 {
   GtkSizeGroupMode new_mode;
 
@@ -71,7 +75,7 @@ toggle_grouping (GtkToggleButton *check_button,
     new_mode = GTK_SIZE_GROUP_HORIZONTAL;
   else
     new_mode = GTK_SIZE_GROUP_NONE;
-
+  
   gtk_size_group_set_mode (size_group, new_mode);
 }
 
@@ -88,29 +92,29 @@ do_sizegroup (GtkWidget *do_widget)
   static const char *color_options[] = {
     "Red", "Green", "Blue", NULL
   };
-
+  
   static const char *dash_options[] = {
     "Solid", "Dashed", "Dotted", NULL
   };
-
+  
   static const char *end_options[] = {
     "Square", "Round", "Arrow", NULL
   };
-
+  
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+					    GTK_WINDOW (do_widget),
+					    0,
+					    GTK_STOCK_CLOSE,
+					    GTK_RESPONSE_NONE,
+					    NULL);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
+      
       g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
@@ -119,40 +123,42 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-      /* Create one frame holding color options */
+      
+      /* Create one frame holding color options
+       */
       frame = gtk_frame_new ("Color Options");
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
-      table = gtk_grid_new ();
+      table = gtk_table_new (2, 2, FALSE);
       gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
 
-      add_row (GTK_GRID (table), 0, size_group, "_Foreground", color_options);
-      add_row (GTK_GRID (table), 1, size_group, "_Background", color_options);
+      add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
+      add_row (GTK_TABLE (table), 1, size_group, "_Background", color_options);
 
-      /* And another frame holding line style options */
+      /* And another frame holding line style options
+       */
       frame = gtk_frame_new ("Line Options");
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-      table = gtk_grid_new ();
+      table = gtk_table_new (2, 2, FALSE);
       gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
 
-      add_row (GTK_GRID (table), 0, size_group, "_Dashing", dash_options);
-      add_row (GTK_GRID (table), 1, size_group, "_Line ends", end_options);
+      add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);
+      add_row (GTK_TABLE (table), 1, size_group, "_Line ends", end_options);
 
       /* And a check button to turn grouping on and off */
       check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
       gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE, 0);
-
+      
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
       g_signal_connect (check_button, "toggled",
-                        G_CALLBACK (toggle_grouping), size_group);
+			G_CALLBACK (toggle_grouping), size_group);
     }
 
   if (!gtk_widget_get_visible (window))