Don't queue resize for hidden widgets without a size group

queue_resize basically tells the parent widget that it may need
to pick a different size/layout. However, for a hidden child widget
that should never be needed. It may be that the widget is in a
sizegroup that has ignore_hidden == FALSE though, so it may
affect the size group calculations.

However, if a widget is not visible and not in a size group then
its safe to avoid the resize, as the widget will be resized on
becoming visible anyway.

This avoids a lot of size allocation for hidden things like menus
and tooltips.

NEWS

@@ -1,298 +1,3 @@
-Overview of Changes in GTK+ 3.7.12
-==================================
-
-* We now support touch friendly popups on entries and text views
-  in place of context menus, on touch devices
-
-* The print dialog now shows printers that are discovered
-  using avahi, if configured with --enable-avahi-browsing
-
-* Bugs fixed:
- 650424 treeview: expander is not easily themable
- 674207 window: Compiler warning when not building on X11
- 675333 Cannot forget association in Open With dialog: program...
- 688956 Print dialog needs to support Bonjour broadcasting of ...
- 691426 get_current_desktop does not interpret property data c...
- 692955 GtkIconCache fails to load non-builtin icons
- 693995 GkColorChooserWidget crashes in select_swatch if palet...
- 694059 GtkTreeView accessible object:state-changed-expanded e...
- 694162 Memory leaks due to extra ref in gtk_ui_manager_builda...
- 694217 drag&drop half-broken – items get stuck while dragging
- 694274 wayland: don't attempt to unqueue events when events a...
- 694302 Convert pixbuf animation demo (both copies) to GdkFram...
- 694395 Remove unused code
- 694406 Excessive amount of accessible text events when changi...
- 694451 Containers shouldn't special case RTL positions
- 694732 gdk: prevent NULL pointer access when debugging is ena...
- 694742 Fix possible memory leak when GlobalAlloc() fails
- 694924 Dead code in GtkClipboard
- 694925 non-expose based draw() doesn't render window background
- 694968 GtkIconTheme: fix failed assertion when asynchrnously ...
- 694990 use primary icon slot for search icon
- 695131 gtkbin: initialize minimum and natural size to zero fo...
-
-Translation updates:
- Brazilian Portuguese
- Czech
- Estonian
- German
- Greek
- Gujarati
- Lithuanian
- Polish
- Punjabi
- Russian
- Serbian
- Simplified Chinese
- Slovenian
- Spanish
- Traditional Chinese
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.7.10
-==================================
-
-* We now support the Window Manager frame synchronization protocol draft (when
-  running under a WM that supports it). This means applications will throttle
-  their drawing cycle to what the compositor is drawing, and the compositor
-  will never render half-updated windows, for seamless resizing and improved
-  smoothness in drawing.
-  See https://mail.gnome.org/archives/wm-spec-list/2013-January/msg00000.html
-  and the articles at http://blog.fishsoup.net/ for more details.
-
-* We now support setting an opacity to any GtkWidget, not just toplevels:
-  gtk_window_set_opacity has been deprecated in favor of gtk_widget_set_opacity.
-
-* GtkIconTheme gained asynchronous loaders for GtkIconInfo objects
-
-* GtkIconInfo has changed from being a boxed type to a GObject. This
-  is technically an ABI change, but basically all existing code
-  will keep working if its used as a boxed type, and its not
-  possible to instantiate GtkIconInfos outside Gtk, so this is not
-  expected to be a big problem.
-
-* Bugs fixed:
- 590325 gtkbuilder needs a public policy about extension name
- 673243 GtkRadioMenuItem accelerators no longer appear
- 681578 gtk-demo: demo.ui is outdated
- 683311 Leak in GtkIconViewAccessible
- 685460 Add frame synchronization to GTK+
- 687842 Support partially transparent widgets
- 690247 multiple context in a immodule can't be selected
- 692411 Slave device tracking goes wrong when there are no GDK_DEVICE_TYPE_SLAVE
- 692728 wayland evet source doesn't handle poll err/hup
- 693251 wayland: fix the direction of scrolling
- 693253 wayland: remove debug message
- 693256 wayland: use the GdkCursorType enum information to lookup the cursor name
- 693257 wayland: avoid returning NULL when getting a cursor
- 693313 Improve tooltip support
- 693338 wayland: skip pointer and keyboard events without a surface
- 693400 gtkcellrenderertext: Sink floating entry before using as signal argument
- 693709 Hide recently used if it is turned off in the control center
- 693724 Add a gtk-recent-files-enabled GtkSetting
- 693802 Add async GtkIconInfo loaders
- 693912 wayland: look further through the hierarchy for the surface with the grab
- 693913 wayland: attempt to determine the possible parent surface for popups
- 693934 Add gdk_frame_clock_begin/end_updating()
- 694022 GtkViewport: annotate the adjustment args of the constructor
- 694075 GtkAccelLabel: Don't show "+" if there's no more keys to add
-        Added scroll and touch events to GtkToolPalette
-
-* Translation updates:
- Arabic
- Catalan
- Catalan (Valencian)
- Czech
- Japanese
- Kazakh
- Lithuanian
- Malayalam
- Polish
- Serbian
-
-Overview of Changes in GTK+ 3.7.8
-=================================
-
-* GtkTreeView and GtkIconView allow single-click activation
-
-* GtkImage can be set from a resource
-
-* GdkWaylandDisplay is now public
-
-* gdk_window_set_fullscreen_mode: new function to let windows
-  be fullscreened across multiple monitors
-
-* Bugs fixed:
- 345023 Single-click in treeview and iconview
- 687025 iconhelper: Treat empty string as NULL stock-id
- 691572 Touch: strengthen synthesized touch crossing events ...
- 691592 the signal handler "gtk_spin_button_accessible_value...
- 691639 introspection: gtk_widget_set_tooltip_text accepts NULL
- 691751 Better column resizing for GtkTreeView
- 691842 /TreeView/scrolling/specific/bug-111500 fails since ...
- 691856 Add support for _NET_WM_FULLSCREEN_MONITORS
- 692163 file chooser: give GSettings schema a path
- 692188 Backspace should not be used for navigation
- 692203 applicationwindow: fix mem leak
- 692467 x11: Add "support" for XI2.3
- 692481 gtkimage: Add GtkImage::resource property
- 692605 Optimize gdk_x11_screen_get_setting()
- 692659 migrating-2to3: Add more words about GSEAL_ENABLE is...
- 692766 textlayout: respect preedit color attribute
- 692844 Incorrect (out) annotation on gtk_tree_drag_source_d...
- 692934 Defer cairo surface creation for image URLs in CSS t...
- 682824 Don't build gtk-launch when gio-unix is not available
- 692637 Only build native-update-icon-cache when no external...
- 692823 GdkDeviceCore should be public as GdkWaylandDevice
- 692899 global_remove handler is missing
- 693015 Deprecate gtk_scrolled_window_add_with_viewport()
- 693066 GTK notification code attempts to create an X notifi...
- 525226 All actions' names and descriptions should be transl...
- 553334 gailrange exposes an action which does nothing
- 658148 The pop-up window in a GtkEntryCompletion lacks an a...
- 680048 Prefer symbolic icons for the default message dialog...
- 687825 weight-set in GtkCellRendererText not working
- 693050 GtkTextView focus handler doesn't honor can-focus pr...
-
-* Translation updates:
- Aragonese
- Assamese
- Basque
- Brazilian Portuguese
- Dutch
- German
- Hebrew
- Hungarian
- Polish
- Portuguese
- Serbian
- Slovenian
- Spanish
- Uyghur
-
-
-Overview of Changes in GTK+ 3.7.6
-=================================
-
-* We now use state flags for text direction: GTK_STATE_FLAG_LTR/RTL.
-  gtk_style_context_set_direction() has been deprecated.
-
-* We install headers for accessible implementations of GTK+ widgets.
-  This makes it possible to implement accessibility for third-party
-  widgets by subclassing the proper GTK+ implementation. To do this,
-  include gtk/gtk-a11y.h.
-
-* Invisible widgets now return a size of 0x0. This is an experimental
-  change that makes GtkWidget::visible essentially behave the same way
-  that "display: none" does in CSS. If you want the effect of CSS's
-  "visibility: hidden", you can use a GtkNotebook with an empty page.
-
-* GtkFrame now draws a background.
-
-* The Broadway backend now installs a separate server: broadwayd.
-
-* Bug fixes:
- 687025 iconhelper: Treat empty string as NULL stock-id
- 687633 gtk_color_chooser_get_rgba: wrong annotations, broke bind...
- 688140 Add missing annotation for gtk_combo_box_text_get_active_...
- 688362 GtkApplication: Fix memory leak
- 689810 Include guard optimization
- 690305 Typo in SECTION:gtkbuildable : (thier -> their)
- 691186 Gtk+ 3.6.3 crashes when opening printing dialog: segfault...
- 691301 Better support for cross-compiling
- 691515 Insufficient checks for EWMH support
- 691677 Gtk Scale (slider) does not react in clicks outside the c...
-
-* Translation updates:
- Assamese
- Bulgarian
- Estonian
- Galician
- Hungarian
- Kazakh
- Latvian
- Lithuanian
- Norwegian bokmål
- Persian
- Portuguese
- Slovenian
- Tamil
- Thai
- Uyghur
-
-
-Overview of Changes in GTK+ 3.7.4
-=================================
-
-* GtkBuilder now lets you refer to external objects from a ui
-  file if the objects have been exported with the new function
-  gtk_builder_expose_object()
-
-* Font handling has been improved:
- - The default font is no longer handled like a custom style sheet
-   that overrides everything, but as the initial value. This is the
-   same behavior as in web browsers.
- - It is now possible to set font-family and font-size like other
-   CSS properties, and relative font sizes are supported. Font
-   sizes in CSS can be specified as numbers or with keywords
-   like xx-small, medium, smaller, larger,...
-
-* GTK+ now uses proper Unicode ellipses in strings.
-
-* The releases includes several noticable performance improvements:
- - Size allocation has been optimized, by avoiding excessive
-   resizing in various situations.
- - The performance of size groups has been improved.
- - Text rendering in GtkLabel and other widgets has been optimized
-   to avoid excessive recreation of Pango layouts.
- - Icon loading overhead was reduced by caching of GtkIconInfo.
- - The CSS is now keeping a tree of selectors to speed up matchinh.
-
-* Deprecations and removals:
- - Custom CSS properties have been deprecated
- - Support for color schemes has been removed
- - gtk_style_provider_get_style, gtk_style_provider_get_icon_factory
- - GtkGradient and GtkSymbolicColor
- - All the padding style properties in menus
-
-* Bugs closed:
- 132333 Can't add a palette to the dialog of a color button
- 371034 Doc for gtk_file_chooser_get_filename: Is the resulting path...
- 447972 Add a way to specify user_data sent to signals
- 548793 funny pattern for iterating GtkTreeModel
- 595615 Use proper ellipses
- 626499 GtkClipboard unnotified on change of OS X pasteboard owner
- 668239 texts disappear when notebook switch page at zh_CN locate!
- 677339 GTK+ 3 documentation wrong about GtkWidget scroll-event signal
- 680065 treemodelfilter: Make the constructor binding friendly
- 687065 InstallableOptions is not filtered in cups backend
- 687816 GtkTreeView does not draw correctly since commit aaedc7b6
- 688710 [PATCH] Splash screens shouldn't stay on top of all applicat...
- 688744 Don't use gtk_style_context_set_background() to render icon/...
- 688884 Typo in gtk_tree_view_set_tooltip_column documentation
- 689012 "Copy file's location" menu item in file chooser dialog uses...
- 689047 Obtain the recent files max age setting from xsettings
- 689081 No caching of icons
- 689168 Deprecate some menu style properties
- 689401 xi2: Abort early if we don't have a proper GDK window
- 689584 Add summary and description to "show-hidden" key
- 689847 Add fast repeated typename -> GType resolver
- 689923 Missing null-check in GtkEntryAccessible
- 690099 GtkScrolledWindow with NEVER policy don't resize with children
- 690266 Freeze with F10/Shift-F10 on submenus
-
-* Translation updates:
- Assamese
- British English
- Dutch
- German
- Hebrew
- Polish
- Slovenian
- Spanish
-
-
 Overview of Changes in GTK+ 3.7.2
 =================================
 

README.in

@@ -69,27 +69,9 @@ 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)
-Even better are git-formatted patches. (Use git format-patch)
+Patches should be in unified diff form. (The -up option to GNU diff.)
 
 
-Release notes for 3.10
-======================
-
-* GDK has been changed to allow only a single screen per display.
-  Only the X11 backend had multiple screens before, and multi-screen
-  setups (not multi-monitor!) are very rare nowadays. If you really
-  need multiple X screens, open them as separate displays.
-
-Release notes for 3.8
-=====================
-
-* GtkIconInfo has changed from being a boxed type to a GObject. This
-  is technically an ABI change, but basically all existing code
-  will keep working if its used as a boxed type, and its not
-  possible to instantiate GtkIconInfos outside Gtk, so this is not
-  expected to be a big problem.
-
 Release notes for 3.6
 =====================
 

build/Makefile.am

@@ -2,5 +2,3 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = \
 	win32
-
--include $(top_srcdir)/git.mk

build/win32/Makefile.am

@@ -3,9 +3,3 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS = \
 	vs9  \
 	vs10
-
-EXTRA_DIST +=	\
-	gen-file-list-gtk.py	\
-	gengir_gtk.bat
-
--include $(top_srcdir)/git.mk

build/win32/gen-file-list-gtk.py

@@ -1,140 +0,0 @@
-#!/usr/bin/python
-# vim: encoding=utf-8
-# Generate the file lists for processing with g-ir-scanner
-import os
-import sys
-import re
-import string
-import subprocess
-import optparse
-
-def gen_gdk_filelist(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
-                             vars = {},
-                             conds = {},
-                             filters = ['gdk_public_h_sources', 'gdk_c_sources'])
-
-    vars['gdk_enums'] = 'gdkenumtypes.c gdkenumtypes.h'
-
-    files = vars['gdk_public_h_sources'].split() + \
-            vars['gdk_c_sources'].split() + \
-            vars['gdk_enums'].split()
-
-    sources = [i for i in files if (i != 'gdkkeysyms-compat.h')]
-
-    with open(dest, 'w') as d:
-        for i in sources:
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def gen_filelist_gtk(srcroot, subdir, dest):
-    vars = read_vars_from_AM(os.path.join(srcroot, 'gtk', 'Makefile.am'),
-                             vars = {},
-                             conds = {'USE_WIN32':True},
-                             filters = ['gtkinclude_HEADERS',
-                                        'deprecatedinclude_HEADERS',
-                                        'gtk_base_c_sources'])
-
-    vars['gtk_other_src'] = 'gtkprintoperation-win32.c gtktypebuiltins.h gtktypebuiltins.c'
-
-    files = vars['gtkinclude_HEADERS'].split() + \
-            vars['deprecatedinclude_HEADERS'].split() + \
-            vars['gtk_base_c_sources'].split() + \
-            vars['gtk_other_src'].split()
-
-    sources = [i for i in files if not (i.endswith('private.h')) and i != 'gtktextdisplay.h' and i != 'gtktextlayout.h']
-
-    with open(dest, 'w') as d:
-        for i in sources:
-            d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
-
-def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
-    '''
-    path: path to the Makefile.am
-    vars: predefined variables
-    conds: condition variables for Makefile
-    filters: if None, all variables defined are returned,
-             otherwise, it is a list contains that variables should be returned
-    '''
-    cur_vars = vars.copy()
-    RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
-    RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
-    RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
-    RE_AM_CONTINUING = re.compile(r'\\\s*$')
-    RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
-    RE_AM_ELSE = re.compile(r'^\s*else')
-    RE_AM_ENDIF = re.compile(r'^\s*endif')
-    def am_eval(cont):
-        return RE_AM_VAR_REF.sub(lambda x: cur_vars.get(x.group(1), ''), cont)
-    with open(path, 'r') as f:
-        contents = f.readlines()
-    #combine continuing lines
-    i = 0
-    ncont = []
-    while i < len(contents):
-        line = contents[i]
-        if RE_AM_CONTINUING.search(line):
-            line = RE_AM_CONTINUING.sub('', line)
-            j = i + 1
-            while j < len(contents) and RE_AM_CONTINUING.search(contents[j]):
-                line += RE_AM_CONTINUING.sub('', contents[j])
-                j += 1
-            else:
-                if j < len(contents):
-                    line += contents[j]
-            i = j
-        else:
-            i += 1
-        ncont.append(line)
-
-    #include, var define, var evaluation
-    i = -1
-    skip = False
-    oldskip = []
-    while i < len(ncont) - 1:
-        i += 1
-        line = ncont[i]
-        mo = RE_AM_IF.search(line)
-        if mo:
-            oldskip.append(skip)
-            skip = False if mo.group(1) in conds and conds[mo.group(1)] \
-                         else True
-            continue
-        mo = RE_AM_ELSE.search(line)
-        if mo:
-            skip = not skip
-            continue
-        mo = RE_AM_ENDIF.search(line)
-        if mo:
-            if oldskip:
-                skip = oldskip.pop()
-            continue
-        if not skip:
-            mo = RE_AM_INCLUDE.search(line)
-            if mo:
-                cur_vars.update(read_vars_from_AM(am_eval(mo.group(1)), cur_vars, conds, None))
-                continue
-            mo = RE_AM_VAR.search(line)
-            if mo:
-                cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
-                continue
-
-    #filter:
-    if filters != None:
-        ret = {}
-        for i in filters:
-            ret[i] = cur_vars.get(i, '')
-        return ret
-    else:
-        return cur_vars
-
-def main(argv):
-    srcroot = '..\\..'
-    subdir_gdk = 'gdk'
-    subdir_gtk = 'gtk'
-
-    gen_gdk_filelist(srcroot, subdir_gdk, 'gdk_list')
-    gen_filelist_gtk(srcroot, subdir_gtk, 'gtk_list')
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))

build/win32/gengir_gtk.bat

@@ -1,177 +0,0 @@
-@echo off
-
-setlocal EnableDelayedExpansion
-
-rem Needed environmental variables:
-rem PLAT: Windows platform-Win32 (i.e. x86) or x64 (i.e. x86-64)
-rem CONF: Configuration Type, Release or Debug
-rem VSVER: Visual C++ version used [9, 10 or 11]
-rem BASEDIR: Where the dependent libraries/headers are located
-rem PKG_CONFIG_PATH: Where the GLib/ATK/Pango/GDK-Pixbuf and their dependent pkg-config .pc files can be found
-rem MINGWDIR: Installation path of MINGW GCC, so gcc.exe can be found in %MINGWDIR%\bin.
-
-rem Note that the Python executable/installation and all the runtime dependencies of the
-rem library/libraries need to be in your PATH or %BASEBIN%\bin.
-
-rem Check the environemental variables...
-if /i "%PLAT%" == "Win32" goto PLAT_OK
-if /i "%PLAT%" == "x64" goto PLAT_OK
-if /i "%PLAT%" == "x86" (
-   set PLAT=Win32
-   goto PLAT_OK
-)
-if /i "%PLAT%" == "x86-64" (
-   set PLAT=x64
-   goto PLAT_OK
-)
-goto ERR_PLAT
-
-:PLAT_OK
-if "%VSVER%" == "9" goto VSVER_OK
-if "%VSVER%" == "10" goto VSVER_OK
-if "%VSVER%" == "11" goto VSVER_OK
-goto ERR_VSVER
-:VSVER_OK
-if /i "%CONF%" == "Release" goto CONF_OK
-if /i "%CONF%" == "Debug" goto CONF_OK
-goto ERR_CONF
-:CONF_OK
-if "%BASEDIR%" == "" goto ERR_BASEDIR
-if not exist %BASEDIR% goto ERR_BASEDIR
-
-if "%PKG_CONFIG_PATH%" == "" goto ERR_PKGCONFIG
-if not exist %PKG_CONFIG_PATH%\gobject-2.0.pc goto ERR_PKGCONFIG
-
-if "%MINGWDIR%" == "" goto ERR_MINGWDIR
-if not exist %MINGWDIR%\bin\gcc.exe goto ERR_MINGWDIR
-
-set CC=cl
-set BINDIR=%CD%\vs%VSVER%\%CONF%\%PLAT%\bin
-set INCLUDE=%BASEDIR%\include\glib-2.0;%BASEDIR%\lib\glib-2.0\include;%INCLUDE%
-set LIB=%BINDIR%;%BASEDIR%\lib;%LIB%
-set PATH=%BINDIR%;%BASEDIR%\bin;%PATH%;%MINGWDIR%\bin
-set PYTHONPATH=%BASEDIR%\lib\gobject-introspection;%BINDIR%
-
-echo Creating filelist files for generating GDK3/GTK3 .gir's...
-call python gen-file-list-gtk.py
-
-echo Setup .bat for generating GDK3/GTK3 .gir's...
-
-rem ===============================================================================
-rem Begin setup of gtk_gir.bat to create Gdk-3.0.gir
-rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)
-rem ===============================================================================
-
-echo echo Generating Gdk-3.0.gir...> gtk_gir.bat
-echo @echo off>> gtk_gir.bat
-echo.>> gtk_gir.bat
-rem ===============================================================
-rem Setup the command line flags to g-ir-scanner for Gdk-3.0.gir...
-rem ===============================================================
-echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. -I..\..\gdk ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\pango-1.0 -I%BASEDIR%\include\atk-1.0 ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\gdk-pixbuf-2.0 -I%BASEDIR%\include ^^>> gtk_gir.bat
-echo --namespace=Gdk --nsversion=3.0 ^^>> gtk_gir.bat
-echo --include=Gio-2.0 --include=GdkPixbuf-2.0 ^^>> gtk_gir.bat
-echo --include=Pango-1.0 --include=cairo-1.0 ^^>> gtk_gir.bat
-echo --no-libtool --library=gdk-3-vs%VSVER% ^^>> gtk_gir.bat
-echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> gtk_gir.bat
-echo --pkg-export gdk-3.0 --warn-all --c-include="gdk/gdk.h" ^^>> gtk_gir.bat
-echo -I..\.. -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION ^^>> gtk_gir.bat
-echo --filelist=gdk_list ^^>> gtk_gir.bat
-echo -o Gdk-3.0.gir>> gtk_gir.bat
-echo.>> gtk_gir.bat
-
-echo Completed setup of .bat for generating Gdk-3.0.gir.
-echo.>> gtk_gir.bat
-
-rem =================================================
-rem Finish setup of gtk_gir.bat to create Gtk-3.0.gir
-rem =================================================
-
-rem ===============================================================================
-rem Begin setup of gtk_gir.bat to create Gtk-3.0.gir
-rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!)
-rem ===============================================================================
-
-echo echo Generating Gtk-3.0.gir...>> gtk_gir.bat
-echo.>> gtk_gir.bat
-rem ===============================================================
-rem Setup the command line flags to g-ir-scanner for Gtk-3.0.gir...
-rem ===============================================================
-echo python %BASEDIR%\bin\g-ir-scanner --verbose -I..\.. -I..\..\gtk -I..\..\gdk ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\pango-1.0 -I%BASEDIR%\include\atk-1.0 ^^>> gtk_gir.bat
-echo -I%BASEDIR%\include\gdk-pixbuf-2.0 -I%BASEDIR%\include ^^>> gtk_gir.bat
-echo --namespace=Gtk --nsversion=3.0 ^^>> gtk_gir.bat
-echo --include=Atk-1.0 ^^>> gtk_gir.bat
-echo --include-uninstalled=./Gdk-3.0.gir ^^>> gtk_gir.bat
-echo --no-libtool --library=gtk-3-vs%VSVER% ^^>> gtk_gir.bat
-echo --reparse-validate --add-include-path=%BASEDIR%\share\gir-1.0 --add-include-path=. ^^>> gtk_gir.bat
-echo --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" ^^>> gtk_gir.bat
-echo -I..\.. -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" ^^>> gtk_gir.bat
-echo -Dtime_t=long ^^>> gtk_gir.bat
-echo -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" ^^>> gtk_gir.bat
-echo -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.6.2\" ^^>> gtk_gir.bat
-echo -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs%VSVER%\" ^^>> gtk_gir.bat
-echo -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" ^^>> gtk_gir.bat
-echo -DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\" ^^>> gtk_gir.bat
-echo -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_am_et -DINCLUDE_IM_cedilla -DINCLUDE_IM_cyrillic_translit ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_ime -DINCLUDE_IM_inuktitut -DINCLUDE_IM_ipa ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_multipress -DINCLUDE_IM_thai -DINCLUDE_IM_ti_er ^^>> gtk_gir.bat
-echo -DINCLUDE_IM_ti_et -DINCLUDE_IM_viqr --filelist=gtk_list ^^>> gtk_gir.bat
-echo -o Gtk-3.0.gir>> gtk_gir.bat
-echo.>> gtk_gir.bat
-
-echo Completed setup of .bat for generating Gtk-3.0.gir.
-echo.>> gtk_gir.bat
-
-rem =================================================
-rem Finish setup of gtk_gir.bat to create Gtk-3.0.gir
-rem =================================================
-
-rem =======================
-rem Now generate the .gir's
-rem =======================
-CALL gtk_gir.bat
-
-rem Clean up the .bat/filelists for generating the .gir files...
-del gtk_gir.bat
-del gdk_list
-del gtk_list
-
-rem Now compile the generated .gir files
-%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Gdk-3.0.gir -o Gdk-3.0.typelib
-%BASEDIR%\bin\g-ir-compiler --includedir=. --debug --verbose Gtk-3.0.gir -o Gtk-3.0.typelib
-rem Copy the generated .girs and .typelibs to their appropriate places
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0
-move /y *.gir %BASEDIR%\share\gir-1.0\
-
-mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0
-move /y *.typelib %BASEDIR%\lib\girepository-1.0\
-
-goto DONE
-
-:ERR_PLAT
-echo You need to specify a valid Platform [set PLAT=Win32 or PLAT=x64]
-goto DONE
-:ERR_VSVER
-echo You need to specify your Visual Studio version [set VSVER=9 or VSVER=10 or VSVER=11]
-goto DONE
-:ERR_CONF
-echo You need to specify a valid Configuration [set CONF=Release or CONF=Debug]
-goto DONE
-:ERR_BASEDIR
-echo You need to specify a valid BASEDIR.
-goto DONE
-:ERR_PKGCONFIG
-echo You need to specify a valid PKG_CONFIG_PATH
-goto DONE
-:ERR_MINGWDIR
-echo You need to specify a valid MINGWDIR, where a valid gcc installation can be found.
-goto DONE
-:DONE
-

