Optimize blur rendering by always choosing the smaller surface to blur, since rendering speed is inversely proportional to the dimension of the surface to blur

Split out the blurred shadow rendering in three steps:
- creation of a surface of the appropriate size - we use the clip
  rectangle as a good measurement for the size, since we won't render
  out of it anyway
- painting the unblurred shape on the surface - this is responsibility
  of the single shadow implementations
- blur the surface and compose the result back on the original cairo_t

This means we can share code between the implementations for the first
and third steps; it also makes the code independent of the rendered
size, so we can avoid passing down a cairo_rectangle_t with e.g. the
icon coordinates.

INSTALL.in

@@ -18,12 +18,12 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % tar xf gtk+-@GTK_VERSION@.tar.xz   # unpack the sources
+  % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-@GTK_VERSION@              # change to the toplevel directory
+  % cd gtk+-@GTK_VERSION@                          # change to the toplevel directory
-  % ./configure                        # run the `configure' script
+  % ./configure                                    # run the `configure' script
-  % make                               # build GTK+
+  % make                                           # build GTK+
   [ Become root if necessary ]
-  % make install                       # install GTK+
+  % make install                                   # install GTK+
 
 The Details
 ===========

NEWS

@@ -1,569 +1,3 @@
-Overview of Changes in GTK+ 3.7.2
-=================================
-
-* Theming:
- - Improve touch text handle theming
- - Always draw background of menuitems
-
-* Geometry management
- - Size groups now handle height-for-width
- - Fix corner cases in label size allocation
-
-* Accessibility
- - Make entry icons accessible
-
-* Filechooser
- - Don't add duplicate bookmarks
- - Remember sidebar width
-
-* Wayland: Build against wayland-client 1.0
-
-* Bugs fixed:
- 524295 remember the file chooser side pane's position
- 577806 gtk_file_chooser_add_shortcut_folder adds duplicates...
- 677609 GtkSizeGroup regression in GTK+ 3.3.20
- 683896 Clean up global resources when the display is closed
- 686021 spinner animation should not be subject to enable-an...
- 686347 Clickable icons are not accessible as children of te...
- 687059 icon-theme: support loading symbolic GFileIcons from...
- 687196 filesystemmodel: invalidate nodes on file remove
- 687467 Commit "Implement proper cross-fades for gradients" ...
- 687842 Support partially transparent widgets
- 687872 Segfault when attempting to get character extents fo...
- 687977 icon-theme: Add some preconditions for NULL arguments
-
-* Translation updates:
- Assamese
- Brazilian Portuguese
- Estonian
- Galician
- German
- Greek
- Gujarati
- Indonesian
- Latvian
- Lithuanian
- Marathi
- Norwegian bokmål
- Serbian
- Slovenian
- Spanish
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.7.0
-=================================
-
-* Add an "inverted" property to GtkLevelBar
-
-* Support RTL flipping in GtkLevelBar
-
-* Various memory leak fixes
-
-* Wayland: Update for protocol changes
-
-* Bugs fixed:
- 684288 level-bar: add an "inverted" property like GtkProgr...
- 684415 Fix drag-motion event handling
- 684980 Improve the appearance of the dragged header
- 686013 CSS: crash drawing a GtkEntry in gedit
- 686152 Calls gdk_window_get_frame_extents with a potential...
- 686209 memleak with "text-shadow" css
- 686265 scrolledwindow: set GDK_EXPOSURE_MASK on the oversh...
- 686280 GtkScrollbar and GtkScale rendering broken in gtk 3.6
- 686366 Use named union for _GtkSymbolicColor in gtk/gtksym...
-
-* Translation updates:
- Czech
- Estonian
- Galician
- Indonesian
- Lithuanian
- Serbian
- Slovak
- Slovenian
- Spanish
-
-
-Overview of Changes in GTK+ 3.6.1
-=================================
-
-* CSS:
- - huge refactoring to avoid computing wrong values
- - treeview: Invalidate children properly
- - treeview: Fix computing child paths
-
-* Broadway:
- - use binary websockets when available
-
-* Bugs fixed:
- 646221 Imperfect Russian translation of 'Print preview'...
- 682395 Nautilus tabs have black background
- 684517 window: Delay showing auto mnemonics on focus in
- 684639 GTK+ 3.5.18 makes Epiphany unusable
- 684984 No focus rendering for Icon Views in SELECTION_N...
- 685449 Non-uniform borders on GtkScrolledWindow break c...
- 685996 trivial build fix: test uses = not ==
-        Fix a multi-display problem in touch handle code
-        App chooser: respect NoDisplay
-
-* Translation updates:
- Catalan
- Catalan (Valencian)
- Italian
- Japanese
- Khmer
- Norwegian bokmål
- Russian
- Slovak
-
-
-Overview of Changes in GTK+ 3.6.0
-=================================
-
-* Add support for blur to CSS shadows
-
-* Bugs fixed:
- 679883 When printing Custom paper sizes GTK Print Dialog...
- 684258 Crash when calling gtk_application_set_menubar twice
- 684606 GtkMenuButton: implement rtl flipping
- 684607 GtkSearchEntry: flip the clear icon in rtl
-        Fix style context path for internal buttons
-
-* Translation updates:
- Bengali
- Brazilian Portuguese
- Bulgarian
- Catalan
- Catalan (Valencian)
- Czech
- Galician
- German
- Gujarati
- Hebrew
- Hindi
- Kannada
- Kyrgyz
- Latvian
- Malayalam
- Punjabi
- Russian
- Serbian
- Telugu
-
-
-Overview of Changes in GTK+ 3.5.18
-==================================
-
-* GMenu:
- - Support namespaces for actions
- - Allow submenus to have actions for opening
- - New function: gtk_menu_shell_bind_model
-
-* CSS:
- - Parse and support CSS animations
- - Support cross-fading and transitions
-
-* OS X:
- - Adjust scrollbar and scale behavior according to platform
-
-* Bugs fixed
- 643611 Leak on gail_widget_get_description
- 658694 GtkAssistant: Unable to change current page in prepare...
- 670390 -GtkMenuBar-shadow-type: none disables background inst...
- 671786 Glade XML files cannot set an ImageMenuItem accelerato...
- 674108 Hard crash due to wrong NSAutoreleasePool stacking
- 676890 GtkButton are still highlighted after removing them fr...
- 677559 argument of Gdk.Keymap.map_virtual_modifiers is not co...
- 680962 GtkMenuButton doesn't display accelerators when used w...
- 682630 GMenuModel attribute for an action to toggle on submen...
- 682831 gtkmodelmenu: expose API for action namespace
- 683474 Print dialog lists custom paper sizes twice for "Print...
- 683627 Memory leak in style_data_lookup
- 683718 box: Fix typo
- 683738 Simplify GtkApplicationWindow accel handling
- 683874 Load settings.ini also from XDG_CONFIG_DIRS
- 683896 Clean up global resources when the display is closed
- 684038 togglebutton: always set PRELIGHT state when in_button...
- 684076 clean up a11y on shutdown
- 684096 GtkWidget:drag-data-received code sample refers to rem...
- 684156 fontchooserwidget: scroll to the currently selected row
-
-* Translation updates
- Arabic
- Assamese
- Belarusian
- Brazilian Portuguese
- British English
- Danish
- Finnish
- French
- Galician
- Greek
- Hebrew
- Hungarian
- Indonesian
- Korean
- Lithuanian
- Persian
- Polish
- Portuguese
- Punjabi
- Serbian
- Slovenian
- Thai
- Spanish
- Russian
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.5.16
-==================================
-
-* Fix critical warnings on startup in nautilus
-
-
-Overview of Changes in GTK+ 3.5.14
-==================================
-
-* Input method support
- - Propagate input purpose and hints to individual IMs
- - Add a hint to suppress on-screen keyboards
-
-* GtkEntry can now set Pango attributes for its text
-
-* GtkEntry and GtkTextView show 'selection handles' when
-  used with touch devices
-
-* GtkSpinButton can be oriented vertically
-
-* Bugs fixed
- 645065 GtkFileChooserButton doesn't handle closing its dialo...
- 661973 gtk+ reacts on F10 press incorrectly with xkeyboard-c...
- 672046 Issues with widget state propagation
- 672431 the alt+tab app switch makes mnemonics flash
- 676787 Update printing demo to use new print setting
- 679144 Gdk doesn't properly find the child area with alpha
- 681617 radio button text isn't centered when draw indicator ...
- 682129 Print Dialog / Improving "Print to file" option
- 682291 GtkMenuButton .ui issues
- 682552 Improve the layout of the mount operations dialog
- 682662 GtkAspectFrame: vertical alignment should be top/bott...
- 682724 Fix a typo in the the comments
- 682825 Also compile gtkdbusgenerated.c on non-UNIX environme...
- 682919 Crash in GTK+-3.x (3.0.x-3.5.12+) on Windows with CJK...
- 683001 Make headings bold in message dialogs by default
- 683168 Make spinbutton orientable
-
-* Translation updates
- Assamese
- French
- Galician
- Greek
- Indonesian
- Japanese
- Kazakh
- Latvian
- Lithuanian
- Norwegian bokmål
- Persian
- Polish
- Punjabi
- Spanish
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.5.12
-==================================
-
-* GtkApplication:
- - Add gtk_application_get_active_window to get the active window
- - Add gtk_widget_insert_action_group to allow more flexibility
-   when associating widgets with actions
-
-* GtkMenuButton:
- - The gtk_menu_button_set_menu function is getting renamed
-   to gtk_menu_button_set_popup. The old name is still available
-   for now, but will be removed before 3.6
-
-* GtkToolbar:
- - use CSS properties instead of style properties for padding
-
-* Input method support:
- - GtkEntry and GtkTextView now have input-purpose and input-hints
-   properties that let applications provide useful hints to
-   input methods, like 'this entry is for a phone nr'.
-
-* Bugs:
- 373279 Toggling a GtkToggleButton emits "clicked", not "toggled"
- 651244 Add a "purpose" tag for GtkEntries
- 673478 Chain up notify implementations
- 681577 Missing mnemonic in "Find applications online"
- 681591 Masked string for password fields is not exposed to accessibility
- 681613 icon view doesn't emit selection changed when the model changes
- 682193 404 in GTK+ docs for duplicated "stable" URL suffix to ATK link
- 682235 gtkmenubutton: repurpose set_menu for GMenuModel
-
-* Translation updates:
- Assamese
- Esperanto
- Galician
- Lithuanian
- Marathi
- Portuguese
- Serbian
- Spanish
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.5.10
-==================================
-
-* Wayland:
- - Add keyboard handling
- - Improve clipboard handling
- - Add default settings implementation
-
-* GDK thread support has been deprecated
-
-* Bugs fixed:
- 679910 GtkTreeModelFilter: Fix _iter_previous() when iter...
- 679978 Optimize gtk_widget_path_copy() by preallocating "...
- 680754 deprecate gdk thread functions
- 680803 menubutton: Clear references in dispose, not finalize
- 680822 Document return value of GtkWidget::draw
- 680901 GTK+: The chinese translations of "even sheet" and...
- 680949 GtkColorButton documentation seems self-contradictory
- 680988 GtkMenuButton down direction positioning suboptimal
- 681005 [IconView] wrong transfer annotation for get_toolt...
- 681006 Escape should cancel DnD operation
- 681064 container: restyle queue leaks
-
-* Updated translations
- Galician
- German
- Greek
- Gujarati
- Japanese
- Kazakh
- Norwegian bokmål
- Persian
- Serbian
- Slovenian
- Spanish
- Telugu
- Traditional Chinese
-
-
-Overview of Changes in GTK+ 3.5.8
-=================================
-
-* gtk-launch: A new commandline utility to launch an application
-  from its desktop file
-
-* GtkStrengthBar: A new widget for displaying the strength
-  or level or some quantity
-
-* Wayland: Updates for changes in the Wayland protocol
-
-* Bugs fixed:
- 667808 Accept -1 as the position where insert an element...
- 671437 GtkStyle background color regression
- 671817 GTK+ doesn't create ~/.local/share (path) and ~/.local...
- 675990 gtk_tree_column_set_visible badly interact with the a1...
- 677347 he accessible name of the 'Lock'/'Unlock' button is al...
- 677491 'toolkit-accessibility' default value should be 'true'...
- 678828 gtk_application_add_accelerator() (and remove) missing...
- 678829 Bloatpad example application has "parse" action instea...
- 679092 gtkstyle: add a gtkstyle-fallback style class for RC c...
- 679166 modelmenu: set the accel group on the GtkMenu
- 679228 signal parameter names are not valid C identifiers
- 679409 docs: link against libgdk-3.la
- 679449 menubutton: set DROPDOWN_MENU hint on the menu topleve...
- 679454 modelmenu: listen for toplevel changes on the attach w...
- 679537 Crash in GtkEntry gtk_entry_get_icon_pixbuf()
- 679705 Using NULL with gtk_application_set_menubar causes seg...
- 677892 Add a GtkStrengthBar widget
- 679342 Add a gtk-launch utility
-
-* Translation updates:
- Bulgarian
- Greek
- Norwegian nynorsk
- Telugu
- Vietnamese
-
-Overview of Changes in GTK+ 3.5.6
-=================================
-
-* GtkSearchEntry is a subclass of GtkEntry that is set up to be
-  used as a search entry
-
-* GtkMenuButton is button that pops up a menu. The menu can be
-  generated from a GMenu or provided manually
-
-* The GtkMountOperation code will now use gnome-shell to present
-  a system-modal mount dialog when available
-
-* The accessibility bridge code that exports accessible objects
-  on the bus is used by default (atk-bridge has been converted into
-  a library that GTK+ links against). To avoid the linking, you can
-  pass --without-atk-bridge when configuring GTK+.
-
-* Bugs fixed:
- 613561 single quote missing in translation of gtk-2-18.kn.po
- 652809 Add "search" entry
- 668013 Add menu button
- 669986 Some keyboard navigation breakage with GtkNotebook
- 670369 gdk: annotate the attributes_mask type for gdk_window_new
- 674963 GtkMountOperation should proxy to the Shell for modal dial...
- 676077 Windows: Weird characters appearing when using certain key...
- 677491 'toolkit-accessibility' default value should be 'true' for...
- 677551 a11y: fix a typo leading to a crash
- 677649 gtk[list,tree]store: fix transformation of GValues upon set
- 677774 gdk: add missing annotations to gdk_event_get_scroll_deltas
- 677809 Regression: gtkiconview changes in 3.4.2 / master break ch...
- 677915 entry-completion: don't move to leftmost character with in...
- 677941 Gtk.ListStore doesn't have the method "reorder" as its doc...
- 677943 DnD of notebook tabs lead to Gtk-WARNING
- 678175 Memory leak in GtkImage
- 678407 GtkImage: fix get_property('stock')
- 678418 Lacks a way to get the position of an item in the icon view
-
-* Translation updates:
- Arabic
- Galician
- Greek
- Spanish
- Telugu
-
-
-Overview of Changes in GTK+ 3.5.4
-=================================
-
-* GtkIconView size allocation has been rewritten to support
-  height-for-width and work better.
-
-* The theming code now supports multiple backgrounds and
-  transitions
-
-* Bug fixes:
- 162865 F1 should be the shortcut for Help/Contents, not ...
- 460908 gtk_paper_size_get_[width|height] doesn't support...
- 478344 GtkTreeRowReference falsely said to auto-subscrib...
- 531319 "weight-set" cellrenderertext attribute misbehave...
- 571254 Constructing a pixel value from components
- 587873 Documentation should explain MessageDialogs don't...
- 643490 gtk-style-context-add-provider () documentation n...
- 645514 Add placeholder-text property to GtkCellrendererText
- 646798 Add a tip about "cloning contexts"
- 647779 Doesn't mention GtkDialog replacements
- 649569 GDK_THREADS_ENTER in file_print_cb@modules/printb...
- 652304 themingengine: don't hardcode the slider lines in...
- 657322 GtkPrintSettings requires every application to wo...
- 659613 GtkLockButton docs are inaccurate
- 663072 GtkSelectionData is incorrectly documented
- 663991 _XOPEN_SOURCE 500 causes error in Solaris Studio ...
- 664646 dnd pointer lock when dragging tab between two ge...
- 665243 settings: Add support for disabling middle click ...
- 670449 Splash screen stays
- 671025 Constants and identifiers starting with a number ...
- 671249 GApplication: Allow a null application_id?
- 672947 GtkEntryCompletion sizing/position fixes
- 673237 window: Remove needless call to ensure_state_flag...
- 673749 Error Message When Creating Tray Icon
- 674192 out-of-tree build failure: demos/widget-factory/w...
- 674409 need a way to identify GtkApplicationWindows remo...
- 674549 widget receives leave event when button released
- 675365 immulticontext: Always check if the global contex...
- 675421 GtkFileChooser should set its role
- 675423 [Patch] doc: Add missing CDATA around a XML progr...
- 675501 gtkquartz.h is not the gtk+-3.5.2.tar.xz archive
- 675535 GtkScale in GtkToolbar: strange behaviour with do...
- 675809 Crash when clicking xrefs
- 675895 Docs for certain functions are built unconditionally
- 675899 Infobar not loadable by GTKBuilder (using python ...
- 675951 gdkx.h inclusion breaks OotSD builds
- 676087 gtk+ fails to build against uclibc due to isnan/i...
- 676196 range: use a CSS margin to shrink the trough comp...
- 676198 current color of a GtkColorButton should be set t...
- 676243 Document removing of accelerators
- 676329 GDK_SMOOTH_SCROLL_MASK lacks "Since"
- 676356 icon-theme: Allow symbolic GFileIcons
- 676429 no way to force showing icons in buttons
- 677055 gtkmenutoolbutton bug fixes
- 677109 Fixes for interactions between background-repeat ...
- 677127 Misc annotation fixes
- 677202 docs: Add section for new 3.6 symbols
- 677203 docs: Fix duplicate declarations in sections
- 677293 GtkFontSelectionDialog partially broken on gtk 3.4
- 677363 grid: Add missing guard to gtk_grid_get_child_at()
-
-* Translation updates:
- Dutch
- French
- Galician
- German
- Greek
- Hebrew
- Italian
- Norwegian bokmål
- Slovenian
- Spanish
-
-
-Overview of Changes in GTK+ 3.5.1
-=================================
-
-* Wayland:
- - Allow the wayland backend to be used without cairo-gl
- - Expose GdkWaylandDisplayManager for runtime checks
-
-* Theming:
- - Optimizations to style invalidation
- - Support CSS animatable properties
-
-* Bugs fixed
- 563688 GtkScale (GtkRange) should jump to clicked position
- 668931 Scrolling down via PageDown/PageUp keys impossible ...
- 669989 gtk_grid_attach(): Documentation doesn't mention mu...
- 670373 modules/printing/cups/gtkprintbackendcups.c won't b...
- 672361 Remove cairo-gl dependency from wayland backend
- 672789 gtk_builder_add_objects_from_file() crashes on GtkU...
- 672993 print dialog overrides default cups number-up settings
- 673259 The gdk/gdkkeysyms-update.pl script and the keysym ...
- 673644 Scroll not working in document overview
- 673650 Evince 3.4: adding new annotation is not possible (...
- 674050 Free image->priv->icon_helper in gtk_image_finalize...
- 674102 Defaults to wayland over x11 backend
- 674118 application-window: Desktop file handling improvements
- 674200 ./configure gives wrong error message if -lXext is ...
- 674286 "Delete confirmation" dialog has wrong padding
- 674326 Use localizations of option names and values contai...
- 674468 Add GTK_STYLE_CLASS_DIM_LABEL
- 674577 Non static variable in GtkStyleProviderPrivate
- 674587 treemodelsort: allow iter_previous() to go past the...
- 674806 icontheme: search first in all themes if the reques...
- 674807 spinbutton: port to GtkIconHelper
- 674808 themingengine: render a frame in gtk_render_handle()
- 674809 themingengine: simplify render_extension() default ...
- 674890 Fix the colord support in GtkPrinterCups when the P...
- 646631 GTK should use XDG base dir spec instead of home
-
-* Translation updates
- Bulgarian
- Crimean Tatar
- Czech
- Galician
- German
- Hebrew
- Norwegian bokmål
- Russian
- Serbian
- Simplified Chinese
- Slovenian
-
-
 Overview of Changes in GTK+ 3.4.1
 =================================
 

README.in

@@ -72,43 +72,13 @@ and attach the patch to that bug report.
 Patches should be in unified diff form. (The -up option to GNU diff.)
 
 
-Release notes for 3.6
-=====================
-
-* The accessibility bridge code that exports accessible objects
-  on the bus is now used by default; atk-bridge has been converted
-  into a library that GTK+ links against. To void the linking,
-  pass --without-atk-bridge when configuring GTK+.
-
-* GDK threading support has been deprecated. It is recommended to
-  use g_idle_add(), g_main_context_invoke() and similar funtions
-  to make all GTK+ calls from the main thread.
-
-* GTK+ now follows the XDG Base Directory specification for
-  user configuration and data files. In detail,
-  * $XDG_CONFIG_HOME/gtk-3.0/custom-papers is the new location
-    for $HOME/.gtk-custom-papers
-  * $XDG_CONFIG_HOME/gtk-3.0/bookmarks is the new location
-    for $HOME/.gtk-bookmarks
-  * $XDG_DATA_HOME/themes is preferred over $HOME/.themes
-  * $XDG_DATA_HOME/icons is preferred over $HOME/.icons.
-  Existing files from the old location will still be read
-  if the new location does not exist.
-
-* $HOME/.gtk-3.0 is no longer in the default module load path.
-  If you want to load modules from there, add it to the GTK_PATH
-  environment variable.
-
 Release notes for 3.4
 =====================
 
 * Scroll events have been separated from button events, and smooth
   scrolling has been added with a separate event mask. Widgets now
   need to have either GDK_SCROLL_MASK or GDK_SMOOTH_SCROLL_MASK in
-  their event mask to receive scroll events. In addition, the
+  their event mask to receive scroll events.
-  GdkScrollDirection enumeration has gained a new member,
-  GDK_SCROLL_SMOOTH, so switch statements will have to be amended
-  to cover this case.
 
 * GTK+ now uses <Primary> instead of <Control> in keyboard accelerators,
   for improved cross-platform handling. This should not affect

build/win32/vs10/gailutil.vcxproj

@@ -26,17 +26,16 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-	<WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -63,10 +62,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

build/win32/vs10/gdk-win32.vcxproj

@@ -27,7 +27,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -36,7 +35,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>

build/win32/vs10/gdk.vcxprojin

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

build/win32/vs10/gtk+.props

@@ -5,7 +5,7 @@
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
     <GtkApiVersion>3.0</GtkApiVersion>
-    <GtkBinaryVersion>3.0.0</GtkBinaryVersion>
+    <GtkBinaryVersion>2.10.0</GtkBinaryVersion>
     <GtkDummyPrefix>\"/dummy\"</GtkDummyPrefix>
     <GtkPrefixDefine>GTK_PREFIX="\"$(GtkDummyPrefix)\""</GtkPrefixDefine>
     <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="\"Gdk\""</GdkDefines>
@@ -18,24 +18,22 @@ mkdir $(CopyDir)\bin
 
 copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
 
-copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
 
+mkdir $(CopyDir)\bin\gtk3-demo
 
-mkdir $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy $(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.c $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.css $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.h $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.ui $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.jpg $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\bin\gtk3-demo
 
-copy ..\..\..\demos\gtk-demo\*.png $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
+copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\bin\gtk3-demo
-
-copy ..\..\..\demos\gtk-demo\*.gif $(CopyDir)\share\gtk-$(GtkApiVersion)\demo
 
 
 mkdir $(CopyDir)\lib
@@ -319,8 +317,6 @@ copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -333,8 +329,6 @@ copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -415,8 +409,6 @@ copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
-copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
-
 copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-$(GtkApiVersion)\gtk
@@ -597,6 +589,8 @@ copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk
 
 copy $(Configuration)\$(Platform)\bin\*-$(GtkApiVersion).lib $(CopyDir)\lib
 
+copy $(Configuration)\$(Platform)\bin\gailutil.lib $(CopyDir)\lib
+
 
 mkdir $(CopyDir)\share\glib-2.0\schemas
 

build/win32/vs10/gtk.vcxprojin

@@ -12,12 +12,10 @@
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|x64">
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -64,9 +62,9 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -83,11 +81,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -103,13 +101,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -128,11 +126,11 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -148,13 +146,13 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
+      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib</ImportLibrary>
+      <ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>

build/win32/vs10/gtk3-demo.vcxproj

@@ -173,12 +173,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\clipboard.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\colorsel.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_accordion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_basics.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -208,8 +202,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\stock_browser.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_custom_css.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />

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

@@ -38,24 +38,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\combobox.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_accordion.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_basics.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -143,12 +125,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_custom_css.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
       <Filter>Source Files</Filter>
     </ClCompile>

build/win32/vs10/libgail.vcxprojin

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

build/win32/vs9/gailutil.vcproj

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

build/win32/vs9/gdk-win32.vcproj

@@ -46,7 +46,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -88,7 +87,6 @@
 			InheritedPropertySheets=".\gtk+.vsprops"
 			ConfigurationType="4"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"

build/win32/vs9/gdk.vcprojin

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

build/win32/vs9/gtk+.vsprops

@@ -27,21 +27,13 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h

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

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

build/win32/vs9/gtk.vcprojin

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

build/win32/vs9/gtk3-demo.vcproj

@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
@@ -77,7 +77,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies=""
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				RandomizedBaseAddress="1"
@@ -169,12 +169,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -204,8 +198,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\theming_custom_css.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />

build/win32/vs9/libgail.vcprojin

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

config.h.win32.in

@@ -8,9 +8,6 @@
 /* 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@"
 
@@ -35,18 +32,6 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1
 
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#ifndef _MSC_VER
-#define HAVE_DECL_ISINF 1
-#endif
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#ifndef _MSC_VER
-#define HAVE_DECL_ISNAN 1
-#endif
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */
 
@@ -72,9 +57,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #define HAVE_GETTEXT 1
 
-/* Define if gio-unix is available */
-/* #undef HAVE_GIO_UNIX */
-
 /* Have GNU ftw */
 /* #undef HAVE_GNU_FTW */
 
@@ -97,11 +79,6 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 /* #undef HAVE_LC_MESSAGES */
 
-/* Define to 1 if you have the `m' library (-lm). */
-#ifndef _MSC_VER
-#define HAVE_LIBM 1
-#endif
-
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
@@ -203,9 +180,18 @@
 /* #undef HAVE_UNISTD_H */
 #endif
 
+/* Have uxtheme.h include file */
+#define HAVE_UXTHEME_H 1
+
+/* Define if we have X11R6 */
+/* #undef HAVE_X11R6 */
+
 /* Have the XCOMPOSITE X extension */
 /* #undef HAVE_XCOMPOSITE */
 
+/* Define to 1 if you have the `XConvertCase' function. */
+/* #undef HAVE_XCONVERTCASE */
+
 /* Have the Xcursor library */
 /* #undef HAVE_XCURSOR */
 
@@ -224,6 +210,9 @@
 /* Define to 1 if xinerama is available */
 /* #undef HAVE_XINERAMA */
 
+/* Define to 1 if you have the `XInternAtoms' function. */
+/* #undef HAVE_XINTERNATOMS */
+
 /* Define to use XKB extension */
 /* #undef HAVE_XKB */
 
@@ -290,17 +279,9 @@
 /* Define to 1 if XInput 2.0 is available */
 /* #undef XINPUT_2 */
 
-/* Define to 1 if XInput 2.2 is available */
-/* #undef XINPUT_2_2 */
-
 /* 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,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [7])
+m4_define([gtk_minor_version], [4])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_micro_version], [2])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [2])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -39,9 +39,9 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.35.0])
+m4_define([glib_required_version], [2.32.0])
 m4_define([pango_required_version], [1.30.0])
-m4_define([atk_required_version], [2.5.3])
+m4_define([atk_required_version], [2.2.0])
 m4_define([cairo_required_version], [1.10.0])
 m4_define([gdk_pixbuf_required_version], [2.26.0])
 m4_define([introspection_required_version], [1.32.0])
@@ -125,7 +125,6 @@ AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 AC_PROG_CC
 AC_PROG_CC_C_O
 AC_PROG_CC_STDC
-AC_PROG_MKDIR_P
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
@@ -141,11 +140,8 @@ MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
 EXE_MANIFEST_ARCHITECTURE=X86
-DISABLE_ON_W32=''
 case "$host" in
   *-*-mingw*)
-    dnl Comment-out certain gtk3.types.in lines
-    DISABLE_ON_W32='%'
     os_win32=yes
     gio_can_sniff=no
     MATH_LIB=
@@ -162,7 +158,6 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])
 
-AC_SUBST(DISABLE_ON_W32)
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
 AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
@@ -362,28 +357,23 @@ else
   AM_CONDITIONAL(USE_WIN32, false)
 fi
 
-DISABLE_ON_QUARTZ=''
 if test "x$enable_quartz_backend" = xyes; then
   cairo_backends="$cairo_backends cairo-quartz"
   GDK_BACKENDS="$GDK_BACKENDS quartz"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
-  DISABLE_ON_QUARTZ='%'
   AM_CONDITIONAL(USE_QUARTZ, true)
   if test "x$quartz_relocation" = xyes; then
     AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
   fi
-  # Pull in gio-unix for GDesktopAppInfo usage, see at least
-  # gdkapplaunchcontext-x11.c
-  have_gio_unix=yes
 
 else
   AM_CONDITIONAL(USE_QUARTZ, false)
 fi
-AC_SUBST(DISABLE_ON_QUARTZ)
 
-if test "x$enable_broadway_backend" = xyes; then
+
+if test "x$enable_broadway_backend" == xyes; then
   GDK_BACKENDS="$GDK_BACKENDS broadway"
   cairo_backends="$cairo_backends cairo"
   GDK_WINDOWING="$GDK_WINDOWING
@@ -394,8 +384,8 @@ else
   AM_CONDITIONAL(USE_BROADWAY, false)
 fi
 
-if test "x$enable_wayland_backend" = "xyes"; then
+if test "x$enable_wayland_backend" == "xyes"; then
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
+  if test "x$enable_wayland_cairo_gl" == "xyes"; then
     # Wayland can use cairo-gl
     cairo_backends="$cairo_backends cairo-gl"
     AC_DEFINE(GDK_WAYLAND_USE_EGL, [1], [Whether to use EGL in Wayland backend])
@@ -407,8 +397,8 @@ if test "x$enable_wayland_backend" = "xyes"; then
   have_gio_unix=yes
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="wayland-client >= 1.0.0 xkbcommon >= 0.2.0 wayland-cursor"
+  WAYLAND_PACKAGES="wayland-client xkbcommon "
-  if test "x$enable_wayland_cairo_gl" = "xyes"; then
+  if test "x$enable_wayland_cairo_gl" == "xyes"; then
     WAYLAND_PACKAGES="$WAYLAND_PACKAGES wayland-egl egl"
   fi
   AM_CONDITIONAL(USE_WAYLAND, true)
@@ -432,7 +422,7 @@ else
   if test "x$enable_debug" = "xno"; then
     GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
   else
-    GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+    GTK_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"
   fi
 fi
 
@@ -714,6 +704,7 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export)
 
+dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
 gtk_save_LIBS=$LIBS
@@ -747,19 +738,6 @@ else
     AC_MSG_RESULT([no])
 fi
 
-#
-# Disable deprecation checks for all libraries we depend on on stable branches.
-# This is so newer versions of those libraries don't cause more warnings with
-# a stable GTK version.
-# We don't ever want to turn off deprecation warnings for master however, because
-# that's where we get rid of deprecated API we use.
-#
-if test m4_eval(gtk_minor_version % 2) = 0 ; then
-  AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
-                     [Disable deprecation warnings from glib])
-fi
-
-dnl
 saved_cflags="$CFLAGS"
 saved_ldflags="$LDFLAGS"
 
@@ -771,10 +749,17 @@ AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T
 
-# Check for round(), rint(), isnan(), isinf() and nearbyint()
+# Check for round()
-AC_CHECK_LIB(m,round,,)
+AC_CHECK_LIB(m,round,have_round=yes,have_round=no)
-AC_CHECK_FUNCS(round rint nearbyint)
+if test $have_round = yes; then
-AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
+    AC_DEFINE(HAVE_ROUND, 1, [Define to 1 if round() is available])
+fi
+
+# Check for rint()
+AC_CHECK_LIB(m,rint,have_rint=yes,have_rint=no)
+if test $have_rint = yes; then
+    AC_DEFINE(HAVE_RINT, 1, [Define to 1 if rint() is available])
+fi
 
 # Checks for gdkspawn
 AC_CHECK_HEADERS(crt_externs.h)
@@ -991,21 +976,19 @@ if test "x$enable_x11_backend" = xyes; then
   # Xext is optional, the chances a system has *none* of these things is so
   # small that we just unconditionally require it.
   AC_CHECK_FUNC(XOpenDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
+                AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
   AC_CHECK_FUNC(XextFindDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
+                AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
 
   # Check for xReply
 
   AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlibint.h>]],
-                                     [[xReply *rep = NULL;
+                                     [[xReply *rep;]])],
-                                       rep = rep;]])],
                     [AC_MSG_RESULT([no])],
                     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/XIproto.h>
                                                           #include <X11/Xlibint.h>]],
-                                                        [[xReply *rep = NULL;
+                                                        [[xReply *rep;]])],
-                                                          rep = rep;]])],
                                        [AC_MSG_RESULT([yes])
                                         AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], [1],
                                                   [Define if <X11/extensions/XIproto.h> needed for xReply])],
@@ -1272,9 +1255,8 @@ if test "x$enable_x11_backend" = xyes; then
   GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
 fi
 
-PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB"
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
-GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 # into the pkg-config files
@@ -1295,16 +1277,33 @@ AC_SUBST(GDK_DEP_CFLAGS)
 # Check for Accessibility Toolkit flags
 ########################################
 
-if test x$enable_x11_backend = xyes; then
+ATK_PACKAGES=atk
-   ATK_PACKAGES="atk atk-bridge-2.0"
+AC_MSG_CHECKING(ATK flags)
+if $PKG_CONFIG --exists $ATK_PACKAGES ; then
+        ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
+        ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
+
+        AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
 else
-   ATK_PACKAGES="atk"
+        AC_MSG_ERROR([
+*** Accessibility Toolkit not found. Accessibility Toolkit is required
+*** to build GTK+.
+])
 fi
 
-PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
+        :
+else
+	gtk_save_LIBS="$LIBS"
+        LIBS="$ATK_LIBS $LIBS"
+        AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
+                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
+                *** to build GTK+]))
+        LIBS="$gtk_save_LIBS"
+fi
 
 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
+GTK_PRIVATE_PACKAGES=""
 if test "x$enable_x11_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1314,9 +1313,8 @@ fi
 GTK_EXTRA_LIBS=
 
 GTK_EXTRA_CFLAGS=
-PKG_CHECK_MODULES(GTK_DEP, $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES)
+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GTK_DEP_LIBS $GTK_EXTRA_LIBS $MATH_LIB"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
-GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
 
 if test x"$os_win32" = xyes; then
   GTK_EXTRA_CFLAGS="$msnative_struct"
@@ -1411,12 +1409,6 @@ else
             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
       AC_MSG_ERROR([CUPS >= 1.2 not found])
     fi
-    if test $CUPS_API_MAJOR -gt 1 -o \
-	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
-      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
-                [Define to 1 if CUPS 1.6 API is available])
-
-    fi
 
     AC_SUBST(CUPS_API_MAJOR)
     AC_SUBST(CUPS_API_MINOR)
@@ -1617,53 +1609,33 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 
 GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
 
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
 AC_ARG_ENABLE(man,
               [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=auto]])],,
+                              [regenerate man pages from Docbook [default=no]])],
-              enable_man=maybe)
+              [enable_man=yes],
+              [enable_man=no])
 
-if test "$enable_man" != no; then
+if test "${enable_man}" != no; then
+  dnl
+  dnl Check for xsltproc
+  dnl
   AC_PATH_PROG([XSLTPROC], [xsltproc])
   if test -z "$XSLTPROC"; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([xsltproc is required for --enable-man])
-    fi
     enable_man=no
   fi
-fi
 
-if test "$enable_man" != no; then
+  dnl check for DocBook DTD and stylesheets in the local catalog.
-  dnl check for DocBook DTD in the local catalog
   JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-     [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
+     [DocBook XML DTD V4.1.2],,enable_man=no)
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook DTD is required for --enable-man])
-    fi
-    enable_man=no
-  fi
-fi
-
-if test "$enable_man" != no; then
-  dnl check for DocBook XSL stylesheets in the local catalog
   JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-     [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
+     [DocBook XSL Stylesheets],,enable_man=no)
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
-    fi
-    enable_man=no
-  fi
 fi
 
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
+AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
-AC_MSG_CHECKING([whether to generate man pages])
-if test "$enable_man" != no; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
 
 ##################################################
 # Output commands
@@ -1763,7 +1735,6 @@ docs/reference/Makefile
 docs/reference/gdk/Makefile
 docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
-docs/reference/gtk/gtk3.types
 docs/reference/gtk/version.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml

demos/gtk-demo/Makefile.am

@@ -15,11 +15,6 @@ demos =						\
 	clipboard.c				\
 	colorsel.c				\
 	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
 	dialog.c				\
 	drawingarea.c				\
 	editable_cells.c			\
@@ -48,8 +43,6 @@ demos =						\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
-	theming_style_classes.c			\
-	theming_custom_css.c			\
 	toolpalette.c				\
 	transparent.c				\
 	tree_store.c				\
@@ -75,13 +68,16 @@ LDADDS = \
 
 bin_PROGRAMS = gtk3-demo gtk3-demo-application
 
-BUILT_SOURCES = demos.h demo_resources.c
+BUILT_SOURCES = demos.h application_resources.c
 
 EXTRA_DIST += 				\
 	$(IMAGEFILES)			\
 	demo.ui				\
-	demo.gresource.xml		\
+	application.gresource.xml	\
-	$(RESOURCES)			\
+	application.ui			\
+	menus.ui			\
+	gtk-logo-24.png			\
+	gtk-logo-48.png			\
 	org.gtk.Demo.gschema.xml
 
 gsettings_SCHEMAS = \
@@ -95,7 +91,6 @@ demos.h: @REBUILD@ $(demos) geninclude.pl
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
-	demo_resources.c	\
 	main.c			\
 	demos.h
 
@@ -105,26 +100,12 @@ gtk3_demo_LDFLAGS = -export-dynamic
 
 gtk3_demo_application_SOURCES = \
 	application-standalone.c \
-	demo_resources.c
+	application_resources.c
 
 gtk3_demo_application_LDADD = $(LDADDS)
 
-demo_resources.c: demo.gresource.xml $(RESOURCES)
+application_resources.c: application.gresource.xml gtk-logo-24.png gtk-logo-48.png application.ui menus.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/application.gresource.xml
-
-RESOURCES=	application.ui			\
-		menus.ui			\
-		theming.ui			\
-		gtk-logo-24.png			\
-		gtk-logo-48.png			\
-		css_accordion.css		\
-		css_basics.css			\
-		css_multiplebgs.css		\
-		css_pixbufs.css			\
-		css_shadows.css			\
-		cssview.css			\
-		fancy.css			\
-		reset.css
 
 IMAGEFILES=	alphatest.png		\
 		apple-red.png		\
@@ -141,11 +122,7 @@ IMAGEFILES=	alphatest.png		\
 		gnu-keys.png		\
 		gtk-logo-rgb.gif
 
-democode_DATA = \
+democode_DATA = $(demos) $(IMAGEFILES) demo.ui
-	$(demos)		\
-	$(IMAGEFILES)		\
-	$(RESOURCES)		\
-	demo.ui
 
 DISTCLEANFILES = demos.h
 

demos/gtk-demo/application.c

@@ -1,4 +1,4 @@
-/* Application class :: menus.ui application.ui
+/* Application class
  *
  * Demonstrates a simple application.
  *
@@ -113,7 +113,7 @@ activate_about (GSimpleAction *action,
     NULL
   };
 
-  pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-48.png", NULL);
+  pixbuf = gdk_pixbuf_new_from_resource ("/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/logos/gtk-logo-24.png", NULL);
+      pixbuf = gdk_pixbuf_new_from_resource ("/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/ui/menus.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/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/ui/application.ui", NULL);
+  gtk_builder_add_from_resource (builder, "/ui/application.ui", NULL);
 
   grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
   contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");
@@ -427,12 +427,6 @@ on_name_vanished (GDBusConnection *connection,
     }
 }
 
-#ifdef G_OS_WIN32
-#define APP_EXTENSION ".exe"
-#else
-#define APP_EXTENSION
-#endif
-
 GtkWidget *
 do_application (GtkWidget *toplevel)
 {
@@ -451,8 +445,8 @@ do_application (GtkWidget *toplevel)
       const gchar *command;
       GError *error = NULL;
 
-      if (g_file_test ("./gtk3-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
+      if (g_file_test ("./gtk3-demo-application", G_FILE_TEST_IS_EXECUTABLE))
-        command = "./gtk3-demo-application" APP_EXTENSION;
+        command = "./gtk3-demo-application";
       else
         command = "gtk3-demo-application";
 

demos/gtk-demo/application.gresource.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/logos">
+    <file preprocess="to-pixdata">gtk-logo-24.png</file>
+    <file preprocess="to-pixdata">gtk-logo-48.png</file>
+  </gresource>
+  <gresource prefix="/ui">
+    <file preprocess="xml-stripblanks">application.ui</file>
+    <file preprocess="xml-stripblanks">menus.ui</file>
+  </gresource>
+</gresources>

demos/gtk-demo/builder.c

@@ -1,4 +1,4 @@
-/* Builder :: demo.ui
+/* Builder
  *
  * Demonstrates an interface loaded from a XML description.
  */
@@ -27,12 +27,6 @@ about_activate (GtkAction *action)
   gtk_widget_hide (about_dlg);
 }
 
-G_MODULE_EXPORT void
-help_activate (GtkAction *action)
-{
-  g_print ("Help not available\n");
-}
-
 GtkWidget *
 do_builder (GtkWidget *do_widget)
 {

demos/gtk-demo/colorsel.c

@@ -1,9 +1,8 @@
-/* Color Chooser
+/* Color Selector
+ *
+ * GtkColorSelection lets the user choose a color. GtkColorSelectionDialog is
+ * a prebuilt dialog containing a GtkColorSelection.
  *
- * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK+. The
- * GtkColorChooserDialog is a prebuilt dialog containing a
- * GtkColorChooserWidget.
  */
 
 #include <gtk/gtk.h>
@@ -78,7 +77,7 @@ do_colorsel (GtkWidget *do_widget)
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
+      gtk_window_set_title (GTK_WINDOW (window), "Color Selection");
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/css_accordion.c

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

demos/gtk-demo/css_accordion.css

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

demos/gtk-demo/css_basics.c

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

demos/gtk-demo/css_basics.css

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

demos/gtk-demo/css_multiplebgs.c

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

demos/gtk-demo/css_multiplebgs.css

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

demos/gtk-demo/css_pixbufs.c

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

demos/gtk-demo/css_pixbufs.css

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

demos/gtk-demo/css_shadows.c

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

demos/gtk-demo/css_shadows.css

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

demos/gtk-demo/cssview.css

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

demos/gtk-demo/demo.gresource.xml

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

demos/gtk-demo/demo.ui

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

demos/gtk-demo/fancy.css

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

demos/gtk-demo/geninclude.pl.in

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

demos/gtk-demo/main.c

@@ -14,7 +14,6 @@ static GtkTextBuffer *source_buffer;
 
 static gchar *current_file = NULL;
 
-static GtkWidget *notebook;
 
 enum {
   TITLE_COLUMN,
@@ -515,47 +514,6 @@ fontify (void)
     }
 }
 
-static GtkWidget *create_text (GtkTextBuffer **buffer, gboolean is_source);
-
-static void
-add_data_tab (const gchar *filename)
-{
-  GtkTextBuffer *buffer = NULL;
-  gchar *full_filename;
-  GError *err = NULL;
-  gchar *text;
-  GtkWidget *widget, *label;
-
-  full_filename = demo_find_file (filename, &err);
-  if (!full_filename ||
-      !g_file_get_contents (full_filename, &text, NULL, &err))
-    {
-      g_warning ("%s", err->message);
-      g_error_free (err);
-      return;
-    }
-
-  widget = create_text (&buffer, FALSE);
-  gtk_widget_show_all (widget);
-  label = gtk_label_new (filename);
-  gtk_widget_show (label);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
-
-  gtk_text_buffer_set_text (buffer, text, -1);
-
-  g_free (full_filename);
-  g_free (text);
-}
-
-static void
-remove_data_tabs (void)
-{
-  gint i;
-
-  for (i = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) - 1; i > 1; i--)
-    gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), i);
-}
-
 void
 load_file (const gchar *filename)
 {
@@ -566,23 +524,15 @@ load_file (const gchar *filename)
   GString *buffer = g_string_new (NULL);
   int state = 0;
   gboolean in_para = 0;
-  gchar **names;
-  gint i;
 
-  remove_data_tabs ();
+  if (current_file && !strcmp (current_file, filename))
-
+    {
-  names = g_strsplit (filename, " ", -1);
+      g_string_free (buffer, TRUE);
-
+      return;
-  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 (names[0]);
+  current_file = g_strdup (filename);
 
   gtk_text_buffer_get_bounds (info_buffer, &start, &end);
   gtk_text_buffer_delete (info_buffer, &start, &end);
@@ -590,12 +540,12 @@ load_file (const gchar *filename)
   gtk_text_buffer_get_bounds (source_buffer, &start, &end);
   gtk_text_buffer_delete (source_buffer, &start, &end);
 
-  full_filename = demo_find_file (names[0], &err);
+  full_filename = demo_find_file (filename, &err);
   if (!full_filename)
     {
       g_warning ("%s", err->message);
       g_error_free (err);
-      goto out;
+      return;
     }
 
   file = g_fopen (full_filename, "r");
@@ -606,7 +556,7 @@ load_file (const gchar *filename)
   g_free (full_filename);
 
   if (!file)
-    goto out;
+    return;
 
   gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
   while (read_line (file, buffer))
@@ -622,23 +572,14 @@ load_file (const gchar *filename)
           while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
             p++;
           r = p;
-          while (*r != '\0')
+          while (*r != '/' && strlen (r))
-            {
+            r++;
-              while (*r != '/' && *r != ':' && *r != '\0')
+          if (strlen (r) > 0)
-                r++;
+            p = r + 1;
-              if (*r == '/')
-                {
-                  r++;
-                  p = r;
-                }
-              if (r[0] == ':' && r[1] == ':')
-                *r = '\0';
-            }
           q = p + strlen (p);
           while (q > p && g_ascii_isspace (*(q - 1)))
             q--;
 
-
           if (q > p)
             {
               int len_chars = g_utf8_pointer_to_offset (p, q);
@@ -654,8 +595,6 @@ load_file (const gchar *filename)
 
               start = end;
 
-              while (*p && *p != '\n') p++;
-
               state++;
             }
           break;
@@ -722,10 +661,7 @@ load_file (const gchar *filename)
 
   fontify ();
 
-out:
   g_string_free (buffer, TRUE);
-
-  g_strfreev (names);
 }
 
 void
@@ -992,6 +928,7 @@ int
 main (int argc, char **argv)
 {
   GtkWidget *window;
+  GtkWidget *notebook;
   GtkWidget *hbox;
   GtkWidget *tree;
 

demos/gtk-demo/pixbufs.c

@@ -175,7 +175,9 @@ timeout (gpointer data)
                                : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
     }
 
+  GDK_THREADS_ENTER ();
   gtk_widget_queue_draw (da);
+  GDK_THREADS_LEAVE ();
 
   frame_num++;
   return G_SOURCE_CONTINUE;

demos/gtk-demo/printing.c

@@ -149,6 +149,8 @@ do_printing (GtkWidget *do_widget)
   GtkPrintOperation *operation;
   GtkPrintSettings *settings;
   PrintData *data;
+  gchar *uri, *ext;
+  const gchar *dir;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();
@@ -168,14 +170,25 @@ do_printing (GtkWidget *do_widget)
   gtk_print_operation_set_embed_page_setup (operation, TRUE);
 
   settings = gtk_print_settings_new ();
+  dir = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+  if (dir == NULL)
+    dir = g_get_home_dir ();
+  if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "ps") == 0)
+    ext = ".ps";
+  else if (g_strcmp0 (gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT), "svg") == 0)
+    ext = ".svg";
+  else
+    ext = ".pdf";
 