build/win32/vs10/Makefile.am

@@ -1,30 +1,25 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk+.props	\
-	gdk-win32.vcxproj	\
-	gdk-win32.vcxproj.filters	\
-	gdk.vcxproj	\
-	gdk.vcxprojin	\
-	gdk.vcxproj.filters	\
-	gdk.vcxproj.filtersin	\
-	gtk.vcxproj	\
-	gtk.vcxprojin	\
-	gtk.vcxproj.filters	\
-	gtk.vcxproj.filtersin	\
-	gtk3-demo.vcxproj	\
-	gtk3-demo.vcxproj.filters	\
-	gtk3-demo-application.vcxproj	\
-	gtk3-demo-application.vcxproj.filters	\
-	gtka11y.vcxproj	\
-	gtka11y.vcxproj.filters	\
-	gtka11y.vcxprojin	\
-	gtka11y.vcxproj.filtersin	\
-	gailutil.vcxproj	\
-	gailutil.vcxproj.filters	\
-	gengir.vcxproj	\
+EXTRA_DIST += \
+	README.txt \
+	gtk+.sln \
+	gtk+.props \
+	gdk-win32.vcxproj \
+	gdk-win32.vcxproj.filters \
+	gdk.vcxproj \
+	gdk.vcxprojin \
+	gdk.vcxproj.filters \
+	gdk.vcxproj.filtersin \
+	gtk.vcxproj \
+	gtk.vcxprojin \
+	gtk.vcxproj.filters \
+	gtk.vcxproj.filtersin \
+	gtk3-demo.vcxproj \
+	gtk3-demo.vcxproj.filters \
+	libgail.vcxproj \
+	libgail.vcxproj.filters \
+	libgail.vcxprojin \
+	libgail.vcxproj.filtersin \
+	gailutil.vcxproj \
+	gailutil.vcxproj.filters \
 	install.vcxproj
-
--include $(top_srcdir)/git.mk

build/win32/vs10/gailutil.vcxproj

@@ -28,23 +28,19 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+	<WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -90,7 +86,7 @@
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
@@ -114,7 +110,7 @@
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -136,7 +132,7 @@
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -161,7 +157,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gdk-win32.vcxproj

@@ -28,23 +28,19 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -75,7 +71,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>

build/win32/vs10/gdk.vcxprojin

@@ -28,23 +28,19 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -79,19 +75,19 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -106,14 +102,14 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -131,12 +127,12 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -151,14 +147,14 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>imm32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gdk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gengir.vcxproj

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B15}</ProjectGuid>
-    <RootNamespace>gengir</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>$(DoGenGir)</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

build/win32/vs10/gtk+.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+# Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
@@ -8,16 +8,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcxproj", "{FC5A
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcxproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcxproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcxproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -82,18 +78,6 @@ Global
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs10/gtk.vcxprojin

@@ -29,22 +29,18 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -79,7 +75,7 @@
       <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -91,7 +87,7 @@
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -113,7 +109,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -136,7 +132,7 @@
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -158,7 +154,7 @@
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -204,7 +200,7 @@
       <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtka11y.vcxproj">
+    <ProjectReference Include="libgail.vcxproj">
       <Project>{f756b0db-40a1-4e9f-be1f-8f02cb86ea46}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>

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

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3281202A-CD26-4C67-B892-EB34BDBC612F}</ProjectGuid>
-    <RootNamespace>gtk3demoapplication</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk+.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\demos\gtk-demo\application-standalone.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk.vcxproj">
-      <Project>{fc5aadb5-95cd-4bf0-ba8b-0c16fe7073f5}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

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

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

build/win32/vs10/gtk3-demo.vcxproj

@@ -27,24 +27,20 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -67,6 +63,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -79,7 +76,7 @@
       <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
@@ -135,7 +132,6 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -159,7 +155,6 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -213,6 +208,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" />

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

@@ -143,6 +143,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>

build/win32/vs10/install.vcxproj

@@ -28,23 +28,19 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -113,10 +109,6 @@
       <Project>{29e3e814-1ba3-4ad7-a3a7-3669cb80a942}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="gtk-demo-application.vcxproj">
-      <Project>{3281202a-cd26-4c67-b892-eb34bdbc612f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

build/win32/vs10/libgail.vcxproj.filtersin

@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtka11y.vs10.sourcefiles.filters"
+#include "libgail.vs10.sourcefiles.filters"
   </ItemGroup>
-</Project>
+</Project>

build/win32/vs10/libgail.vcxprojin

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}</ProjectGuid>
-    <RootNamespace>gtka11y</RootNamespace>
+    <RootNamespace>libgail</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -28,23 +28,19 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -66,6 +62,9 @@
     <Import Project="gtk+.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -120,9 +119,9 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtka11y.vs10.sourcefiles"
+#include "libgail.vs10.sourcefiles"
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

build/win32/vs9/Makefile.am

@@ -1,20 +1,16 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+.sln	\
-	gtk+.vsprops	\
-	gdk-win32.vcproj	\
-	gdk.vcproj	\
-	gdk.vcprojin	\
-	gtk.vcproj	\
-	gtk.vcprojin	\
-	gtk3-demo.vcproj	\
-	gtk3-demo-application.vcproj	\
-	gtka11y.vcproj	\
-	gtka11y.vcprojin	\
-	gailutil.vcproj	\
-	gengir.vcproj	\
+EXTRA_DIST += \
+	README.txt \
+	gtk+.sln \
+	gtk+.vsprops \
+	gdk-win32.vcproj \
+	gdk.vcproj \
+	gdk.vcprojin \
+	gtk.vcproj \
+	gtk.vcprojin \
+	gtk3-demo.vcproj \
+	libgail.vcproj \
+	libgail.vcprojin \
+	gailutil.vcproj \
 	install.vcproj
-
--include $(top_srcdir)/git.mk

build/win32/vs9/gailutil.vcproj

@@ -47,7 +47,7 @@
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				SubSystem="2"
 				TargetMachine="1"
 			/>
@@ -81,7 +81,7 @@
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -114,7 +114,7 @@
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				GenerateDebugInformation="true"
 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -150,7 +150,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gdk-win32.vcproj

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

build/win32/vs9/gdk.vcprojin

@@ -35,20 +35,20 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -81,7 +81,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -108,13 +108,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -139,7 +139,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="imm32.lib winmm.lib"
+				AdditionalDependencies="imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
 				LinkIncremental="1"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -147,7 +147,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gengir.vcproj

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gengir"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}"
-	RootNamespace="gengir"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(DoGenGir)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>

build/win32/vs9/gtk+.sln

@@ -19,13 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo", "gtk3-demo.vcpr
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-demo-application", "gtk3-demo-application.vcproj", "{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtka11y", "gtka11y.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgail", "libgail.vcproj", "{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gailutil", "gailutil.vcproj", "{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -39,13 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942} = {29E3E814-1BA3-4AD7-A3A7-3669CB80A942}
-		{3281202A-CD26-4C67-B892-EB34BDBC612F} = {3281202A-CD26-4C67-B892-EB34BDBC612F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
 	EndProjectSection
 EndProject
 Global
@@ -112,18 +99,6 @@ Global
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|Win32.Build.0 = Release|Win32
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.ActiveCfg = Release|x64
 		{29E3E814-1BA3-4AD7-A3A7-3669CB80A942}.Release|x64.Build.0 = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|Win32.Build.0 = Debug|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.ActiveCfg = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Debug|x64.Build.0 = Debug|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.ActiveCfg = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|Win32.Build.0 = Release|Win32
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.ActiveCfg = Release|x64
-		{3281202A-CD26-4C67-B892-EB34BDBC612F}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/win32/vs9/gtk+.vsprops

@@ -27,24 +27,16 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h

 copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h

 "
 	/>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
 	<UserMacro
 		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRootFromBuildWin32"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+		Value="..\..\..\..\vs9\$(PlatformName)"
 	/>
 	<UserMacro
 		Name="CopyDir"
 		Value="$(GlibEtcInstallRoot)"
 	/>
 	<UserMacro
-		Name="ApiVersion"
+		Name="GtkApiVersion"
 		Value="3.0"
 	/>
 	<UserMacro
@@ -69,7 +61,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
+		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
 	/>
 	<UserMacro
 		Name="GtkDoInstall"
@@ -79,364 +71,308 @@ mkdir $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin&#x0D;&#x0A;
 
+mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\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 $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
 
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\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 $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#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 $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroupprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactiongroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactivatable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkalignment.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkarrow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimagemenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmisc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknumerableicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivatetypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradioaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstock.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleproperties.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkthemingengine.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggleaction.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkuimanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;;
-copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk&#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;
 
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
+mkdir $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk\deprecated&#x0D;&#x0A;
 
-copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#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\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-
-copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#x0D;&#x0A;
-copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util&#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\*-$(ApiVersion).lib $(CopyDir)\lib&#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;
-copy ..\..\..\demos\gtk-demo\org.gtk.Demo.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;
 "
 	/>
-	<UserMacro
-		Name="DoGenGir"
-		Value="
-set VSVER=$(VSVer)&#x0D;&#x0A;
-set CONF=$(ConfigurationName)&#x0D;&#x0A;
-set PLAT=$(PlatformName)&#x0D;&#x0A;
-set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
-cd ..&#x0D;&#x0A;
-
-call gengir_gtk.bat&#x0D;&#x0A;
-cd vs$(VSVer)&#x0D;&#x0A;
-		      "
-	/>
 	<UserMacro
 		Name="GtkGenerateGdkDef"
 		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
@@ -451,24 +387,24 @@ cd vs$(VSVer)&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
+		Value="-$(GtkApiVersion)-0"
 	/>
 	<UserMacro
-		Name="GtkSeparateVSDllPrefix"
+		Name="GtkSeparateVS9DllPrefix"
 		Value=""
 	/>
 	<UserMacro
-		Name="GtkSeparateVSDllSuffix"
-		Value="-3-vs$(VSVer)"
+		Name="GtkSeparateVS9DllSuffix"
+		Value="-3-vs9"
 	/>
 	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
 	GtkLibtoolCompatibleDllSuffix if that is what you want -->
 	<UserMacro
 		Name="GtkDllPrefix"
-		Value="$(GtkSeparateVSDllPrefix)"
+		Value="$(GtkSeparateVS9DllPrefix)"
 	/>
 	<UserMacro
 		Name="GtkDllSuffix"
-		Value="$(GtkSeparateVSDllSuffix)"
+		Value="$(GtkSeparateVS9DllSuffix)"
 	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk.vcprojin

@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -48,7 +48,7 @@
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -81,7 +81,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="1"
 			/>
 		</Configuration>
@@ -114,7 +114,7 @@
 				ModuleDefinitionFile="$(IntDir)\gtk.def"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>
@@ -147,7 +147,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
+				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
 				TargetMachine="17"
 			/>
 		</Configuration>

build/win32/vs9/gtk3-demo-application.vcproj

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk3-demo-application"
-	ProjectGUID="{3281202A-CD26-4C67-B892-EB34BDBC612F}"
-	RootNamespace="gtk3demoapplication"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-			<File RelativePath="..\..\..\demos\gtk-demo\application-standalone.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/gtk3-demo.vcproj

@@ -35,7 +35,7 @@
 				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
@@ -90,7 +90,7 @@
 			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -123,7 +123,7 @@
 			ConfigurationType="1"
 			InheritedPropertySheets=".\gtk+.vsprops"
 			CharacterSet="2"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -204,6 +204,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" />

build/win32/vs9/libgail.vcprojin

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtka11y"
+	Name="libgail"
 	ProjectGUID="{F756B0DB-40A1-4E9F-BE1F-8F02CB86EA46}"
-	RootNamespace="gtka11y"
+	RootNamespace="libgail"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@@ -115,7 +115,7 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-#include "gtka11y.sourcefiles"
+#include "libgail.sourcefiles"
 		</Filter>
 		<Filter
 			Name="Headers"

config.h.win32.in

@@ -8,12 +8,12 @@
 /* define to enable packagekit */
 /* #undef ENABLE_PACKAGEKIT */
 
+/* Whether to use EGL in Wayland backend */
+/* #undef GDK_WAYLAND_USE_EGL */
+
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
-/* Disable deprecation warnings from glib */
-/* #undef GLIB_DISABLE_DEPRECATION_WARNINGS */
-
 /* Define if debugging is enabled */
 #define GTK_COMPILED_WITH_DEBUGGING "yes"
 
@@ -50,9 +50,15 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
+/* Define to 1 if you have the `flockfile' function. */
+/* #undef HAVE_FLOCKFILE */
+
 /* Define to 1 if you have the <ftw.h> header file. */
 /* #undef HAVE_FTW_H */
 
+/* Define to 1 if you have the `getc_unlocked' function. */
+/* #undef HAVE_GETC_UNLOCKED */
+
 /* Define to 1 if you have the `getpagesize' function. */
 #ifndef _MSC_VER
 #define HAVE_GETPAGESIZE 1
@@ -290,6 +296,11 @@
 /* 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 */
 

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], [9])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_minor_version], [7])
+m4_define([gtk_micro_version], [3])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -24,14 +24,11 @@ AC_INIT([gtk+], [gtk_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
         [gtk+])
 
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
 # Define a string for the earliest version that this release has
 # backwards binary compatibility with for all interfaces a module
 # might. Unless we add module-only API with lower stability
@@ -42,11 +39,11 @@ AC_CANONICAL_TARGET
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.37.0])
-m4_define([pango_required_version], [1.32.4])
-m4_define([atk_required_version], [2.7.5])
+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([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.27.1])
+m4_define([gdk_pixbuf_required_version], [2.26.0])
 m4_define([introspection_required_version], [1.32.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -126,8 +123,8 @@ AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 
 # Checks for programs.
 AC_PROG_CC
-AX_PROG_CC_FOR_BUILD
 AC_PROG_CC_C_O
+AC_PROG_CC_STDC
 AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -138,6 +135,8 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
 
+AC_CANONICAL_HOST
+
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
@@ -322,6 +321,12 @@ AC_ARG_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
@@ -350,7 +355,7 @@ if test "$enable_win32_backend" = "yes"; then
   backend_immodules="$backend_immodules,ime"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
   AM_CONDITIONAL(USE_WIN32, true)
   PANGO_PACKAGES="pangowin32 pangocairo"
 else
@@ -381,7 +386,6 @@ AC_SUBST(DISABLE_ON_QUARTZ)
 if test "x$enable_broadway_backend" = xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
-  have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_BROADWAY"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
@@ -390,21 +394,27 @@ else
   AM_CONDITIONAL(USE_BROADWAY, false)
 fi
 
-DISABLE_ON_WAYLAND=''
 if test "x$enable_wayland_backend" = "xyes"; then
-  # For the cairo image backend
-  cairo_backends="$cairo_backends cairo"
+  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
   GDK_BACKENDS="$GDK_BACKENDS wayland"
   have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  DISABLE_ON_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
   AM_CONDITIONAL(USE_WAYLAND, true)
 else
   AM_CONDITIONAL(USE_WAYLAND, false)
 fi
-AC_SUBST(DISABLE_ON_WAYLAND)
 
 # strip leading space
 GDK_BACKENDS=${GDK_BACKENDS#* }
@@ -563,7 +573,7 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-AC_CHECK_FUNCS(lstat mkstemp)
+AC_CHECK_FUNCS(lstat mkstemp flockfile getc_unlocked)
 AC_CHECK_FUNCS(localtime_r)
 
 # _NL_TIME_FIRST_WEEKDAY is an enum and not a define
@@ -895,32 +905,14 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
 
 AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 
-AS_IF([test "x$enable_gtk2_dependency" = xyes],
-      [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-       if test x$GTK_UPDATE_ICON_CACHE = xno; then
-         REBUILD_PNGS=#
-       fi],
+if test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes; then
+  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+    REBUILD_PNGS=#
+  fi
+fi
 
-      [test "x$cross_compiling" = xyes],
-      [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf.
-       # pkg.m4 blocks all variable starting with PKG, so allow this one
-       m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
-
-       AS_IF([test x$PKG_CONFIG_FOR_BUILD = x],
-             [AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])])
-
-       AC_MSG_CHECKING([for native gdk-pixbuf])
-       AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])],
-             [AC_MSG_RESULT([yes])],
-             [AC_MSG_ERROR([native gdk-pixbuf not found])])
-
-       NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0`
-       NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0`
-       AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS)
-       AC_SUBST(NATIVE_GDKPIXBUF_LIBS)]
-)
-
-AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes])
+AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes])
 
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
@@ -1242,7 +1234,6 @@ if test "$have_gio_unix" = "yes"; then
 else
   GDK_GIO_PACKAGE=gio-2.0
 fi
-AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
 
 # Check for Pango flags
 
@@ -1424,7 +1415,7 @@ else
 	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
       AC_DEFINE(HAVE_CUPS_API_1_6, 1,
                 [Define to 1 if CUPS 1.6 API is available])
-      have_cups_api_1_6=yes
+
     fi
 
     AC_SUBST(CUPS_API_MAJOR)
@@ -1796,7 +1787,6 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
-gtk/native/Makefile
 gtk/tests/Makefile
 libgail-util/Makefile
 modules/Makefile

demos/gtk-demo/Makefile.am

@@ -1,6 +1,8 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
+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 =						\
@@ -43,17 +45,18 @@ demos =						\
 	search_entry.c				\
 	sizegroup.c				\
 	spinner.c				\
-	stack.c					\
 	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
 
 AM_CPPFLAGS = \
+	-DDEMOCODEDIR="\"$(democodedir)\""	\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir)/gdk			\
 	-DGDK_DISABLE_DEPRECATED		\
@@ -76,6 +79,7 @@ BUILT_SOURCES = demos.h demo_resources.c
 
 EXTRA_DIST += 				\
 	$(IMAGEFILES)			\
+	demo.ui				\
 	demo.gresource.xml		\
 	$(RESOURCES)			\
 	org.gtk.Demo.gschema.xml
@@ -90,6 +94,7 @@ demos.h: @REBUILD@ $(demos) geninclude.pl
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
+	demo-common.h		\
 	demo_resources.c	\
 	main.c			\
 	demos.h
@@ -107,36 +112,41 @@ 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=	$(demos)			\
-		application.ui			\
-		demo.ui				\
+RESOURCES=	application.ui			\
 		menus.ui			\
-		stack.ui			\
 		theming.ui			\
-		alphatest.png			\
-		apple-red.png			\
-		background.jpg			\
-		floppybuddy.gif			\
-		gnome-applets.png		\
-		gnome-calendar.png		\
-		gnome-foot.png			\
-		gnome-fs-directory.png		\
-		gnome-fs-regular.png		\
-		gnome-gimp.png			\
-		gnome-gmush.png			\
-		gnome-gsame.png			\
-		gnu-keys.png			\
 		gtk-logo-24.png			\
 		gtk-logo-48.png			\
-		gtk-logo-old.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		\
+		background.jpg		\
+		floppybuddy.gif		\
+		gnome-applets.png	\
+		gnome-calendar.png	\
+		gnome-fs-directory.png	\
+		gnome-fs-regular.png	\
+		gnome-foot.png		\
+		gnome-gimp.png		\
+		gnome-gmush.png		\
+		gnome-gsame.png		\
+		gnu-keys.png		\
+		gtk-logo-rgb.gif
+
+democode_DATA = \
+	$(demos)		\
+	$(IMAGEFILES)		\
+	$(RESOURCES)		\
+	demo.ui
+
 DISTCLEANFILES = demos.h
 
 -include $(top_srcdir)/git.mk

demos/gtk-demo/application.c

@@ -1,4 +1,4 @@
-/* Application class
+/* Application class :: menus.ui application.ui
  *
  * Demonstrates a simple application.
  *
@@ -113,7 +113,7 @@ activate_about (GSimpleAction *action,
     NULL
   };
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", 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",
@@ -177,7 +177,7 @@ register_stock_icons (void)
       factory = gtk_icon_factory_new ();
       gtk_icon_factory_add_default (factory);
 
-      pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-24.png", NULL);
+      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);
@@ -295,7 +295,7 @@ startup (GApplication *app)
   GMenuModel *menubar;
 
   builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application/menus.ui", NULL);
+  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");
@@ -331,7 +331,7 @@ activate (GApplication *app)
                                    window);
 
   builder = gtk_builder_new ();
-  gtk_builder_add_from_resource (builder, "/application/application.ui", NULL);
+  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");

demos/gtk-demo/appwindow.c

@@ -7,6 +7,7 @@
 
 #include <gtk/gtk.h>
 #include "config.h"
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 static GtkWidget *infobar = NULL;
@@ -80,7 +81,8 @@ static void
 about_cb (GtkAction *action,
           GtkWidget *window)
 {
-  GdkPixbuf *pixbuf;
+  GdkPixbuf *pixbuf, *transparent;
+  gchar *filename;
 
   const gchar *authors[] = {
     "Peter Mattis",
@@ -98,9 +100,16 @@ about_cb (GtkAction *action,
     NULL
   };
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-old.png", NULL);
-  /* We asser the existence of the pixbuf as we load it from a custom resource. */
-  g_assert (pixbuf);
+  pixbuf = NULL;
+  transparent = NULL;
+  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
+  if (filename)
+    {
+      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+      g_free (filename);
+      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
+      g_object_unref (pixbuf);
+    }
 
   gtk_show_about_dialog (GTK_WINDOW (window),
                          "program-name", "GTK+ Code Demos",
@@ -115,11 +124,11 @@ about_cb (GtkAction *action,
                          "comments", "Program to demonstrate GTK+ functions.",
                          "authors", authors,
                          "documenters", documentors,
-                         "logo", pixbuf,
+                         "logo", transparent,
                          "title", "About GTK+ Code Demos",
                          NULL);
 
-  g_object_unref (pixbuf);
+  g_object_unref (transparent);
 }
 
 typedef struct
@@ -300,7 +309,7 @@ register_stock_icons (void)
     {
       GdkPixbuf *pixbuf;
       GtkIconFactory *factory;
-      GtkIconSet *icon_set;
+      char *filename;
 
       static GtkStockItem items[] = {
         { "demo-gtk-logo",
@@ -317,14 +326,35 @@ register_stock_icons (void)
       factory = gtk_icon_factory_new ();
       gtk_icon_factory_add_default (factory);
 
-      pixbuf = gdk_pixbuf_new_from_resource ("/appwindow/gtk-logo-old.png", NULL);
-      /* We assert the existence of the pixbuf as we load it from a custom resource. */
-      g_assert (pixbuf);
+      /* demo_find_file() looks in the current directory first,
+       * so you can run gtk-demo without installing GTK, then looks
+       * in the location where the file is installed.
+       */
+      pixbuf = NULL;
+      filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
+      if (filename)
+        {
+          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+          g_free (filename);
+        }
 
-      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);
+      /* Register icon to accompany stock item */
+      if (pixbuf != NULL)
+        {
+          GtkIconSet *icon_set;
+          GdkPixbuf *transparent;
+
+          /* The gtk-logo-rgb icon has a white background, make it transparent */
+          transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
+
+          icon_set = gtk_icon_set_new_from_pixbuf (transparent);
+          gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
+          gtk_icon_set_unref (icon_set);
+          g_object_unref (pixbuf);
+          g_object_unref (transparent);
+        }
+      else
+        g_warning ("failed to load GTK logo for toolbar");
 
       /* Drop our reference to the factory, GTK will hold a reference. */
       g_object_unref (factory);

demos/gtk-demo/assistant.c

@@ -6,6 +6,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 static GtkWidget *assistant = NULL;
 static GtkWidget *progress_bar = NULL;

demos/gtk-demo/builder.c

@@ -1,9 +1,10 @@
-/* Builder
+/* Builder :: demo.ui
  *
  * Demonstrates an interface loaded from a XML description.
  */
 
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 static GtkBuilder *builder;
 
@@ -37,11 +38,14 @@ do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GError *err = NULL;
+  gchar *filename;
 
   if (!window)
     {
       builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/builder/demo.ui", &err);
+      filename = demo_find_file ("demo.ui", NULL);
+      gtk_builder_add_from_file (builder, filename, &err);
+      g_free (filename);
       if (err)
         {
           g_error ("ERROR: %s\n", err->message);

demos/gtk-demo/changedisplay.c

@@ -1,23 +1,24 @@
 /* Change Display
  *
- * Demonstrates migrating a window between different displays.
- * A display is a mouse and keyboard with some number of
- * associated monitors. The neat thing about having multiple 
- * displays is that they can be on a completely separate
+ * Demonstrates migrating a window between different displays and
+ * screens. A display is a mouse and keyboard with some number of
+ * associated monitors. A screen is a set of monitors grouped
+ * into a single physical work area. The neat thing about having
+ * multiple displays is that they can be on a completely separate
  * computers, as long as there is a network connection to the
  * computer where the application is running.
  *
  * Only some of the windowing systems where GTK+ runs have the
- * concept of multiple displays. (The X Window System is the
- * main example.) Other windowing systems can only handle one
- * keyboard and mouse, and combine all monitors into
- * a single display.
+ * concept of multiple displays and screens. (The X Window System
+ * is the main example.) Other windowing systems can only
+ * handle one keyboard and mouse, and combine all monitors into
+ * a single screen.
  *
  * This is a moderately complex example, and demonstrates:
  *
- *  - Tracking the currently open displays
+ *  - Tracking the currently open displays and screens
  *
- *  - Changing the display for a window
+ *  - Changing the screen for a window
  *
  *  - Letting the user choose a window by clicking on it
  *
@@ -30,6 +31,7 @@
 #undef GDK_DISABLE_DEPRECATED
 
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 /* The ChangeDisplayInfo structure corresponds to a toplevel window and
  * holds pointers to widgets inside the toplevel window along with other
@@ -44,8 +46,11 @@ struct _ChangeDisplayInfo
   GtkSizeGroup *size_group;
 
   GtkTreeModel *display_model;
+  GtkTreeModel *screen_model;
+  GtkTreeSelection *screen_selection;
 
   GdkDisplay *current_display;
+  GdkScreen *current_screen;
 };
 
 /* These enumerations provide symbolic names for the columns
@@ -173,11 +178,40 @@ query_change_display (ChangeDisplayInfo *info)
                                  "to move to the new screen");
 
   if (toplevel)
-    gtk_window_set_screen (GTK_WINDOW (toplevel), gdk_display_get_screen (info->current_display, 0));
+    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
   else
     gdk_display_beep (gdk_screen_get_display (screen));
 }
 
+/* Fills in the screen list based on the current display
+ */
+static void
+fill_screens (ChangeDisplayInfo *info)
+{
+  gtk_list_store_clear (GTK_LIST_STORE (info->screen_model));
+
+  if (info->current_display)
+    {
+      gint n_screens = gdk_display_get_n_screens (info->current_display);
+      gint i;
+
+      for (i = 0; i < n_screens; i++)
+        {
+          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);
+
+          if (i == 0)
+            gtk_tree_selection_select_iter (info->screen_selection, &iter);
+        }
+    }
+}
+
 /* Called when the user clicks on a button in our dialog or
  * closes the dialog through the window manager. Unless the
  * "Change" button was clicked, we destroy the dialog.
@@ -287,6 +321,28 @@ display_changed_cb (GtkTreeSelection  *selection,
                         -1);
   else
     info->current_display = NULL;
+
+  fill_screens (info);
+}
+
+/* Called when the selected row in the sceen list changes.
+ * Updates info->current_screen.
+ */
+static void
+screen_changed_cb (GtkTreeSelection  *selection,
+                   ChangeDisplayInfo *info)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (info->current_screen)
+    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);
+  else
+    info->current_screen = NULL;
 }
 
 /* This function is used both for creating the "Display" and
@@ -391,6 +447,37 @@ create_display_frame (ChangeDisplayInfo *info)
   return frame;
 }
 
+/* Creates the "Screen" frame in the main window.
+ */
+GtkWidget *
+create_screen_frame (ChangeDisplayInfo *info)
+{
+  GtkWidget *frame;
+  GtkWidget *tree_view;
+  GtkWidget *button_vbox;
+  GtkTreeViewColumn *column;
+
+  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);
+
+  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_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);
+
+  return frame;
+}
+
 /* Called when one of the currently open displays is closed.
  * Remove it from our list of displays.
  */
@@ -494,9 +581,12 @@ destroy_info (ChangeDisplayInfo *info)
 
   g_object_unref (info->size_group);
   g_object_unref (info->display_model);
+  g_object_unref (info->screen_model);
 
   if (info->current_display)
     g_object_unref (info->current_display);
+  if (info->current_screen)
+    g_object_unref (info->current_screen);
 
   g_free (info);
 }
@@ -548,6 +638,9 @@ do_changedisplay (GtkWidget *do_widget)
       frame = create_display_frame (info);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
 
+      frame = create_screen_frame (info);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+
       initialize_displays (info);
 
       gtk_widget_show_all (info->window);

demos/gtk-demo/css_accordion.c