-  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BASENAME, "gtk-demo");
+  uri = g_strconcat ("file://", dir, "/", "gtk-demo", ext, NULL);
+  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
   gtk_print_operation_set_print_settings (operation, settings);
 
   gtk_print_operation_run (operation, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW (do_widget), &error);
 
   g_object_unref (operation);
   g_object_unref (settings);
+  g_free (uri);
 
   if (error)
     {

demos/gtk-demo/reset.css

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

demos/gtk-demo/search_entry.c

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

demos/gtk-demo/theming.ui

@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkGrid" id="grid">
-    <property name="row-spacing">6</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkToolbar" id="toolbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="show-arrow">False</property>
-        <style>
-          <class name="primary-toolbar"/>
-        </style>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton1">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
-            <property name="icon_name">edit-find</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton2">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
-            <property name="icon_name">edit-find</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton3">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
-            <property name="icon_name">edit-find</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton5">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Raised</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
-            <property name="icon_name">edit-find-symbolic</property>
-            <style>
-              <class name="raised"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton6">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Raised Active</property>
-            <property name="use_underline">True</property>
-            <property name="is_important">True</property>
-            <property name="icon_name">edit-find-symbolic</property>
-            <property name="active">True</property>
-            <style>
-              <class name="raised"/>
-            </style>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="toolbutton4">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">edit-find</property>
-            <property name="is_important">True</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="toolitementry">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-                <property name="placeholder-text" translatable="yes">Search...</property>
-                <property name="secondary-icon-name">edit-find-symbolic</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToolItem" id="toolitemswitch">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkSwitch" id="switch1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">horizontal</property>
-        <property name="valign">center</property>
-        <property name="halign">center</property>
-        <style>
-          <class name="linked"/>
-        </style>
-        <child>
-          <object class="GtkButton" id="button1">
-            <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button2">
-            <property name="label" translatable="yes">And I'm another button</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="button3">
-            <property name="label" translatable="yes">This is a button party!</property>
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_action_appearance">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkToolbar" id="itoolbar1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="icon_size">1</property>
-        <style>
-          <class name="inline-toolbar"/>
-        </style>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton1">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">list-add-symbolic</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton2">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Normal</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">list-add-symbolic</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton3">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">list-remove-symbolic</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton4">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Active</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">list-remove-symbolic</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton5">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">edit-find-symbolic</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="itoolbutton6">
-            <property name="use_action_appearance">False</property>
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">False</property>
-            <property name="use_action_appearance">False</property>
-            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">go-up-symbolic</property>
-            <property name="active">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/theming_custom_css.c

@@ -1,66 +0,0 @@
-/* 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,58 +0,0 @@
-/* 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.
- *
- * This demo shows some common examples where theming features
- * of GTK+ are used for certain effects: primary toolbars,
- * inline toolbars and linked buttons.
- */
-
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_theming_style_classes (GtkWidget *do_widget)
-{
-  GtkWidget *grid;
-  GtkBuilder *builder;
-  GError *err = NULL;
-
-  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), "Style Classes");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      builder = gtk_builder_new ();
-      gtk_builder_add_from_resource (builder, "/theming_style_classes/theming.ui", NULL);
-      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
-
-      grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
-      gtk_widget_show_all (grid);
-      gtk_container_add (GTK_CONTAINER (window), grid);
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/toolpalette.c