@@ -1,4 +1,4 @@
-/* CSS Theming/CSS Accordion
+/* CSS Theming/CSS Accordion :: css_accordion.css
  *
  * A simple accordion demo written using CSS transitions and multiple backgrounds
  *
@@ -57,7 +57,7 @@ do_css_accordion (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (container), child);
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
-      bytes = g_resources_lookup_data ("/css_accordion/css_accordion.css", 0, NULL);
+      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);

demos/gtk-demo/css_accordion.css

@@ -1,4 +1,4 @@
-@import url("resource://css_accordion/reset.css");
+@import url("resource:///reset.css");
 
 * {
     transition-property: color, background-color, border-color, background-image, padding, border-width;

demos/gtk-demo/css_basics.c

@@ -1,4 +1,4 @@
-/* CSS Theming/CSS Basics
+/* 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.
@@ -98,7 +98,7 @@ do_css_basics (GtkWidget *do_widget)
                         G_CALLBACK (css_text_changed),
                         provider);
 
-      bytes = g_resources_lookup_data ("/css_basics/css_basics.css", 0, NULL);
+      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);
 

demos/gtk-demo/css_basics.css

@@ -6,7 +6,7 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource://css_basics/reset.css");
+@import url("resource:///reset.css");
 
 /* Set a very futuristic style by default */
 * {

demos/gtk-demo/css_multiplebgs.c

@@ -1,4 +1,4 @@
-/* CSS Theming/Multiple Backgrounds
+/* 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.
@@ -147,7 +147,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
                         G_CALLBACK (css_text_changed),
                         provider);
 
-      bytes = g_resources_lookup_data ("/css_multiplebgs/css_multiplebgs.css", 0, NULL);
+      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);
 

demos/gtk-demo/css_multiplebgs.css

@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource://css_multiplebgs/reset.css");
-@import url("resource://css_multiplebgs/cssview.css");
+@import url("resource:///reset.css");
+@import url("resource:///cssview.css");
 
 #canvas {
     transition-property: background-color, background-image;

demos/gtk-demo/css_pixbufs.c

@@ -1,7 +1,7 @@
-/* CSS Theming/Animated Backgrounds
+/* 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.
+ * 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>
@@ -106,7 +106,6 @@ do_css_pixbufs (GtkWidget *do_widget)
 
       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_bytes_unref (bytes);
 
       g_signal_connect (provider,
                         "parsing-error",

demos/gtk-demo/css_pixbufs.css

@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource://css_pixbufs/reset.css");
-@import url("resource://css_pixbufs/cssview.css");
+@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%; }
@@ -51,15 +51,15 @@
 }
 
 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-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;

demos/gtk-demo/css_shadows.c

@@ -126,7 +126,6 @@ do_css_shadows (GtkWidget *do_widget)
 
       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_bytes_unref (bytes);
 
       g_signal_connect (provider,
                         "parsing-error",

demos/gtk-demo/css_shadows.css

@@ -6,8 +6,8 @@
 
 /* This CSS resets all properties to their defaults values
  *    and overrides all user settings and the theme in use */
-@import url("resource://css_shadows/reset.css");
-@import url("resource://css_shadows/cssview.css");
+@import url("resource:///reset.css");
+@import url("resource:///cssview.css");
 
 /* Get a nice background for the window */
 .background {

demos/gtk-demo/demo-common.h

@@ -0,0 +1,11 @@
+#ifndef __DEMO_COMMON_H__
+#define __DEMO_COMMON_H__
+
+G_BEGIN_DECLS
+
+gchar *demo_find_file (const gchar  *base,
+		       GError      **err);
+
+G_END_DECLS
+
+#endif /* __DEMO_COMMON_H__ */

demos/gtk-demo/demo.gresource.xml

@@ -1,41 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
-    <file>gtk-logo-old.png</file>
-  </gresource>
-  <gresource prefix="/application">
+  <gresource prefix="/application/logos">
     <file preprocess="to-pixdata">gtk-logo-24.png</file>
     <file preprocess="to-pixdata">gtk-logo-48.png</file>
-    <file>application.ui</file>
-    <file>menus.ui</file>
   </gresource>
-  <gresource prefix="/appwindow">
-    <file preprocess="to-pixdata">gtk-logo-old.png</file>
+  <gresource prefix="/application/ui">
+    <file preprocess="xml-stripblanks">application.ui</file>
+    <file preprocess="xml-stripblanks">menus.ui</file>
   </gresource>
-  <gresource prefix="/builder">
-    <file>demo.ui</file>
-  </gresource>
-  <gresource prefix="/css_accordion">
-    <file>css_accordion.css</file>
-    <file>reset.css</file>
-  </gresource>
-  <gresource prefix="/css_basics">
-    <file>css_basics.css</file>
-    <file>reset.css</file>
-  </gresource>
-  <gresource prefix="/css_multiplebgs">
-    <file>css_multiplebgs.css</file>
-    <file>brick.png</file>
+  <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>theming.ui</file>
+    <file preprocess="xml-stripblanks">theming.ui</file>
   </gresource>
   <gresource prefix="/css_pixbufs">
     <file alias="gtk.css">css_pixbufs.css</file>
-    <file>cssview.css</file>
-    <file>reset.css</file>
     <file>background.jpg</file>
     <file>apple-red.png</file>
     <file>gnome-applets.png</file>
@@ -48,84 +42,5 @@
   </gresource>
   <gresource prefix="/css_shadows">
     <file alias="gtk.css">css_shadows.css</file>
-    <file>cssview.css</file>
-    <file>reset.css</file>
-  </gresource>
-  <gresource prefix="/iconview">
-    <file preprocess="to-pixdata">gnome-fs-directory.png</file>
-    <file preprocess="to-pixdata">gnome-fs-regular.png</file>
-  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
-  <gresource prefix="/images">
-    <file>alphatest.png</file>
-    <file>floppybuddy.gif</file>
-    <file>gtk-logo-old.png</file>
-  </gresource>
-  <gresource prefix="/pixbufs">
-    <file>apple-red.png</file>
-    <file>background.jpg</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="/sources">
-    <file>application.c</file>
-    <file>appwindow.c</file>
-    <file>assistant.c</file>
-    <file>builder.c</file>
-    <file>button_box.c</file>
-    <file>changedisplay.c</file>
-    <file>clipboard.c</file>
-    <file>colorsel.c</file>
-    <file>combobox.c</file>
-    <file>css_accordion.c</file>
-    <file>css_basics.c</file>
-    <file>css_multiplebgs.c</file>
-    <file>css_pixbufs.c</file>
-    <file>css_shadows.c</file>
-    <file>dialog.c</file>
-    <file>drawingarea.c</file>
-    <file>editable_cells.c</file>
-    <file>entry_buffer.c</file>
-    <file>entry_completion.c</file>
-    <file>expander.c</file>
-    <file>hypertext.c</file>
-    <file>iconview.c</file>
-    <file>iconview_edit.c</file>
-    <file>images.c</file>
-    <file>infobar.c</file>
-    <file>links.c</file>
-    <file>list_store.c</file>
-    <file>menus.c</file>
-    <file>offscreen_window.c</file>
-    <file>offscreen_window2.c</file>
-    <file>overlay.c</file>
-    <file>panes.c</file>
-    <file>pickers.c</file>
-    <file>pixbufs.c</file>
-    <file>printing.c</file>
-    <file>rotated_text.c</file>
-    <file>search_entry.c</file>
-    <file>sizegroup.c</file>
-    <file>stack.c</file>
-    <file>spinner.c</file>
-    <file>stock_browser.c</file>
-    <file>textview.c</file>
-    <file>textscroll.c</file>
-    <file>theming_style_classes.c</file>
-    <file>toolpalette.c</file>
-    <file>transparent.c</file>
-    <file>tree_store.c</file>
-    <file>ui_manager.c</file>
-  </gresource>
-  <gresource prefix="/textview">
-    <file>floppybuddy.gif</file>
-    <file>gtk-logo-old.png</file>
   </gresource>
 </gresources>

demos/gtk-demo/demo.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<interface>
+<interface domain="gtk20">
     <object class="GtkListStore" id="liststore1">
       <columns>
         <column type="gchararray"/>

demos/gtk-demo/fancy.css

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

@@ -24,13 +24,20 @@ 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,
+    push @demos, {"name" => $basename, "title" => $title, "file" => "$file $extra",
 		  "func"  => "do_$basename"};
 }
 
@@ -41,7 +48,7 @@ foreach $href (@demos) {
 	my $do_next = 0;
 
 	# parent detected
-	if (@parents) {
+	if (defined @parents) {
 	    foreach $foo (@parents) {
 		if ($foo eq $parent_name) {
 		    $do_next = 1;
@@ -55,7 +62,7 @@ foreach $href (@demos) {
 
 	push @parents, $parent_name;
 
-	$tmp = (@child_arrays)?($#child_arrays + 1):0;
+	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
 	push @child_arrays, "child$tmp";
 
 	push @demos, {"name" => "NULL", "title" => $parent_name, "file" => "NULL",
@@ -63,7 +70,7 @@ foreach $href (@demos) {
     }
 }
 
-if (@parents) {
+if (defined @parents) {
     $i = 0;
     for ($i = 0; $i <= $#parents; $i++) {
 	$first = 1;
@@ -74,7 +81,7 @@ if (@parents) {
 	for ($j = 0; $j <= $#demos; $j++) {
 	    $href = $demos[$j];
 	    
-	    if (!$demos[$j]) {
+	    if (!defined $demos[$j]) {
 		next;
 	    }
 	    
@@ -106,7 +113,7 @@ if (@parents) {
 } @demos_old;
 
 # sort the child arrays
-if (@child_arrays) {
+if (defined @child_arrays) {
     for ($i = 0; $i <= $#child_arrays; $i++) {
 	@foo_old = @{$child_arrays[$i]};
 
@@ -134,7 +141,7 @@ foreach $href (@demos) {
 	print ", \n";
     }
 
-    if (@parents) {
+    if (defined @parents) {
 	for ($i = 0; $i <= $#parents; $i++) {
 	    if ($parents[$i] eq $href->{title}) {
 

demos/gtk-demo/iconview.c

@@ -7,11 +7,12 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
-#define FOLDER_NAME "/iconview/gnome-fs-directory.png"
-#define FILE_NAME "/iconview/gnome-fs-regular.png"
+#define FOLDER_NAME "gnome-fs-directory.png"
+#define FILE_NAME "gnome-fs-regular.png"
 
 enum
 {
@@ -28,18 +29,36 @@ gchar *parent;
 GtkToolItem *up_button;
 
 /* Loads the images for the demo and returns whether the operation succeeded */
-static void
-load_pixbufs (void)
+static gboolean
+load_pixbufs (GError **error)
 {
+  char *filename;
+
   if (file_pixbuf)
-    return; /* already loaded earlier */
+    return TRUE; /* already loaded earlier */
 
-  file_pixbuf = gdk_pixbuf_new_from_resource (FILE_NAME, NULL);
-  /* resources must load successfully */
-  g_assert (file_pixbuf);
+  /* demo_find_file() looks in the current directory first,
+   * so you can run gtk-demo without installing GTK, then looks
+   * in the location where the file is installed.
+   */
+  filename = demo_find_file (FILE_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
 
-  folder_pixbuf = gdk_pixbuf_new_from_resource (FOLDER_NAME, NULL);
-  g_assert (folder_pixbuf);
+  file_pixbuf = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+
+  if (!file_pixbuf)
+    return FALSE; /* Note that "error" was filled with a GError */
+
+  filename = demo_find_file (FOLDER_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
+
+  folder_pixbuf = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+
+  return TRUE;
 }
 
 static void
@@ -242,12 +261,7 @@ do_iconview (GtkWidget *do_widget)
 {
   if (!window)
     {
-      GtkWidget *sw;
-      GtkWidget *icon_view;
-      GtkListStore *store;
-      GtkWidget *vbox;
-      GtkWidget *tool_bar;
-      GtkToolItem *home_button;
+      GError *error;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
@@ -259,63 +273,90 @@ do_iconview (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (close_window), NULL);
 
-      load_pixbufs ();
+      error = NULL;
+      if (!load_pixbufs (&error))
+        {
+          GtkWidget *dialog;
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+          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);
 
-      tool_bar = gtk_toolbar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
+          g_error_free (error);
 
-      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);
+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (gtk_widget_destroy), NULL);
 
-      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);
+          gtk_widget_show (dialog);
+        }
+      else
+        {
+          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);
+
+          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);
+
+          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))

demos/gtk-demo/iconview_edit.c

@@ -7,6 +7,7 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 

demos/gtk-demo/images.c

@@ -16,11 +16,12 @@
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 static GdkPixbufLoader *pixbuf_loader = NULL;
 static guint load_timeout = 0;
-static GInputStream * image_stream = NULL;
+static FILE* image_stream = NULL;
 
 static void
 progressive_prepared_callback (GdkPixbufLoader *loader,
@@ -78,13 +79,13 @@ progressive_timeout (gpointer data)
 
   if (image_stream)
     {
-      gssize bytes_read;
+      size_t bytes_read;
       guchar buf[256];
       GError *error = NULL;
 
-      bytes_read = g_input_stream_read (image_stream, buf, 256, NULL, &error);
+      bytes_read = fread (buf, 1, 256, image_stream);
 
-      if (bytes_read < 0)
+      if (ferror (image_stream))
         {
           GtkWidget *dialog;
 
@@ -93,13 +94,12 @@ progressive_timeout (gpointer data)
                                            GTK_MESSAGE_ERROR,
                                            GTK_BUTTONS_CLOSE,
                                            "Failure reading image file 'alphatest.png': %s",
-                                           error->message);
-          g_error_free (error);
+                                           g_strerror (errno));
 
           g_signal_connect (dialog, "response",
                             G_CALLBACK (gtk_widget_destroy), NULL);
 
-          g_object_unref (image_stream);
+          fclose (image_stream);
           image_stream = NULL;
 
           gtk_widget_show (dialog);
@@ -127,7 +127,7 @@ progressive_timeout (gpointer data)
           g_signal_connect (dialog, "response",
                             G_CALLBACK (gtk_widget_destroy), NULL);
 
-          g_object_unref (image_stream);
+          fclose (image_stream);
           image_stream = NULL;
 
           gtk_widget_show (dialog);
@@ -137,42 +137,9 @@ progressive_timeout (gpointer data)
           return FALSE; /* uninstall the timeout */
         }
 
-      if (bytes_read == 0)
+      if (feof (image_stream))
         {
-          /* 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 (!g_input_stream_close (image_stream, NULL, &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);
-
-              g_error_free (error);
-
-              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
-
-              gtk_widget_show (dialog);
-
-              g_object_unref (image_stream);
-              image_stream = NULL;
-              g_object_unref (pixbuf_loader);
-              pixbuf_loader = NULL;
-
-              load_timeout = 0;
-
-              return FALSE; /* uninstall the timeout */
-            }
-
-          g_object_unref (image_stream);
+          fclose (image_stream);
           image_stream = NULL;
 
           /* Errors can happen on close, e.g. if the image
@@ -213,9 +180,29 @@ progressive_timeout (gpointer data)
     }
   else
     {
+      gchar *filename;
+      gchar *error_message = NULL;
       GError *error = NULL;
 
-      image_stream = g_resources_open_stream ("/images/alphatest.png", 0, &error);
+      /* demo_find_file() looks in the current directory first,
+       * so you can run gtk-demo without installing GTK, then looks
+       * in the location where the file is installed.
+       */
+      filename = demo_find_file ("alphatest.png", &error);
+      if (error)
+        {
+          error_message = g_strdup (error->message);
+          g_error_free (error);
+        }
+      else
+        {
+          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 == NULL)
         {
@@ -225,8 +212,8 @@ progressive_timeout (gpointer data)
                                            GTK_DIALOG_DESTROY_WITH_PARENT,
                                            GTK_MESSAGE_ERROR,
                                            GTK_BUTTONS_CLOSE,
-                                           "%s", error->message);
-          g_error_free (error);
+                                           "%s", error_message);
+          g_free (error_message);
 
           g_signal_connect (dialog, "response",
                             G_CALLBACK (gtk_widget_destroy), NULL);
@@ -242,6 +229,7 @@ progressive_timeout (gpointer data)
         {
           gdk_pixbuf_loader_close (pixbuf_loader, NULL);
           g_object_unref (pixbuf_loader);
+          pixbuf_loader = NULL;
         }
 
       pixbuf_loader = gdk_pixbuf_loader_new ();
@@ -290,10 +278,8 @@ cleanup_callback (GObject   *object,
     }
 
   if (image_stream)
-    {
-      g_object_unref (image_stream);
-      image_stream = NULL;
-    }
+    fclose (image_stream);
+  image_stream = NULL;
 }
 
 static void
@@ -331,6 +317,8 @@ do_images (GtkWidget *do_widget)
   GtkWidget *button;
   GdkPixbuf *pixbuf;
   GIcon     *gicon;
+  GError *error = NULL;
+  char *filename;
 
   if (!window)
     {
@@ -361,9 +349,41 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-      pixbuf = gdk_pixbuf_new_from_resource ("/images/gtk-logo-old.png", NULL);
-      /* The image loading must work, we ensure that the resources are valid. */
-      g_assert (pixbuf);
+      /* demo_find_file() looks in the current directory first,
+       * so you can run gtk-demo without installing GTK, then looks
+       * in the location where the file is installed.
+       */
+      pixbuf = NULL;
+      filename = demo_find_file ("gtk-logo-rgb.gif", &error);
+      if (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;
+
+          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);
+
+          gtk_widget_show (dialog);
+        }
 
       image = gtk_image_new_from_pixbuf (pixbuf);
 
@@ -383,7 +403,9 @@ do_images (GtkWidget *do_widget)
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-      image = gtk_image_new_from_resource ("/images/floppybuddy.gif");
+      filename = demo_find_file ("floppybuddy.gif", NULL);
+      image = gtk_image_new_from_file (filename);
+      g_free (filename);
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
@@ -405,9 +427,9 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
-
       /* Progressive */
 
+
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Progressive image loading</u>");

demos/gtk-demo/main.c

@@ -9,15 +9,14 @@
 
 #include "demos.h"
 
-static GtkWidget *info_view;
-static GtkWidget *source_view;
+static GtkTextBuffer *info_buffer;
+static GtkTextBuffer *source_buffer;
 
 static gchar *current_file = NULL;
 
 static GtkWidget *notebook;
 
 enum {
-  NAME_COLUMN,
   TITLE_COLUMN,
   FILENAME_COLUMN,
   FUNC_COLUMN,
@@ -32,6 +31,65 @@ struct _CallbackData
   GtkTreePath *path;
 };
 
+#ifdef G_OS_WIN32
+
+#undef DEMOCODEDIR
+
+static char *
+get_democodedir (void)
+{
+  static char *result = NULL;
+
+  if (result == NULL)
+    {
+      result = g_win32_get_package_installation_directory_of_module (NULL);
+      if (result == NULL)
+        result = "unknown-location";
+
+      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
+    }
+
+  return result;
+}
+
+#define DEMOCODEDIR get_democodedir ()
+
+#endif
+
+/**
+ * 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)
+{
+  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);
+  else
+    {
+      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;
+        }
+      return filename;
+    }
+}
+
 static void
 window_closed_cb (GtkWidget *window, gpointer data)
 {
@@ -52,6 +110,65 @@ window_closed_cb (GtkWidget *window, gpointer data)
   g_free (cbdata);
 }
 
+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
+      c = getc (stream);
+#endif
+
+      if (c == EOF)
+        goto done;
+      else
+        n_read++;
+
+      switch (c)
+        {
+        case '\r':
+        case '\n':
+          {
+#ifdef HAVE_FLOCKFILE
+            int next_c = getc_unlocked (stream);
+#else
+            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);
+        }
+    }
+
+ done:
+
+#ifdef HAVE_FLOCKFILE
+  funlockfile (stream);
+#endif
+
+  return n_read > 0;
+}
+
+
 /* Stupid syntax highlighting.
  *
  * No regex was used in the making of this highlighting.
@@ -353,7 +470,7 @@ parse_chars (gchar     *text,
 
 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 static void
-fontify (GtkTextBuffer *source_buffer)
+fontify (void)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
   gint state;
@@ -398,78 +515,36 @@ fontify (GtkTextBuffer *source_buffer)
     }
 }
 
-static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);
+static GtkWidget *create_text (GtkTextBuffer **buffer, gboolean is_source);
 
 static void
-add_data_tab (const gchar *demoname)
+add_data_tab (const gchar *filename)
 {
-  gchar *resource_dir, *resource_name, *content_type, *content_mime;
-  gchar **resources;
-  GBytes *bytes;
+  GtkTextBuffer *buffer = NULL;
+  gchar *full_filename;
+  GError *err = NULL;
+  gchar *text;
   GtkWidget *widget, *label;
-  guint i;
 
-  resource_dir = g_strconcat ("/", demoname, NULL);
-  resources = g_resources_enumerate_children (resource_dir, 0, NULL);
-  if (resources == NULL)
+  full_filename = demo_find_file (filename, &err);
+  if (!full_filename ||
+      !g_file_get_contents (full_filename, &text, NULL, &err))
     {
-      g_free (resource_dir);
+      g_warning ("%s", err->message);
+      g_error_free (err);
       return;
     }
 
-  for (i = 0; resources[i]; i++)
-    {
-      resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
-      bytes = g_resources_lookup_data (resource_name, 0, NULL);
-      g_assert (bytes);
+  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);
 
-      content_type = g_content_type_guess (resource_name,
-                                           g_bytes_get_data (bytes, NULL),
-                                           g_bytes_get_size (bytes),
-                                           NULL);
-      content_mime = g_content_type_get_mime_type (content_type);
+  gtk_text_buffer_set_text (buffer, text, -1);
 
-      /* In theory we should look at all the mime types gdk-pixbuf supports
-       * and go from there, but we know what file types we've added.
-       */
-      if (g_content_type_is_a (content_mime, "image/png") ||
-          g_content_type_is_a (content_mime, "image/gif") ||
-          g_content_type_is_a (content_mime, "image/jpeg"))
-        {
-          widget = gtk_image_new_from_resource (resource_name);
-        }
-      else if (g_content_type_is_a (content_mime, "text/plain") ||
-               g_content_type_is_a (content_mime, "application/x-ext-ui") ||
-               g_content_type_is_a (content_mime, "text/css"))
-        {
-          GtkTextBuffer *buffer;
-          GtkWidget *textview;
-
-          widget = create_text (&textview, FALSE);
-          buffer = gtk_text_buffer_new (NULL);
-          gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-          gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-        }
-      else
-        {
-
-          g_warning ("Don't know how to display resource '%s' of type '%s'\n", resource_name, content_mime);
-          widget = NULL;
-        }
-
-      gtk_widget_show_all (widget);
-      label = gtk_label_new (resources[i]);
-      gtk_widget_show (label);
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
-
-      g_free (content_mime);
-      g_free (content_type);
-      g_free (resource_name);
-      g_bytes_unref (bytes);
-    }
-
-  g_strfreev (resources);
-  g_free (resource_dir);
+  g_free (full_filename);
+  g_free (text);
 }
 
 static void
@@ -482,83 +557,64 @@ remove_data_tabs (void)
 }
 
 void
-load_file (const gchar *demoname,
-           const gchar *filename)
+load_file (const gchar *filename)
 {
-  GtkTextBuffer *info_buffer, *source_buffer;
+  FILE *file;
   GtkTextIter start, end;
-  char *resource_filename;
+  char *full_filename;
   GError *err = NULL;
+  GString *buffer = g_string_new (NULL);
   int state = 0;
   gboolean in_para = 0;
-  gchar **lines;
-  GBytes *bytes;
+  gchar **names;
   gint i;
 
-  if (!g_strcmp0 (current_file, filename))
-    return;
-
   remove_data_tabs ();
 
-  add_data_tab (demoname);
+  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;
 
   g_free (current_file);
-  current_file = g_strdup (filename);
+  current_file = g_strdup (names[0]);
 
-  info_buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_create_tag (info_buffer, "title",
-                              "font", "Sans 18",
-                              "pixels-below-lines", 10,
-                              NULL);
+  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
+  gtk_text_buffer_delete (info_buffer, &start, &end);
 
-  source_buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_create_tag (source_buffer, "comment",
-                              "foreground", "DodgerBlue",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "type",
-                              "foreground", "ForestGreen",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "string",
-                              "foreground", "RosyBrown",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "control",
-                              "foreground", "purple",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-                              "style", PANGO_STYLE_OBLIQUE,
-                              "foreground", "burlywood4",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "function",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              "foreground", "DarkGoldenrod4",
-                              NULL);
+  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
+  gtk_text_buffer_delete (source_buffer, &start, &end);
 
-  resource_filename = g_strconcat ("/sources/", filename, NULL);
-  bytes = g_resources_lookup_data (resource_filename, 0, &err);
-  g_free (resource_filename);
-
-  if (bytes == NULL)
+  full_filename = demo_find_file (names[0], &err);
+  if (!full_filename)
     {
-      g_warning ("Cannot open source for %s: %s\n", filename, err->message);
+      g_warning ("%s", err->message);
       g_error_free (err);
-      return;
+      goto out;
     }
 
-  lines = g_strsplit (g_bytes_get_data (bytes, NULL), "\n", -1);
-  g_bytes_unref (bytes);
+  file = g_fopen (full_filename, "r");
+
+  if (!file)
+    g_warning ("Cannot open %s: %s\n", full_filename, g_strerror (errno));
+
+  g_free (full_filename);
+
+  if (!file)
+    goto out;
 
   gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
-  for (i = 0; lines[i] != NULL; i++)
+  while (read_line (file, buffer))
     {
-      gchar *p;
+      gchar *p = buffer->str;
       gchar *q;
       gchar *r;
 
-      /* Make sure \r is stripped at the end for the poor windows people */
-      lines[i] = g_strchomp (lines[i]);
-
-      p = lines[i];
       switch (state)
         {
         case 0:
@@ -647,7 +703,7 @@ load_file (const gchar *demoname,
             p++;
           if (*p)
             {
-              p = lines[i];
+              p = buffer->str;
               state++;
               /* Fall through */
             }
@@ -662,14 +718,14 @@ load_file (const gchar *demoname,
         }
     }
 
-  fontify (source_buffer);
+  fclose (file);
 
-  g_strfreev (lines);
+  fontify ();
 
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (info_view), info_buffer);
-  g_object_unref (info_buffer);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
-  g_object_unref (source_buffer);
+out:
+  g_string_free (buffer, TRUE);
+
+  g_strfreev (names);
 }
 
 void
@@ -719,26 +775,22 @@ selection_cb (GtkTreeSelection *selection,
               GtkTreeModel     *model)
 {
   GtkTreeIter iter;
-  char *name, *filename;
+  GValue value = G_VALUE_INIT;
 
   if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
     return;
 
-  gtk_tree_model_get (model, &iter,
-                      NAME_COLUMN, &name,
-                      FILENAME_COLUMN, &filename,
-                      -1);
-
-  if (filename)
-    load_file (name, filename);
-
-  g_free (name);
-  g_free (filename);
+  gtk_tree_model_get_value (model, &iter,
+                            FILENAME_COLUMN,
+                            &value);
+  if (g_value_get_string (&value))
+    load_file (g_value_get_string (&value));
+  g_value_unset (&value);
 }
 
 static GtkWidget *
-create_text (GtkWidget **view,
-             gboolean    is_source)
+create_text (GtkTextBuffer **buffer,
+             gboolean        is_source)
 {
   GtkWidget *scrolled_window;
   GtkWidget *text_view;
@@ -751,9 +803,10 @@ create_text (GtkWidget **view,
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
                                        GTK_SHADOW_IN);
 
-  *view = text_view = gtk_text_view_new ();
-  g_object_set (text_view, "margin", 20, NULL);
+  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);
 
@@ -795,7 +848,7 @@ create_tree (void)
 
   Demo *d = gtk_demos;
 
-  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
+  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 ();
   gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -815,7 +868,6 @@ create_tree (void)
 
       gtk_tree_store_set (GTK_TREE_STORE (model),
                           &iter,
-                          NAME_COLUMN, d->name,
                           TITLE_COLUMN, d->title,
                           FILENAME_COLUMN, d->filename,
                           FUNC_COLUMN, d->func,
@@ -835,7 +887,6 @@ create_tree (void)
 
           gtk_tree_store_set (GTK_TREE_STORE (model),
                               &child_iter,
-                              NAME_COLUMN, children->name,
                               TITLE_COLUMN, children->title,
                               FILENAME_COLUMN, children->filename,
                               FUNC_COLUMN, children->func,
@@ -888,14 +939,53 @@ static void
 setup_default_icon (void)
 {
   GdkPixbuf *pixbuf;
+  char *filename;
+  GError *err;
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/gtk-logo-old.png", NULL);
-  /* We load a resource, so we can guarantee that loading it is successful */
-  g_assert (pixbuf);
+  err = NULL;
 
-  gtk_window_set_default_icon (pixbuf);
-  
-  g_object_unref (pixbuf);
+  pixbuf = NULL;
+  filename = demo_find_file ("gtk-logo-rgb.gif", &err);
+  if (filename)
+    {
+      pixbuf = gdk_pixbuf_new_from_file (filename, &err);
+      g_free (filename);
+    }
+
+  /* Ignoring this error (passing NULL instead of &err above)
+   * would probably be reasonable for most apps.  We're just
+   * showing off.
+   */
+  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);
+      g_error_free (err);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_widget_destroy), NULL);
+    }
+
+  if (pixbuf)
+    {
+      GList *list;
+      GdkPixbuf *transparent;
+
+      /* The gtk-logo-rgb icon has a white background, make it transparent */
+      transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
+
+      list = NULL;
+      list = g_list_append (list, transparent);
+      gtk_window_set_default_icon_list (list);
+      g_list_free (list);
+      g_object_unref (pixbuf);
+      g_object_unref (transparent);
+    }
 }
 
 int
@@ -931,21 +1021,49 @@ main (int argc, char **argv)
   gtk_box_pack_start (GTK_BOX (hbox), tree, FALSE, FALSE, 0);
 
   notebook = gtk_notebook_new ();
-  gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);
 
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&info_view, FALSE),
+                            create_text (&info_buffer, FALSE),
                             gtk_label_new_with_mnemonic ("_Info"));
 
+  gtk_text_buffer_create_tag (info_buffer, "title",
+                              "font", "Sans 18",
+                              NULL);
+  g_object_unref (info_buffer);
+
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&source_view, TRUE),
+                            create_text (&source_buffer, TRUE),
                             gtk_label_new_with_mnemonic ("_Source"));
 
+
+  gtk_text_buffer_create_tag (source_buffer, "comment",
+                              "foreground", "DodgerBlue",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "type",
+                              "foreground", "ForestGreen",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "string",
+                              "foreground", "RosyBrown",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "control",
+                              "foreground", "purple",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
+                              "style", PANGO_STYLE_OBLIQUE,
+                              "foreground", "burlywood4",
+                              NULL);
+  gtk_text_buffer_create_tag (source_buffer, "function",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "foreground", "DarkGoldenrod4",
+                              NULL);
+  g_object_unref (source_buffer);
+
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);
 
-  load_file (gtk_demos[0].name, gtk_demos[0].filename);
+  load_file (gtk_demos[0].filename);
 
   gtk_main ();
 

demos/gtk-demo/pixbufs.c

@@ -16,17 +16,21 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#define BACKGROUND_NAME "/pixbufs/background.jpg"
+#include "demo-common.h"
+
+#define FRAME_DELAY 50
+
+#define BACKGROUND_NAME "background.jpg"
 
 static const char *image_names[] = {
-  "/pixbufs/apple-red.png",
-  "/pixbufs/gnome-applets.png",
-  "/pixbufs/gnome-calendar.png",
-  "/pixbufs/gnome-foot.png",
-  "/pixbufs/gnome-gmush.png",
-  "/pixbufs/gnome-gimp.png",
-  "/pixbufs/gnome-gsame.png",
-  "/pixbufs/gnu-keys.png"
+  "apple-red.png",
+  "gnome-applets.png",
+  "gnome-calendar.png",
+  "gnome-foot.png",
+  "gnome-gmush.png",
+  "gnome-gimp.png",
+  "gnome-gsame.png",
+  "gnu-keys.png"
 };
 
 #define N_IMAGES G_N_ELEMENTS (image_names)
@@ -52,11 +56,22 @@ static gboolean
 load_pixbufs (GError **error)
 {
   gint i;
+  char *filename;
 
   if (background)
     return TRUE; /* already loaded earlier */
 
-  background = gdk_pixbuf_new_from_resource (BACKGROUND_NAME, error);
+  /* demo_find_file() looks in the current directory first,
+   * so you can run gtk-demo without installing GTK, then looks
+   * in the location where the file is installed.
+   */
+  filename = demo_find_file (BACKGROUND_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
+
+  background = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+
   if (!background)
     return FALSE; /* Note that "error" was filled with a GError */
 
@@ -65,7 +80,12 @@ load_pixbufs (GError **error)
 
   for (i = 0; i < N_IMAGES; i++)
     {
-      images[i] = gdk_pixbuf_new_from_resource (image_names[i], 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 */
@@ -86,17 +106,14 @@ draw_cb (GtkWidget *widget,
   return TRUE;
 }
 
-#define CYCLE_TIME 3000000 /* 3 seconds */
+#define CYCLE_LEN 60
 
-static gint64 start_time;
+static int frame_num;
 
-/* Handler to regenerate the frame */
-static gboolean
-on_tick (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       data)
+/* Timeout handler to regenerate the frame */
+static gint
+timeout (gpointer data)
 {
-  gint64 current_time;
   double f;
   int i;
   double xmid, ymid;
@@ -105,11 +122,7 @@ on_tick (GtkWidget     *widget,
   gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
                         frame, 0, 0);
 
-  if (start_time == 0)
-    start_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-  current_time = gdk_frame_clock_get_frame_time (frame_clock);
-  f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
+  f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
 
   xmid = back_width / 2.0;
   ymid = back_height / 2.0;
@@ -164,9 +177,20 @@ on_tick (GtkWidget     *widget,
 
   gtk_widget_queue_draw (da);
 
+  frame_num++;
   return G_SOURCE_CONTINUE;
 }
 
+static guint timeout_id;
+
+static void
+cleanup_callback (GObject   *object,
+                  gpointer   data)
+{
+  g_source_remove (timeout_id);
+  timeout_id = 0;
+}
+
 GtkWidget *
 do_pixbufs (GtkWidget *do_widget)
 {
@@ -182,6 +206,8 @@ do_pixbufs (GtkWidget *do_widget)
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (cleanup_callback), NULL);
 
 
       error = NULL;
@@ -216,7 +242,7 @@ do_pixbufs (GtkWidget *do_widget)
 
           gtk_container_add (GTK_CONTAINER (window), da);
 
-          gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
+          timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
         }
     }
 

demos/gtk-demo/printing.c

@@ -7,6 +7,7 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 /* In points */
 #define HEADER_HEIGHT (10*72/25.4)
@@ -14,7 +15,7 @@
 
 typedef struct
 {
-  gchar *resourcename;
+  gchar *filename;
   gdouble font_size;
 
   gint lines_per_page;
@@ -29,7 +30,7 @@ begin_print (GtkPrintOperation *operation,
              gpointer           user_data)
 {
   PrintData *data = (PrintData *)user_data;
-  GBytes *bytes;
+  char *contents;
   int i;
   double height;
 
@@ -37,10 +38,10 @@ begin_print (GtkPrintOperation *operation,
 
   data->lines_per_page = floor (height / data->font_size);
 
-  bytes = g_resources_lookup_data (data->resourcename, 0, NULL);
+  g_file_get_contents (data->filename, &contents, NULL, NULL);
 
-  data->lines = g_strsplit (g_bytes_get_data (bytes, NULL), "\n", 0);
-  g_bytes_unref (bytes);
+  data->lines = g_strsplit (contents, "\n", 0);
+  g_free (contents);
 
   i = 0;
   while (data->lines[i] != NULL)
@@ -85,7 +86,7 @@ draw_page (GtkPrintOperation *operation,
   pango_layout_set_font_description (layout, desc);
   pango_font_description_free (desc);
 
-  pango_layout_set_text (layout, data->resourcename, -1);
+  pango_layout_set_text (layout, data->filename, -1);
   pango_layout_get_pixel_size (layout, &text_width, &text_height);
 
   if (text_width > width)
@@ -136,7 +137,7 @@ end_print (GtkPrintOperation *operation,
 {
   PrintData *data = (PrintData *)user_data;
 
-  g_free (data->resourcename);
+  g_free (data->filename);
   g_strfreev (data->lines);
   g_free (data);
 }
@@ -152,7 +153,7 @@ do_printing (GtkWidget *do_widget)
 
   operation = gtk_print_operation_new ();
   data = g_new0 (PrintData, 1);
-  data->resourcename = g_strdup ("/sources/printing.c");
+  data->filename = demo_find_file ("printing.c", NULL);
   data->font_size = 12.0;
 
   g_signal_connect (G_OBJECT (operation), "begin-print",

demos/gtk-demo/stack.c

@@ -1,48 +0,0 @@
-/* Stack
- *
- * GtkStack is a container that shows a single child at a time,
- * with nice transitions when the visible child changes.
- *
- * GtkStackSwitcher adds buttons to control which child is visible.
- */
-
-#include <gtk/gtk.h>
-
-static GtkBuilder *builder;
-
-GtkWidget *
-do_stack (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GError *err = NULL;
-
-  if (!window)
-    {
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/stack/stack.ui", &err);
-      if (err)
-        {
-          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));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-
-  return window;
-}

demos/gtk-demo/stack.ui

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">GtkStack</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkStackSwitcher" id="switcher">
-            <property name="visible">True</property>
-            <property name="stack">stack</property>
-            <property name="halign">center</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="transition-type">crossfade</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin-top">20</property>
-                <property name="margin-bottom">20</property>
-                <property name="resource">/application/gtk-logo-48.png</property>
-              </object>
-              <packing>
-                <property name="name">page1</property>
-                <property name="title" translatable="yes">Page 1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton1">
-                <property name="label" translatable="yes">Page 2</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="name">page2</property>
-                <property name="title" translatable="yes">Page 2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinner" id="spinner1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="active">True</property>
-              </object>
-              <packing>
-                <property name="name">page3</property>
-                <property name="icon-name">face-laugh-symbolic</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/textscroll.c

@@ -6,6 +6,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 /* Scroll to the end of the buffer.
  */
@@ -85,7 +86,7 @@ scroll_to_bottom (GtkTextView *textview)
   gtk_text_iter_set_line_offset (&iter, 0);
 
   /* and place the mark at iter. the mark will stay there after we
-   * insert some text at the end because it has left gravity.
+   * insert some text at the end because it has right gravity.
    */
   mark = gtk_text_buffer_get_mark (buffer, "scroll");
   gtk_text_buffer_move_mark (buffer, mark, &iter);

demos/gtk-demo/textview.c

@@ -10,6 +10,8 @@
 #include <gtk/gtk.h>
 #include <stdlib.h> /* for exit() */
 
+#include "demo-common.h"
+
 static void easter_egg_callback (GtkWidget *button, gpointer data);
 
 static void
@@ -130,9 +132,25 @@ insert_text (GtkTextBuffer *buffer)
   GtkTextIter start, end;
   GdkPixbuf *pixbuf;
   GdkPixbuf *scaled;
+  char *filename;
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/textview/gtk-logo-old.png", NULL);
-  g_assert (pixbuf);
+  /* demo_find_file() looks in the current directory first,
+   * so you can run gtk-demo without installing GTK, then looks
+   * in the location where the file is installed.
+   */
+  pixbuf = NULL;
+  filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
+  if (filename)
+    {
+      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+      g_free (filename);
+    }
+
+  if (pixbuf == NULL)
+    {
+      g_printerr ("Failed to load image file gtk-logo-rgb.gif\n");
+      exit (1);
+    }
 
   scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
   g_object_unref (pixbuf);
@@ -435,7 +453,9 @@ attach_widgets (GtkTextView *text_view)
         }
       else if (i == 3)
         {
-          widget = gtk_image_new_from_resource ("/textview/floppybuddy.gif");
+          gchar *filename = demo_find_file ("floppybuddy.gif", NULL);
+          widget = gtk_image_new_from_file (filename);
+          g_free (filename);
         }
       else if (i == 4)
         {

demos/gtk-demo/theming_custom_css.c

@@ -0,0 +1,66 @@
+/* CSS Theming/Custom CSS :: fancy.css
+ *
+ * GTK+ uses CSS for theming. If required, applications can
+ * install their own custom CSS style provider to achieve
+ * special effects.
+ *
+ * Doing this has the downside that your application will no
+ * longer react to the users theme preferences, so this should
+ * be used sparingly.
+ */
+
+#include <gtk/gtk.h>
+#include "demo-common.h"
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_theming_custom_css (GtkWidget *do_widget)
+{
+  GtkWidget *box;
+  GtkWidget *button;
+  GtkCssProvider *provider;
+  GBytes *bytes;
+
+  if (!window)
+    {
+      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), "Custom CSS");
+      gtk_container_set_border_width (GTK_CONTAINER (window), 18);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_container_add (GTK_CONTAINER (window), box);
+      button = gtk_button_new_with_label ("Plain");
+      gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0);
+      button = gtk_button_new_with_label ("Fancy");
+      gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0);
+      gtk_widget_set_name (button, "fancy");
+
+      provider = gtk_css_provider_new ();
+      bytes = g_resources_lookup_data ("/theming_custom_css/gtk.css", 0, NULL);
+      gtk_css_provider_load_from_data (provider, g_bytes_get_data (bytes, NULL),
+                                       g_bytes_get_size (bytes), NULL);
+      gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (do_widget),
+                                                 GTK_STYLE_PROVIDER (provider),
+                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+      g_object_unref (provider);
+      g_bytes_unref (bytes);
+
+      gtk_widget_show_all (box);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/theming_style_classes.c

@@ -1,4 +1,4 @@
-/* CSS Theming/Style Classes
+/* CSS Theming/Style Classes :: theming.ui
  *
  * GTK+ uses CSS for theming. Style classes can be associated
  * with widgets to inform the theme about intended rendering.
@@ -9,6 +9,7 @@
  */
 
 #include <gtk/gtk.h>
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 

demos/gtk-demo/toolpalette.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include "config.h"
+#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
@@ -575,7 +576,8 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
-      gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
+      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
+                                             contents);
       gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
 
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
@@ -605,7 +607,8 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
-      gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
+      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
+                                             contents);
       gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
 
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,

demos/pixbuf-demo/pixbuf-demo.c

@@ -25,6 +25,8 @@
 
 
 
+#define FRAME_DELAY 50
+
 #define BACKGROUND_NAME "background.jpg"
 
 static const char *image_names[] = {
@@ -91,17 +93,14 @@ draw_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
 	return TRUE;
 }
 
-#define CYCLE_TIME 3000000 /* 3 seconds */
+#define CYCLE_LEN 60
 
-static gint64 start_time;
+static int frame_num;
 
-/* Handler to regenerate the frame */
-static gboolean
-on_tick (GtkWidget     *widget,
-         GdkFrameClock *frame_clock,
-         gpointer       data)
+/* Timeout handler to regenerate the frame */
+static gint
+timeout (gpointer data)
 {
-	gint64	current_time;
 	double f;
 	int i;
 	double xmid, ymid;
@@ -110,11 +109,7 @@ on_tick (GtkWidget     *widget,
 	gdk_pixbuf_copy_area (background, 0, 0, back_width, back_height,
 			      frame, 0, 0);
 
-        if (start_time == 0)
-          start_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-	current_time = gdk_frame_clock_get_frame_time (frame_clock);
-	f = ((current_time - start_time) % CYCLE_TIME) / (double)CYCLE_TIME;
+	f = (double) (frame_num % CYCLE_LEN) / CYCLE_LEN;
 
 	xmid = back_width / 2.0;
 	ymid = back_height / 2.0;
@@ -168,13 +163,19 @@ on_tick (GtkWidget     *widget,
 
 	gtk_widget_queue_draw (da);
 
-	return G_SOURCE_CONTINUE;
+	frame_num++;
+	return TRUE;
 }
 
+static guint timeout_id;
+
 /* Destroy handler for the window */
 static void
 destroy_cb (GObject *object, gpointer data)
 {
+	g_source_remove (timeout_id);
+	timeout_id = 0;
+
 	gtk_main_quit ();
 }
 
@@ -207,7 +208,7 @@ main (int argc, char **argv)
 
 	gtk_container_add (GTK_CONTAINER (window), da);
 
-	gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
+	timeout_id = gdk_threads_add_timeout (FRAME_DELAY, timeout, NULL);
 
 	gtk_widget_show_all (window);
 	gtk_main ();

demos/widget-factory/Makefile.am

@@ -29,5 +29,3 @@ EXTRA_DIST += \
 	widget-factory.ui \
 	widget-factory.gresource.xml \
 	gtk-logo-256.png
-
--include $(top_srcdir)/git.mk

docs/reference/gdk/Makefile.am

@@ -147,11 +147,4 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 EXTRA_DIST += version.xml.in
 
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
 -include $(top_srcdir)/git.mk

docs/reference/gdk/gdk-docs.sgml

@@ -31,8 +31,6 @@
     <xi:include href="xml/visuals.xml" />
     <xi:include href="xml/cursors.xml" />
     <xi:include href="xml/windows.xml" />
-    <xi:include href="xml/gdkframeclock.xml" />
-    <xi:include href="xml/gdkframetimings.xml" />
     <xi:include href="xml/events.xml" />
     <xi:include href="xml/event_structs.xml" />
     <xi:include href="xml/keys.xml" />
@@ -43,7 +41,6 @@
     <xi:include href="xml/pango_interaction.xml" />
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />
-    <xi:include href="xml/wayland_interaction.xml" />
     <xi:include href="xml/gdkapplaunchcontext.xml" />
     <xi:include href="xml/gdktestutils.xml" />
   </reference>
@@ -72,10 +69,6 @@
     <title>Index of new symbols in 3.6</title>
     <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-8" role="3.8">
-    <title>Index of new symbols in 3.8</title>
-    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -10,7 +10,6 @@ gdk_parse_args
 gdk_get_display_arg_name
 gdk_notify_startup_complete
 gdk_notify_startup_complete_with_id
-gdk_set_allowed_backends
 
 <SUBSECTION>
 gdk_get_program_class
@@ -52,7 +51,6 @@ gdk_error_trap_pop_ignored
 GDK_WINDOWING_X11
 GDK_WINDOWING_WIN32
 GDK_WINDOWING_QUARTZ
-GDK_WINDOWING_WAYLAND
 
 <SUBSECTION>
 GDK_VERSION_3_0
@@ -172,7 +170,6 @@ GdkDisplayClass
 <TITLE>GdkDisplayManager</TITLE>
 GdkDisplayManager
 gdk_display_manager_get
-gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
@@ -358,9 +355,6 @@ gdk_window_maximize
 gdk_window_unmaximize
 gdk_window_fullscreen
 gdk_window_unfullscreen
-GdkFullscreenMode
-gdk_window_get_fullscreen_mode
-gdk_window_set_fullscreen_mode
 gdk_window_set_keep_above
 gdk_window_set_keep_below
 gdk_window_set_opacity
@@ -407,7 +401,6 @@ gdk_window_process_updates
 gdk_window_set_debug_updates
 gdk_window_enable_synchronized_configure
 gdk_window_configure_finished
-gdk_window_get_frame_clock
 
 <SUBSECTION>
 gdk_window_set_user_data
@@ -524,7 +517,6 @@ GdkWindowRedirect
 gdk_window_impl_get_type
 gdk_window_freeze_toplevel_updates_libgtk_only
 gdk_window_thaw_toplevel_updates_libgtk_only
-gdk_fullscreen_mode_get_type
 </SECTION>
 
 <SECTION>
@@ -992,7 +984,6 @@ gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
-gdk_x11_window_set_utf8_property
 gdk_x11_get_default_root_xwindow
 gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
@@ -1129,54 +1120,6 @@ gdk_x11_window_get_type
 gdk_window_impl_x11_get_type
 </SECTION>
 
-<SECTION>
-<INCLUDE>gdk/gdkwayland.h</INCLUDE>
-<TITLE>Wayland Interaction</TITLE>
-<FILE>wayland_interaction</FILE>
-gdk_wayland_device_get_wl_keyboard
-gdk_wayland_device_get_wl_pointer
-gdk_wayland_device_get_wl_seat
-gdk_wayland_display_get_wl_compositor
-gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
-gdk_wayland_window_get_wl_surface
-gdk_wayland_window_set_use_custom_surface
-
-<SUBSECTION Standard>
-GDK_TYPE_WAYLAND_DEVICE
-GDK_WAYLAND_DEVICE
-GDK_WAYLAND_DEVICE_CLASS
-GDK_WAYLAND_DEVICE_GET_CLASS
-GDK_IS_WAYLAND_DEVICE
-GDK_IS_WAYLAND_DEVICE_CLASS
-GDK_TYPE_WAYLAND_DISPLAY
-GDK_WAYLAND_DISPLAY
-GDK_WAYLAND_DISPLAY_CLASS
-GDK_WAYLAND_DISPLAY_GET_CLASS
-GDK_IS_WAYLAND_DISPLAY
-GDK_IS_WAYLAND_DISPLAY_CLASS
-GDK_TYPE_WAYLAND_DISPLAY_MANAGER
-GDK_WAYLAND_DISPLAY_MANAGER
-GDK_WAYLAND_DISPLAY_MANAGER_CLASS
-GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS
-GDK_IS_WAYLAND_DISPLAY_MANAGER
-GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS
-GDK_TYPE_WAYLAND_WINDOW
-GDK_WAYLAND_WINDOW
-GDK_WAYLAND_WINDOW_CLASS
-GDK_WAYLAND_WINDOW_GET_CLASS
-GDK_IS_WAYLAND_WINDOW
-GDK_IS_WAYLAND_WINDOW_CLASS
-
-<SUBSECTION Private>
-gdk_wayland_device_get_type
-gdk_wayland_display_get_type
-gdk_wayland_display_manager_get_type
-gdk_wayland_window_get_type
-
-</SECTION>
-
 <SECTION>
 <TITLE>Application launching</TITLE>
 <FILE>gdkapplaunchcontext</FILE>
@@ -1207,38 +1150,3 @@ gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
 </SECTION>
-
-<SECTION>
-<TITLE>GdkFrameClock</TITLE>
-<FILE>gdkframeclock</FILE>
-GdkFrameClock
-gdk_frame_clock_get_frame_time
-GdkFrameClockPhase
-gdk_frame_clock_request_phase
-gdk_frame_clock_begin_updating
-gdk_frame_clock_end_updating
-gdk_frame_clock_get_frame_counter
-gdk_frame_clock_get_history_start
-gdk_frame_clock_get_timings
-gdk_frame_clock_get_current_timings
-gdk_frame_clock_get_refresh_info
-<SUBSECTION Private>
-GdkFrameClockPrivate
-gdk_frame_clock_get_type
-</SECTION>
-
-<SECTION>
-<TITLE>GdkFrameTimings</TITLE>
-<FILE>gdkframetimings</FILE>
-GdkFrameTimings
-gdk_frame_timings_ref
-gdk_frame_timings_unref
-gdk_frame_timings_get_frame_counter
-gdk_frame_timings_get_complete
-gdk_frame_timings_get_frame_time
-gdk_frame_timings_get_presentation_time
-gdk_frame_timings_get_refresh_interval
-gdk_frame_timings_get_predicted_presentation_time
-<SUBSECTION Private>
-gdk_frame_get_type
-</SECTION>

docs/reference/gtk/Makefile.am

@@ -21,20 +21,10 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	fnmatch.h			\
-	gactionmuxer.h			\
-	gactionobserver.h		\
-	gactionobservable.h		\
 	gtk9slice.h			\
 	gtkanimationdescription.h	\
 	gtkdebug.h			\
-	gtkactionhelper.h		\
-	gtkapplicationprivate.h		\
 	gtkbuilderprivate.h		\
-	gtkcolorchooserprivate.h	\
-	gtkcoloreditorprivate.h		\
-	gtkcolorplaneprivate.h		\
-	gtkcolorscaleprivate.h		\
-	gtkcolorswatchprivate.h		\
 	gtkdndcursors.h			\
 	gtkentryprivate.h		\
 	gtkfilechooserdefault.h		\
@@ -55,8 +45,6 @@ IGNORE_HFILES=				\
 	gtkmarshal.h			\
 	gtkmenuprivate.h		\
 	gtkmnemonichash.h		\
-	gtkmodelmenu.h			\
-	gtkmodelmenuitem.h		\
 	gtkpathbar.h			\
 	gtkplugprivate.h		\
 	gtkprintbackend.h		\
@@ -154,7 +142,6 @@ content_files =					\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
 	gtk-launch.xml				\
-	broadwayd.xml				\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -428,8 +415,7 @@ EXTRA_DIST += version.xml.in gtk3.types.in
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
 	gtk-update-icon-cache.1		\
-	gtk-launch.1			\
-	broadwayd.1
+	gtk-launch.1
 
 if ENABLE_MAN
 
@@ -463,13 +449,6 @@ MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
 
 EXTRA_DIST += $(man_MANS)
 
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
 dist-hook-local: dist-local-check-mans-enabled all-local
 
 gtk-docs-clean: clean

docs/reference/gtk/broadway.xml

@@ -4,25 +4,25 @@
 ]>
 <refentry id="gtk-broadway">
 <refmeta>
-<refentrytitle>Using GTK+ with Broadway</refentrytitle>
+<refentrytitle>Using GTK+ with HTML5</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>Using GTK+ with Broadway</refname>
+<refname>Using GTK+ with HTML5</refname>
 <refpurpose>
 HTML-specific aspects of using GTK+
 </refpurpose>
 </refnamediv>
 
 <refsect1>
-<title>Using GTK+ with Broadway</title>
+<title>Using GTK+ with HTML5</title>
 
 <para>
 The GDK Broadway backend provides support for displaying GTK+
-applications in a web browser, using HTML5 and web sockets. To run
-your application in this way, select the Broadway backend by setting
+applications using HTML5 and Web sockets. To run your application
+in this way, select the Broadway backend by setting
 <literal>GDK_BACKEND=broadway</literal>. Then you can make
 your application appear in a web browser by pointing it at
 <literal>http://127.0.0.1:8080</literal>. Note that you need
@@ -35,37 +35,6 @@ the <envar>BROADWAY_DISPLAY</envar> environment variable to the
 port that you want to use.
 </para>
 
-<para>
-It is also possible to use multiple GTK+ applications in the same
-web browser window, by using the Broadway server,
-<command>broadwayd</command>, that ships with GTK+.
-To use broadwayd, start it like this:
-<programlisting>
-broadwayd :5
-</programlisting>
-Then point your web browser at <literal>http://127.0.0.1:8084</literal>.
-Start your applications like this:
-<programlisting>
-BROADWAY_DISPLAY=:5 gtk3-demo
-</programlisting>
-</para>
-
-<refsect2 id="broadway-envar">
-<title>Broadway-specific environment variables</title>
-
-</refsect2>
-  <formalpara>
-    <title><envar>BROADWAY_DISPLAY</envar></title>
-
-    <para>
-      Specifies the Broadway display number. The default display is 1.
-      The display number determines the port to use when connecting
-      to a Broadway application via the following formula:
-      <programlisting>
-        <replaceable>port</replaceable> = 8080 + (<replaceable>display</replaceable> - 1)
-      </programlisting>
-    </para>
-  </formalpara>
 </refsect1>
 
 </refentry>

docs/reference/gtk/broadwayd.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<refentry id="broadwayd">
-
-<refentryinfo>
-  <title>broadwayd</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Alexander</firstname>
-      <surname>Larsson</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>broadwayd</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>broadwayd</refname>
-  <refpurpose>Broadway display server</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>broadwayd</command>
-<arg choice="opt">--port <replaceable>PORT</replaceable></arg>
-<arg choice="opt">--address <replaceable>ADDRESS</replaceable></arg>
-<arg choice="opt"><replaceable>:DISPLAY</replaceable></arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>broadwayd</command> is a display server for the Broadway
-GDK backend. It allows multiple GTK+ applications to display their
-windows in the same web browser, by connecting to broadwayd.
-</para>
-<para>
-When using broadwayd, specify the display number to use, prefixed
-with a colon, similar to X. The default display number is 1.
-<programlisting>
-broadwayd :5
-</programlisting>
-Then point your web browser at <literal>http://127.0.0.1:8084</literal>.
-Start your applications like this:
-<programlisting>
-BROADWAY_DISPLAY=:5 gtk3-demo
-</programlisting>
-
-You can add password protection for your session by creating a file in
-<filename>$XDG_CONFIG_HOME/broadway.passwd</filename> or <filename>$HOME/.config/broadway.passwd</filename>
-with a crypt(3) style password hash.
-
-A simple way to generate it is with openssl:
-<programlisting>
-openssl passwd -1  > ~/.config/broadway.passwd
-</programlisting>
-
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-<variablelist>
-  <varlistentry>
-    <term>--port</term>
-    <listitem><para>Use <replaceable>PORT</replaceable> as the HTTP
-      port, instead of the default 8080 + (<replaceable>DISPLAY</replaceable> - 1).
-      </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>--address</term>
-    <listitem><para>Use <replaceable>ADDRESS</replaceable> as the HTTP
-      address, instead of the default <literal>http://127.0.0.1:<replaceable>PORT</replaceable></literal>.
-      </para></listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-</refentry>

docs/reference/gtk/building.sgml

@@ -317,8 +317,8 @@ How to compile GTK+ itself
           <command>configure</command>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-modules</arg>
-            <arg choice="plain">--enable-modules</arg>
+            <arg>--disable-modules</arg>
+            <arg>--enable-modules</arg>
           </group>
           <sbr/>
           <group>
@@ -326,81 +326,65 @@ How to compile GTK+ itself
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-debug=[no/minimum/yes]</arg>
+            <arg>--enable-debug=[no/minimum/yes]</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-Bsymbolic</arg>
-            <arg choice="plain">--enable-Bsymbolic</arg>
+            <arg>--disable-Bsymbolic</arg>
+            <arg>--enable-Bsymbolic</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-xkb</arg>
-            <arg choice="plain">--enable-xkb</arg>
+            <arg>--disable-xkb</arg>
+            <arg>--enable-xkb</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-xinerama</arg>
-            <arg choice="plain">--enable-xinerama</arg>
+            <arg>--disable-xinerama</arg>
+            <arg>--enable-xinerama</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-gtk-doc</arg>
-            <arg choice="plain">--enable-gtk-doc</arg>
+            <arg>--disable-gtk-doc</arg>
+            <arg>--enable-gtk-doc</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-cups</arg>
-            <arg choice="plain">--enable-cups</arg>
+            <arg>--disable-cups</arg>
+            <arg>--enable-cups</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--disable-papi</arg>
-            <arg choice="plain">--enable-papi</arg>
+            <arg>--disable-papi</arg>
+            <arg>--enable-papi</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-xinput</arg>
-            <arg choice="plain">--disable-xinput</arg>
+            <arg>--enable-xinput</arg>
+            <arg>--disable-xinput</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-packagekit</arg>
-            <arg choice="plain">--disable-packagekit</arg>
+            <arg>--enable-packagekit</arg>
+            <arg>--disable-packagekit</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-x11-backend</arg>
-            <arg choice="plain">--disable-x11-backend</arg>
+            <arg>--enable-x11-backend</arg>
+            <arg>--disable-x11-backend</arg>
+            <arg>--enable-win32-backend</arg>
+            <arg>--disable-win32-backend</arg>
+            <arg>--enable-quartz-backend</arg>
+            <arg>--disable-quartz-backend</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-win32-backend</arg>
-            <arg choice="plain">--disable-win32-backend</arg>
+            <arg>--enable-introspection=[no/auto/yes]</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">--enable-quartz-backend</arg>
-            <arg choice="plain">--disable-quartz-backend</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-broadway-backend</arg>
-            <arg choice="plain">--disable-broadway-backend</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-wayland-backend</arg>
-            <arg choice="plain">--disable-wayland-backend</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-gtk2-dependency</arg>
-            <arg choice="plain">--disable-gtk2-dependency</arg>
+            <arg>--enable-gtk2-dependency</arg>
+            <arg>--disable-gtk2-dependency</arg>
           </group>
         </cmdsynopsis>
       </para>
@@ -587,11 +571,7 @@ How to compile GTK+ itself
           <systemitem>--enable-win32-backend</systemitem>,
           <systemitem>--disable-win32-backend</systemitem>,
           <systemitem>--enable-quartz-backend</systemitem>,
-          <systemitem>--disable-quartz-backend</systemitem>,
-          <systemitem>--enable-broadway-backend</systemitem>,
-          <systemitem>--disable-broadway-backend</systemitem>,
-          <systemitem>--enable-wayland-backend</systemitem>, and
-          <systemitem>--disable-wayland-backend</systemitem></title>
+          and <systemitem>--disable-quartz-backend</systemitem></title>
 
         <para>
           Enables specific backends for GDK.  If none of these options

docs/reference/gtk/compiling.sgml

@@ -67,7 +67,7 @@ this range will trigger compiler warnings.
 Here is how you would compile hello.c if you want to allow it
 to use symbols that were not deprecated in 3.2:
 <programlisting>
-$ cc -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
+$ cc -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>
 

docs/reference/gtk/gtk-docs.sgml

@@ -61,9 +61,13 @@
     <xi:include href="xml/gtkstyleproperties.xml" />
     <xi:include href="xml/gtkthemingengine.xml" />
     <xi:include href="xml/gtkwidgetpath.xml" />
+    <xi:include href="xml/gtksymboliccolor.xml" />
+    <xi:include href="xml/gtkgradient.xml" />
     <xi:include href="xml/gtkicontheme.xml" />
     <xi:include href="xml/gtkiconfactory.xml" />
     <xi:include href="xml/gtknumerableicon.xml" />
+    <xi:include href="xml/gtkrc.xml" />
+    <xi:include href="xml/gtkstyle.xml" />
   </part>
 
   <part id="gtkobjects">
@@ -124,6 +128,8 @@
       <xi:include href="xml/gtkentrybuffer.xml" />
       <xi:include href="xml/gtkentrycompletion.xml" />
       <xi:include href="xml/gtkscale.xml" />
+      <xi:include href="xml/gtkhscale.xml" />
+      <xi:include href="xml/gtkvscale.xml" />
       <xi:include href="xml/gtkspinbutton.xml" />
       <xi:include href="xml/gtksearchentry.xml" />
       <xi:include href="xml/gtkeditable.xml" />
@@ -182,6 +188,7 @@
       <xi:include href="xml/gtkradiomenuitem.xml" />
       <xi:include href="xml/gtkcheckmenuitem.xml" />
       <xi:include href="xml/gtkseparatormenuitem.xml" />
+      <xi:include href="xml/gtktearoffmenuitem.xml" />
       <xi:include href="xml/gtktoolshell.xml" />
       <xi:include href="xml/gtktoolbar.xml" />
       <xi:include href="xml/gtktoolitem.xml" />
@@ -211,6 +218,9 @@
       <xi:include href="xml/gtkcolorbutton.xml" />
       <xi:include href="xml/gtkcolorchooserwidget.xml" />
       <xi:include href="xml/gtkcolorchooserdialog.xml" />
+      <xi:include href="xml/gtkcolorsel.xml" />
+      <xi:include href="xml/gtkcolorseldlg.xml" />
+      <xi:include href="xml/gtkhsv.xml" />
       <xi:include href="xml/gtkfilechooser.xml" />
       <xi:include href="xml/gtkfilechooserbutton.xml" />
       <xi:include href="xml/gtkfilechooserdialog.xml" />
@@ -220,7 +230,8 @@
       <xi:include href="xml/gtkfontbutton.xml" />
       <xi:include href="xml/gtkfontchooserwidget.xml" />
       <xi:include href="xml/gtkfontchooserdialog.xml" />
-      <xi:include href="xml/gtkplacessidebar.xml" />
+      <xi:include href="xml/gtkfontsel.xml" />
+      <xi:include href="xml/gtkfontseldlg.xml" />
     </chapter>
     
     <chapter id="LayoutContainers">
@@ -229,16 +240,20 @@
       <xi:include href="xml/gtkalignment.xml" />
       <xi:include href="xml/gtkaspectframe.xml" />
       <xi:include href="xml/gtkbox.xml" />
+      <xi:include href="xml/gtkhbox.xml" />
+      <xi:include href="xml/gtkvbox.xml" />
       <xi:include href="xml/gtkbbox.xml" />
+      <xi:include href="xml/gtkhbbox.xml" />
+      <xi:include href="xml/gtkvbbox.xml" />
       <xi:include href="xml/gtkfixed.xml" />
       <xi:include href="xml/gtkpaned.xml" />
+      <xi:include href="xml/gtkhpaned.xml" />
+      <xi:include href="xml/gtkvpaned.xml" />
       <xi:include href="xml/gtklayout.xml" />
       <xi:include href="xml/gtknotebook.xml" />
-      <xi:include href="xml/gtkstack.xml" />
-      <xi:include href="xml/gtkstackswitcher.xml" />
+      <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkoverlay.xml" />
-      <xi:include href="xml/gtkheaderbar.xml" />
       <xi:include href="xml/gtkorientable.xml" />
     </chapter>
 
@@ -246,11 +261,15 @@
       <title>Ornaments</title>
       <xi:include href="xml/gtkframe.xml" />
       <xi:include href="xml/gtkseparator.xml" />
+      <xi:include href="xml/gtkhseparator.xml" />
+      <xi:include href="xml/gtkvseparator.xml" />
     </chapter>
 
     <chapter id="ScrollingWidgets">
       <title>Scrolling</title>
       <xi:include href="xml/gtkscrollbar.xml" />
+      <xi:include href="xml/gtkhscrollbar.xml" />
+      <xi:include href="xml/gtkvscrollbar.xml" />
       <xi:include href="xml/gtkscrolledwindow.xml" />
       <xi:include href="xml/gtkscrollable.xml" />
     </chapter>
@@ -331,34 +350,6 @@
       <xi:include href="xml/gtkapplicationwindow.xml" />
       <xi:include href="xml/gtkactionable.xml" />
     </chapter>
-
-    <chapter id="DeprecatedObjects">
-      <title>Deprecated</title>
-      <xi:include href="xml/gtksymboliccolor.xml" />
-      <xi:include href="xml/gtkgradient.xml" />
-      <xi:include href="xml/gtkrc.xml" />
-      <xi:include href="xml/gtkstyle.xml" />
-      <xi:include href="xml/gtkhscale.xml" />
-      <xi:include href="xml/gtkvscale.xml" />
-      <xi:include href="xml/gtktearoffmenuitem.xml" />
-      <xi:include href="xml/gtkcolorsel.xml" />
-      <xi:include href="xml/gtkcolorseldlg.xml" />
-      <xi:include href="xml/gtkhsv.xml" />
-      <xi:include href="xml/gtkfontsel.xml" />
-      <xi:include href="xml/gtkfontseldlg.xml" />
-      <xi:include href="xml/gtkhbox.xml" />
-      <xi:include href="xml/gtkvbox.xml" />
-      <xi:include href="xml/gtkhbbox.xml" />
-      <xi:include href="xml/gtkvbbox.xml" />
-      <xi:include href="xml/gtkhpaned.xml" />
-      <xi:include href="xml/gtkvpaned.xml" />
-      <xi:include href="xml/gtktable.xml" />
-      <xi:include href="xml/gtkhseparator.xml" />
-      <xi:include href="xml/gtkvseparator.xml" />
-      <xi:include href="xml/gtkhscrollbar.xml" />
-      <xi:include href="xml/gtkvscrollbar.xml" />
-    </chapter>
-
   </part>
 
   <part id="migrating">
@@ -387,7 +378,6 @@
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-launch.xml" />
-    <xi:include href="broadwayd.xml" />
   </part>
 
   <xi:include href="glossary.xml" />
@@ -416,14 +406,6 @@
     <title>Index of new symbols in 3.6</title>
     <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-8" role="3.8">
-    <title>Index of new symbols in 3.8</title>
-    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="api-index-3-10" role="3.10">
-    <title>Index of new symbols in 3.10</title>
-    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk3-sections.txt

@@ -536,12 +536,8 @@ gtk_builder_add_objects_from_string
 gtk_builder_add_objects_from_resource
 gtk_builder_get_object
 gtk_builder_get_objects
-gtk_builder_expose_object
 gtk_builder_connect_signals
 gtk_builder_connect_signals_full
-gtk_builder_add_callback_symbol
-gtk_builder_add_callback_symbols
-gtk_builder_lookup_callback_symbol
 gtk_builder_set_translation_domain
 gtk_builder_get_translation_domain
 gtk_builder_get_type_from_name
@@ -1759,8 +1755,6 @@ gtk_icon_view_set_margin
 gtk_icon_view_get_margin
 gtk_icon_view_set_item_padding
 gtk_icon_view_get_item_padding
-gtk_icon_view_set_activate_on_single_click
-gtk_icon_view_get_activate_on_single_click
 gtk_icon_view_get_cell_rect
 gtk_icon_view_select_path
 gtk_icon_view_unselect_path
@@ -2483,32 +2477,6 @@ GTK_PANED_GET_CLASS
 gtk_paned_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkplacessidebar</FILE>
-<TITLE>GtkPlacesSidebar</FILE>
-GtkPlacesSidebar
-GtkPlacesOpenFlags
-gtk_places_sidebar_new
-gtk_places_sidebar_set_open_flags
-gtk_places_sidebar_set_location
-gtk_places_sidebar_get_location
-gtk_places_sidebar_set_show_desktop
-gtk_places_sidebar_set_accept_uri_drops
-gtk_places_sidebar_add_shortcut
-gtk_places_sidebar_remove_shortcut
-gtk_places_sidebar_list_shortcuts
-gtk_places_sidebar_get_nth_bookmark
-<SUBSECTION Standard>
-GTK_PLACES_SIDEBAR
-GTK_IS_PLACES_SIDEBAR
-GTK_TYPE_PLACES_SIDEBAR
-GTK_PLACES_SIDEBAR_CLASS
-GTK_IS_PLACES_SIDEBAR_CLASS
-GTK_PLACES_SIDEBAR_GET_CLASS
-<SUBSECTION Private>
-gtk_places_sidebar_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkplug</FILE>
 <TITLE>GtkPlug</TITLE>
@@ -3605,11 +3573,11 @@ gtk_text_mark_get_type
 <TITLE>GtkTextTag</TITLE>
 GtkTextTag
 GtkWrapMode
+GtkTextAttributes
 gtk_text_tag_new
 gtk_text_tag_get_priority
 gtk_text_tag_set_priority
 gtk_text_tag_event
-GtkTextAttributes
 GtkTextAppearance
 gtk_text_attributes_new
 gtk_text_attributes_copy
@@ -4487,8 +4455,6 @@ gtk_tree_view_get_headers_clickable
 gtk_tree_view_set_headers_clickable
 gtk_tree_view_set_rules_hint
 gtk_tree_view_get_rules_hint
-gtk_tree_view_set_activate_on_single_click
-gtk_tree_view_get_activate_on_single_click
 gtk_tree_view_append_column
 gtk_tree_view_remove_column
 gtk_tree_view_insert_column
@@ -4771,7 +4737,6 @@ GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
-gtk_cell_renderer_class_set_accessible_type
 gtk_cell_renderer_get_aligned_area
 gtk_cell_renderer_get_size
 gtk_cell_renderer_render
@@ -5181,10 +5146,6 @@ gtk_widget_draw
 gtk_widget_queue_draw
 gtk_widget_queue_resize
 gtk_widget_queue_resize_no_redraw
-gtk_widget_get_frame_clock
-GtkTickCallback
-gtk_widget_add_tick_callback
-gtk_widget_remove_tick_callback
 gtk_widget_size_request
 gtk_widget_get_child_requisition
 gtk_widget_size_allocate
@@ -5312,8 +5273,6 @@ gtk_widget_get_has_tooltip
 gtk_widget_set_has_tooltip
 gtk_widget_trigger_tooltip_query
 gtk_widget_get_window
-gtk_widget_register_window
-gtk_widget_unregister_window
 gtk_cairo_should_draw_window
 gtk_cairo_transform_to_window
 gtk_widget_get_allocated_width
@@ -5357,11 +5316,6 @@ gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
 gtk_widget_insert_action_group
-gtk_widget_add_tick_callback
-gtk_widget_remove_tick_callback
-gtk_widget_get_frame_clock
-gtk_widget_get_opacity
-gtk_widget_set_opacity
 
 <SUBSECTION>
 gtk_widget_get_path
@@ -5411,18 +5365,6 @@ gtk_widget_set_vexpand_set
 gtk_widget_queue_compute_expand
 gtk_widget_compute_expand
 
-<SUBSECTION Templates>
-gtk_widget_init_template
-gtk_widget_class_set_template
-gtk_widget_class_set_template_from_resource
-gtk_widget_get_automated_child
-gtk_widget_class_bind_child
-gtk_widget_class_bind_child_internal
-gtk_widget_class_automate_child
-gtk_widget_class_bind_callback
-gtk_widget_class_declare_callback
-gtk_widget_class_set_connect_func
-
 <SUBSECTION Standard>
 GTK_WIDGET
 GTK_IS_WIDGET
@@ -5554,7 +5496,6 @@ gtk_window_get_resize_grip_area
 gtk_window_get_application
 gtk_window_set_application
 gtk_window_set_has_user_ref_count
-gtk_window_set_titlebar
 
 <SUBSECTION Standard>
 GTK_WINDOW
@@ -5856,7 +5797,6 @@ gtk_style_context_get_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
-gtk_style_context_get_frame_clock
 gtk_style_context_get_state
 gtk_style_context_get_style
 gtk_style_context_get_style_property
@@ -5898,7 +5838,6 @@ gtk_style_context_remove_region
 gtk_style_context_has_region
 gtk_style_context_list_regions
 gtk_style_context_set_screen
-gtk_style_context_set_frame_clock
 gtk_style_context_set_state
 
 <SUBSECTION>
@@ -6536,15 +6475,9 @@ gtk_icon_info_get_base_size
 gtk_icon_info_get_filename
 gtk_icon_info_get_builtin_pixbuf
 gtk_icon_info_load_icon
-gtk_icon_info_load_icon_async
-gtk_icon_info_load_icon_finish
 gtk_icon_info_load_symbolic
-gtk_icon_info_load_symbolic_async
-gtk_icon_info_load_symbolic_finish
 gtk_icon_info_load_symbolic_for_style
 gtk_icon_info_load_symbolic_for_context
-gtk_icon_info_load_symbolic_for_context_async
-gtk_icon_info_load_symbolic_for_context_finish
 gtk_icon_info_set_raw_coordinates
 gtk_icon_info_get_embedded_rect
 gtk_icon_info_get_attach_points
@@ -7279,8 +7212,6 @@ gtk_grid_attach_next_to
 gtk_grid_get_child_at
 gtk_grid_insert_row
 gtk_grid_insert_column
-gtk_grid_remove_row
-gtk_grid_remove_column
 gtk_grid_insert_next_to
 gtk_grid_set_row_homogeneous
 gtk_grid_get_row_homogeneous
@@ -7538,59 +7469,3 @@ GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
 GtkColorChooserDialogPrivate
 gtk_color_chooser_dialog_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkheaderbar</FILE>
-<TITLE>GtkHeaderBar</TITLE>
-GtkHeaderBar
-gtk_header_bar_new
-gtk_header_bar_set_title
-gtk_header_bar_get_title
-gtk_header_bar_set_subtitle
-gtk_header_bar_get_subtitle
-gtk_header_bar_set_custom_title
-gtk_header_bar_get_custom_title
-gtk_header_bar_pack_start
-gtk_header_bar_pack_end
-
-<SUBSECTION Standard>
-GTK_TYPE_HEADER_BAR
-GTK_HEADER_BAR
-GTK_HEADER_BAR_CLASS
-GTK_IS_HEADER_BAR
-GTK_IS_HEADER_BAR_CLASS
-GTK_HEADER_BAR_GET_CLASS
-
-<SUBSECTION Private>
-gtk_header_bar_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstack</FILE>
-<TITLE>GtkStack</TITLE>
-GtkStack
-gtk_stack_new
-gtk_stack_add_named
-gtk_stack_add_titled
-gtk_stack_set_visible_child
-gtk_stack_get_visible_child
-gtk_stack_set_visible_child_name
-gtk_stack_get_visible_child_name
-gtk_stack_set_visible_child_full
-gtk_stack_set_homogeneous
-gtk_stack_get_homogeneous
-gtk_stack_set_transition_duration
-gtk_stack_get_transition_duration
-GtkStackTransitionType
-gtk_stack_set_transition_type
-gtk_stack_get_transition_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkstackswitcher</FILE>
-<TITLE>GtkStackSwitcher</TITLE>
-GtkStackSwitcher
-gtk_stack_switcher_new
-gtk_stack_switcher_set_stack
-gtk_stack_switcher_get_stack
-</SECTION>

docs/reference/gtk/gtk3.types.in

@@ -119,7 +119,7 @@ gtk_page_setup_get_type
 @DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_plug_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_plug_get_type
 @DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
 @DISABLE_ON_W32@gtk_print_job_get_type
@@ -151,7 +151,7 @@ gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_size_group_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_socket_get_type
+@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_statusbar_get_type

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

@@ -119,46 +119,6 @@
     make CFLAGS+="-DGSEAL_ENABLE"
     </programlisting>
   </para>
-  <para>
-    While it may be painful to convert, this helps us keep API and ABI
-    compatibility when we change internal interfaces. As a quick example,
-    when adding GSEAL_ENABLE, if you see an error like:
-    <programlisting>
-    error: 'GtkToggleButton' has no member named 'active'
-    </programlisting>
-    this means that you are accessing the public structure of
-    GtkToggleButton directly, perhaps with some code like:
-    <informalexample><programlisting>
-      static void
-      on_toggled (GtkToggleButton *button)
-      {
-        if (button->active)
-          frob_active ();
-        else
-          frob_inactive ();
-      }
-    </programlisting></informalexample>
-  </para>
-  <para>
-    In most cases, this can easily be replaced with the correct accessor
-    method. The main rule is that if you have code like the above which
-    accesses the "active" field of a "GtkToggleButton", then the accessor
-    method becomes "gtk_toggle_button_get_active":
-    <informalexample><programlisting>
-      static void
-      on_toggled (GtkToggleButton *button)
-      {
-        if (gtk_toggle_button_get_active (button))
-          frob_active ();
-        else
-          frob_inactive ();
-      }
-    </programlisting></informalexample>
-  </para>
-  <para>
-    In the case of setting field members directly, there's usually
-    a corresponding setter method.
-  </para>
   </section>
 
   <section>
@@ -1171,15 +1131,6 @@ gtk_arrow_draw (GtkWidget *widget,
       from GtkObject and makes use of the destroy functionality, you have
       to implement ::destroy yourself.
     </para>
-
-    <para>
-      If your program used functions like gtk_object_get or gtk_object_set,
-      these can be replaced directly with g_object_get or g_object_set. In
-      fact, most every gtk_object_* function can be replaced with the
-      corresponding g_object_ function, even in GTK+ 2 code. The one exception
-      to this rule is gtk_object_destroy, which can be replaced with
-      gtk_widget_destroy, again in both GTK+ 2 and GTK+ 3.
-    </para>
   </section>
 
   <section>

docs/reference/gtk/running.sgml

@@ -126,7 +126,7 @@ variables like <envar>LANG</envar>, <envar>PATH</envar>, <envar>HOME</envar>
 or <envar>DISPLAY</envar>; mostly to determine paths to look for certain
 files. The <link linkend="x11-envar">X11</link>,
 <link linkend="win32-envar">Windows</link> and
-<link linkend="broadway-envar">Broadway</link> GDK backends use some
+<link linkend="fb-envar">Framebuffer</link> GDK backends use some
 additional environment variables.
 </para>
 
@@ -452,22 +452,28 @@ nevertheless.
 
       <varlistentry>
         <term>broadway</term>
-        <listitem><para>Selects the Broadway backend for display in web browsers</para></listitem>
+        <listitem><para>Selects the HTML5 backend.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term>wayland</term>
-        <listitem><para>Selects the Wayland backend for connecting to Wayland display servers</para></listitem>
+        <listitem><para>Selects the Wayland backend for connecting to Wayland display servers.</para></listitem>
       </varlistentry>
 
     </variablelist>
-    Since 3.10, this environment variable can contain a comma-separated list
-    of backend names, which are tried in order. The list may also contain
-    a *, which means: try all remaining backends.
     For more information about selecting backends, see the gdk_display_manager_get() function.
   </para>
 </formalpara>
 
+<formalpara>
+  <title><envar>GDK_SYNCHRONIZE</envar></title>
+
+  <para>
+    If set, GDK makes all X requests synchronously. This is a useful
+    option for debugging, but it will slow down the performance considerably.
+  </para>
+</formalpara>
+
 <formalpara>
   <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>
 

docs/reference/gtk/text_widget.sgml

@@ -153,7 +153,7 @@ You can change the default attributes for a given #GtkTextView, and you can
 apply tags that change the attributes for a region of text.  For text features 
 that come from the theme — such as font and foreground color — use 
 standard #GtkWidget functions such as gtk_widget_modify_font() or
-gtk_widget_override_color(). For other attributes there are dedicated methods on
+gtk_widget_override_text(). For other attributes there are dedicated methods on
 #GtkTextView such as gtk_text_view_set_tabs().
 
 <informalexample><programlisting>

docs/reference/gtk/wayland.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-wayland">
+<refentry id="gtk-osx">
 <refmeta>
 <refentrytitle>Using GTK+ with Wayland</refentrytitle>
 <manvolnum>3</manvolnum>

docs/reference/gtk/x11.sgml

@@ -56,33 +56,6 @@ in the <envar>DISPLAY</envar> environment variable.
 
 </refsect2>
 
-<refsect2 id="x11-envar">
-<title>X11-specific environment variables</title>
-
-<para>
-The X11 GDK backend can be influenced with some additional environment variables.
-</para>
-
-<formalpara>
-  <title><envar>GDK_SYNCHRONIZE</envar></title>
-
-  <para>
-    If set, GDK makes all X requests synchronously. This is a useful
-    option for debugging, but it will slow down the performance considerably.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><envar>GDK_CORE_DEVICE_EVENTS</envar></title>
-
-  <para>
-    If set, GDK makes does not use the XInput extension, and only reacts
-    to core X input events.
-  </para>
-</formalpara>
-
-</refsect2>
-
 </refsect1>
 
 <refsect1 id="gtk-X11-arch">

docs/tools/widgets.c

@@ -1024,7 +1024,8 @@ create_scrolledwindow (void)
   scrolledwin = gtk_scrolled_window_new (NULL, NULL);
   label = gtk_label_new ("Scrolled Window");
 
-  gtk_container_add (GTK_CONTAINER (scrolledwin), label);
+  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwin), 
+					 label);
 
   return new_widget_info ("scrolledwindow", scrolledwin, MEDIUM);
 }

examples/Makefile.am

@@ -61,5 +61,3 @@ noinst_PROGRAMS = \
 	builder
 
 EXTRA_DIST = builder.ui
-
--include $(top_srcdir)/git.mk

examples/bloatpad.c

@@ -34,29 +34,6 @@ change_fullscreen_state (GSimpleAction *action,
   g_simple_action_set_state (action, state);
 }
 
-static void
-change_busy_state (GSimpleAction *action,
-                   GVariant      *state,
-                   gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-  GApplication *application = G_APPLICATION (gtk_window_get_application (window));
-
-  /* do this twice to test multiple busy counter increases */
-  if (g_variant_get_boolean (state))
-    {
-      g_application_mark_busy (application);
-      g_application_mark_busy (application);
-    }
-  else
-    {
-      g_application_unmark_busy (application);
-      g_application_unmark_busy (application);
-    }
-
-  g_simple_action_set_state (action, state);
-}
-
 static void
 change_justify_state (GSimpleAction *action,
                       GVariant      *state,
@@ -117,7 +94,6 @@ static GActionEntry win_entries[] = {
   { "copy", window_copy, NULL, NULL, NULL },
   { "paste", window_paste, NULL, NULL, NULL },
   { "fullscreen", activate_toggle, NULL, "false", change_fullscreen_state },
-  { "busy", activate_toggle, NULL, "false", change_busy_state },
   { "justify", activate_radio, "s", "'left'", change_justify_state }
 };
 
@@ -380,10 +356,6 @@ bloat_pad_startup (GApplication *application)
                                "          <attribute name='action'>win.fullscreen</attribute>"
                                "          <attribute name='accel'>F11</attribute>"
                                "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Look Busy</attribute>"
-                               "          <attribute name='action'>win.busy</attribute>"
-                               "        </item>"
                                "      </section>"
                                "    </submenu>"
                                "    <submenu id='time-menu'>"

gdk/Makefile.am

@@ -75,13 +75,11 @@ gdk_public_h_sources = 				\
 	gdkdisplaymanager.h			\
 	gdkdnd.h				\
 	gdkevents.h				\
-	gdkframetimings.h			\
 	gdkkeys.h				\
 	gdkkeysyms.h				\
 	gdkkeysyms-compat.h			\
 	gdkmain.h				\
 	gdkpango.h				\
-	gdkframeclock.h				\
 	gdkpixbuf.h				\
 	gdkprivate.h				\
 	gdkproperty.h				\
@@ -103,8 +101,6 @@ gdk_private_headers = 				\
 	gdkdisplaymanagerprivate.h		\
 	gdkdisplayprivate.h			\
 	gdkdndprivate.h				\
-	gdkframeclockidle.h			\
-	gdkframeclockprivate.h			\
 	gdkscreenprivate.h			\
 	gdkinternals.h				\
 	gdkintl.h				\
@@ -125,16 +121,12 @@ gdk_c_sources = 				\
 	gdkdisplaymanager.c			\
 	gdkdnd.c				\
 	gdkevents.c     			\
-	gdkframetimings.c			\
 	gdkglobals.c				\
 	gdkkeys.c				\
 	gdkkeyuni.c				\
 	gdkoffscreenwindow.c			\
-	gdkframeclock.c				\
-	gdkframeclockidle.c			\
 	gdkpango.c				\
 	gdkpixbuf-drawable.c			\
-	gdkproperty.c				\
 	gdkrectangle.c				\
 	gdkrgba.c				\
 	gdkscreen.c				\
@@ -212,6 +204,7 @@ INTROSPECTION_GIRS += Gdk-3.0.gir
 
 if USE_X11
 x11_introspection_files = 		\
+	x11/checksettings.c		\
 	x11/gdkapplaunchcontext-x11.c	\
 	x11/gdkasync.c			\
 	x11/gdkcursor-x11.c		\
@@ -237,6 +230,7 @@ x11_introspection_files = 		\
 	x11/gdkxftdefaults.c		\
 	x11/gdkxid.c			\
 	x11/xsettings-client.c		\
+	x11/xsettings-common.c		\
 	x11/gdkx.h			\
 	x11/gdkx11cursor.h		\
 	x11/gdkx11display.h		\

gdk/broadway/Makefile.am

@@ -15,9 +15,7 @@ AM_CPPFLAGS =			\
 
 LDADDS = $(GDK_DEP_LIBS)
 
-noinst_LTLIBRARIES = libgdk-broadway.la
-
-bin_PROGRAMS = broadwayd
+noinst_LTLIBRARIES = libbroadway.la libgdk-broadway.la
 
 libgdkinclude_HEADERS = 	\
 	gdkbroadway.h
@@ -28,6 +26,10 @@ libgdkbroadwayinclude_HEADERS = 	\
 	gdkbroadwaycursor.h		\
 	gdkbroadwayvisual.h
 
+libbroadway_la_SOURCES =		\
+	broadway.h			\
+	broadway.c
+
 clienthtml.h: client.html
 	$(PERL) $(srcdir)/toarray.pl $(srcdir)/client.html client_html > $@
 
@@ -60,7 +62,9 @@ libgdk_broadway_la_SOURCES =		\
 	gdkeventsource.c	\
 	gdkeventsource.h	\
 	gdkglobals-broadway.c	\
+	gdkim-broadway.c	\
 	gdkkeys-broadway.c	\
+	gdkmain-broadway.c	\
 	gdkproperty-broadway.c	\
 	gdkscreen-broadway.c	\
 	gdkscreen-broadway.h	\
@@ -69,19 +73,9 @@ libgdk_broadway_la_SOURCES =		\
 	gdkvisual-broadway.c	\
 	gdkwindow-broadway.c	\
 	gdkwindow-broadway.h	\
-	gdkprivate-broadway.h   \
-	gdkbroadway-server.h	\
-	gdkbroadway-server.c
+	gdkprivate-broadway.h
 
-broadwayd_SOURCES = \
-	broadway-protocol.h		\
-	broadwayd.c 			\
-	broadway-server.h		\
-	broadway-server.c		\
-	broadway-output.h		\
-	broadway-output.c
-
-broadwayd_LDADD = $(GDK_DEP_LIBS) -lrt -lcrypt
+libgdk_broadway_la_LIBADD = libbroadway.la
 
 MAINTAINERCLEANFILES = $(broadway_built_sources)
 EXTRA_DIST += $(broadway_built_sources)

gdk/broadway/TODO.broadway

@@ -1,11 +0,0 @@
-Cache surfaces that are opened via shm_open inbetween updates.
-Handle implicit grabs when in broadway-server.c
-keyboard focus handling
-Add resize handling to js WM
-Support window titles
-_gdk_broadway_server_has_client is always FALSE, so resize don't work
-Send reset events on client disconnect (button up, normal state. Maybe grab state reset?)
-rgba suport
-shift-select in gedit doesn't work
-backdrop mode
-clean up /dev/shm on abrupt client exit

gdk/broadway/broadway-protocol.h

@@ -1,267 +0,0 @@
-#ifndef __BROADWAY_PROTOCOL_H__
-#define __BROADWAY_PROTOCOL_H__
-
-#include <glib.h>
-
-typedef struct  {
-    gint32 x, y;
-    gint32 width, height;
-} BroadwayRect;
-
-typedef enum {
-  BROADWAY_EVENT_ENTER = 'e',
-  BROADWAY_EVENT_LEAVE = 'l',
-  BROADWAY_EVENT_POINTER_MOVE = 'm',
-  BROADWAY_EVENT_BUTTON_PRESS = 'b',
-  BROADWAY_EVENT_BUTTON_RELEASE = 'B',
-  BROADWAY_EVENT_SCROLL = 's',
-  BROADWAY_EVENT_KEY_PRESS = 'k',
-  BROADWAY_EVENT_KEY_RELEASE = 'K',
-  BROADWAY_EVENT_GRAB_NOTIFY = 'g',
-  BROADWAY_EVENT_UNGRAB_NOTIFY = 'u',
-  BROADWAY_EVENT_CONFIGURE_NOTIFY = 'w',
-  BROADWAY_EVENT_DELETE_NOTIFY = 'W',
-  BROADWAY_EVENT_SCREEN_SIZE_CHANGED = 'd'
-} BroadwayEventType;
-
-typedef enum {
-  BROADWAY_OP_COPY_RECTANGLES = 'b',
-  BROADWAY_OP_GRAB_POINTER = 'g',
-  BROADWAY_OP_UNGRAB_POINTER = 'u',
-  BROADWAY_OP_NEW_SURFACE = 's',
-  BROADWAY_OP_SHOW_SURFACE = 'S',
-  BROADWAY_OP_HIDE_SURFACE = 'H',
-  BROADWAY_OP_DESTROY_SURFACE = 'd',
-  BROADWAY_OP_MOVE_RESIZE = 'm',
-  BROADWAY_OP_SET_TRANSIENT_FOR = 'p',
-  BROADWAY_OP_PUT_RGB = 'i',
-  BROADWAY_OP_FLUSH = 'f',
-  BROADWAY_OP_REQUEST_AUTH = 'l',
-  BROADWAY_OP_AUTH_OK = 'L',
-  BROADWAY_OP_DISCONNECTED = 'D',
-} BroadwayOpType;
-
-typedef struct {
-  guint32 type;
-  guint32 serial;
-  guint64 time;
-} BroadwayInputBaseMsg;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  guint32 mouse_window_id; /* The real window, not taking grabs into account */
-  guint32 event_window_id;
-  gint32 root_x;
-  gint32 root_y;
-  gint32 win_x;
-  gint32 win_y;
-  guint32 state;
-} BroadwayInputPointerMsg;
-
-typedef struct {
-  BroadwayInputPointerMsg pointer;
-  guint32 mode;
-} BroadwayInputCrossingMsg;
-
-typedef struct {
-  BroadwayInputPointerMsg pointer;
-  guint32 button;
-} BroadwayInputButtonMsg;
-
-typedef struct {
-  BroadwayInputPointerMsg pointer;
-  gint32 dir;
-} BroadwayInputScrollMsg;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  guint32 mouse_window_id; /* The real window, not taking grabs into account */
-  guint32 state;
-  gint32 key;
-} BroadwayInputKeyMsg;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  gint32 res;
-} BroadwayInputGrabReply;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  gint32 id;
-  gint32 x;
-  gint32 y;
-  gint32 width;
-  gint32 height;
-} BroadwayInputConfigureNotify;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  guint32 width;
-  guint32 height;
-} BroadwayInputScreenResizeNotify;
-
-typedef struct {
-  BroadwayInputBaseMsg base;
-  gint32 id;
-} BroadwayInputDeleteNotify;
-
-typedef union {
-  BroadwayInputBaseMsg base;
-  BroadwayInputPointerMsg pointer;
-  BroadwayInputCrossingMsg crossing;
-  BroadwayInputButtonMsg button;
-  BroadwayInputScrollMsg scroll;
-  BroadwayInputKeyMsg key;
-  BroadwayInputGrabReply grab_reply;
-  BroadwayInputConfigureNotify configure_notify;
-  BroadwayInputDeleteNotify delete_notify;
-  BroadwayInputScreenResizeNotify screen_resize_notify;
-} BroadwayInputMsg;
-
-typedef enum {
-  BROADWAY_REQUEST_NEW_WINDOW,
-  BROADWAY_REQUEST_FLUSH,
-  BROADWAY_REQUEST_SYNC,
-  BROADWAY_REQUEST_QUERY_MOUSE,
-  BROADWAY_REQUEST_DESTROY_WINDOW,
-  BROADWAY_REQUEST_SHOW_WINDOW,
-  BROADWAY_REQUEST_HIDE_WINDOW,
-  BROADWAY_REQUEST_SET_TRANSIENT_FOR,
-  BROADWAY_REQUEST_TRANSLATE,
-  BROADWAY_REQUEST_UPDATE,
-  BROADWAY_REQUEST_MOVE_RESIZE,
-  BROADWAY_REQUEST_GRAB_POINTER,
-  BROADWAY_REQUEST_UNGRAB_POINTER
-} BroadwayRequestType;
-
-typedef struct {
-  guint32 size;
-  guint32 serial;
-  guint32 type;
-} BroadwayRequestBase, BroadwayRequestFlush, BroadwayRequestSync, BroadwayRequestQueryMouse;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-} BroadwayRequestDestroyWindow, BroadwayRequestShowWindow, BroadwayRequestHideWindow;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  guint32 parent;
-} BroadwayRequestSetTransientFor;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  gint32 dx;
-  gint32 dy;
-  guint32 n_rects;
-  BroadwayRect rects[1];
-} BroadwayRequestTranslate;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  char name[36];
-  guint32 width;
-  guint32 height;
-} BroadwayRequestUpdate;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  guint32 owner_events;
-  guint32 event_mask;
-  guint32 time_;
-} BroadwayRequestGrabPointer;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 time_;
-} BroadwayRequestUngrabPointer;
-
-typedef struct {
-  BroadwayRequestBase base;
-  gint32 x;
-  gint32 y;
-  guint32 width;
-  guint32 height;
-  guint32 is_temp;
-} BroadwayRequestNewWindow;
-
-typedef struct {
-  BroadwayRequestBase base;
-  guint32 id;
-  guint32 with_move;
-  gint32 x;
-  gint32 y;
-  guint32 width;
-  guint32 height;
-} BroadwayRequestMoveResize;
-
-typedef union {
-  BroadwayRequestBase base;
-  BroadwayRequestNewWindow new_window;
-  BroadwayRequestFlush flush;
-  BroadwayRequestSync sync;
-  BroadwayRequestQueryMouse query_mouse;
-  BroadwayRequestDestroyWindow destroy_window;
-  BroadwayRequestShowWindow show_window;
-  BroadwayRequestHideWindow hide_window;
-  BroadwayRequestSetTransientFor set_transient_for;
-  BroadwayRequestUpdate update;
-  BroadwayRequestMoveResize move_resize;
-  BroadwayRequestGrabPointer grab_pointer;
-  BroadwayRequestUngrabPointer ungrab_pointer;
-  BroadwayRequestTranslate translate;
-} BroadwayRequest;
-
-typedef enum {
-  BROADWAY_REPLY_EVENT,
-  BROADWAY_REPLY_SYNC,
-  BROADWAY_REPLY_QUERY_MOUSE,
-  BROADWAY_REPLY_NEW_WINDOW,
-  BROADWAY_REPLY_GRAB_POINTER,
-  BROADWAY_REPLY_UNGRAB_POINTER
-} BroadwayReplyType;
-
-typedef struct {
-  guint32 size;
-  guint32 in_reply_to;
-  guint32 type;
-} BroadwayReplyBase, BroadwayReplySync;
-
-typedef struct {
-  BroadwayReplyBase base;
-  guint32 id;
-} BroadwayReplyNewWindow;
-
-typedef struct {
-  BroadwayReplyBase base;
-  guint32 status;
-} BroadwayReplyGrabPointer, BroadwayReplyUngrabPointer;
-
-typedef struct {
-  BroadwayReplyBase base;
-  guint32 toplevel;
-  gint32 root_x;
-  gint32 root_y;
-  guint32 mask;
-} BroadwayReplyQueryMouse;
-
-typedef struct {
-  BroadwayReplyBase base;
-  BroadwayInputMsg msg;
-} BroadwayReplyEvent;
-
-typedef union {
-  BroadwayReplyBase base;
-  BroadwayReplyEvent event;
-  BroadwayReplyQueryMouse query_mouse;
-  BroadwayReplyNewWindow new_window;
-  BroadwayReplyGrabPointer grab_pointer;
-  BroadwayReplyUngrabPointer ungrab_pointer;
-} BroadwayReply;
-
-#endif /* __BROADWAY_PROTOCOL_H__ */

gdk/broadway/broadway-server.h

@@ -1,87 +0,0 @@
-#ifndef __BROADWAY_SERVER__
-#define __BROADWAY_SERVER__
-
-#include "broadway-protocol.h"
-#include <glib-object.h>
-#include <cairo.h>
-
-void broadway_events_got_input (BroadwayInputMsg *message,
-				gint32 client_id);
-
-typedef struct _BroadwayServer BroadwayServer;
-typedef struct _BroadwayServerClass BroadwayServerClass;
-
-#define BROADWAY_TYPE_SERVER              (broadway_server_get_type())
-#define BROADWAY_SERVER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), BROADWAY_TYPE_SERVER, BroadwayServer))
-#define BROADWAY_SERVER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), BROADWAY_TYPE_SERVER, BroadwayServerClass))
-#define BROADWAY_IS_SERVER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), BROADWAY_TYPE_SERVER))
-#define BROADWAY_IS_SERVER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), BROADWAY_TYPE_SERVER))
-#define BROADWAY_SERVER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), BROADWAY_TYPE_SERVER, BroadwayServerClass))
-
-
-BroadwayServer     *broadway_server_new                      (char             *address,
-							      int               port,
-							      GError          **error);
-gboolean            broadway_server_has_client               (BroadwayServer   *server);
-void                broadway_server_flush                    (BroadwayServer   *server);
-void                broadway_server_sync                     (BroadwayServer   *server);
-void                broadway_server_get_screen_size          (BroadwayServer   *server,
-							      guint32          *width,
-							      guint32          *height);
-guint32             broadway_server_get_next_serial          (BroadwayServer   *server);
-guint32             broadway_server_get_last_seen_time       (BroadwayServer   *server);
-gboolean            broadway_server_lookahead_event          (BroadwayServer   *server,
-							      const char       *types);
-void                broadway_server_query_mouse              (BroadwayServer   *server,
-							      guint32          *toplevel,
-							      gint32           *root_x,
-							      gint32           *root_y,
-							      guint32          *mask);
-guint32             broadway_server_grab_pointer             (BroadwayServer   *server,
-							      gint              client_id,
-							      gint              id,
-							      gboolean          owner_events,
-							      guint32           event_mask,
-							      guint32           time_);
-guint32             broadway_server_ungrab_pointer           (BroadwayServer   *server,
-							      guint32           time_);
-gint32              broadway_server_get_mouse_toplevel       (BroadwayServer   *server);
-guint32             broadway_server_new_window               (BroadwayServer   *server,
-							      int               x,
-							      int               y,
-							      int               width,
-							      int               height,
-							      gboolean          is_temp);
-void                broadway_server_destroy_window           (BroadwayServer   *server,
-							      gint              id);
-gboolean            broadway_server_window_show              (BroadwayServer   *server,
-							      gint              id);
-gboolean            broadway_server_window_hide              (BroadwayServer   *server,
-							      gint              id);
-void                broadway_server_window_set_transient_for (BroadwayServer   *server,
-							      gint              id,
-							      gint              parent);
-gboolean            broadway_server_window_translate         (BroadwayServer   *server,
-							      gint              id,
-							      cairo_region_t   *area,
-							      gint              dx,
-							      gint              dy);
-cairo_surface_t   * broadway_server_create_surface           (int               width,
-							      int               height);
-void                broadway_server_window_update            (BroadwayServer   *server,
-							      gint              id,
-							      cairo_surface_t  *surface);
-gboolean            broadway_server_window_move_resize       (BroadwayServer   *server,
-							      gint              id,
-							      gboolean          with_move,
-							      int               x,
-							      int               y,
-							      int               width,
-							      int               height);
-cairo_surface_t * broadway_server_open_surface (BroadwayServer *server,
-						guint32 id,
-						char *name,
-						int width,
-						int height);
-
-#endif /* __BROADWAY_SERVER__ */

gdk/broadway/broadway.c

@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <cairo.h>
 
-#include "broadway-output.h"
+#include "broadway.h"
 
 /************************************************************************
  *                Base64 functions                                      *
@@ -317,13 +317,6 @@ broadway_output_get_next_serial (BroadwayOutput *output)
   return output->serial;
 }
 
-void
-broadway_output_set_next_serial (BroadwayOutput *output,
-				 guint32 serial)
-{
-  output->serial = serial;
-}
-
 
 /************************************************************************
  *                     Core rendering operations                        *
@@ -358,12 +351,12 @@ static void
 append_uint16 (BroadwayOutput *output, guint32 v)
 {
   gsize old_len = output->buf->len;
-  guint8 *buf;
 
   if (output->binary)
     {
+      guint8 *buf = (guint8 *)output->buf->str + old_len;
+
       g_string_set_size (output->buf, old_len + 2);
-      buf = (guint8 *)output->buf->str + old_len;
       buf[0] = (v >> 0) & 0xff;
       buf[1] = (v >> 8) & 0xff;
     }
@@ -378,12 +371,12 @@ static void
 append_uint32 (BroadwayOutput *output, guint32 v)
 {
   gsize old_len = output->buf->len;
-  guint8 *buf;
 
   if (output->binary)
     {
+      guint8 *buf = (guint8 *)output->buf->str + old_len;
+
       g_string_set_size (output->buf, old_len + 4);
-      buf = (guint8 *)output->buf->str + old_len;
       buf[0] = (v >> 0) & 0xff;
       buf[1] = (v >> 8) & 0xff;
       buf[2] = (v >> 16) & 0xff;
@@ -429,7 +422,7 @@ broadway_output_copy_rectangles (BroadwayOutput *output,  int id,
 {
   int i;
 
-  write_header (output, BROADWAY_OP_COPY_RECTANGLES);
+  write_header (output, 'b');
   append_uint16 (output, id);
   append_uint16 (output, n_rects);
   for (i = 0; i < n_rects; i++)
@@ -448,7 +441,7 @@ broadway_output_grab_pointer (BroadwayOutput *output,
 			      int id,
 			      gboolean owner_event)
 {
-  write_header (output, BROADWAY_OP_GRAB_POINTER);
+  write_header (output, 'g');
   append_uint16 (output, id);
   append_bool (output, owner_event);
 }
@@ -459,7 +452,7 @@ broadway_output_ungrab_pointer (BroadwayOutput *output)
   guint32 serial;
 
   serial = output->serial;
-  write_header (output, BROADWAY_OP_UNGRAB_POINTER);
+  write_header (output, 'u');
 
   return serial;
 }
@@ -469,7 +462,7 @@ broadway_output_new_surface(BroadwayOutput *output,
 			    int id, int x, int y, int w, int h,
 			    gboolean is_temp)
 {
-  write_header (output, BROADWAY_OP_NEW_SURFACE);
+  write_header (output, 's');
   append_uint16 (output, id);
   append_uint16 (output, x);
   append_uint16 (output, y);
@@ -478,42 +471,24 @@ broadway_output_new_surface(BroadwayOutput *output,
   append_bool (output, is_temp);
 }
 
-void
-broadway_output_request_auth (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_REQUEST_AUTH);
-}
-
-void
-broadway_output_auth_ok (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_AUTH_OK);
-}
-
-void
-broadway_output_disconnected (BroadwayOutput *output)
-{
-  write_header (output, BROADWAY_OP_DISCONNECTED);
-}
-
 void
 broadway_output_show_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, BROADWAY_OP_SHOW_SURFACE);
+  write_header (output, 'S');
   append_uint16 (output, id);
 }
 
 void
 broadway_output_hide_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, BROADWAY_OP_HIDE_SURFACE);
+  write_header (output, 'H');
   append_uint16 (output, id);
 }
 
 void
 broadway_output_destroy_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, BROADWAY_OP_DESTROY_SURFACE);
+  write_header (output, 'd');
   append_uint16 (output, id);
 }
 
@@ -533,7 +508,7 @@ broadway_output_move_resize_surface (BroadwayOutput *output,
   if (!has_pos && !has_size)
     return;
 
-  write_header (output, BROADWAY_OP_MOVE_RESIZE);
+  write_header (output, 'm');
   val = (!!has_pos) | ((!!has_size) << 1);
   append_uint16 (output, id);
   append_flags (output, val);
@@ -554,7 +529,7 @@ broadway_output_set_transient_for (BroadwayOutput *output,
 				   int             id,
 				   int             parent_id)
 {
-  write_header (output, BROADWAY_OP_SET_TRANSIENT_FOR);
+  write_header (output, 'p');
   append_uint16 (output, id);
   append_uint16 (output, parent_id);
 }
@@ -566,7 +541,7 @@ broadway_output_put_rgb (BroadwayOutput *output,  int id, int x, int y,
 {
   gsize size_start, image_start, len;
 
-  write_header (output, BROADWAY_OP_PUT_RGB);
+  write_header (output, 'i');
 
   append_uint16 (output, id);
   append_uint16 (output, x);
@@ -823,7 +798,7 @@ broadway_output_put_rgba (BroadwayOutput *output,  int id, int x, int y,
     {
       guint8 *subdata;
 
-      write_header (output, BROADWAY_OP_PUT_RGB);
+      write_header (output, 'i');
       append_uint16 (output, id);
       append_uint16 (output, x + rects[i].x1);
       append_uint16 (output, y + rects[i].y1);
@@ -855,6 +830,6 @@ void
 broadway_output_surface_flush (BroadwayOutput *output,
 			       int             id)
 {
-  write_header (output, BROADWAY_OP_FLUSH);
+  write_header (output, 'f');
   append_uint16 (output, id);
 }

gdk/broadway/broadway.h

@@ -1,12 +1,13 @@
-#ifndef __BROADWAY_H__
-#define __BROADWAY_H__
-
 #include <glib.h>
 #include <gio/gio.h>
-#include "broadway-protocol.h"
 
 typedef struct BroadwayOutput BroadwayOutput;
 
+typedef struct  {
+    int x, y;
+    int width, height;
+} BroadwayRect;
+
 typedef enum {
   BROADWAY_WS_CONTINUATION = 0,
   BROADWAY_WS_TEXT = 1,
@@ -23,8 +24,6 @@ BroadwayOutput *broadway_output_new             (GOutputStream  *out,
 void            broadway_output_free            (BroadwayOutput *output);
 int             broadway_output_flush           (BroadwayOutput *output);
 int             broadway_output_has_error       (BroadwayOutput *output);
-void            broadway_output_set_next_serial (BroadwayOutput *output,
-						 guint32         serial);
 guint32         broadway_output_get_next_serial (BroadwayOutput *output);
 void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             id,
@@ -33,9 +32,6 @@ void            broadway_output_new_surface     (BroadwayOutput *output,
 						 int             w,
 						 int             h,
 						 gboolean        is_temp);
-void            broadway_output_request_auth    (BroadwayOutput *output);
-void            broadway_output_auth_ok         (BroadwayOutput *output);
-void            broadway_output_disconnected    (BroadwayOutput *output);
 void            broadway_output_show_surface    (BroadwayOutput *output,
 						 int             id);
 void            broadway_output_hide_surface    (BroadwayOutput *output,
@@ -82,5 +78,3 @@ void            broadway_output_grab_pointer    (BroadwayOutput *output,
 						 gboolean owner_event);
 guint32         broadway_output_ungrab_pointer  (BroadwayOutput *output);
 void            broadway_output_pong            (BroadwayOutput *output);
-
-#endif /* __BROADWAY_H__ */

gdk/broadway/broadway.js

@@ -132,6 +132,18 @@ function createXHR()
     return null;
 }
 
+/* This resizes the window so the *inner* size is the specified size */
+function resizeBrowserWindow(window, w, h) {
+    var innerW = window.innerWidth;
+    var innerH = window.innerHeight;
+
+    var outerW = window.outerWidth;
+    var outerH = window.outerHeight;
+
+    window.resizeTo(w + outerW - innerW,
+		    h + outerH - innerH);
+}
+
 function resizeCanvas(canvas, w, h)
 {
     /* Canvas resize clears the data, so we need to save it first */
@@ -151,6 +163,8 @@ function resizeCanvas(canvas, w, h)
     context.drawImage(tmpCanvas, 0, 0, tmpCanvas.width, tmpCanvas.height);
 }
 
+var useToplevelWindows = false;
+var toplevelWindows = [];
 var grab = new Object();
 grab.window = null;
 grab.ownerEvents = false;
@@ -225,16 +239,34 @@ function flushSurface(surface)
 	    context.save();
 	    context.beginPath();
 
+	    var minx;
+	    var miny;
+	    var maxx;
+	    var maxy;
 	    for (var j = 0; j < cmd.rects.length; j++) {
 		var rect = cmd.rects[j];
 		context.rect(rect.x, rect.y, rect.w, rect.h);
+		if (j == 0) {
+		    minx = rect.x;
+		    miny = rect.y;
+		    maxx = rect.x + rect.w;
+		    maxy = rect.y + rect.h;
+		} else {
+		    if (rect.x < minx)
+			minx = rect.x;
+		    if (rect.y < miny)
+			miny = rect.y;
+		    if (rect.x + rect.w > maxx)
+			maxx = rect.x + rect.w;
+		    if (rect.y + rect.h > maxy)
+			maxy = rect.y + rect.h;
+		}
 	    }
 	    context.clip();