@@ -522,7 +522,6 @@ do_toolpalette (GtkWidget *do_widget)
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
       gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
-      gtk_widget_set_hexpand (palette_scroller, TRUE);
 
       gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
       gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);

demos/widget-factory/Makefile.am

@@ -22,7 +22,7 @@ gtk3_widget_factory_LDADD = \
 	$(top_builddir)/gtk/libgtk-3.la \
 	$(GTK_DEP_LIBS)
 
-widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
+widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 EXTRA_DIST += \

demos/widget-factory/widget-factory.c

@@ -65,26 +65,12 @@ show_about (GtkMenuItem *item, GtkWidget *window)
   g_object_unref (pixbuf);
 }
 
-static void
-on_page_toggled (GtkToggleButton *button,
-                 GtkNotebook     *pages)
-{
-  gint page;
-
-  if (!gtk_toggle_button_get_active (button))
-    return;
-
-  page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "page"));
-  gtk_notebook_set_current_page (pages, page);
-}
-
 int
 main (int argc, char *argv[])
 {
   GtkBuilder *builder;
   GtkWidget  *window;
   GtkWidget  *widget;
-  GtkWidget  *notebook;
   gboolean    dark = FALSE;
 
   gtk_init (&argc, &argv);
@@ -102,15 +88,6 @@ main (int argc, char *argv[])
   g_signal_connect (widget, "toggled", G_CALLBACK (dark_toggled), NULL);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), dark);
 