-	    // This seems to break chrome when src overlaps dest
-	    // But source-over should be fine for rgb surfaces anyway
-	    //context.globalCompositeOperation = "copy";
-	    context.drawImage(surface.canvas,
-			      cmd.dx, cmd.dy);
+	    context.globalCompositeOperation = "copy";
+	    context.drawImage(context.canvas,
+			      minx - cmd.dx, miny - cmd.dy, maxx - minx, maxy - miny,
+			      minx, miny, maxx - minx, maxy - miny);
 	    context.restore();
 	    break;
 
@@ -244,11 +276,121 @@ function flushSurface(surface)
     }
 }
 
+function ensureSurfaceInDocument(surface, doc)
+{
+    if (surface.document != doc) {
+	var oldCanvas = surface.canvas;
+	var canvas = doc.importNode(oldCanvas, false);
+	doc.body.appendChild(canvas);
+	canvas.surface = surface;
+	oldCanvas.parentNode.removeChild(oldCanvas);
+
+	surface.canvas = canvas;
+	if (surface.toplevelElement == oldCanvas)
+	    surface.toplevelElement = canvas;
+	surface.document = doc;
+    }
+}
+
 function sendConfigureNotify(surface)
 {
     sendInput("w", [surface.id, surface.x, surface.y, surface.width, surface.height]);
 }
 
+var windowGeometryTimeout = null;
+
+function updateBrowserWindowGeometry(win, alwaysSendConfigure) {
+    if (win.closed)
+	return;
+
+    var surface = win.surface;
+
+    var innerW = win.innerWidth;
+    var innerH = win.innerHeight;
+
+    var x = surface.x;
+    var y = surface.y;
+
+    if (win.mozInnerScreenX != undefined) {
+	x = win.mozInnerScreenX;
+	y = win.mozInnerScreenY;
+    } else if (win.screenTop != undefined) {
+	x = win.screenTop;
+	y = win.screenLeft;
+    } else {
+	alert("No implementation to get window position");
+    }
+
+    if (alwaysSendConfigure || x != surface.x || y != surface.y ||
+       innerW != surface.width || innerH != surface.height) {
+	var oldX = surface.x;
+	var oldY = surface.y;
+	surface.x = x;
+	surface.y = y;
+	if (surface.width != innerW || surface.height != innerH)
+	    resizeCanvas(surface.canvas, innerW, innerH);
+	surface.width = innerW;
+	surface.height = innerH;
+	sendConfigureNotify(surface);
+	for (id in surfaces) {
+	    var childSurface = surfaces[id];
+	    var transientToplevel = getTransientToplevel(childSurface);
+	    if (transientToplevel != null && transientToplevel == surface) {
+		childSurface.x += surface.x - oldX;
+		childSurface.y += surface.y - oldY;
+		sendConfigureNotify(childSurface);
+	    }
+	}
+    }
+}
+
+function browserWindowClosed(win) {
+    var surface = win.surface;
+
+    sendInput ("W", [surface.id]);
+    for (id in surfaces) {
+	var childSurface = surfaces[id];
+	var transientToplevel = getTransientToplevel(childSurface);
+	if (transientToplevel != null && transientToplevel == surface) {
+	    sendInput ("W", [childSurface.id]);
+	}
+    }
+}
+
+function registerWindow(win)
+{
+    toplevelWindows.push(win);
+    win.onresize = function(ev) { updateBrowserWindowGeometry(ev.target, false); };
+    if (!windowGeometryTimeout)
+	windowGeometryTimeout = setInterval(function () {
+						for (var i = 0; i < toplevelWindows.length; i++)
+						    updateBrowserWindowGeometry(toplevelWindows[i], false);
+					    }, 2000);
+    win.onunload = function(ev) { browserWindowClosed(ev.target.defaultView); };
+}
+
+function unregisterWindow(win)
+{
+    var i = toplevelWindows.indexOf(win);
+    if (i >= 0)
+	toplevelWindows.splice(i, 1);
+
+    if (windowGeometryTimeout && toplevelWindows.length == 0) {
+	clearInterval(windowGeometryTimeout);
+	windowGeometryTimeout = null;
+    }
+}
+
+function getTransientToplevel(surface)
+{
+    while (surface && surface.transientParent != 0) {
+	surface = surfaces[surface.transientParent];
+	if (surface && surface.window)
+	    return surface;
+    }
+    return null;
+}
+
 function getStyle(el, styleProp)
 {
     if (el.currentStyle) {
@@ -298,6 +440,8 @@ function cmdCreateSurface(id, x, y, width, height, isTemp)
     surface.drawQueue = [];
     surface.transientParent = 0;
     surface.visible = false;
+    surface.window = null;
+    surface.document = document;
     surface.frame = null;
 
     var canvas = document.createElement("canvas");
@@ -307,7 +451,7 @@ function cmdCreateSurface(id, x, y, width, height, isTemp)
     surface.canvas = canvas;
     var toplevelElement;
 
-    if (isTemp) {
+    if (useToplevelWindows || isTemp) {
 	toplevelElement = canvas;
 	document.body.appendChild(canvas);
     } else {
@@ -332,6 +476,10 @@ function cmdCreateSurface(id, x, y, width, height, isTemp)
 
 	toplevelElement = frame;
 	document.body.appendChild(frame);
+
+	surface.x = 100 + positionIndex * 10;
+	surface.y = 100 + positionIndex * 10;
+	positionIndex = (positionIndex + 1) % 20;
     }
 
     surface.toplevelElement = toplevelElement;
@@ -363,10 +511,42 @@ function cmdShowSurface(id)
     var xOffset = surface.x;
     var yOffset = surface.y;
 
-    if (surface.frame) {
-	var offset = getFrameOffset(surface);
-	xOffset -= offset.x;
-	yOffset -= offset.y;
+    if (useToplevelWindows) {
+	var doc = document;
+	if (!surface.isTemp) {
+	    var options =
+		'width='+surface.width+',height='+surface.height+
+		',location=no,menubar=no,scrollbars=no,toolbar=no';
+	    if (surface.positioned)
+		options = options +
+		',left='+surface.x+',top='+surface.y+',screenX='+surface.x+',screenY='+surface.y;
+	    var win = window.open('','_blank', options);
+	    win.surface = surface;
+	    registerWindow(win);
+	    doc = win.document;
+	    doc.open();
+	    doc.write("<body></body>");
+	    setupDocument(doc);
+
+	    surface.window = win;
+	    xOffset = 0;
+	    yOffset = 0;
+	} else {
+	    var transientToplevel = getTransientToplevel(surface);
+	    if (transientToplevel) {
+		doc = transientToplevel.window.document;
+		xOffset = surface.x - transientToplevel.x;
+		yOffset = surface.y - transientToplevel.y;
+	    }
+	}
+
+	ensureSurfaceInDocument(surface, doc);
+    } else {
+	if (surface.frame) {
+	    var offset = getFrameOffset(surface);
+	    xOffset -= offset.x;
+	    yOffset -= offset.y;
+	}
     }
 
     surface.toplevelElement.style["left"] = xOffset + "px";
@@ -374,6 +554,9 @@ function cmdShowSurface(id)
     surface.toplevelElement.style["visibility"] = "visible";
 
     restackWindows();
+
+    if (surface.window)
+	updateBrowserWindowGeometry(surface.window, false);
 }
 
 function cmdHideSurface(id)
@@ -390,6 +573,15 @@ function cmdHideSurface(id)
     var element = surface.toplevelElement;
 
     element.style["visibility"] = "hidden";
+
+    // Import the canvas into the main document
+    ensureSurfaceInDocument(surface, document);
+
+    if (surface.window) {
+	unregisterWindow(surface.window);
+	surface.window.close();
+	surface.window = null;
+    }
 }
 
 function cmdSetTransientFor(id, parentId)
@@ -474,24 +666,45 @@ function cmdMoveResizeSurface(id, has_pos, x, y, has_size, w, h)
 	resizeCanvas(surface.canvas, w, h);
 
     if (surface.visible) {
-	if (has_pos) {
-	    var xOffset = surface.x;
-	    var yOffset = surface.y;
+	if (surface.window) {
+	    /* TODO: This moves the outer frame position, we really want the inner position.
+	     * However this isn't *strictly* invalid, as any WM could have done whatever it
+	     * wanted with the positioning of the window.
+	     */
+	    if (has_pos)
+		surface.window.moveTo(surface.x, surface.y);
+	    if (has_size)
+		resizeBrowserWindow(surface.window, w, h);
+	} else {
+	    if (has_pos) {
+		var xOffset = surface.x;
+		var yOffset = surface.y;
 
-	    var element = surface.canvas;
-	    if (surface.frame) {
-		element = surface.frame;
-		var offset = getFrameOffset(surface);
-		xOffset -= offset.x;
-		yOffset -= offset.y;
+		var transientToplevel = getTransientToplevel(surface);
+		if (transientToplevel) {
+		    xOffset = surface.x - transientToplevel.x;
+		    yOffset = surface.y - transientToplevel.y;
+		}
+
+		var element = surface.canvas;
+		if (surface.frame) {
+		    element = surface.frame;
+		    var offset = getFrameOffset(surface);
+		    xOffset -= offset.x;
+		    yOffset -= offset.y;
+		}
+
+		element.style["left"] = xOffset + "px";
+		element.style["top"] = yOffset + "px";
 	    }
-
-	    element.style["left"] = xOffset + "px";
-	    element.style["top"] = yOffset + "px";
 	}
     }
 
-    sendConfigureNotify(surface);
+    if (surface.window) {
+	updateBrowserWindowGeometry(surface.window, true);
+    } else {
+	sendConfigureNotify(surface);
+    }
 }
 
 function cmdFlushSurface(id)
@@ -519,21 +732,6 @@ function handleCommands(cmd)
 	var command = cmd.get_char();
 	lastSerial = cmd.get_32();
 	switch (command) {
-	case 'l':
-	    login ();
-	    break;
-
-	case 'L':
-	    if (loginDiv != null)
-		loginDiv.parentNode.removeChild(loginDiv);
-	    start ();
-	    break;
-
-	case 'D':
-	    alert ("disconnected");
-	    inputSocket = null;
-	    break;
-
 	case 's': // create new surface
 	    id = cmd.get_16();
 	    x = cmd.get_16s();
@@ -733,12 +931,8 @@ BinCommands.prototype.get_32 = function() {
 };
 BinCommands.prototype.get_image_url = function() {
     var size = this.get_32();
-    var png_blob = new Blob ([new Uint8Array (this.arraybuffer, this.pos, size)], {type:"image/png"});
-    var url;
-    if (window.webkitURL)
-	url = window.webkitURL.createObjectURL(png_blob);
-    else
-	url = window.URL.createObjectURL(png_blob, {oneTimeOnly: true});
+    var png_blob = new Blob ([this.arraybuffer.slice (this.pos, this.pos + size)], {type:"image/png"});
+    var url = URL.createObjectURL(png_blob, {oneTimeOnly: true});
     this.pos = this.pos + size;
     return url;
 };
@@ -791,8 +985,13 @@ function getPositionsFromAbsCoord(absX, absY, relativeId) {
 
 function getPositionsFromEvent(ev, relativeId) {
     var absX, absY;
-    absX = ev.pageX;
-    absY = ev.pageY;
+    if (useToplevelWindows) {
+	absX = ev.screenX;
+	absY = ev.screenY;
+    } else {
+	absX = ev.pageX;
+	absY = ev.pageY;
+    }
     var res = getPositionsFromAbsCoord(absX, absY, relativeId);
 
     lastX = res.rootX;
@@ -821,6 +1020,10 @@ function updateForEvent(ev) {
 	lastState |= GDK_MOD1_MASK;
 
     lastTimeStamp = ev.timeStamp;
+    if (ev.target.surface && ev.target.surface.window) {
+	var win = ev.target.surface.window;
+	updateBrowserWindowGeometry(win, false);
+    }
 }
 
 function onMouseMove (ev) {
@@ -833,8 +1036,6 @@ function onMouseMove (ev) {
 	    surface.x += dx;
 	    surface.y += dy;
 	    var offset = getFrameOffset(surface);
-	    if (surface.y < offset.y)
-		surface.y = offset.y;
 	    localGrab.frame.style["left"] = (surface.x - offset.x) + "px";
 	    localGrab.frame.style["top"] = (surface.y - offset.y) + "px";
 	    sendConfigureNotify(surface);
@@ -940,7 +1141,7 @@ function onMouseDown (ev) {
 	localGrab.lastX = ev.pageX;
 	localGrab.lastY = ev.pageY;
 	moveToTop(localGrab.frame.frameFor);
-	return false;
+	return;
     }
 
     if (id == 0 && ev.target.closeFor) { /* mouse click on frame */
@@ -952,14 +1153,13 @@ function onMouseDown (ev) {
 	localGrab.button = ev.target;
 	localGrab.lastX = ev.pageX;
 	localGrab.lastY = ev.pageY;
-	return false;
+	return;
     }
 
     var pos = getPositionsFromEvent(ev, id);
     if (grab.window == null)
 	doGrab (id, false, true);
     sendInput ("b", [realWindowWithMouse, id, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState, button]);
-    return false;
 }
 
 function onMouseUp (ev) {
@@ -989,15 +1189,13 @@ function onMouseUp (ev) {
 		sendInput ("W", [localGrab.surface.id]);
 	}
 	localGrab = null;
-	return false;
+	return;
     }
 
     sendInput ("B", [realWindowWithMouse, id, pos.rootX, pos.rootY, pos.winX, pos.winY, lastState, button]);
 
     if (grab.window != null && grab.implicit)
 	doUngrab();
-
-    return false;
 }
 
 /* Some of the keyboard handling code is from noVNC and
@@ -2473,7 +2671,7 @@ function handleKeyDown(e) {
 	// browser behaviors or it has no corresponding keyPress
 	// event, then send it immediately
 	if (!ignoreKeyEvent(ev))
-	    sendInput("k", [realWindowWithMouse, keysym, lastState]);
+	    sendInput("k", [keysym, lastState]);
 	suppress = true;
     }
 
@@ -2518,7 +2716,7 @@ function handleKeyPress(e) {
 
     // Send the translated keysym
     if (keysym > 0)
-	sendInput ("k", [realWindowWithMouse, keysym, lastState]);
+	sendInput ("k", [keysym, lastState]);
 
     // Stop keypress events just in case
     return cancelEvent(ev);
@@ -2537,7 +2735,7 @@ function handleKeyUp(e) {
     }
 
     if (keysym > 0)
-	sendInput ("K", [realWindowWithMouse, keysym, lastState]);
+	sendInput ("K", [keysym, lastState]);
     return cancelEvent(ev);
 }
 
@@ -2585,7 +2783,7 @@ function onMouseWheel(ev)
     var id = getSurfaceId(ev);
     var pos = getPositionsFromEvent(ev, id);
 
-    var offset = ev.detail ? ev.detail : -ev.wheelDelta;
+    var offset = ev.detail ? ev.detail : ev.wheelDelta;
     var dir = 0;
     if (offset > 0)
 	dir = 1;
@@ -2626,56 +2824,17 @@ function newWS(loc) {
     return ws;
 }
 
-function start()
-{
-    setupDocument(document);
-
-    var w, h;
-    w = window.innerWidth;
-    h = window.innerHeight;
-    window.onresize = function(ev) {
-	var w, h;
-	w = window.innerWidth;
-	h = window.innerHeight;
-	sendInput ("d", [w, h]);
-    };
-    sendInput ("d", [w, h]);
-}
-
-var loginDiv = null;
-function login()
-{
-    if (loginDiv == null) {
-	var div = document.createElement('div');
-	document.body.appendChild(div);
-	div.innerHTML = "Please enter password<br>";
-	div.style.marginTop = "40px";
-	div.style.textAlign = "center";
-
-	var input = document.createElement("input");
-	input.setAttribute("type", "password");
-	div.appendChild(input);
-	input.focus ();
-	input.onkeyup = function(e) {
-	    if (e.keyCode === 13 && input.value != "") {
-		inputSocket.send ("l" + input.value);
-	    }
-	}
-	loginDiv = div;
-    } else {
-	alert ("Wrong password");
-    }
-}
-
 function connect()
 {
     var url = window.location.toString();
     var query_string = url.split("?");
     if (query_string.length > 1) {
 	var params = query_string[1].split("&");
+	if (params[0].indexOf("toplevel") != -1)
+	    useToplevelWindows = true;
     }
 
-    var loc = window.location.toString().replace("http:", "ws:").replace("https:", "wss:");
+    var loc = window.location.toString().replace("http:", "ws:");
     loc = loc.substr(0, loc.lastIndexOf('/')) + "/socket";
 
     var supports_binary = newWS (loc + "-test").binaryType == "blob";
@@ -2688,13 +2847,32 @@ function connect()
 
     ws.onopen = function() {
 	inputSocket = ws;
+	var w, h;
+	if (useToplevelWindows) {
+	    w = window.screen.width;
+	    h = window.screen.height;
+	} else {
+	    w = window.innerWidth;
+	    h = window.innerHeight;
+	    window.onresize = function(ev) {
+		var w, h;
+		w = window.innerWidth;
+		h = window.innerHeight;
+		sendInput ("d", [w, h]);
+	    };
+	}
+	sendInput ("d", [w, h]);
     };
     ws.onclose = function() {
-	if (inputSocket != null)
-	    alert ("disconnected");
 	inputSocket = null;
     };
     ws.onmessage = function(event) {
 	handleMessage(event.data);
     };
+
+    setupDocument(document);
+    window.onunload = function (ev) {
+	for (var i = 0; i < toplevelWindows.length; i++)
+	    toplevelWindows[i].close();
+    };
 }