-  notebook = (GtkWidget*) gtk_builder_get_object (builder, "toplevel_notebook");
-  widget = (GtkWidget*) gtk_builder_get_object (builder, "togglepage1");
-  g_object_set_data (G_OBJECT (widget), "page", GINT_TO_POINTER (0));
-  g_signal_connect (widget, "toggled", G_CALLBACK (on_page_toggled), notebook);
-
-  widget = (GtkWidget*) gtk_builder_get_object (builder, "togglepage2");
-  g_object_set_data (G_OBJECT (widget), "page", GINT_TO_POINTER (1));
-  g_signal_connect (widget, "toggled", G_CALLBACK (on_page_toggled), notebook);
-
   widget = (GtkWidget*) gtk_builder_get_object (builder, "aboutmenuitem");
   g_signal_connect (widget, "activate", G_CALLBACK (show_about), window);
 

docs/RELEASE-HOWTO

@@ -89,20 +89,25 @@ Make sure that gtk-doc is the latest released version.
     it to download.gnome.org. If you don't have an account on master.gnome.org,
     find someone who can do it for you. The command for this looks like
 
-      scp gtk+-2.12.10.tar.xz matthiasc@master.gnome.org:
+      scp gtk+-2.12.10.tar.gz matthiasc@master.gnome.org:
-      ssh matthiasc@master.gnome.org ftpadmin install gtk+-2.12.10.tar.xz
+      ssh matthiasc@master.gnome.org
+      install-module gtk+-2.12.10.tar.gz
 
-15) Upload the tarball and checksum to ftp.gtk.org and put them in the right
+15) Get the .bz2 tarball and the .md5sum files back from master.gnome.org
-    directory below /ftp/pub. Pay attention to correct ownership, and don't
+    You can probably also create it locally, but I've experienced md5
-    forget to update the LATEST file in the directory.
+    mismatches when doing so.
 
-16) Go to the gnome-announce list archives, find the last announce message,
+16) Upload the .gz and .bz2 tarballs and checksums to ftp.gtk.org and put
+    them in the right directory below /ftp/pub. Pay attention to correct
+    ownership, and don't forget to update the LATEST file in the directory.
+
+17) Go to the gnome-announce list archives, find the last announce message,
     create a new message in the same form, replacing version numbers,
     commentary at the top about "what this release is about" and the
     summary of changes.
 
-17) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
+18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
     gtk-devel-list. Set reply-to to desktop-devel-list.
 
-18) Add a link to the release announcement to www.gtk.org which lives
+19) Add a link to the release announcement to www.gtk.org which lives
     in the gtk-web git module.

docs/reference/gdk/Makefile.am

@@ -32,9 +32,9 @@ IGNORE_HFILES= 			\
 	x11			\
 	quartz
 
-# Extra files to add when scanning
+# Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=			\
-	$(top_srcdir)/gdk/x11/gdkx.h
+	../../../gdk/x11/gdkx.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.

docs/reference/gdk/gdk-docs.sgml

@@ -10,9 +10,9 @@
     <releaseinfo>
       This document is for the GDK 3 library, version &version;
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gdk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/devel/gdk3/">http://developer.gnome.org/devel/gdk3/</ulink>.
       If you are looking for the older GDK 2 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gdk2/">http://developer.gnome.org/gdk2/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/devel/gdk/">http://developer.gnome.org/devel/gdk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -42,7 +42,7 @@
     <xi:include href="xml/cairo_interaction.xml" />
     <xi:include href="xml/x_interaction.xml" />
     <xi:include href="xml/gdkapplaunchcontext.xml" />
-    <xi:include href="xml/gdktestutils.xml" />
+    <xi:include href="xml/gdktesting.xml" />
   </reference>
 
   <index id="api-index-full">
@@ -65,10 +65,6 @@
     <title>Index of new symbols in 3.4</title>
     <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-6" role="3.6">
-    <title>Index of new symbols in 3.6</title>
-    <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -991,8 +991,6 @@ gdk_x11_grab_server
 gdk_x11_ungrab_server
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
-gdk_x11_keymap_get_group_for_state
-gdk_x11_keymap_key_is_modifier
 gdk_x11_visual_get_xvisual
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
@@ -1145,8 +1143,8 @@ gdk_app_launch_context_get_type
 
 <SECTION>
 <TITLE>Testing</TITLE>
-<FILE>gdktestutils</FILE>
+<FILE>gdktesting</FILE>
 gdk_test_render_sync
 gdk_test_simulate_button
 gdk_test_simulate_key
-</SECTION>
+

docs/reference/gtk/Makefile.am

@@ -43,7 +43,6 @@ IGNORE_HFILES=				\
 	gtkintl.h			\
 	gtkkeyhash.h			\
 	gtkmarshal.h			\
-	gtkmenuprivate.h		\
 	gtkmnemonichash.h		\
 	gtkpathbar.h			\
 	gtkplugprivate.h		\
@@ -107,7 +106,6 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gdk/libgdk-3.la \
 	$(top_builddir)/gtk/libgtk-3.la	\
 	$(GTK_DEP_LIBS)
 
@@ -141,7 +139,6 @@ content_files =					\
 	x11.sgml				\
 	gtk-query-immodules-3.0.xml		\
 	gtk-update-icon-cache.xml		\
-	gtk-launch.xml				\
 	visual_index.xml			\
 	getting_started.xml			\
 	overview.xml
@@ -297,7 +294,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
 	$(srcdir)/images/entry.png					\
-	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/figure-hierarchical-drawing.png		\
 	$(srcdir)/images/figure-windowed-label.png			\
 	$(srcdir)/images/file-button.png				\
@@ -309,16 +305,14 @@ HTML_IMAGES = \
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
 	$(srcdir)/images/label.png					\
-	$(srcdir)/images/levelbar.png					\
 	$(srcdir)/images/link-button.png				\
 	$(srcdir)/images/list-and-tree.png				\
 	$(srcdir)/images/lock-button.png				\
-	$(srcdir)/images/lockbutton.png	        			\
+	$(srcdir)/images/lockbutton.png				\
 	$(srcdir)/images/lockbutton-locked.png				\
 	$(srcdir)/images/lockbutton-unlocked.png			\
 	$(srcdir)/images/lockbutton-sorry.png				\
 	$(srcdir)/images/menubar.png					\
-	$(srcdir)/images/menu-button.png				\
 	$(srcdir)/images/messagedialog.png				\
 	$(srcdir)/images/multiline-text.png				\
 	$(srcdir)/images/notebook.png					\
@@ -382,19 +376,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/numerableicon2.png				\
 	$(srcdir)/images/bloatpad-osx.png				\
 	$(srcdir)/images/bloatpad-gnome.png				\
-	$(srcdir)/images/bloatpad-xfce.png				\
+	$(srcdir)/images/bloatpad-xfce.png
-	$(srcdir)/images/down-center.png				\
-	$(srcdir)/images/down-end.png					\
-	$(srcdir)/images/down-start.png					\
-	$(srcdir)/images/left-center.png				\
-	$(srcdir)/images/left-end.png					\
-	$(srcdir)/images/left-start.png					\
-	$(srcdir)/images/right-center.png				\
-	$(srcdir)/images/right-end.png					\
-	$(srcdir)/images/right-start.png				\
-	$(srcdir)/images/up-center.png					\
-	$(srcdir)/images/up-end.png					\
-	$(srcdir)/images/up-start.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -408,27 +390,18 @@ FIXXREF_OPTIONS=--extra-dir=../gdk/html \
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in gtk3.types.in
+EXTRA_DIST += version.xml.in
 
 ########################################################################
 
 man_MANS = 				\
 	gtk-query-immodules-3.0.1	\
-	gtk-update-icon-cache.1		\
+	gtk-update-icon-cache.1
-	gtk-launch.1
 
 if ENABLE_MAN
 
-XSLTPROC_FLAGS = \
-        --nonet \
-        --stringparam man.output.quietly 1 \
-        --stringparam funcsynopsis.style ansi \
-        --stringparam man.th.extra1.suppress 1 \
-        --stringparam man.authors.section.enabled 0 \
-        --stringparam man.copyright.section.enabled 0
-
 .xml.1:
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 dist-local-check-mans-enabled:
 	if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi

docs/reference/gtk/compiling.sgml

@@ -63,22 +63,6 @@ to use. APIs that were deprecated before or introduced after
 this range will trigger compiler warnings.
 </para>
 
-<para>
-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_REQIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
-</programlisting>
-</para>
-
-<para>
-And here is how you would compile hello.c if you don't want
-it to use any symbols that were introduced after 3.4:
-<programlisting>
-$ cc -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
-</programlisting>
-</para>
-
 <para>
 The older deprecation mechanism of hiding deprecated interfaces
 entirely from the compiler by using the preprocessor symbol

docs/reference/gtk/getting_started.xml

@@ -5,7 +5,7 @@
 <chapter id="gtk-getting-started" xmlns:xi="http://www.w3.org/2003/XInclude">
   <title>Getting Started with GTK+</title>
 
-  <para>This chapter contains some tutorial information to get you
+  <para>This chapter is contains some tutorial information to get you
   started with GTK+ programming. It assumes that you have GTK+, its
   dependencies and a C compiler installed and ready to use. If you
   need to build GTK+ itself first, refer to the

docs/reference/gtk/gtk-docs.sgml

@@ -12,9 +12,9 @@
     <releaseinfo>
       This document is for the GTK+ 3 library, version &version;.
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/devel/gtk3/">http://developer.gnome.org/devel/gtk3/</ulink>.
       If you are looking for the older GTK+ 2 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gtk2/">http://developer.gnome.org/gtk2/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/devel/gtk/">http://developer.gnome.org/devel/gtk/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -102,7 +102,6 @@
       <xi:include href="xml/gtklabel.xml" />
       <xi:include href="xml/gtkprogressbar.xml" />
       <xi:include href="xml/gtkstatusbar.xml" />
-      <xi:include href="xml/gtklevelbar.xml" />
       <xi:include href="xml/gtkinfobar.xml" />
       <xi:include href="xml/gtkstatusicon.xml" />
       <xi:include href="xml/gtkspinner.xml" />
@@ -119,7 +118,6 @@
       <xi:include href="xml/gtkvolumebutton.xml" />
       <xi:include href="xml/gtkswitch.xml" />
       <xi:include href="xml/gtklockbutton.xml" />
-      <xi:include href="xml/gtkmenubutton.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -131,7 +129,6 @@
       <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" />
     </chapter>
 
@@ -377,7 +374,6 @@
     <title>GTK+ Tools</title>
     <xi:include href="gtk-query-immodules-3.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
-    <xi:include href="gtk-launch.xml" />
   </part>
 
   <xi:include href="glossary.xml" />
@@ -402,10 +398,6 @@
     <title>Index of new symbols in 3.4</title>
     <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-6" role="3.6">
-    <title>Index of new symbols in 3.6</title>
-    <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gtk/gtk-launch.xml

@@ -1,67 +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="gtk-launch">
-
-<refentryinfo>
-  <title>gtk-launch</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Tomáš</firstname>
-      <surname>Bžatek</surname>
-      <email>tbzatek@redhat.com</email>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>gtk-launch</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="manual">User Commands</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>gtk-launch</refname>
-  <refpurpose>Launch an application</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-<cmdsynopsis>
-<command>gtk-launch</command>
-<arg>APPLICATION</arg>
-<arg choice="opt" rep="repeat">URI</arg>
-</cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1><title>Description</title>
-<para>
-<command>gtk-launch</command> launches an application using the given name.
-The application is started with proper startup notification on a default
-display, unless specified otherwise.
-</para>
-<para>
-<command>gtk-launch</command> takes at least one argument, the name of
-the application to launch. The name should match application desktop file name,
-as residing in /usr/share/application, with or without the '.desktop' suffix.
-</para>
-<para>
-If called with more than one argument, the rest of them besides the application
-name are considered URI locations and are passed as arguments to the launched
-application.
-</para>
-</refsect1>
-
-<refsect1><title>Options</title>
-  <para>The following options are understood:</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>-?</option>, <option>--help</option></term>
-      <listitem><para>Prints a short help text and exits.</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
-</refentry>

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

@@ -4,18 +4,6 @@
 ]>
 <refentry id="gtk-query-immodules-3.0">
 
-<refentryinfo>
-  <title>gtk-query-immodules-3.0</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
 <refmeta>
   <refentrytitle>gtk-query-immodules-3.0</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -31,7 +19,7 @@
 <cmdsynopsis>
 <command>gtk-query-immodules-3.0</command>
 <arg choice="opt">--update-cache</arg>
-<arg choice="opt" rep="repeat">MODULE</arg>
+<arg choice="opt" rep="repeat">module</arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -49,13 +37,11 @@ module path.
 If called with arguments, it looks for the specified modules. The arguments
 may be absolute or relative paths.
 </para>
-
 <para>
 Normally, the output of <command>gtk-query-immodules-3.0</command> is written
-to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>,
+to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
-where GTK+ looks for it by default. If it is written to some other location,
+location, the environment variable <link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link>
-the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
+can be set to point GTK+ at the file.
-GTK+ at the file.
 </para>
 </refsect1>
 
@@ -69,28 +55,19 @@ GTK+ at the file.
 </variablelist>
 </refsect1>
 
-<refsect1><title>Files</title>
+<refsect1><title>Environment</title>
-<variablelist>
+<para>
-  <varlistentry>
+The environment variable <link linkend="gtk-path"><envar>GTK_PATH</envar></link>
-    <term><filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename></term>
+can be used to prepend directories to the input method module path.
-    <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
+</para>
-  </varlistentry>
-</variablelist>
-
 </refsect1>
 
-<refsect1><title>Environment</title>
+<refsect1><title>Bugs</title>
-<variablelist>
+<para>
-  <varlistentry>
+None known yet.
-    <term><link linkend="gtk-path"><envar>GTK_PATH</envar></link></term>
+</para>
-    <listitem><para>Prepends directories to the input method module path</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link></term>
-    <listitem><para>Specifies an alternative im module cache for GTK+
-    applications</para></listitem>
-  </varlistentry>
-</variablelist>
 </refsect1>
 
 </refentry>
+
+

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

@@ -4,18 +4,6 @@
 ]>
 <refentry id="gtk-update-icon-cache">
 
-<refentryinfo>
-  <title>gtk-update-icon-cache</title>
-  <productname>GTK+</productname>
-  <authorgroup>
-    <author>
-      <contrib>Developer</contrib>
-      <firstname>Matthias</firstname>
-      <surname>Clasen</surname>
-    </author>
-  </authorgroup>
-</refentryinfo>
-
 <refmeta>
   <refentrytitle>gtk-update-icon-cache</refentrytitle>
   <manvolnum>1</manvolnum>
@@ -111,4 +99,10 @@
 </variablelist>
 </refsect1>
 
+<refsect1><title>Bugs</title>
+<para>
+None known yet.
+</para>
+</refsect1>
+
 </refentry>

docs/reference/gtk/gtk3-sections.txt

@@ -62,6 +62,7 @@ GtkAccelGroupActivate
 GtkAccelGroupFindFunc
 gtk_accel_group_disconnect
 gtk_accel_group_disconnect_key
+gtk_accel_group_query
 gtk_accel_group_activate
 gtk_accel_group_lock
 gtk_accel_group_unlock
@@ -95,7 +96,6 @@ GTK_ACCEL_GROUP_GET_CLASS
 GTK_ACCEL_GROUP_GET_PRIVATE
 GtkAccelGroupPrivate
 GtkAccelGroupEntry
-gtk_accel_group_query
 gtk_accel_group_get_type
 </SECTION>
 
@@ -139,7 +139,6 @@ gtk_accel_label_set_accel_closure
 gtk_accel_label_get_accel_widget
 gtk_accel_label_set_accel_widget
 gtk_accel_label_get_accel_width
-gtk_accel_label_set_accel
 gtk_accel_label_refetch
 <SUBSECTION Standard>
 GTK_ACCEL_LABEL
@@ -264,8 +263,6 @@ gtk_action_group_get_sensitive
 gtk_action_group_set_sensitive
 gtk_action_group_get_visible
 gtk_action_group_set_visible
-gtk_action_group_get_accel_group
-gtk_action_group_set_accel_group
 gtk_action_group_get_action
 gtk_action_group_list_actions
 gtk_action_group_add_action
@@ -529,11 +526,9 @@ GtkBuilderConnectFunc
 GtkBuilderError
 gtk_builder_new
 gtk_builder_add_from_file
-gtk_builder_add_from_resource
 gtk_builder_add_from_string
 gtk_builder_add_objects_from_file
 gtk_builder_add_objects_from_string
-gtk_builder_add_objects_from_resource
 gtk_builder_get_object
 gtk_builder_get_objects
 gtk_builder_connect_signals
@@ -587,8 +582,6 @@ gtk_button_set_image
 gtk_button_get_image
 gtk_button_set_image_position
 gtk_button_get_image_position
-gtk_button_set_always_show_image
-gtk_button_get_always_show_image
 gtk_button_get_event_window
 
 <SUBSECTION Standard>
@@ -1052,8 +1045,6 @@ gtk_entry_get_layout
 gtk_entry_get_layout_offsets
 gtk_entry_layout_index_to_text_index
 gtk_entry_text_index_to_layout_index
-gtk_entry_set_attributes
-gtk_entry_get_attributes
 gtk_entry_get_max_length
 gtk_entry_get_visibility
 gtk_entry_set_completion
@@ -1089,12 +1080,6 @@ gtk_entry_get_icon_tooltip_markup
 gtk_entry_set_icon_drag_source
 gtk_entry_get_current_icon_drag_source
 gtk_entry_get_icon_area
-GtkInputPurpose
-gtk_entry_set_input_purpose
-gtk_entry_get_input_purpose
-GtkInputHints
-gtk_entry_set_input_hints
-gtk_entry_get_input_hints
 
 <SUBSECTION Standard>
 GTK_ENTRY
@@ -1755,7 +1740,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_get_cell_rect
 gtk_icon_view_select_path
 gtk_icon_view_unselect_path
 gtk_icon_view_path_is_selected
@@ -1816,7 +1800,6 @@ gtk_image_new_from_stock
 gtk_image_new_from_animation
 gtk_image_new_from_icon_name
 gtk_image_new_from_gicon
-gtk_image_new_from_resource
 gtk_image_set_from_file
 gtk_image_set_from_icon_set
 gtk_image_set_from_pixbuf
@@ -1824,7 +1807,6 @@ gtk_image_set_from_stock
 gtk_image_set_from_animation
 gtk_image_set_from_icon_name
 gtk_image_set_from_gicon
-gtk_image_set_from_resource
 gtk_image_clear
 gtk_image_new
 gtk_image_set_pixel_size
@@ -2141,31 +2123,6 @@ GtkMenuBarPrivate
 gtk_menu_bar_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkmenubutton</FILE>
-<TITLE>GtkMenuButton</TITLE>
-GtkMenuButton
-gtk_menu_button_new
-gtk_menu_button_set_popup
-gtk_menu_button_get_popup
-gtk_menu_button_set_menu_model
-gtk_menu_button_get_menu_model
-gtk_menu_button_set_direction
-gtk_menu_button_get_direction
-gtk_menu_button_set_align_widget
-gtk_menu_button_get_align_widget
-<SUBSECTION Standard>
-GTK_TYPE_MENU_BUTTON
-GTK_MENU_BUTTON
-GTK_MENU_BUTTON_CLASS
-GTK_IS_MENU_BUTTON
-GTK_IS_MENU_BUTTON_CLASS
-GTK_MENU_BUTTON_GET_CLASS
-<SUBSECTION Private>
-GtkMenuButtonrPrivate
-gtk_menu_button_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkmenuitem</FILE>
 <TITLE>GtkMenuItem</TITLE>
@@ -2215,7 +2172,6 @@ gtk_ui_manager_get_accel_group
 gtk_ui_manager_get_widget
 gtk_ui_manager_get_toplevels
 gtk_ui_manager_get_action
-gtk_ui_manager_add_ui_from_resource
 gtk_ui_manager_add_ui_from_string
 gtk_ui_manager_add_ui_from_file
 gtk_ui_manager_new_merge_id
@@ -2254,7 +2210,6 @@ gtk_menu_shell_set_take_focus
 gtk_menu_shell_get_take_focus
 gtk_menu_shell_get_selected_item
 gtk_menu_shell_get_parent_shell
-gtk_menu_shell_bind_model
 GtkMenuDirectionType
 <SUBSECTION Standard>
 GTK_MENU_SHELL
@@ -3001,22 +2956,6 @@ gtk_scrolled_window_get_type
 GtkScrolledWindowPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtksearchentry</FILE>
-<TITLE>GtkSearchEntry</TITLE>
-GtkSearchEntry
-gtk_search_entry_new
-<SUBSECTION Standard>
-GTK_TYPE_SEARCH_ENTRY
-GTK_SEARCH_ENTRY
-GTK_SEARCH_ENTRY_CLASS
-GTK_IS_SEARCH_ENTRY
-GTK_IS_SEARCH_ENTRY_CLASS
-GTK_SEARCH_ENTRY_GET_CLASS
-<SUBSECTION Private>
-gtk_search_entry_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkseparator</FILE>
 <TITLE>GtkSeparator</TITLE>
@@ -3184,6 +3123,7 @@ GTK_TYPE_SPINNER
 GTK_SPINNER_CLASS
 GTK_IS_SPINNER_CLASS
 GTK_SPINNER_GET_CLASS
+GTK_IS_SPINNER_CLASS
 
 <SUBSECTION Private>
 GtkSpinnerPrivate
@@ -3264,40 +3204,6 @@ GtkStatusIconPrivate
 gtk_status_icon_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtklevelbar</FILE>
-<TITLE>GtkLevelBar</TITLE>
-GTK_LEVEL_BAR_OFFSET_LOW
-GTK_LEVEL_BAR_OFFSET_HIGH
-GtkLevelBarMode
-GtkLevelBar
-gtk_level_bar_new
-gtk_level_bar_new_for_interval
-gtk_level_bar_set_mode
-gtk_level_bar_get_mode
-gtk_level_bar_set_value
-gtk_level_bar_get_value
-gtk_level_bar_set_min_value
-gtk_level_bar_get_min_value
-gtk_level_bar_set_max_value
-gtk_level_bar_get_max_value
-gtk_level_bar_set_inverted
-gtk_level_bar_get_inverted
-gtk_level_bar_add_offset_value
-gtk_level_bar_remove_offset_value
-gtk_level_bar_get_offset_value
-<SUBSECTION Standard>
-GTK_LEVEL_BAR
-GTK_IS_LEVEL_BAR
-GTK_TYPE_LEVEL_BAR
-GTK_LEVEL_BAR_CLASS
-GTK_IS_LEVEL_BAR_CLASS
-GTK_LEVEL_BAR_GET_CLASS
-<SUBSECTION Private>
-GtkLevelBarPrivate
-gtk_level_bar_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtktable</FILE>
 <TITLE>GtkTable</TITLE>
@@ -3691,10 +3597,6 @@ gtk_text_view_get_accepts_tab
 gtk_text_view_get_default_attributes
 gtk_text_view_im_context_filter_keypress
 gtk_text_view_reset_im_context
-gtk_text_view_set_input_purpose
-gtk_text_view_get_input_purpose
-gtk_text_view_set_input_hints
-gtk_text_view_get_input_hints
 GTK_TEXT_VIEW_PRIORITY_VALIDATE
 <SUBSECTION Standard>
 GTK_TEXT_VIEW
@@ -5127,6 +5029,7 @@ GtkWidgetClass
 GtkCallback
 GtkRequisition
 GtkAllocation
+GtkSelectionData
 GtkWidgetAuxInfo
 GtkWidgetHelpType
 gtk_widget_new
@@ -5291,7 +5194,6 @@ gtk_widget_get_sensitive
 gtk_widget_is_sensitive
 gtk_widget_get_state
 gtk_widget_get_visible
-gtk_widget_is_visible
 gtk_widget_set_visible
 gtk_widget_set_state_flags
 gtk_widget_unset_state_flags
@@ -5315,7 +5217,6 @@ gtk_widget_get_mapped
 gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
-gtk_widget_insert_action_group
 
 <SUBSECTION>
 gtk_widget_get_path
@@ -5777,10 +5678,6 @@ GTK_STYLE_CLASS_LEFT
 GTK_STYLE_CLASS_RIGHT
 GTK_STYLE_CLASS_LINKED
 GTK_STYLE_CLASS_ARROW
-GTK_STYLE_CLASS_OSD
-GTK_STYLE_CLASS_LEVEL_BAR
-GTK_STYLE_CLASS_CURSOR_HANDLE
-GTK_STYLE_CLASS_INSERTION_CURSOR
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW
@@ -5793,7 +5690,7 @@ gtk_style_context_add_provider_for_screen
 gtk_style_context_get
 gtk_style_context_get_direction
 gtk_style_context_get_junction_sides
-gtk_style_context_get_parent
+gtk_style_context_set_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
@@ -5902,6 +5799,7 @@ gtk_css_section_get_parent
 gtk_css_section_get_section_type
 gtk_css_section_get_start_line
 gtk_css_section_get_start_position
+gtk_css_section_get_type
 gtk_css_section_ref
 gtk_css_section_unref
 <SUBSECTION Standard>
@@ -5990,7 +5888,6 @@ gtk_gradient_add_color_stop
 gtk_gradient_ref
 gtk_gradient_unref
 gtk_gradient_resolve
-gtk_gradient_resolve_for_context
 gtk_gradient_to_string
 
 <SUBSECTION Standard>
@@ -6102,7 +5999,6 @@ GtkRcContext
 <SECTION>
 <FILE>gtkselection</FILE>
 <TITLE>Selections</TITLE>
-GtkSelectionData
 GtkTargetEntry
 GtkTargetList
 GtkTargetPair
@@ -7122,8 +7018,6 @@ gtk_application_new
 gtk_application_add_window
 gtk_application_remove_window
 gtk_application_get_windows
-gtk_application_get_window_by_id
-gtk_application_get_active_window
 
 <SUBSECTION>
 GtkApplicationInhibitFlags
@@ -7137,9 +7031,6 @@ gtk_application_set_app_menu
 gtk_application_get_menubar
 gtk_application_set_menubar
 
-gtk_application_add_accelerator
-gtk_application_remove_accelerator
-
 <SUBSECTION Standard>
 GtkApplicationClass
 GTK_TYPE_APPLICATION
@@ -7160,7 +7051,6 @@ GtkApplicationWindow
 gtk_application_window_new
 gtk_application_window_set_show_menubar
 gtk_application_window_get_show_menubar
-gtk_application_window_get_id
 
 <SUBSECTION Standard>
 GtkApplicationWindowClass

docs/reference/gtk/gtk3.types

@@ -102,7 +102,6 @@ gtk_link_button_get_type
 gtk_list_store_get_type
 gtk_lock_button_get_type
 gtk_menu_bar_get_type
-gtk_menu_button_get_type
 gtk_menu_get_type
 gtk_menu_item_get_type
 gtk_menu_shell_get_type
@@ -116,17 +115,17 @@ gtk_offscreen_window_get_type
 gtk_orientable_get_type
 gtk_overlay_get_type
 gtk_page_setup_get_type
-@DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
+gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-@DISABLE_ON_W32@@DISABLE_ON_QUARTZ@gtk_plug_get_type
+gtk_plug_get_type
-@DISABLE_ON_W32@gtk_printer_get_type
+gtk_printer_get_type
 gtk_print_context_get_type
-@DISABLE_ON_W32@gtk_print_job_get_type
+gtk_print_job_get_type
 gtk_print_operation_get_type
 gtk_print_operation_preview_get_type
 gtk_print_settings_get_type
-@DISABLE_ON_W32@gtk_print_unix_dialog_get_type
+gtk_print_unix_dialog_get_type
 gtk_progress_bar_get_type
 gtk_radio_action_get_type
 gtk_radio_button_get_type
@@ -145,19 +144,17 @@ gtk_scale_get_type
 gtk_scrollable_get_type
 gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
-gtk_search_entry_get_type
 gtk_separator_get_type
 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@gtk_socket_get_type
+gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_switch_get_type
-gtk_level_bar_get_type
 gtk_style_get_type
 gtk_style_context_get_type
 gtk_style_provider_get_type

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

@@ -82,8 +82,9 @@
     Over the years, a number of functions, and in some cases, entire
     widgets have been deprecated. These deprecations are clearly spelled
     out in the API reference, with hints about the recommended replacements.
-    The API reference for GTK+ 2 also includes an
+    The API reference also includes an
-    <ulink url="http://developer.gnome.org/gtk/2.24/api-index-deprecated.html">index</ulink> of all deprecated symbols.
+    <link linkend="api-index-deprecated">index</link> of all deprecated
+    symbols.
   </para>
   <para>
     To verify that your program does not use any deprecated symbols,
@@ -91,14 +92,7 @@
     as follows:
     <programlisting>
     make CFLAGS+="-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-   </programlisting>
+    </programlisting>
-  </para>
-  <para>
-    Note that some parts of our API, such as enumeration values, are
-    not well covered by the deprecation warnings. In most cases, using
-    them will require you to also use deprecated functions, which will
-    trigger warnings. But some things, like the %GTK_DIALOG_NO_SEPARATOR
-    flag that has disappeared in GTK+ 3, may not.
   </para>
   </section>
 
@@ -279,7 +273,7 @@ gdk_cairo_set_source_pixbuf() instead of cairo_set_source_surface().
         <para>
           Drawing layouts clipped is often used to avoid overdraw or to
           allow drawing selections. Code would have looked like this:
-          <informalexample><programlisting>
+	  <informalexample><programlisting>
 GdkGC *gc;
 
 /* setup */
@@ -1000,8 +994,7 @@ AM_CONDITIONAL(BUILD_x11, [test "x$have_x11" = "xyes"])
       Another convenience function that can help when implementing
       ::draw for multi-window widgets is gtk_cairo_transform_to_window(),
       which transforms a cairo context from widget-relative coordinates
-      to window-relative coordinates. You may want to use cairo_save() and
+      to window-relative coordinates.
-      cairo_restore() when modifying the cairo context in your draw function.
     </para>
     <para>
       All GtkStyle drawing functions (gtk_paint_box(), etc) have been changed

docs/reference/gtk/migrating-GtkStyleContext.xml

@@ -134,7 +134,7 @@
     </simplelist>
 
     <para>
-      One of the main differences to #GtkStyle<!-- -->-based engines is that the
+      One of the main differences to #GtkStyle-based engines is that the
       rendered widget is totally isolated from the theme engine, all style
       information is meant to be retrieved from the #GtkThemingEngine API,
       or from the #GtkWidgetPath obtained from gtk_theming_engine_get_path(),
@@ -171,7 +171,7 @@
     </para>
 
     <para>
-      The installed properties depend on the #GtkThemingEngine:name property,
+      The installed properties depend on the #GtkThemeEngine::name property,
       so they should be added in the <literal>constructed()</literal> vfunc.
       For example, if an engine with the name "Clearlooks" installs a
       "focus-color" property with the type #GdkRGBA, the property

docs/reference/gtk/migrating-checklist.sgml

@@ -295,7 +295,7 @@ my_widget_key_press_event_handler (GtkWidget *widget, GdkEventKey *event)
 
     <para>
       Named icons can be used for window icons (see gtk_window_set_icon_name())
-      and images (see gtk_image_set_from_icon_name()). You can also use named icons
+      and images (see gtk_image_set_icon_name()). You can also use named icons
       for drag-and-drop (see gtk_drag_source_set_icon_name()) and in treeview
       cells (see the #GtkCellRendererPixbuf:icon-name property).
     </para>

docs/reference/gtk/migrating-smclient-GtkApplication.xml

@@ -31,18 +31,18 @@
       </thead>
       <tbody>
         <row><entry>EggSMClient::quit-requested</entry><entry>instead of calling will_quit (FALSE,...) in response to this signal, install an inhibitor</entry></row>
-        <row><entry>EggSMClient::quit</entry><entry>the #GApplication::shutdown signal</entry></row>
+        <row><entry>EggSMClient::quit</entry><entry>the #GtkApplication::quit signal</entry></row>
-        <row><entry>EggSMClient::quit-cancelled</entry><entry>-</entry></row>
+        <row><entry>EggSMClient::quit-cancelled</entry><entry></entry></row>
         <row><entry>egg_sm_client_will_quit</entry><entry>instead of calling will_quit (FALSE,...), install an inhibitor</entry></row>
-        <row><entry>egg_sm_client_end_session</entry><entry>-</entry></row>
+        <row><entry>egg_sm_client_end_session</entry><entry>gtk_application_end_session()</entry></row>
       </tbody>
     </tgroup>
   </table>
 
   <para>
-    At this point, GtkApplication has no special support for state saving
+    At this point, GtkApplication has no special support for state saving.
-    and restarting. Applications can use GSettings or GKeyFile and save as
+    Applications can use GSettings or GKeyFile and save as much state as
-    much state as they see fit in response to #GApplication::shutdown or
+    they see fit in response to #GtkApplication::quit or whenever they
-    whenever they consider appropriate.
+    consider appropriate.
   </para>
 </chapter>

docs/reference/gtk/objects_grouped.sgml

@@ -90,7 +90,6 @@
     <link linkend="GtkCalendar">GtkCalendar</link>
     <link linkend="GtkProgressBar">GtkProgressBar</link>
     <link linkend="GtkStatusbar">GtkStatusbar</link>
-    <link linkend="GtkStrengthBar">GtkStrengthBar</link>
     <link linkend="GtkHRuler">GtkHRuler</link>
     <link linkend="GtkVRuler">GtkVRuler</link>
     <link linkend="GtkHScrollbar">GtkHScrollbar</link>

docs/reference/gtk/running.sgml

@@ -58,8 +58,8 @@ warning that occurs.
 <para>
 A list of <link linkend="GTK-Debug-Options">debug options</link>
 to turn on in addition to those specified in the <envar>GTK_DEBUG</envar>
-environment variable. This option is not available if GTK+ has been
+environment variable. This option is only available if GTK+ has been
-configured with <option>--enable-debug=no</option>.
+configured with <option>--enable-debug=yes</option>.
 </para>
 </formalpara>
 
@@ -134,7 +134,7 @@ additional environment variables.
   <title><envar>GTK_DEBUG</envar></title>
 
   <para>
-  Unless GTK+ has been configured with <option>--enable-debug=no</option>,
+  If GTK+ has been configured with <option>--enable-debug=yes</option>,
   this variable can be set to a list of debug options, which cause GTK+
   to print out different types of debugging information.
   <variablelist>
@@ -186,14 +186,6 @@ additional environment variables.
       <term>builder</term>
       <listitem><para>GtkBuilder support</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>size-request</term>
-      <listitem><para>Size requests</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>no-css-cache</term>
-      <listitem><para>Bypass caching for CSS style properties.</para></listitem>
-    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all

docs/reference/gtk/visual_index.xml

@@ -18,12 +18,12 @@
   <link linkend="GtkComboBox">
     <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkComboBoxEntry">
+    <inlinegraphic fileref="combo-box-entry.png" format="PNG"></inlinegraphic>
+  </link>
   <link linkend="GtkEntry">
     <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkSearchEntry">
-    <inlinegraphic fileref="search-entry.png" format="PNG"></inlinegraphic>
-  </link>
   <link linkend="GtkFileChooserButton">
     <inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic>
   </link>
@@ -48,18 +48,12 @@
   <link linkend="GtkLabel">
     <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkLevelBar">
-    <inlinegraphic fileref="levelbar.png" format="PNG"></inlinegraphic>
-  </link>
   <link linkend="GtkLinkButton">
     <inlinegraphic fileref="link-button.png" format="PNG"></inlinegraphic>
   </link>
   <link linkend="GtkLockButton">
     <inlinegraphic fileref="lockbutton.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkMenuButton">
-    <inlinegraphic fileref="menu-button.png" format="PNG"></inlinegraphic>
-  </link>
   <link linkend="GtkMenuBar">
     <inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
   </link>

docs/reference/libgail-util/Makefile.am

@@ -22,7 +22,7 @@ AM_CPPFLAGS =                   \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-3.la
+GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil.la
 
 # gtkdoc-mkdb related varaibles
 MKDB_OPTIONS =

docs/reference/libgail-util/gail-libgail-util-docs.sgml

@@ -10,7 +10,7 @@
     <releaseinfo>
       Version &version;
       The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://developer.gnome.org/gail-libgail-util/unstable/">http://developer.gnome.org/gail-libgail-util/unstable/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/devel/gail-libgail-util/unstable/">http://developer.gnome.org/devel/gail-libgail-util/unstable/</ulink>.
     </releaseinfo>
   </bookinfo>
   <chapter id="libgail-util-main">

docs/tools/widgets.c

@@ -224,31 +224,6 @@ create_link_button (void)
   return new_widget_info ("link-button", align, SMALL);
 }
 
-static WidgetInfo *
-create_menu_button (void)
-{
-  GtkWidget *widget;
-  GtkWidget *image;
-  GtkWidget *menu;
-  GtkWidget *vbox;
-
-  widget = gtk_menu_button_new ();
-  image = gtk_image_new ();
-  gtk_image_set_from_icon_name (GTK_IMAGE (image), "emblem-system-symbolic", GTK_ICON_SIZE_MENU);
-  gtk_button_set_image (GTK_BUTTON (widget), image);
-  menu = gtk_menu_new ();
-  gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE, 0);
-
-  return new_widget_info ("menu-button", vbox, SMALL);
-}
-
 #define G_TYPE_TEST_PERMISSION      (g_test_permission_get_type ())
 #define G_TEST_PERMISSION(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
                                      G_TYPE_TEST_PERMISSION,             \
@@ -287,20 +262,14 @@ g_test_permission_class_init (GTestPermissionClass *class)
 static WidgetInfo *
 create_lockbutton (void)
 {
-  GtkWidget *vbox;
   GtkWidget *widget;
+  GtkWidget *align;
 
   widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
 
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  return new_widget_info ("lock-button", align, SMALL);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Lock Button"),
-		      FALSE, FALSE, 0);
-  gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
-
-  return new_widget_info ("lock-button", vbox, SMALL);
 }
 
 static WidgetInfo *
@@ -318,20 +287,6 @@ create_entry (void)
   return  new_widget_info ("entry", align, SMALL);
 }
 
-static WidgetInfo *
-create_search_entry (void)
-{
-  GtkWidget *widget;
-  GtkWidget *align;
-
-  widget = gtk_search_entry_new ();
-  gtk_entry_set_placeholder_text (GTK_ENTRY (widget), "Search...");
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-
-  return  new_widget_info ("search-entry", align, SMALL);
-}
-
 static WidgetInfo *
 create_radio (void)
 {
@@ -998,24 +953,6 @@ create_progressbar (void)
   return new_widget_info ("progressbar", vbox, SMALL);
 }
 
-static WidgetInfo *
-create_level_bar (void)
-{
-  GtkWidget *vbox;
-  GtkWidget *widget;
-
-  widget = gtk_level_bar_new ();
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Level Bar"),
-		      FALSE, FALSE, 0);
-
-  return new_widget_info ("levelbar", vbox, SMALL);
-}
-
 static WidgetInfo *
 create_scrolledwindow (void)
 {
@@ -1296,9 +1233,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_lockbutton ());
   retval = g_list_prepend (retval, create_fontchooserdialog ());
   retval = g_list_prepend (retval, create_colorchooserdialog ());
-  retval = g_list_prepend (retval, create_menu_button ());
-  retval = g_list_prepend (retval, create_search_entry ());
-  retval = g_list_prepend (retval, create_level_bar ());
 
   return retval;
 }

examples/Makefile.am

@@ -53,9 +53,7 @@ noinst_PROGRAMS = \
 	hello-world				\
 	window-default				\
 	bloatpad				\
-	plugman					\
+	plugman				\
-	sunny					\
-	action-namespace			\
 	grid-packing				\
 	drawing					\
 	builder

examples/action-namespace.c

@@ -1,134 +0,0 @@
-#include <gtk/gtk.h>
-
-static void
-action_activated (GSimpleAction *action,
-                  GVariant      *parameter,
-                  gpointer       user_data)
-{
-  GtkWindow *parent = user_data;
-  GtkWidget *dialog;
-
-  dialog = gtk_message_dialog_new (parent,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_CLOSE,
-                                   "Activated action `%s`",
-                                   g_action_get_name (G_ACTION (action)));
-
-  g_signal_connect_swapped (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), dialog);
-
-  gtk_widget_show_all (dialog);
-}
-
-static GActionEntry doc_entries[] = {
-  { "save", action_activated },
-  { "print", action_activated },
-  { "share", action_activated }
-};
-
-static GActionEntry win_entries[] = {
-  { "fullscreen", action_activated },
-  { "close", action_activated },
-};
-
-const gchar *menu_ui =
-  "<interface>"
-  "  <menu id='doc-menu'>"
-  "    <section>"
-  "      <item>"
-  "        <attribute name='label'>_Save</attribute>"
-  "        <attribute name='action'>save</attribute>"
-  "      </item>"
-  "      <item>"
-  "        <attribute name='label'>_Print</attribute>"
-  "        <attribute name='action'>print</attribute>"
-  "      </item>"
-  "      <item>"
-  "        <attribute name='label'>_Share</attribute>"
-  "        <attribute name='action'>share</attribute>"
-  "      </item>"
-  "    </section>"
-  "  </menu>"
-  "  <menu id='win-menu'>"
-  "    <section>"
-  "      <item>"
-  "        <attribute name='label'>_Fullscreen</attribute>"
-  "        <attribute name='action'>fullscreen</attribute>"
-  "      </item>"
-  "      <item>"
-  "        <attribute name='label'>_Close</attribute>"
-  "        <attribute name='action'>close</attribute>"
-  "      </item>"
-  "    </section>"
-  "  </menu>"
-  "</interface>";
-
-static void
-activate (GApplication *app,
-          gpointer      user_data)
-{
-  GtkWidget *win;
-  GtkWidget *button;
-  GSimpleActionGroup *doc_actions;
-  GtkBuilder *builder;
-  GMenuModel *doc_menu;
-  GMenuModel *win_menu;
-  GMenu *button_menu;
-  GMenuItem *section;
-
-  if (gtk_application_get_windows (GTK_APPLICATION (app)) != NULL)
-    return;
-
-  win = gtk_application_window_new (GTK_APPLICATION (app));
-
-  doc_actions = g_simple_action_group_new ();
-  g_simple_action_group_add_entries (doc_actions, doc_entries,
-                                     G_N_ELEMENTS (doc_entries), win);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (win), win_entries,
-                                   G_N_ELEMENTS (win_entries), win);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_string (builder, menu_ui, -1, NULL);
-
-  doc_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "doc-menu"));
-  win_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "win-menu"));
-
-  button_menu = g_menu_new ();
-
-  section = g_menu_item_new_section (NULL, doc_menu);
-  g_menu_item_set_attribute (section, "action-namespace", "s", "doc");
-  g_menu_append_item (button_menu, section);
-  g_object_unref (section);
-
-  section = g_menu_item_new_section (NULL, win_menu);
-  g_menu_item_set_attribute (section, "action-namespace", "s", "win");
-  g_menu_append_item (button_menu, section);
-  g_object_unref (section);
-
-  button = gtk_menu_button_new ();
-  gtk_button_set_label (GTK_BUTTON (button), "Menu");
-  gtk_widget_insert_action_group (button, "doc", G_ACTION_GROUP (doc_actions));
-  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), G_MENU_MODEL (button_menu));
-
-  gtk_container_add (GTK_CONTAINER (win), button);
-  gtk_container_set_border_width (GTK_CONTAINER (win), 12);
-  gtk_widget_show_all (win);
-
-  g_object_unref (button_menu);
-  g_object_unref (doc_actions);
-  g_object_unref (builder);
-}
-
-int
-main(int    argc,
-     char **argv)
-{
-  GtkApplication *app;
-
-  app = gtk_application_new ("org.gtk.Example", 0);
-  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
-
-  return g_application_run (G_APPLICATION (app), argc, argv);
-}

examples/bloatpad.c

@@ -191,14 +191,7 @@ bloat_pad_open (GApplication  *application,
     new_window (application, files[i]);
 }
 
-typedef struct
+typedef GtkApplication BloatPad;
-{
-  GtkApplication parent_instance;
-
-  GMenu *time;
-  guint timeout;
-} BloatPad;
-
 typedef GtkApplicationClass BloatPadClass;
 
 G_DEFINE_TYPE (BloatPad, bloat_pad, GTK_TYPE_APPLICATION)
@@ -241,65 +234,15 @@ quit_activated (GSimpleAction *action,
   g_application_quit (app);
 }
 
-static gboolean
-update_time (gpointer user_data)
-{
-  BloatPad *bloatpad = user_data;
-  GDateTime *now;
-  gchar *time;
-
-  while (g_menu_model_get_n_items (G_MENU_MODEL (bloatpad->time)))
-    g_menu_remove (bloatpad->time, 0);
-
-  g_message ("Updating the time menu (which should be open now)...");
-
-  now = g_date_time_new_now_local ();
-  time = g_date_time_format (now, "%c");
-  g_menu_append (bloatpad->time, time, NULL);
-  g_date_time_unref (now);
-  g_free (time);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-time_active_changed (GSimpleAction *action,
-                     GVariant      *state,
-                     gpointer       user_data)
-{
-  BloatPad *bloatpad = user_data;
-
-  if (g_variant_get_boolean (state))
-    {
-      if (!bloatpad->timeout)
-        {
-          bloatpad->timeout = g_timeout_add (1000, update_time, bloatpad);
-          update_time (bloatpad);
-        }
-    }
-  else
-    {
-      if (bloatpad->timeout)
-        {
-          g_source_remove (bloatpad->timeout);
-          bloatpad->timeout = 0;
-        }
-    }
-
-  g_simple_action_set_state (action, state);
-}
-
 static GActionEntry app_entries[] = {
   { "new", new_activated, NULL, NULL, NULL },
   { "about", about_activated, NULL, NULL, NULL },
   { "quit", quit_activated, NULL, NULL, NULL },
-  { "time-active", NULL, NULL, "false", time_active_changed }
 };
 
 static void
 bloat_pad_startup (GApplication *application)
 {
-  BloatPad *bloatpad = (BloatPad*) application;
   GtkBuilder *builder;
 
   G_APPLICATION_CLASS (bloat_pad_parent_class)
@@ -342,8 +285,8 @@ bloat_pad_startup (GApplication *application)
                                "          <attribute name='accel'>&lt;Primary&gt;c</attribute>"
                                "        </item>"
                                "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Paste</attribute>"
+                               "          <attribute name='label' translatable='yes'>_Parse</attribute>"
-                               "          <attribute name='action'>win.paste</attribute>"
+                               "          <attribute name='action'>win.parse</attribute>"
                                "          <attribute name='accel'>&lt;Primary&gt;v</attribute>"
                                "        </item>"
                                "      </section>"
@@ -358,34 +301,13 @@ bloat_pad_startup (GApplication *application)
                                "        </item>"
                                "      </section>"
                                "    </submenu>"
-                               "    <submenu id='time-menu'>"
-                               "      <attribute name='label' translatable='yes'>Time</attribute>"
-                               "      <attribute name='submenu-action'>app.time-active</attribute>"
-                               "    </submenu>"
                                "  </menu>"
                                "</interface>", -1, NULL);
   gtk_application_set_app_menu (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
   gtk_application_set_menubar (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
-  //gtk_application_set_menubar (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-  bloatpad->time = G_MENU (gtk_builder_get_object (builder, "time-menu"));
   g_object_unref (builder);
 }
 
-static void
-bloat_pad_shutdown (GApplication *application)
-{
-  BloatPad *bloatpad = (BloatPad *) application;
-
-  if (bloatpad->timeout)
-    {
-      g_source_remove (bloatpad->timeout);
-      bloatpad->timeout = 0;
-    }
-
-  G_APPLICATION_CLASS (bloat_pad_parent_class)
-    ->shutdown (application);
-}
-
 static void
 bloat_pad_init (BloatPad *app)
 {
@@ -398,7 +320,6 @@ bloat_pad_class_init (BloatPadClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
   application_class->startup = bloat_pad_startup;
-  application_class->shutdown = bloat_pad_shutdown;
   application_class->activate = bloat_pad_activate;
   application_class->open = bloat_pad_open;
 
@@ -409,7 +330,9 @@ bloat_pad_class_init (BloatPadClass *class)
 BloatPad *
 bloat_pad_new (void)
 {
-  BloatPad *bloat_pad;
+  GtkApplication *bloat_pad;
+
+  g_type_init ();
 
   g_set_application_name ("Bloatpad");
 

examples/plugman.c

@@ -322,13 +322,13 @@ configure_plugins (GSimpleAction *action,
                                "        <property name='visible'>True</property>"
                                "        <child>"
                                "          <object class='GtkCheckButton' id='red-plugin'>"
-                               "            <property name='label' translatable='yes'>Red Plugin - turn your text red</property>"
+                               "            <property name='label'>Red Plugin - turn your text red</property>"
                                "            <property name='visible'>True</property>"
                                "          </object>"
                                "        </child>"
                                "        <child>"
                                "          <object class='GtkCheckButton' id='black-plugin'>"
-                               "            <property name='label' translatable='yes'>Black Plugin - turn your text black</property>"
+                               "            <property name='label'>Black Plugin - turn your text black</property>"
                                "            <property name='visible'>True</property>"
                                "          </object>"
                                "        </child>"
@@ -339,7 +339,7 @@ configure_plugins (GSimpleAction *action,
                                "        <property name='visible'>True</property>"
                                "        <child>"
                                "          <object class='GtkButton' id='close-button'>"
-                               "            <property name='label' translatable='yes'>Close</property>"
+                               "            <property name='label'>Close</property>"
                                "            <property name='visible'>True</property>"
                                "          </object>"
                                "        </child>"
@@ -391,48 +391,27 @@ plug_man_startup (GApplication *application)
                                "<interface>"
                                "  <menu id='app-menu'>"
                                "    <section>"
-                               "      <item>"
+                               "      <item label='_About Plugman' action='app.about'/>"
-                               "        <attribute name='label' translatable='yes'>_About Plugman</attribute>"
-                               "        <attribute name='action'>app.about</attribute>"
-                               "      </item>"
                                "    </section>"
                                "    <section>"
-                               "      <item>"
+                               "      <item label='_Quit' action='app.quit' accel='<Primary>q'/>"
-                               "        <attribute name='label' translatable='yes'>_Quit</attribute>"
-                               "        <attribute name='action'>app.quit</attribute>"
-                               "        <attribute name='accel'>&lt;Primary&gt;q</attribute>"
-                               "      </item>"
                                "    </section>"
                                "  </menu>"
                                "  <menu id='menubar'>"
-                               "    <submenu>"
+                               "    <submenu label='_Edit'>"
-                               "      <attribute name='label' translatable='yes'>_Edit</attribute>"
                                "      <section>"
-                               "        <item>"
+                               "        <item label='_Copy' action='win.copy'/>"
-                               "          <attribute name='label' translatable='yes'>_Copy</attribute>"
+                               "        <item label='_Paste' action='win.paste'/>"
-                               "          <attribute name='action'>win.copy</attribute>"
-                               "        </item>"
-                               "        <item>"
-                               "          <attribute name='label' translatable='yes'>_Paste</attribute>"
-                               "          <attribute name='action'>win.paste</attribute>"
-                               "        </item>"
                                "      </section>"
                                "      <item><link name='section' id='plugins'>"
                                "      </link></item>"
                                "      <section>"
-                               "        <item>"
+                               "        <item label='Plugins' action='app.plugins'/>"
-                               "          <attribute name='label' translatable='yes'>Plugins</attribute>"
-                               "          <attribute name='action'>app.plugins</attribute>"
-                               "        </item>"
                                "      </section>"
                                "    </submenu>"
-                               "    <submenu>"
+                               "    <submenu label='_View'>"
-                               "      <attribute name='label' translatable='yes'>_View</attribute>"
                                "      <section>"
-                               "        <item>"
+                               "        <item label='_Fullscreen' action='win.fullscreen'/>"
-                               "          <attribute name='label' translatable='yes'>_Fullscreen</attribute>"
-                               "          <attribute name='action'>win.fullscreen</attribute>"
-                               "        </item>"
                                "      </section>"
                                "    </submenu>"
                                "  </menu>"
@@ -465,6 +444,8 @@ plug_man_class_init (PlugManClass *class)
 PlugMan *
 plug_man_new (void)
 {
+  g_type_init ();
+
   return g_object_new (plug_man_get_type (),
                        "application-id", "org.gtk.Test.plugman",
                        "flags", G_APPLICATION_HANDLES_OPEN,

examples/sunny.c

@@ -1,211 +0,0 @@
-#include <stdlib.h>
-#include <gtk/gtk.h>
-
-static void
-new_window (GApplication *app,
-            GFile        *file)
-{
-  GtkWidget *window, *scrolled, *view, *overlay;
-  GtkSettings *settings;
-  gboolean appmenu;
-
-  window = gtk_application_window_new (GTK_APPLICATION (app));
-  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (window), FALSE);
-  gtk_window_set_default_size ((GtkWindow*)window, 640, 480);
-  gtk_window_set_title (GTK_WINDOW (window), "Sunny");
-
-  overlay = gtk_overlay_new ();
-  gtk_container_add (GTK_CONTAINER (window), overlay);
-
-  settings = gtk_settings_get_default ();
-  g_object_get (settings, "gtk-shell-shows-app-menu", &appmenu, NULL);
-  if (!appmenu)
-    {
-      GMenuModel *model;
-      GtkWidget *menu;
-      GtkWidget *image;
-
-      model = gtk_application_get_app_menu (GTK_APPLICATION (app));
-      menu = gtk_menu_button_new ();
-      gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu), model);
-      gtk_widget_set_halign (menu, GTK_ALIGN_END);
-      gtk_widget_set_valign (menu, GTK_ALIGN_START);
-      image = gtk_image_new ();
-      gtk_image_set_from_icon_name (GTK_IMAGE (image),
-                                    "sunny",
-                                    GTK_ICON_SIZE_MENU);
-      gtk_button_set_image (GTK_BUTTON (menu), image);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), menu);
-    }
-
-  scrolled = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_set_hexpand (scrolled, TRUE);
-  gtk_widget_set_vexpand (scrolled, TRUE);
-  view = gtk_text_view_new ();
-
-  gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_container_add (GTK_CONTAINER (overlay), scrolled);
-
-  if (file != NULL)
-    {
-      gchar *contents;
-      gsize length;
-
-      if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
-        {
-          GtkTextBuffer *buffer;
-
-          buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-          gtk_text_buffer_set_text (buffer, contents, length);
-          g_free (contents);
-        }
-    }
-
-  gtk_widget_show_all (GTK_WIDGET (window));
-}
-
-static void
-activate (GApplication *application)
-{
-  new_window (application, NULL);
-}
-
-static void
-open (GApplication  *application,
-      GFile        **files,
-      gint           n_files,
-      const gchar   *hint)
-{
-  gint i;
-
-  for (i = 0; i < n_files; i++)
-    new_window (application, files[i]);
-}
-
-typedef GtkApplication MenuButton;
-typedef GtkApplicationClass MenuButtonClass;
-
-G_DEFINE_TYPE (MenuButton, menu_button, GTK_TYPE_APPLICATION)
-
-static void
-show_about (GSimpleAction *action,
-            GVariant      *parameter,
-            gpointer       user_data)
-{
-  gtk_show_about_dialog (NULL,
-                         "program-name", "Sunny",
-                         "title", "About Sunny",
-                         "logo-icon-name", "sunny",
-                         "comments", "A cheap Bloatpad clone.",
-                         NULL);
-}
-
-
-static void
-quit_app (GSimpleAction *action,
-          GVariant      *parameter,
-          gpointer       user_data)
-{
-  GList *list, *next;
-  GtkWindow *win;
-
-  g_print ("Going down...\n");
-
-  list = gtk_application_get_windows (GTK_APPLICATION (g_application_get_default ()));
-  while (list)
-    {
-      win = list->data;
-      next = list->next;
-
-      gtk_widget_destroy (GTK_WIDGET (win));
-
-      list = next;
-    }
-}
-
-static void
-new_activated (GSimpleAction *action,
-               GVariant      *parameter,
-               gpointer       user_data)
-{
-  GApplication *app = user_data;
-
-  g_application_activate (app);
-}
-
-static GActionEntry app_entries[] = {
-  { "about", show_about, NULL, NULL, NULL },
-  { "quit", quit_app, NULL, NULL, NULL },
-  { "new", new_activated, NULL, NULL, NULL }
-};
-
-static void
-startup (GApplication *application)
-{
-  GtkBuilder *builder;
-
-  G_APPLICATION_CLASS (menu_button_parent_class)->startup (application);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries), application);
-
-  builder = gtk_builder_new ();
-  gtk_builder_add_from_string (builder,
-                               "<interface>"
-                               "  <menu id='app-menu'>"
-                               "    <section>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_New Window</attribute>"
-                               "        <attribute name='action'>app.new</attribute>"
-                               "      </item>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_About Sunny</attribute>"
-                               "        <attribute name='action'>app.about</attribute>"
-                               "      </item>"
-                               "      <item>"
-                               "        <attribute name='label' translatable='yes'>_Quit</attribute>"
-                               "        <attribute name='action'>app.quit</attribute>"
-                               "        <attribute name='accel'>&lt;Primary&gt;q</attribute>"
-                               "      </item>"
-                               "    </section>"
-                               "  </menu>"
-                               "</interface>", -1, NULL);
-  gtk_application_set_app_menu (GTK_APPLICATION (application), G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
-  g_object_unref (builder);
-}
-
-static void
-menu_button_init (MenuButton *app)
-{
-}
-
-static void
-menu_button_class_init (MenuButtonClass *class)
-{
-  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
-
-  application_class->startup = startup;
-  application_class->activate = activate;
-  application_class->open = open;
-}
-
-MenuButton *
-menu_button_new (void)
-{
-  return g_object_new (menu_button_get_type (),
-                       "application-id", "org.gtk.Test.Sunny",
-                       "flags", G_APPLICATION_HANDLES_OPEN,
-                       NULL);
-}
-
-int
-main (int argc, char **argv)
-{
-  MenuButton *menu_button;
-  int status;
-
-  menu_button = menu_button_new ();
-  status = g_application_run (G_APPLICATION (menu_button), argc, argv);
-  g_object_unref (menu_button);
-
-  return status;
-}

gdk/Makefile.am

@@ -306,9 +306,7 @@ endif
 lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
-EXTRA_DIST += \
+EXTRA_DIST += $(gdk_built_sources)
-	$(gdk_built_sources)	\
-	fallback-c89.c
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
@@ -341,8 +339,7 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
 	|| ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-	$(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp	\
-	 $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp	\
 	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
 	|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
 

gdk/broadway/Makefile.am

@@ -31,12 +31,12 @@ libbroadway_la_SOURCES =		\
 	broadway.c
 
 clienthtml.h: client.html
-	$(PERL) $(srcdir)/toarray.pl $(srcdir)/client.html client_html > $@
+	$(PERL) ./toarray.pl client.html client_html > $@
 
 EXTRA_DIST += client.html
 
 broadwayjs.h: broadway.js
-	$(PERL) $(srcdir)/toarray.pl $(srcdir)/broadway.js broadway_js > $@
+	$(PERL) ./toarray.pl broadway.js broadway_js > $@
 
 EXTRA_DIST += broadway.js
 

gdk/broadway/broadway.c

@@ -57,44 +57,8 @@ base64_uint32 (guint32 v, char *c)
  *  conversion of raw image data to png data: uris         *
  ***********************************************************/
 
-static cairo_status_t
-write_png_data (void		  *closure,
-		const unsigned char *data,
-		unsigned int	   data_len)
-{
-  GString *buf = closure;
-
-  g_string_append_len (buf,  (char *)data, data_len);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static void
-to_png_rgb (GString *buf, int w, int h, int byte_stride, guint32 *data)
-{
-  cairo_surface_t *surface;
-
-  surface = cairo_image_surface_create_for_data ((guchar *)data,
-						 CAIRO_FORMAT_RGB24, w, h, byte_stride);
-
-  cairo_surface_write_to_png_stream (surface, write_png_data, buf);
-  cairo_surface_destroy (surface);
-}
-
-static void
-to_png_rgba (GString *buf, int w, int h, int byte_stride, guint32 *data)
-{
-  cairo_surface_t *surface;
-
-  surface = cairo_image_surface_create_for_data ((guchar *)data,
-						 CAIRO_FORMAT_ARGB32, w, h, byte_stride);
-
-  cairo_surface_write_to_png_stream (surface, write_png_data, buf);
-  cairo_surface_destroy (surface);
-}
-
 struct PngTarget {
-  GString *buf;
+  GString *url;
   int state;
   int save;
 };
@@ -107,73 +71,71 @@ write_png_url (void		  *closure,
   struct PngTarget *target = closure;
   gsize res, old_len;
 
-  old_len = target->buf->len;
+  old_len = target->url->len;
-  g_string_set_size (target->buf,
+  g_string_set_size (target->url,
 		     old_len + (data_len / 3 + 1) * 4 + 4);
 
   res = g_base64_encode_step (data, data_len, FALSE,
-			      target->buf->str + old_len,
+			      target->url->str + old_len,
 			      &target->state, &target->save);
 
-  g_string_set_size (target->buf,  old_len + res);
+  g_string_set_size (target->url,  old_len + res);
 
   return CAIRO_STATUS_SUCCESS;
 }
 
-static void
+static char *
-to_png_url_rgb (GString *buf, int w, int h, int byte_stride, guint32 *data)
+to_png_rgb (int w, int h, int byte_stride, guint32 *data)
 {
   cairo_surface_t *surface;
   struct PngTarget target;
   gsize res, old_len;
 
-  target.buf = buf;
+  target.url = g_string_new ("data:image/png;base64,");
   target.state = 0;
   target.save = 0;
 
-  g_string_append (buf, "data:image/png;base64,");
-
   surface = cairo_image_surface_create_for_data ((guchar *)data,
 						 CAIRO_FORMAT_RGB24, w, h, byte_stride);
 
   cairo_surface_write_to_png_stream (surface, write_png_url, &target);
-  cairo_surface_destroy (surface);
 
-  old_len = buf->len;
+  old_len = target.url->len;
 
-  g_string_set_size (buf, old_len + 4);
+  g_string_set_size (target.url, old_len + 4);
   res = g_base64_encode_close (FALSE,
-			       buf->str + old_len,
+			       target.url->str + old_len,
 			       &target.state, &target.save);
-  g_string_set_size (buf, old_len + res);
+  g_string_set_size (target.url, old_len + res);
+
+  return g_string_free (target.url, FALSE);
 }
 
-static void
+static char *
-to_png_url_rgba (GString *buf, int w, int h, int byte_stride, guint32 *data)
+to_png_rgba (int w, int h, int byte_stride, guint32 *data)
 {
   cairo_surface_t *surface;
   struct PngTarget target;
   gsize res, old_len;
 
-  target.buf = buf;
+  target.url = g_string_new ("data:image/png;base64,");
   target.state = 0;
   target.save = 0;
 
-  g_string_append (buf, "data:image/png;base64,");
-
   surface = cairo_image_surface_create_for_data ((guchar *)data,
 						 CAIRO_FORMAT_ARGB32, w, h, byte_stride);
 
   cairo_surface_write_to_png_stream (surface, write_png_url, &target);
-  cairo_surface_destroy (surface);
 
-  old_len = buf->len;
+  old_len = target.url->len;
 
-  g_string_set_size (buf, old_len + 4);
+  g_string_set_size (target.url, old_len + 4);
   res = g_base64_encode_close (FALSE,
-			       buf->str + old_len,
+			       target.url->str + old_len,
 			       &target.state, &target.save);
-  g_string_set_size (buf, old_len + res);
+  g_string_set_size (target.url, old_len + res);
+
+  return g_string_free (target.url, FALSE);
 }
 
 #if 0
@@ -211,11 +173,9 @@ to_png_a (int w, int h, int byte_stride, guint8 *data)
 
 struct BroadwayOutput {
   GOutputStream *out;
-  GString *buf;
   int error;
   guint32 serial;
   gboolean proto_v7_plus;
-  gboolean binary;
 };
 
 static void
@@ -252,12 +212,13 @@ broadway_output_send_cmd (BroadwayOutput *output,
 }
 
 static void
-broadway_output_send_cmd_pre_v7 (BroadwayOutput *output,
+broadway_output_sendmsg (BroadwayOutput *output,
-				 const void *buf, gsize count)
+			 const void *buf, gsize count)
 {
-  g_output_stream_write_all (output->out, "\0", 1, NULL, NULL, NULL);
+  if (!output->proto_v7_plus)
-  g_output_stream_write_all (output->out, buf, count, NULL, NULL, NULL);
+    g_output_stream_write_all (output->out, buf, count, NULL, NULL, NULL);
-  g_output_stream_write_all (output->out, "\xff", 1, NULL, NULL, NULL);
+  else
+    broadway_output_send_cmd (output, TRUE, BROADWAY_WS_TEXT, buf, count);
 }
 
 void broadway_output_pong (BroadwayOutput *output)
@@ -266,40 +227,42 @@ void broadway_output_pong (BroadwayOutput *output)
     broadway_output_send_cmd (output, TRUE, BROADWAY_WS_CNX_PONG, NULL, 0);
 }
 
+static void
+broadway_output_sendmsg_initiate (BroadwayOutput *output)
+{
+  if (!output->proto_v7_plus)
+    g_output_stream_write (output->out, "\0", 1, NULL, NULL);
+  else
+    {
+    }
+}
+
 int
 broadway_output_flush (BroadwayOutput *output)
 {
-  if (output->buf->len == 0)
-    return TRUE;
-
   if (!output->proto_v7_plus)
-    broadway_output_send_cmd_pre_v7 (output, output->buf->str, output->buf->len);
+    {
-  else if (output->binary)
+      broadway_output_sendmsg (output, "\xff", 1);
-    broadway_output_send_cmd (output, TRUE, BROADWAY_WS_BINARY,
+      broadway_output_sendmsg (output, "\0", 1);
-			      output->buf->str, output->buf->len);
+      return !output->error;
-  else
+    }
-    broadway_output_send_cmd (output, TRUE, BROADWAY_WS_TEXT,
+  else /* no need to flush */
-			      output->buf->str, output->buf->len);
+    return !output->error;
-
-  g_string_set_size (output->buf, 0);
-
-  return !output->error;
-
 }
 
 BroadwayOutput *
-broadway_output_new (GOutputStream *out, guint32 serial,
+broadway_output_new(GOutputStream *out, guint32 serial,
-		     gboolean proto_v7_plus, gboolean binary)
+		    gboolean proto_v7_plus)
 {
   BroadwayOutput *output;
 
   output = g_new0 (BroadwayOutput, 1);
 
   output->out = g_object_ref (out);
-  output->buf = g_string_new ("");
   output->serial = serial;
   output->proto_v7_plus = proto_v7_plus;
-  output->binary = binary;
+
+  broadway_output_sendmsg_initiate (output);
 
   return output;
 }
@@ -322,97 +285,32 @@ broadway_output_get_next_serial (BroadwayOutput *output)
  *                     Core rendering operations                        *
  ************************************************************************/
 
+#define HEADER_LEN (1+6)
+
 static void
-append_char (BroadwayOutput *output, char c)
+append_uint16 (guint32 v, char *buf, int *p)
 {
-  g_string_append_c (output->buf, c);
+  base64_uint16 (v, &buf[*p]);
+  *p += 3;
 }
 
 static void
-append_bool (BroadwayOutput *output, gboolean val)
+append_uint32 (guint32 v, char *buf, int *p)
 {
-  if (output->binary)
+  base64_uint32 (v, &buf[*p]);
-    g_string_append_c (output->buf, val ? 1: 0);
+  *p += 6;
-  else
-    g_string_append_c (output->buf, val ? '1': '0');
 }
 
-static void
+static int
-append_flags (BroadwayOutput *output, guint32 val)
+write_header(BroadwayOutput *output, char *buf, char op)
 {
-  if (output->binary)
+  int p;
-    g_string_append_c (output->buf, val);
-  else
-    g_string_append_c (output->buf, val + '0');
-}
 
+  p = 0;
+  buf[p++] = op;
+  append_uint32 (output->serial++, buf, &p);
 
-static void
+  return p;
-append_uint16 (BroadwayOutput *output, guint32 v)
-{
-  gsize old_len = output->buf->len;
-
-  if (output->binary)
-    {
-      guint8 *buf = (guint8 *)output->buf->str + old_len;
-
-      g_string_set_size (output->buf, old_len + 2);
-      buf[0] = (v >> 0) & 0xff;
-      buf[1] = (v >> 8) & 0xff;
-    }
-  else
-    {
-      g_string_set_size (output->buf, old_len + 3);
-      base64_uint16 (v, output->buf->str + old_len);
-    }
-}
-
-static void
-append_uint32 (BroadwayOutput *output, guint32 v)
-{
-  gsize old_len = output->buf->len;
-
-  if (output->binary)
-    {
-      guint8 *buf = (guint8 *)output->buf->str + old_len;
-
-      g_string_set_size (output->buf, old_len + 4);
-      buf[0] = (v >> 0) & 0xff;
-      buf[1] = (v >> 8) & 0xff;
-      buf[2] = (v >> 16) & 0xff;
-      buf[3] = (v >> 24) & 0xff;
-    }
-  else
-    {
-      g_string_set_size (output->buf, old_len + 6);
-      base64_uint32 (v, output->buf->str + old_len);
-    }
-}
-
-static void
-overwrite_uint32 (BroadwayOutput *output, gsize pos, guint32 v)
-{
-  if (output->binary)
-    {
-      guint8 *buf = (guint8 *)output->buf->str + pos;
-
-      buf[0] = (v >> 0) & 0xff;
-      buf[1] = (v >> 8) & 0xff;
-      buf[2] = (v >> 16) & 0xff;
-      buf[3] = (v >> 24) & 0xff;
-    }
-  else
-    {
-      base64_uint32 (v, output->buf->str + pos);
-    }
-}
-
-
-static void
-write_header(BroadwayOutput *output, char op)
-{
-  append_char (output, op);
-  append_uint32 (output, output->serial++);
 }
 
 void
@@ -420,20 +318,29 @@ broadway_output_copy_rectangles (BroadwayOutput *output,  int id,
 				 BroadwayRect *rects, int n_rects,
 				 int dx, int dy)
 {
-  int i;
+  char *buf;
+  int len, i, p;
 
-  write_header (output, 'b');
+  len = HEADER_LEN + 3 + 3 + 3*4*n_rects + 3 + 3;
-  append_uint16 (output, id);
+
-  append_uint16 (output, n_rects);
+  buf = g_malloc (len);
+  p = write_header (output, buf, 'b');
+  append_uint16 (id, buf, &p);
+  append_uint16 (n_rects, buf, &p);
   for (i = 0; i < n_rects; i++)
     {
-      append_uint16 (output, rects[i].x);
+      append_uint16 (rects[i].x, buf, &p);
-      append_uint16 (output, rects[i].y);
+      append_uint16 (rects[i].y, buf, &p);
-      append_uint16 (output, rects[i].width);
+      append_uint16 (rects[i].width, buf, &p);
-      append_uint16 (output, rects[i].height);
+      append_uint16 (rects[i].height, buf, &p);
     }
-  append_uint16 (output, dx);
+  append_uint16 (dx, buf, &p);
-  append_uint16 (output, dy);
+  append_uint16 (dy, buf, &p);
+
+  assert (p == len);
+
+  broadway_output_sendmsg (output, buf, len);
+  free (buf);
 }
 
 void
@@ -441,18 +348,31 @@ broadway_output_grab_pointer (BroadwayOutput *output,
 			      int id,
 			      gboolean owner_event)
 {
-  write_header (output, 'g');
+  char buf[HEADER_LEN + 3 + 1];
-  append_uint16 (output, id);
+  int p;
-  append_bool (output, owner_event);
+
+  p = write_header (output, buf, 'g');
+  append_uint16 (id, buf, &p);
+  buf[p++] = owner_event ? '1': '0';
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 guint32
 broadway_output_ungrab_pointer (BroadwayOutput *output)
 {
+  char buf[HEADER_LEN];
   guint32 serial;
+  int p;
 
   serial = output->serial;
-  write_header (output, 'u');
+  p = write_header (output, buf, 'u');
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 
   return serial;
 }
@@ -462,34 +382,62 @@ broadway_output_new_surface(BroadwayOutput *output,
 			    int id, int x, int y, int w, int h,
 			    gboolean is_temp)
 {
-  write_header (output, 's');
+  char buf[HEADER_LEN + 16];
-  append_uint16 (output, id);
+  int p;
-  append_uint16 (output, x);
+
-  append_uint16 (output, y);
+  p = write_header (output, buf, 's');
-  append_uint16 (output, w);
+  append_uint16 (id, buf, &p);
-  append_uint16 (output, h);
+  append_uint16 (x, buf, &p);
-  append_bool (output, is_temp);
+  append_uint16 (y, buf, &p);
+  append_uint16 (w, buf, &p);
+  append_uint16 (h, buf, &p);
+  buf[p++] = is_temp ? '1' : '0';
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 void
 broadway_output_show_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, 'S');
+  char buf[HEADER_LEN + 3];
-  append_uint16 (output, id);
+  int p;
+
+  p = write_header (output, buf, 'S');
+  append_uint16 (id, buf, &p);
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 void
 broadway_output_hide_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, 'H');
+  char buf[HEADER_LEN + 3];
-  append_uint16 (output, id);
+  int p;
+
+  p = write_header (output, buf, 'H');
+  append_uint16 (id, buf, &p);
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 void
 broadway_output_destroy_surface(BroadwayOutput *output,  int id)
 {
-  write_header (output, 'd');
+  char buf[HEADER_LEN + 3];
-  append_uint16 (output, id);
+  int p;
+
+  p = write_header (output, buf, 'd');
+  append_uint16 (id, buf, &p);
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 
@@ -503,25 +451,31 @@ broadway_output_move_resize_surface (BroadwayOutput *output,
 				     int             w,
 				     int             h)
 {
+  char buf[HEADER_LEN+3+1+6+6];
+  int p;
   int val;
 
   if (!has_pos && !has_size)
     return;
 
-  write_header (output, 'm');
+  p = write_header (output, buf, 'm');
+
   val = (!!has_pos) | ((!!has_size) << 1);
-  append_uint16 (output, id);
+  append_uint16 (id, buf, &p);
-  append_flags (output, val);
+  buf[p++] = val + '0';
   if (has_pos)
     {
-      append_uint16 (output, x);
+      append_uint16 (x, buf, &p);
-      append_uint16 (output, y);
+      append_uint16 (y, buf, &p);
     }
   if (has_size)
     {
-      append_uint16 (output, w);
+      append_uint16 (w, buf, &p);
-      append_uint16 (output, h);
+      append_uint16 (h, buf, &p);
     }
+  assert (p <= sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, p);
 }
 
 void
@@ -529,9 +483,17 @@ broadway_output_set_transient_for (BroadwayOutput *output,
 				   int             id,
 				   int             parent_id)
 {
-  write_header (output, 'p');
+  char buf[HEADER_LEN + 6];
-  append_uint16 (output, id);
+  int p;
-  append_uint16 (output, parent_id);
+
+  p = write_header (output, buf, 'p');
+
+  append_uint16 (id, buf, &p);
+  append_uint16 (parent_id, buf, &p);
+
+  assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }
 
 
@@ -539,26 +501,32 @@ void
 broadway_output_put_rgb (BroadwayOutput *output,  int id, int x, int y,
 			 int w, int h, int byte_stride, void *data)
 {
-  gsize size_start, image_start, len;
+  gsize buf_size;
+  gsize url_len;
+  char *url, *buf;
+  int p;
 
-  write_header (output, 'i');
+  url = to_png_rgb (w, h, byte_stride, (guint32*)data);
+  url_len = strlen (url);
 
-  append_uint16 (output, id);
+  buf_size = HEADER_LEN + 15 + url_len;
-  append_uint16 (output, x);
+  buf = g_malloc (buf_size);
-  append_uint16 (output, y);
 
-  size_start = output->buf->len;
+  p = write_header (output, buf, 'i');
-  append_uint32 (output, 0);
 
-  image_start = output->buf->len;
+  append_uint16 (id, buf, &p);
-  if (output->binary)
+  append_uint16 (x, buf, &p);
-    to_png_rgb (output->buf, w, h, byte_stride, (guint32*)data);
+  append_uint16 (y, buf, &p);
-  else
-    to_png_url_rgb (output->buf, w, h, byte_stride, (guint32*)data);
 
-  len = output->buf->len - image_start;
+  append_uint32 (url_len, buf, &p);
 
-  overwrite_uint32 (output, size_start, len);
+  g_assert (p == HEADER_LEN + 15);
+  strncpy (buf + p, url, url_len);
+
+  broadway_output_sendmsg (output, buf, buf_size);
+
+  g_free (buf);
+  free (url);
 }
 
 typedef struct  {
@@ -789,38 +757,39 @@ broadway_output_put_rgba (BroadwayOutput *output,  int id, int x, int y,
 			  int w, int h, int byte_stride, void *data)
 {
   BroadwayBox *rects;
-  int i, n_rects;
+  int p, i, n_rects;
-  gsize size_start, image_start, len;
 
   rects = rgba_find_rects (data, w, h, byte_stride, &n_rects);
 
   for (i = 0; i < n_rects; i++)
     {
+      gsize url_len, buf_size;
+      char *buf, *url;
       guint8 *subdata;
 
-      write_header (output, 'i');
-      append_uint16 (output, id);
-      append_uint16 (output, x + rects[i].x1);
-      append_uint16 (output, y + rects[i].y1);
-
-      size_start = output->buf->len;
-      append_uint32 (output, 0);
-
-      image_start = output->buf->len;
-
       subdata = (guint8 *)data + rects[i].x1 * 4 + rects[i].y1 * byte_stride;
-      if (output->binary)
+      url = to_png_rgba (rects[i].x2 - rects[i].x1,
-	to_png_rgba (output->buf, rects[i].x2 - rects[i].x1,
-		     rects[i].y2 - rects[i].y1,
-		     byte_stride, (guint32*)subdata);
-      else
-	to_png_url_rgba (output->buf, rects[i].x2 - rects[i].x1,
 			 rects[i].y2 - rects[i].y1,
 			 byte_stride, (guint32*)subdata);
 
-      len = output->buf->len - image_start;
+      url_len = strlen (url);
+      buf_size = HEADER_LEN + 15 + url_len;
+      buf = g_malloc (buf_size);
 
-      overwrite_uint32 (output, size_start, len);
+
+      p = write_header (output, buf, 'i');
+      append_uint16 (id, buf, &p);
+      append_uint16 (x + rects[i].x1, buf, &p);
+      append_uint16 (y + rects[i].y1, buf, &p);
+
+      append_uint32 (url_len, buf, &p);
+      g_assert (p == HEADER_LEN + 15);
+      strncpy (buf + p, url, url_len);
+
+      broadway_output_sendmsg (output, buf, buf_size);
+
+      free (url);
+      g_free (buf);
     }
 
   free (rects);
@@ -830,6 +799,13 @@ void
 broadway_output_surface_flush (BroadwayOutput *output,
 			       int             id)
 {
-  write_header (output, 'f');
+  char buf[HEADER_LEN + 3];
-  append_uint16 (output, id);
+  int p;
+
+  p = write_header (output, buf, 'f');
+  append_uint16 (id, buf, &p);
+
+  g_assert (p == sizeof (buf));
+
+  broadway_output_sendmsg (output, buf, sizeof (buf));
 }