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

Merge branch 'master' into gtkbuilder-gbinding
Moved transformation function support here from "gtkbuilder-gbinding" branch
2011-08-30 08:38:03 +02:00 · 2011-08-30 08:37:28 +02:00 · 2011-08-21 21:56:17 +02:00 · 2011-08-21 21:51:21 +02:00 · 2011-08-21 21:36:22 +02:00 · 2011-08-19 12:43:57 +02:00
985 changed files with 129537 additions and 183776 deletions
@@ -63,6 +63,10 @@ gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-waylan
 	rm -f $@ && \
 	cp gdk-3.0.pc $@

+gtk+-*-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
+	rm -f $@ && \
+	cp gtk+-3.0-uninstalled.pc $@
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc

@@ -80,6 +84,8 @@ DISTCLEANFILES = \
 	gdk-3.0.pc			\
 	gdk-x11-3.0.pc			\
 	gail-3.0.pc			\
+	gtk+-3.0-uninstalled.pc		\
+	gail-3.0-uninstalled.pc		\
 	config.lt

 distclean-local:
@@ -10,7 +10,7 @@ TEST_PROGS =
 ### testing rules

 # Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
+XVFB = Xvfb -ac -noreset -screen 0 800x600x16
 XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
@@ -29,7 +29,7 @@ endif
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
+	&& { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
 	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY
@@ -1,556 +1,3 @@
-Overview of Changes in GTK+ 3.3.14
-==================================
-
-* Theming
- - Fixes for border handling in GtkEntry,
-   GtkCellRendererText, GtkComboBox
- - Parse values more carefully, supporting
-   percentages, angles
- - Implement CSS linear-gradient syntax
- - Support background-size
- - Support a gtk.gresource file in themes
-
-* Bugs fixed
- 543520 Cups custom options are not sent properly
- 649121 Crash in GtkAppChooserDialog packagekit button
- 669176 Regression: atk-add-key-event-listener doesn't work
-
-* Updated translations
- Galician
- Norwegian bokmål
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.10
-==================================
-
-* GtkApplication:
- - Move application menu handling over from GIO
- - Fix resize grip positioning in GtkApplicationWindow
-
-* Wayland:
- - Make combo boxes work
- - Make key modifiers work like on X11
- - Make mouse buttons work correctly
-
-* Quartz:
- - Make key modifiers work more like they do on X11
-
-* Printing:
- - Fix handling of custom cups options
-
-* Accessibility:
- - Bring key snooping support back for now
-
-* Translation updates:
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.8
-=================================
-
-* GtkApplication:
- - Supports logout notification and inhibiting
- - Buttons, toolbuttons and switches can now be connected
-   to GActions
-
-* GtkSpinButton no longer allows to change the value
-  when not editable
-
-* GtkLabel link support has been rewritten to be be
-  more robust
-
-* GtkBuilder:
- - Supports the 'id' in GtkComboBoxText
- - Can parse GVariant-valued properties
- - Support loading from a GResource
-
-* GtkImage:
- - Support loading from a GResource
-
-* GtkUIManager:
- - Support loading from a GResource
-
-* Accessibility:
- - key snooping support has been removed
-
-* Wayland backend:
- - Cursor handling updates
- - Look for cursors in the 'weston' directory
- - Make resize grips work
- - Implement device grabs
- - Implement window geometry hints
- - Set surface type based on window type hint
- - Add basic clipboard and selection implementations
- - Implement client-side keyboard repeat
- - Update GdkWindow focus state to match reality
-
-* Theming:
- - Improved CSS compliance for selector matching
- - Improved CSS compliance for value resolution,
-   including full support for 'inherit', 'initial',
-   'currentColor', 'none'
- - Support border-style properties
- - 'window-unfocused' has been renamed to 'backdrop'
-
-* New deprecations:
- - GdkColor
- - GtkButton::inner-border
-
-* Miscellaneous:
- - Turn default theme css files and dnd cursors into
-   GResources
-
-* Bugs fixed:
- 543520 Cups custom options are not sent properly
- 612396 ...default of entry-text-column for GtkComboBoxText
- 613728 Rationalize GtkTreeView focus
- 620240 GNOME Drag & Drop broken for remote X sessions
- 629878 Missing "Back" and "Forward" icons for Firefox
- 631414 Add symbolic constants for event emission control
- 639875 crashes when unparenting a tab from a window...
- 657367 GtkAction: Hold a reference to proxy widgets
- 659516 gtk_css_provider_to_string lacks "since" tag
- 660139 GtkGrid gives Gtk-Warnings about negative sizes when empty
- 660309 check x11 backend when create xim module
- 663479 "Finishing" ("Completion") and "Advanced" tabs are empty
- 665015 "Widget (%s) has more than one label" unwanted warnings
- 666103 Should be able to match the parent where a dropdown menu...
- 666600 allocate the CSS border and deprecate GtkButton-inner-border
- 666685 SIGSEGV in _gtk_tree_selection_internal_select_node
- 666710 Fix compose sequences disabling other sequences
- 666842 [patch] "sticky" window state reported wrongly on X11
- 667018 Fix compilation on Windows
- 667229 gtkspinbutton: Respect value of inherited 'editable' property
- 667394 Gtk(Tool)Button: add an 'action-name' property
- 667473 gdk_rgba_free (NULL)
- 667485 gdk_rgba_parse error checking
- 667534 Non-XInput2 build fix
- 667546 GApplication doc mentions g_application_set_app_menu
- 667628 GtkWindow:application property should have G_PARAM_CONSTRUCT
- 667695 GAction leaked in examples/plugman.c
- 667705 fix up GtkApplication on OS X
- 666921 Fix the _NET_SUPPORTING_WM_CHECK window fetch to be spec...
-
-* Translation updates:
- Arabic
- Bulgarian
- Finnish
- Hebrew
- Norwegian bokmål
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.6
-=================================
-
-* GtkApplication has grown support for exporting application
-  menus and menubars on the bus, as a GMenuModel. The
-  new GtkApplicationWindow toplevel automatically
-  displays these menu models when needed.
-
-* GtkSpinButtons have received a long-overdue face-lift
-  to make them easier to use with both mouse and touch.
-
-* GtkScale has gained a has-origin property to request
-  filled-in drawing of the trough.
-
-* GtkWindow can now request that the window manager hide
-  the titlebar when the window is maximized.
-
-* The GtkTreeView accessibility support and the core
-  treeview code have been extensively refactored;
-  performance should be much improved. But watch out
-  for regressions.
-
-* The GtkFileChooser entry completion code has been
-  extensively refactored; it now uses GtkEntryCompletion
-
-* Excessive dependencies have been culled from Requires:
-  lines in pc files. Dependent modules may have to declare
-  dependencies that they were getting 'for free' in the past.
-
-* Theming improvements:
- - The background-clip and background-origin CSS properties
-   have been implemented
-
-* Win32 improvements:
- - Theming of column headers, radio buttons and menuitems,
-   notebook tabs, etc has been fixed
- - Menus, tooltips, and other popups show above the task bar
-
-* Wayland:
- - The Wayland backend has been updated to the current Wayland API
-
-* Bugs fixed:
- 603823 Print to File suggests ".ps" as filename...
- 640317 gtk_draw_insertion_cursor should be moved to gtk_render
- 646461 Leak in gtkfilechooserbutton.c: model_free_row_data
- 650943 Clicking resize grip causes strange mouse grabbing beh...
- 661428 Allow themes to know when a toplevel window appears un...
- 662814 Request for way to tell gtk_recent_manager_add_item_qu...
- 664137 Crash in Audacious audio player when browsing the add ...
- 664456 segfault on arrow keypress in empty GtkIconView
- 664467 prop-editor is broken for GdkColor properties
- 664469 color button doesn't notify "color" and "alpha" when c...
- 664537 GtkCssProvider: don't segfault when CSS file is not found
- 664640 CUPS authentication does not work
- 665140 Draw the scale split
- 665326 FTBFS: missing Xi/Pango/Fc for gtk-query-immodules-3.0
- 665616 Add hide-titlebar-when-maximized setting
- 665741 Crashes in treeview when pressing End key.
- 665999 Introspection wrong for GDK_INPUT_ONLY vs GDK_INPUT_OUTPUT
- 666242 Separators in menuitem are not vertically aligned
- 641999 Consider adding a workarea API
- 657578 Toggling the state of a GtkCheckButton causes accessible...
- 659445 Accessible event.any_data is incorrect for text-removed...
- 663573 Rework GtkFileChooserEntry
- 666392 widget: Flip the sensitive flag even if the state doesn't...
- 666552 Layered region is leaked in GdkWindow
-
-* Updated translations
- Breton
- Kazakh
- Russian
- Slovak
- Spanish
-
-
-Overview of Changes in GTK+ 3.3.4
-=================================
-
-* The beagle search backend has been dropped
-
-* Stop using GDK/GTK_DISABLE_DEPRECATED guards for deprecated
-  functions; instead use function attributes
-
-* Make GtkCellRendererAccel support naked keyvals, so it can
-  be used in gnome-control-center
-
-* GDK changes
- - Make the Mod1 == Alt assumption official
- - The Broadway backend has initial support for V7+ websockets
-
-* GtkApplication no longer uses gtk_main internally
-
-* GtkNotebook now destroys its action widgets, instead of leaking them
-
-* Theming improvements:
- - Background images can now be tiled instead of stretched,
-   using the background-repeat CSS property
- - Unfocused windows can be themed differently, using
-   the 'window-unfocused' state flag
-
-* Accessibility improvements:
- - Much better treeview performance
- - Completely ignore invisible columns in treeviews
- - Many a11y/treeview-related crashes fixed
- - Combo box keybindings are reported again
- - Textview respects display lines again
-
-* OS X improvements:
- - Improved handling of motion events and event state
- - Handle recursive CFRunLoops
- - More fixes to accel handling
-
-* Win32 improvements:
- - Many fixes, making this the first version of GTK+ 3 that
-   works well on Windows
-
-* Bugs fixed:
-  84314 gdk_display_sync() and gdk_flush()
- 142874 use of SetWindowLong in gdkwindow-win32.c causes incorrect...
- 169811 configure_event and window-state-event are not emitted con...
- 171456 "Keep Above" option in Gimp broken on Win32
- 324254 Realizing a top-level window widget early positions it at 0,0
- 516822 gtk_window_fullscreen does not resize correctly if removing...
- 542777 Scroll-Wheel doesn't scroll (Win)
- 552041 Windows' System Menu from taskbar is buggy
- 603559 gtk should handle missing immodules better
- 604156 gtk_window_set_modal() freezes application completely
- 606727 Can't bind keys on numerical keypad with numlock on
- 612359 Dialog positioning hints fail on Windows 7
- 616544 win32 drag and drop (DnD) broken for GTK+ 3
- 628049 Native windows don't work very well
- 631384 Images pasted from clipboard are shifted/wrapped
- 647460 typo in msw_style.c?
- 652239 win32: resurect Windows clipboard selection notification
- 658841 Ensure native window in gdk_win32_drawable_get_handle()...
- 658842 Fix win32 _gdk_windowing_window_at_pointer - port to gtk3
- 659151 Cannot obtain accessible keybinding for comboboxes
- 659257 Gtk-WARNING **: GtkRecentChooserWidget 0x80da890 is mapped...
- 661858 Add annotations for some GtkRadio* constructors
- 661859 Add annotations for some GtkSymbolicColor constructors
- 661997 Gtk crashes when changing the TreeView model while rubber...
- 662160 gtk_print_operation_cancel fails
- 662628 Add keyboard brightness to keyname-table.h
- 662670 Pressing "Enter" in print dialog box will not cause printing
- 662691 menuitem: Always treat submenus as popup
- 662755 Keycode support in GtkCellRendererAccel broken
- 662839 Fix XIGrabKeycode usage
- 662870 Fix introspection annotations for GtkRadioToolButton
- 662953 x11: Fix window manager change detection
- 663073 gtk_dialog_new_with_buttons should be G_GNUC_NULL_TERMINATED
- 663138 iconview: layout items immediately when setting a GtkTreeModel
- 663182 Dragging any item on OS X crashes Banshee
- 663345 'from gi.repository import Gtk' fails in jhbuild
- 663396 With multiple master devices, right clicking may show popup...
- 663522 css: start background-repeat
- 663605 Fix event->state of many event types on quartz
- 663694 GtkTreeViewAccessibleCellInfo are leaked
- 663761 gtk: Fix GtkCellRenderer ignoring keycodes
- 663825 calling gtk_progress_bar_set_fraction with a fraction > 1.0...
- 663856 Make option-foo accelerators use the right symbol
- 663994 GtkTextView no longer reports the correct line text to ATs...
- 664021 GtkSpinButton: Clarify clamping behavior in gtk_spin_button...
- 664027 Build fails with undefined reference to `gdk_keymap_get_mod...
- 664132 gdk_cairo_region_create_from_surface broken on PPC...
-
-
-Overview of Changes in GTK+ 3.3.2
-=================================
-
-* GtkCellRendererAccel can show virtual modifiers
-
-* Theming improvements:
- - CSS: 'transparent' can be used a color
- - Improved notebook tab rendering
- - Support opacity and rounded corners for tooltips
-
-* OS X improvements:
- - Disable mnemonics
- - Make Option work as a modifier
- - Cleanup of modifiers: Alt/Option is MOD1, Command is MOD2
- - Fix keyval <> Unicode and lowercase/uppercase mapping
-
-* Improvements of cross-platform key and button event handling:
- - Support '<Primary>' in accelerator strings
- - Use approprivate modifiers for extending and modifying
-   selections, depending on the platform
- - Use the appropriate button for triggering context menus,
-   depending on the platform
-
-* Bugs fixed:
- 628936 gtk build fails because of objective-c elements
- 653289 GtkCellRendererText "edited" signal not emitted...
- 655057 rendering issues with map plugin
- 657770 Write to released memory in gtkdnd-quartz.c
- 658767 Drag and Drop NSEvent capture is racy
- 658772 Directory paths for resource directories are hard-coded
- 659022 gtk_tree_model_filter_clear_cache_helper: assertion failed
- 659655 3 errors in Spanish translation of gtk+
- 660687 roxterm X crashes with accessibility enabled
- 660730 Use of "struct stat" breaks Windows
- 659602 Provide an abstraction for the platform's use...
- 659406 Abstract what triggers a context menu
- 660619 __SIZEOF_INT__ and __SIZEOF_POINTER__ may not be defined
- 599617 a modern tooltip look
- 628936 gtk build fails because of objective-c elements
- 631167 GtkComboBox with has-entry=true should not require...
- 651818 Crash in gtk_app_chooser_refresh()
- 659672 gtk_tree_view_column_dispose() does not remove from tree...
- 660139 GtkGrid gives Gtk-Warnings about negative sizes...
- 660833 all: add an 'only-child' pseudo-class selector
- 661032 out-of-tree builds result in broken gtk-doc documentation
- 661089 gtkfontbutton.c will not compile on Solaris
- 661780 GTK_STOCK_INDENT references wrong images
- 661835 GMountOperation on OpenBSD: remove the need for kvm(3)
- 662024 tests/css/parser/selector.errors missing from EXTRA_DIST
- 662132 --sync
- 662177 Toolbar returns invalid paths for toolbar items
- 662230 treemodel: document gtk_tree_path_free() as allow-none
- 662308 Scrollbars seem to unconditionally reserve a space...
- 662467 tooltip: only update shape if the window is realized
- 662481 Clean up the gtkprivate directory redefinition mess
- 662629 notebook: update tab area allocation when switching page
-
-* Translation updates
- Brazilian Portuguese
- British English
- Catalan (Valencian)
- Czech
- Dutch
- Esperanto
- Japanese
- Galician
- Latvian
- Serbian
- Spanish
- Simplified Chinese
- Traditional Chinese
- Vietnamese
-
-
-Overview of Changes in GTK+ 3.2
-===============================
-
-* GtkFontChooser:
- - More speed ups. The font chooser will now load
-   instanteously, even if you have thousands of fonts
-
-* Bug fixes
- 659826 new broadband connection weirdness in assistant
- 659966 Fix module blacklisting
- 640741 Fix return value fo gtk_tree_view_column_cell_get_position
-        Assertion in the treeview accessible code
-        Fix erroneous beeping in textview keynav
-
-* Translation updates
- Assamese
- Basque
- Brazilian Portuguese
- Bulgarian
- Catalan
- Czech
- Danish
- French
- Galician
- German
- Hungarian
- Japanese
- Korean
- Latvian
- Lithuanian
- Oriya
- Polish
- Portuguese
- Russian
- Slovenian
- Spanish
- Swedish
- Telugu
-
-
-Overview of Changes in GTK+ 3.1.92
-==================================
-
-* GtkIconView:
- - Cells will now be prelighted, if you set the
-   GtkCellRendererPixbuf::follow-state property.
-
-* GtkFontChooser:
- - Speed up population of the font list somewhat.
-   More speedups are expected in 3.2
-
-* Bugs fixed:
- 615501 GtkIconView does not support prelight cells
- 658981 Inability to effectively clear string indicator in stf imp...
- 659241 GtkPaned initially allocates space for separator, even if...
- 659247 link-button: Reset the mouse cursor when destroyed
-
-* Translation updates:
- Asturian
- Belarussian
- Brazilian Portuguese
- British English
- Bulgarian
- French
- Galician
- German
- Latvian
- Portuguese
- Punjabi
- Russian
- Serbian
- Slovenian
- Swedish
-
-
-Overview of Changes in GTK+ 3.1.90
-==================================
-
-* GtkAppChooserButton: A new function has been added
-  that makes it possible to have the button select the
-  default app (as opposed to the most-recently-used app).
-
-* A lot of feedback on the the tree model refactoring has
-  been incorporated via new test cases and bug fixes
-
-* The filechooser search has been ported to tracker 0.12
-  and is using the tracker DBus API directly now.
-
-* The new fontchooser API has been reworked a bit to make
-  it follow the same pattern we use else where. GtkFontChooser
-  is now an interface that is implemented by GtkFontChooserButton,
-  GtkFontChooserDialog and GtkFontChooserWidget (to which the
-  original GtkFontChooser has been renamed).
-
-* Bugs fixed
- 514843 gtkfilechooser should be more robust to malformed URIs...
- 617583 Dead accents keys don't work in GTK+ applications on OSX
- 642706 No way to select the default entry
- 657353 GtkTreeModelFilter hangs when filtering
- 657627 new font chooser API inconsistent
- 658272 Port gtksearchenginetracker.c to tracker 0.11/0.12
- 658379 Disabled devices still added to list on startup
- 658398 Use of uninitialized variable reported by Valgrind
- 658507 better comboboxes for right to left languages
- 658600 Geany crashes when reopening file chooser dialog
- 658696 Crash when inserting a new node
- 658774 Regression: GtkFileChooserButtons do not expand
-
-* Translation updates:
- Belarusian
- British English
- French
- Galician
- Indonesian
- Italian
- Latvian
- Norwegian bokmål
- Persian
- Polish
- Portuguese
- Punjabi
- Simplified Chinese
- Slovenian
- Spanish
- Swedish
- Tamil
-
-
-Overview of Changes in GTK+ 3.1.18
-==================================
-
-* GtkFileChooser:
- - It is no possible to go to the containing folder of a
-   selected file in recent files or search results.
-
-* Bugs fixed
- 530253 typo ifaces under gtk_tree_view_set_reorderable
- 566202 GTK_SELECTION_MULTIPLE description unclear
- 581435 gtk_tree_view_set_drag_dest_row() needs more documentation
- 655631 Description of x and y parameters in gtk_render_arrow is in...
- 657793 Support NULL sibling in gtk_grid_attach_next_to
- 657882 gtk_css_provider_propagate_error's signature not updated...
- 657963 themingengine: remove xthickness FIXME from gtk_render_line()
- 657985 reeview: add GTK_STYLE_CLASS_SEPARATOR for tree view separators
- 658008 Centered text alignment in GtkAssistant is wrong
- 658077 Add theming support to GtkPathBar
- 658111 gtk_label_set_pattern() is reset by a call to gtk_box_pack_...
- 658168 Gtk-Message: Failed to load module "gail"
- 658200 gtk_toolbar_finalize() does stuff it shouldn't
-        Fix colord support in the print dialog
-
-* Translation updates
- Belarusian
- Brazilian Portuguese
- Esperanto
- Galician
- Korean
- Lithuanian
-
-
-Overview of Changes in GTK+ 3.1.16
-==================================
-
-* Make distcheck work again, and fix errors that crept in by
-  lack of a working distcheck.
-
-* Bugs fixed:
- 656223 GtkToolShell: Move vfunc default results to default impl...
-
-
 Overview of Changes in GTK+ 3.1.14
 ==================================

@@ -27,11 +27,6 @@ Installation
 See the file 'INSTALL'


-Release notes for 3.4
-=====================
-
-* The -uninstalled variants of the pkg-config files have been dropped.
-
 Release notes for 3.2
 =====================

@@ -156,17 +156,11 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.

-There are also VS 2008/2010 solution and project files to build GTK+, which
+There are also VS 2008 solution and project files to build GTK+, which
 are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
 provided that the afore-mentioned dependencies are installed.  They will
-build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in),
-the GAIL-Util library and the gtk-demo program.
-
-Please refer to the following GNOME Live! page for a more detailed ouline
-on the process of building the GTK+ stack and its dependencies with Visual
-C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+build GDK with the Win32 backend, GTK+ itself and the gtk-demo program.
+(The GAIL and GAIL-util sources are not built by this method yet)

 Alternative 1 also generates Microsoft import libraries (.lib), if you
 have lib.exe available. It might also work for cross-compilation from
@@ -1,11 +1,4 @@
-Please do not compile this package (GTK+) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-A more detailed outline for instructions on building the GTK+ with Visual
-C++ can be found in the following GNOME Live! page:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+Note that all this is rather experimental.

 This VS10 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you
@@ -565,9 +565,7 @@ mkdir $(CopyDir)\share\glib-2.0\schemas

 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

-copy ..\..\..\gtk\org.gtk.WindowState.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-
-echo "Compiling gsettings XML Files..."
+echo "Compiling gsettings XML File(s)..."

 $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas

@@ -590,7 +588,7 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
    </ClCompile>
 	<Link>
@@ -69,7 +69,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -91,7 +91,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
@@ -114,7 +114,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -136,7 +136,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <PrecompiledHeader>
@@ -202,7 +202,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
    <ClCompile Include="..\..\..\demos\gtk-demo\ui_manager.c" />
  </ItemGroup>
@@ -125,9 +125,6 @@
    <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -1,11 +1,4 @@
-Please do not compile this package (GTK+) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-A more detailed outline for instructions on building the GTK+ with Visual
-C++ can be found in the following GNOME Live! page:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
+Note that all this is rather experimental.

 This VS9 solution and the projects it includes are intented to be used
 in a GTK+ source tree unpacked from a tarball. In a git checkout you
@@ -9,7 +9,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
+		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
@@ -339,8 +339,7 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gailutil.lib $(OutDir)\lib&#x0D;&#

 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;
-copy ..\..\..\gtk\org.gtk.WindowState.gschema.xml $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
+echo &quot;Compiling gsettings XML File(s)...&quot;&#x0D;&#x0A;
 $(OutDir)\bin\glib-compile-schemas.exe $(OutDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 "
 	/>
@@ -31,7 +31,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gtk"
+				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
 				PreprocessorDefinitions="$(GtkDefines)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -198,7 +198,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
 		</Filter>
@@ -9,7 +9,7 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [3])
+m4_define([gtk_minor_version], [1])
 m4_define([gtk_micro_version], [15])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
@@ -39,11 +39,11 @@ 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.31.14])
+m4_define([glib_required_version], [2.29.14])
 m4_define([pango_required_version], [1.29.0])
 m4_define([atk_required_version], [2.1.5])
 m4_define([cairo_required_version], [1.10.0])
-m4_define([gdk_pixbuf_required_version], [2.25.2])
+m4_define([gdk_pixbuf_required_version], [2.23.5])
 m4_define([introspection_required_version], [0.10.1])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
@@ -62,7 +62,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}

-AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])

 # Support silent build rules. Disable
@@ -165,6 +165,9 @@ case $host in
  *-*-linux*)
    os_linux=yes
    ;;
+  *-*-openbsd*)
+    os_openbsd=yes
+    ;;
 esac

 dnl
@@ -263,27 +266,27 @@ AC_ARG_ENABLE(xkb,
              [enable_xkb="maybe"])
 AC_ARG_ENABLE(xinerama,
              [AS_HELP_STRING([--enable-xinerama],
-	                      [support Xinerama extension [default=maybe]])],,
+	                      [support Xinerama extension if available [default=maybe]])],,
              [enable_xinerama="maybe"])
 AC_ARG_ENABLE(xinput,
              [AS_HELP_STRING([--enable-xinput],
-                              [support XInput extension [default=yes]])],,
+                              [support XInput extension if available [default=yes]])],,
              [enable_xinput="maybe"])
 AC_ARG_ENABLE(xrandr,
              [AS_HELP_STRING([--enable-xrandr],
-                              [support XRandR extension [default=maybe]])],,
+                              [support XRandR extension if available [default=maybe]])],,
              [enable_xrandr="maybe"])
 AC_ARG_ENABLE(xfixes,
              [AS_HELP_STRING([--enable-xfixes],
-                              [support XFixes extension [default=maybe]])],,
+                              [support XFixes extension if available [default=maybe]])],,
              [enable_xfixes="maybe"])
 AC_ARG_ENABLE(xcomposite,
              [AS_HELP_STRING([--enable-xcomposite],
-                              [support X Composite extension [default=maybe]])],,
+                              [support X Composite extension if available [default=maybe]])],,
              [enable_xcomposite="maybe"])
 AC_ARG_ENABLE(xdamage,
              [AS_HELP_STRING([--enable-xdamage],
-                              [support X Damage extension [default=maybe]])],,
+                              [support X Damage extension if available [default=maybe]])],,
              [enable_xdamage="maybe"])

 AC_ARG_ENABLE(x11-backend,
@@ -315,11 +318,6 @@ if test -z "$backend_set"; then
  fi
 fi

-AC_ARG_ENABLE(quartz-relocation,
-              [AS_HELP_STRING([--enable-quartz-relocation],
-                              [enable bundle-based relocation functions])],
-                              [quartz_relocation=yes])
-
 cairo_backends=
 backend_immodules=
 GDK_BACKENDS=
@@ -329,7 +327,7 @@ GDK_WINDOWING=
 GIO_PACKAGE=gio-2.0
 PANGO_PACKAGES="pango pangocairo"

-if test "$enable_x11_backend" = "yes"; then
+if test "x$enable_x11_backend" = xyes; then
  # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
  # backend names are identical.
  cairo_backends="$cairo_backends cairo-xlib"
@@ -342,7 +340,7 @@ if test "$enable_x11_backend" = "yes"; then
 #define GDK_WINDOWING_X11"
 fi

-if test "$enable_win32_backend" = "yes"; then
+if test "x$enable_win32_backend" = xyes; then
  cairo_backends="$cairo_backends cairo-win32"
  GDK_BACKENDS="$GDK_BACKENDS win32"
  backend_immodules="$backend_immodules,ime"
@@ -362,10 +360,6 @@ if test "x$enable_quartz_backend" = xyes; then
 #define GDK_WINDOWING_QUARTZ"
  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
  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
-
 else
  AM_CONDITIONAL(USE_QUARTZ, false)
 fi
@@ -406,7 +400,7 @@ fi

 if test "x$enable_debug" = "xyes"; then
  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
 else
  if test "x$enable_debug" = "xno"; then
    GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
@@ -444,6 +438,8 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl

+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DATK_DISABLE_SINGLE_INCLUDES"
+
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
@@ -495,8 +491,6 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,

 PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])

-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-
 if test "$os_win32" != yes; then
    # libtool option to control which symbols are exported
    # right now, symbols starting with _ are not exported
@@ -687,11 +681,23 @@ esac
 # Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
 #

+GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
+
 AM_PATH_GLIB_2_0(glib_required_version, :,
  AC_MSG_ERROR([
 *** GLIB glib_required_version or better is required. The latest version of
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule-no-export)
+  gobject gmodule-no-export gthread)
+
+# See if it's safe to turn G_DISABLE_DEPRECATED on.
+GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.@<:@^.@:>@*\$//"`
+GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo glib_required_version | sed "s/\.@<:@^.@:>@*\$//"`
+if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+  CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+fi
+
+CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+

 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -935,7 +941,7 @@ if test "x$enable_x11_backend" = xyes; then
    have_base_x_pc=true
    X_PACKAGES="$X_PACKAGES x11 xext"
    x_libs="`$PKG_CONFIG --libs x11 xext`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext` -DXINPUT2_1_USE_UNSTABLE_PROTOCOL -DXINPUT2_2_USE_UNSTABLE_PROTOCOL"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"

    # Strip out any .la files that pkg-config might give us (this happens
    # with -uninstalled.pc files)
@@ -1118,7 +1124,6 @@ if test "x$enable_x11_backend" = xyes; then
              [Define to 1 if XFree XInput should be used])

    X_PACKAGES="$X_PACKAGES xi"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"

    AC_CHECK_HEADER(X11/extensions/XInput2.h,
                    have_xinput2=yes
@@ -1126,10 +1131,6 @@ if test "x$enable_x11_backend" = xyes; then
                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]),
                    X_EXTENSIONS="$X_EXTENSIONS XInput")

-    gtk_save_LIBS="$LIBS"
-    LIBS="$LIBS -lXi"
-    AC_CHECK_FUNC(XIAllowTouchEvents, AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]))
-    LIBS="$gtk_save_LIBS"
  else
    AC_DEFINE(XINPUT_NONE, 1,
              [Define to 1 if no XInput should be used])
@@ -1260,24 +1261,20 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"

-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
-GDK_PRIVATE_PACKAGES="$GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
-if test "x$enable_x11_backend" = xyes; then
-  GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
-fi
+GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"

-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
 #
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
 # into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
  GDK_EXTRA_LIBS=
 fi

 AC_SUBST(GDK_PACKAGES)
-AC_SUBST(GDK_PRIVATE_PACKAGES)
 AC_SUBST(GDK_EXTRA_LIBS)
 AC_SUBST(GDK_EXTRA_CFLAGS)
 AC_SUBST(GDK_DEP_LIBS)
@@ -1314,15 +1311,17 @@ else
 fi

 GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
-GTK_PRIVATE_PACKAGES=""
 if test "x$enable_x11_backend" = xyes; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
+  GTK_PACKAGES="$GTK_PACKAGES pangoft2"
 fi
 GTK_EXTRA_LIBS=
+if test x"$os_openbsd" = xyes; then
+  GTK_EXTRA_LIBS="$GTK_EXTRA_LIBS -lkvm"
+fi

 GTK_EXTRA_CFLAGS=
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES` $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_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $MATH_LIB"
+GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GTK_PACKAGES` $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"

 if test x"$os_win32" = xyes; then
  GTK_EXTRA_CFLAGS="$msnative_struct"
@@ -1334,7 +1333,6 @@ PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"

 AC_SUBST(GTK_PACKAGES)
-AC_SUBST(GTK_PRIVATE_PACKAGES)
 AC_SUBST(GTK_EXTRA_LIBS)
 AC_SUBST(GTK_EXTRA_CFLAGS)
 AC_SUBST(GTK_DEP_LIBS)
@@ -1503,9 +1501,6 @@ if test "x$enable_test_print_backend" != "xno" ; then
 fi
 AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")

-if test "$os_win32" = "yes"; then
-  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
-fi

 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
@@ -1533,13 +1528,6 @@ fi

 GLIB_GSETTINGS

-#############
-# Resources #
-#############
-
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
 ##################################################
 # GObject introspection
 ##################################################
@@ -1552,7 +1540,7 @@ GOBJECT_INTROSPECTION_CHECK(introspection_required_version)

 AC_ARG_ENABLE(packagekit,
              [AS_HELP_STRING([--enable-packagekit=@<:@yes/no/auto@:>@],
-                              [build PackageKit open-with module [default=auto]])],
+                              [build packagekit open-with module [default=auto]])],
              [enable_packagekit="$enableval"],
              [enable_packagekit=auto])
 if test "$enable_packagekit" = "auto"; then
@@ -1563,7 +1551,7 @@ if test "$enable_packagekit" = "auto"; then
  fi
 fi

-AC_MSG_CHECKING([whether to use PackageKit])
+AC_MSG_CHECKING([Whether to use PackageKit])
 build_packagekit=no
 if test "x$enable_packagekit" != "xno"; then
  if test "$os_win32" != "yes"; then
@@ -1586,26 +1574,22 @@ AC_ARG_ENABLE(colord,
                              [build colord support code [default=auto]])],
              [enable_colord="$enableval"],
              [enable_colord=auto])
-
-AC_MSG_CHECKING([whether to use colord])
 if test "$enable_colord" = "auto"; then
  if test "$os_win32" = "yes"; then
    enable_colord=no
+  else
+    enable_colord=yes
  fi
 fi
-if test "$enable_colord" != "no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi

+AC_MSG_CHECKING([Whether to use colord])
 have_colord=no
-if test "$enable_colord" != "no"; then
+if test "x$enable_colord" != "xno"; then
        if test "$os_win32" != "yes"; then
                PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
                                  have_colord=yes, have_colord=no)
-                if test "$enable_colord" = "yes"; then
-                        if test "$have_colord" = "no"; then
+                if test "enable_colord" = "yes"; then
+                        if test "have_colord" = "no"; then
                                AC_MSG_ERROR([--enable-colord specified, but not available])
                        fi
                fi
@@ -1613,8 +1597,9 @@ if test "$enable_colord" != "no"; then
                AC_MSG_ERROR([colord support is not available on win32])
        fi
 fi
+AC_MSG_RESULT([$have_colord])

-if test "$have_colord" = "yes"; then
+if test "have_colord" = "yes"; then
        AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
@@ -1676,20 +1661,6 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [

 G_BEGIN_DECLS

-/* These macros are used to mark deprecated functions in GDK and
- * GTK+ headers, and thus have to be exposed in installed headers.
- * But please do *not* use them in other projects. Instead, use
- * G_DEPRECATED or define your own wrappers around it.
- */
-
-#ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-#define GDK_DEPRECATED
-#define GDK_DEPRECATED_FOR(f)
-#else
-#define GDK_DEPRECATED G_DEPRECATED
-#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
-#endif
-
 _______EOF

 	cat >>$outfile <<_______EOF
@@ -1745,6 +1716,8 @@ gdk-3.0.pc
 gtk+-3.0.pc
 gtk+-unix-print-3.0.pc
 gail-3.0.pc
+gtk+-3.0-uninstalled.pc
+gail-3.0-uninstalled.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -1752,14 +1725,12 @@ demos/Makefile
 demos/gtk-demo/Makefile
 demos/gtk-demo/geninclude.pl
 demos/pixbuf-demo/Makefile
-demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
 tests/a11y/Makefile
 tests/css/Makefile
 tests/css/parser/Makefile
 tests/reftests/Makefile
-tests/visuals/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1816,7 +1787,7 @@ echo "        GTK+ $GTK_VERSION"
 echo "        ==========="
 echo ""
 echo "        GDK backends:         $GDK_BACKENDS"
-if test "$enable_x11_backend" = "yes"; then
+if test "x$enable_x11_backend" = "xyes"; then
 echo "        X11 extensions:       $X_EXTENSIONS"
 fi
 echo "        Print backends:       $PRINT_BACKENDS"
@@ -0,0 +1,18 @@
+libgtk1 for Debian
+----------------------
+
+The GIMP Tool Kit (gtk) is a set of widgets to help you program
+programs for the X Windowing System easily and powerfully.
+
+gtk is the moving force behind The GNU Image Manipulation Program (The
+GIMP) -- the number one freely-available image editing and creation
+program available. 
+
+gtk is rapidly under development, and the source tree has officially
+been separated from The GIMP now, as other teams of programmers
+are beginning to write software using its great widget set -- like
+GNOME, a desktop interface for X, and gzilla, a freely available
+web browser for X.
+
+Ben Gertzfield <che@debian.org>, Mon, 29 Sep 1997 13:11:45 -0700
+
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+				# Adjust debian/changelog and build a new
+				# Debian package of a CVS archive.
+
+				# Written 17 November 1998 by Ben Gertzfield
+				# <che@debian.org>
+
+				# This work is released under the GNU
+				# General Public License, version 2 or
+				# later.
+
+use strict;
+use diagnostics;
+use File::Copy;
+
+my $maintainer = 'Ben Gertzfield <che@debian.org>';
+
+my @date = localtime;
+
+my $datestr = sprintf("%d%.2d%.2d", $date[5] + 1900, $date[4] + 1, $date[3]);
+my $revision = '01';
+
+open (CHANGELOG, 'debian/changelog') or die "Couldn't open debian/changelog: $!\n";
+
+$_ = <CHANGELOG>;
+chomp;
+
+close CHANGELOG;
+
+my ($package, $last_date, $last_revision) = /^(.*?) \((.*?)\.(.*)?\)/;
+
+if ($last_date eq $datestr) {
+  $revision = sprintf("%.2d", $last_revision + 1);
+}
+
+my $new_version = "$datestr.$revision";
+
+copy('debian/changelog', 'debian/changelog.old') or die "Couldn't copy debian/changelog to debian/changelog.old: $!\n";
+
+open(NEWCHANGELOG, ">debian/changelog") or die "Couldn't open debian/changelog for writing: $!\n";
+
+print NEWCHANGELOG "$package ($new_version) unstable; urgency=low\n\n  * CVS snapshot build at " . scalar localtime() . "\n\n -- $maintainer  " . `date -R` . "\n";
+
+open(OLDCHANGELOG, "debian/changelog.old") or die "Couldn't open debian/changelog.old: $!\n";
+
+while (<OLDCHANGELOG>) {
+  print NEWCHANGELOG;
+}
+
+close OLDCHANGELOG;
+close NEWCHANGELOG;
+
+unlink('debian/changelog.old') or die "Couldn't unlink debian/changelog.old: $!\n";
+
+open(NEWVERSION, '>debian/version') or die "Couldn't open debian/version for writing: $!\n";
+print NEWVERSION "$new_version\n";
+close NEWVERSION;
+
+system('dpkg-buildpackage -b -rfakeroot -us -uc');
+unlink 'debian/version' or die "Couldn't unlink debian/version: $!\n";
+
@@ -0,0 +1,10 @@
+gtk+-cvs (19981116.01) unstable; urgency=low
+
+  * First test build from CVS
+
+ -- Ben Gertzfield <che@debian.org>  Tue, 17 Nov 1998 12:02:13 -0800
+
+Local variables:
+mode: debian-changelog
+add-log-mailing-address: "che@debian.org"
+End:
@@ -0,0 +1,81 @@
+Source: gtk+-cvs
+Priority: extra
+Section: libs
+Maintainer: Ben Gertzfield <che@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: libgtk-cvs-1.1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Conflicts: libgtk-dev (<< 1:1.0.2), libgtk1.1
+Description: CVS build of the GIMP Toolkit set of widgets for X
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ . 
+ The GIMP Toolkit is a freely available set of widgets for X.
+ GTK is easy to use, and has been implemented in such projects as
+ The GNU Image Manipulation Program (The GIMP), GNOME, a GNU
+ desktop set of utilities for X, and gzilla, a GNU web-browser.
+ .
+ This is the unstable 1.1 branch of GTK. It is not intended for use
+ with stable projects!
+
+Package: libgtk-cvs-dev
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (=${Source-Version}), libglib-cvs-dev
+Suggests: libgtk-cvs-doc
+Provides: libgtk1.1-dev
+Replaces: libgtk1.1-dev
+Conflicts: libgtk-dev, libgtk1 (<< 1:1.0.4), libgtk1.1-dev
+Description: CVS build of development files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the header files and static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to develop your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to compile your own plug-ins for
+ The GIMP.
+
+Package: libgtk-cvs-doc
+Architecture: all
+Section: doc
+Conflicts: libgtk-dev (<< 1:0.99.4), libgtk-doc, libgtk1.1-doc
+Description: CVS build of documentation for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains lots of info-files, HTML docs, FAQs, and
+ other handy documentation about the GIMP Toolkit set of widgets
+ for X. 
+ .
+ This package documents the unstable 1.1 release of the GIMP Toolkit.
+ . 
+ Install this package if you want to have lots of info about the
+ GIMP toolkit when you're programming.
+
+Package: libgtk-cvs-dbg
+Architecture: any
+Section: devel
+Depends: libgtk-cvs-1.1 (= ${Source-Version}), libgtk-cvs-dev (= ${Source-Version})
+Suggests: libgtk-cvs-doc
+Conflicts: libgtk1.1-dbg
+Description: CVS build of debugging files for the GIMP Toolkit
+ **THIS IS NOT AN OFFICIAL DEBIAN PACKAGE! THIS IS AN AUTOMATED CVS
+   BUILD OF THE GTK+ LIBRARIES! BEWARE! IT MAY NOT WORK!**
+ .
+ This package contains the debugging static libraries for the
+ GIMP Toolkit set of widgets for X. 
+ .
+ This is the unstable, 1.1 branch of GTK+. This is not intended for
+ use with stable releases of programs! 
+ .
+ Install this package if you wish to debug your own X programs using
+ the GIMP Toolkit 1.1, or if you wish to debug your own plug-ins for
+ The GIMP.
@@ -0,0 +1,8 @@
+This package was debianized by Ben Gertzfield <che@debian.org> on
+Tue, 17 Nov 1998 12:07:17 -0800
+
+It was produced from the CVS repository at cvs.gimp.org.
+
+It may be redistributed under the terms of the GNU LGPL, Version 2 or
+later, found on Debian systems in the file /usr/doc/copyright/LGPL.
+
@@ -0,0 +1,9 @@
+usr/lib/libgdk.so
+usr/lib/libgdk.a
+usr/lib/libgtk.so
+usr/lib/libgtk.a
+usr/include/gdk/
+usr/include/gtk/
+usr/bin/gtk-config
+usr/man/man1/gtk-config.1
+usr/share/aclocal/gtk.m4
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+
+#DEBHELPER#
@@ -0,0 +1,8 @@
+usr/info/gdk.info
+usr/info/gtk.info
+usr/info/gtk.info-1
+usr/info/gtk.info-2
+usr/info/gtk.info-3
+usr/info/gtk.info-4
+usr/info/gtk.info-5
+
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+install-info --quiet --description="The GIMP Toolkit." \
+ --section "The GIMP" "The GIMP" /usr/info/gtk.info.gz
+
+install-info --quiet --description="The GIMP Drawing Kit." \
+ --section "The GIMP" "The GIMP" /usr/info/gdk.info.gz
+
+#DEBHELPER#
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+install-info --quiet --remove gtk
+install-info --quiet --remove gdk
+
+#DEBHELPER#
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+ldconfig
+
+#DEBHELPER#
@@ -0,0 +1,160 @@
+#!/usr/bin/make -f
+
+# debian/rules file for gtk+ Debian package
+# written April 1998 by Ben Gertzfield <che@debian.org
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./autogen.sh --prefix=/usr --with-xinput=xfree
+	$(MAKE)
+	cd docs && make distdocs
+	cd ..
+	touch build-stamp
+
+build-dbg: build-dbg-stamp
+build-dbg-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-xinput=xfree --enable-debug=yes
+	$(MAKE)
+	touch build-dbg-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs 
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean
+
+clean-dbg:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp build-dbg-stamp install-stamp install-dbg-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) clean
+	cd docs
+	-$(MAKE) maintainer-clean
+	cd ..
+	-$(MAKE) distclean
+	find . -name '*.o' -o -name '_libs' -o -name '*.lo' -o -name '*.a' -o -name '.deps' | xargs rm -rf
+	dh_clean -k
+
+install: install-stamp
+install-stamp: build
+	dh_testdir
+	dh_testroot
+	dh_clean
+	$(MAKE) prefix=`pwd`/debian/tmp/usr install
+	touch install-stamp
+
+install-dbg: install-dbg-stamp
+install-dbg-stamp: build-dbg
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) prefix=`pwd`/debian/libgtk-cvs-dbg/usr install
+	touch install-dbg-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install libgtk-cvs-doc
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install libgtk-cvs-dev libgtk-cvs-1.1 libgtk-cvs-dbg
+
+libgtk-cvs-1.1: build
+	dh_testdir -plibgtk-cvs-1.1 
+	dh_testroot -plibgtk-cvs-1.1
+	dh_installdirs -plibgtk-cvs-1.1
+	# Add here commands to install the files into debian/tmp
+	rm -rf debian/tmp/usr/bin debian/tmp/usr/include debian/tmp/usr/info debian/tmp/usr/lib/glib debian/tmp/usr/share/aclocal debian/tmp/usr/man debian/tmp/usr/lib/*.la
+	dh_installdocs -plibgtk-cvs-1.1
+	dh_installchangelogs -plibgtk-cvs-1.1
+	dh_strip -plibgtk-cvs-1.1
+	dh_compress -plibgtk-cvs-1.1
+	dh_fixperms -plibgtk-cvs-1.1
+	dh_installdeb -plibgtk-cvs-1.1
+	dh_shlibdeps -plibgtk-cvs-1.1
+	dh_gencontrol -plibgtk-cvs-1.1
+	dh_makeshlibs -plibgtk-cvs-1.1 -V 'libgtk-cvs-1.1 (='`cat debian/version`')'
+	dh_md5sums -plibgtk-cvs-1.1
+	dh_builddeb -plibgtk-cvs-1.1
+
+libgtk-cvs-dev: build
+	dh_testdir -plibgtk-cvs-dev
+	dh_testroot -plibgtk-cvs-dev
+	dh_clean -plibgtk-cvs-dev -k
+	dh_installdirs -plibgtk-cvs-dev
+	# Add here commands to install the files into debian/tmp
+	dh_movefiles -plibgtk-cvs-dev
+	cp gtk-config debian/tmp/usr/bin
+	dh_installdocs -plibgtk-cvs-dev 
+	dh_installchangelogs -plibgtk-cvs-dev
+	dh_strip -plibgtk-cvs-dev
+	dh_compress -plibgtk-cvs-dev
+	dh_fixperms -plibgtk-cvs-dev
+	dh_installdeb -plibgtk-cvs-dev
+	dh_shlibdeps -plibgtk-cvs-dev
+	dh_gencontrol -plibgtk-cvs-dev
+	dh_md5sums -plibgtk-cvs-dev
+	dh_builddeb -plibgtk-cvs-dev
+
+libgtk-cvs-doc:
+	dh_testdir -plibgtk-cvs-doc
+	dh_testroot -plibgtk-cvs-doc
+	dh_clean -plibgtk-cvs-doc -k
+	dh_installdirs -plibgtk-cvs-doc usr/doc/libgtk-cvs-doc/faq-html \
+	  usr/doc/libgtk-cvs-doc/tutorial-html usr/doc/libgtk-cvs-doc/italian-tutorial-html usr/doc/libgtk-cvs-doc/french-tutorial-html usr/doc/libgtk-cvs-doc/gdk-html
+	dh_movefiles -plibgtk-cvs-doc
+	cp docs/html/gtkfaq*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/faq-html
+	cp docs/html/gtk_tut-*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/tutorial-html
+	cp docs/html/gtk_tut_it*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/italian-tutorial-html
+	cp docs/html/gtk_tut_fr*.html debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/*.gif debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/french-tutorial-html
+	cp docs/html/gdk* debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/gdk-html
+	cp docs/text/*.txt debian/libgtk-cvs-doc/usr/doc/libgtk-cvs-doc/
+
+	dh_installdocs -plibgtk-cvs-doc docs/{debugging,developers,styles,text_widget,widget_system,gtk-config,refcounting}.txt TODO NEWS
+	dh_installchangelogs -plibgtk-cvs-doc
+	dh_strip -plibgtk-cvs-doc
+	dh_compress -plibgtk-cvs-doc
+	dh_fixperms -plibgtk-cvs-doc
+	dh_installdeb -plibgtk-cvs-doc
+	dh_shlibdeps -plibgtk-cvs-doc
+	dh_gencontrol -plibgtk-cvs-doc
+	dh_md5sums -plibgtk-cvs-doc
+	dh_builddeb -plibgtk-cvs-doc
+
+libgtk-cvs-dbg: clean-dbg install-dbg
+	dh_testdir -plibgtk-cvs-dbg
+	dh_testroot -plibgtk-cvs-dbg
+	dh_installdirs -plibgtk-cvs-dbg
+	# Add here commands to install the files into debian/libgtk-cvs-dbg
+	rm -rf debian/libgtk-cvs-dbg/usr/bin debian/libgtk-cvs-dbg/usr/include debian/libgtk-cvs-dbg/usr/info debian/libgtk-cvs-dbg/usr/lib/glib debian/libgtk-cvs-dbg/usr/man debian/libgtk-cvs-dbg/usr/share debian/libgtk-cvs-dbg/usr/lib/*.{la,so*}
+	for file in `find debian/libgtk-cvs-dbg/usr/lib -name '*.a'` ; do \
+	  mv $$file debian/libgtk-cvs-dbg/usr/lib/`basename $$file .a`_g.a; \
+        done
+	dh_installdocs -plibgtk-cvs-dbg
+	dh_installchangelogs -plibgtk-cvs-dbg
+	dh_compress -plibgtk-cvs-dbg
+	dh_fixperms -plibgtk-cvs-dbg
+	dh_installdeb -plibgtk-cvs-dbg
+	dh_shlibdeps -plibgtk-cvs-dbg
+	dh_gencontrol -plibgtk-cvs-dbg
+	dh_md5sums -plibgtk-cvs-dbg
+	dh_builddeb -plibgtk-cvs-dbg
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
@@ -1,6 +1,6 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl

-SUBDIRS = gtk-demo widget-factory pixbuf-demo
+SUBDIRS = gtk-demo pixbuf-demo

 -include $(top_srcdir)/git.mk
@@ -6,7 +6,6 @@ democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
 demos =						\
-	application.c				\
 	appwindow.c				\
 	assistant.c				\
 	builder.c				\
@@ -29,7 +28,6 @@ demos =						\
 	links.c					\
 	list_store.c				\
 	menus.c					\
-	multitouch.c				\
 	offscreen_window.c			\
 	offscreen_window2.c			\
 	overlay.c				\
@@ -45,7 +43,6 @@ demos =						\
 	textview.c				\
 	textscroll.c				\
 	toolpalette.c				\
-	transparent.c				\
 	tree_store.c				\
 	ui_manager.c

@@ -67,24 +64,13 @@ LDADDS = \
 	$(GTK_DEP_LIBS)				\
 	-lm

-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk3-demo

-BUILT_SOURCES = demos.h application_resources.c
+BUILT_SOURCES = demos.h

-EXTRA_DIST += 				\
-	$(IMAGEFILES)			\
-	demo.ui				\
-	application.gresource.xml	\
-	application.ui			\
-	menus.ui			\
-	gtk-logo-24.png			\
-	gtk-logo-48.png			\
-	org.gtk.Demo.gschema.xml
-
-gsettings_SCHEMAS = \
-	org.gtk.Demo.gschema.xml
-
-@GSETTINGS_RULES@
+EXTRA_DIST += 		\
+	$(IMAGEFILES)	\
+	demo.ui

 demos.h: @REBUILD@ $(demos) geninclude.pl
 	$(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
@@ -99,17 +85,8 @@ gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic

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

 #include <gtk/gtk.h>
@@ -27,18 +25,10 @@ activate_action (GtkAction *action)
      GtkSettings *settings = gtk_settings_get_default ();

      g_object_set (G_OBJECT (settings),
-                    "gtk-application-prefer-dark-theme", value,
-                    NULL);
+		    "gtk-application-prefer-dark-theme", value,
+		    NULL);
      return;
    }
-
-  if (g_str_equal (name, "HideTitlebar"))
-    {
-      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-      gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), value);
-      return;
-    }
-
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
@@ -79,7 +69,7 @@ activate_radio_action (GtkAction *action, GtkRadioAction *current)

 static void
 about_cb (GtkAction *action,
-          GtkWidget *window)
+	  GtkWidget *window)
 {
  GdkPixbuf *pixbuf, *transparent;
  gchar *filename;
@@ -112,21 +102,21 @@ about_cb (GtkAction *action,
    }

  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK+ Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
-                                                     PACKAGE_VERSION,
-                                                     gtk_get_major_version (),
-                                                     gtk_get_minor_version (),
-                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2009 The GTK+ Team",
-                         "license-type", GTK_LICENSE_LGPL_2_1,
-                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK+ functions.",
-                         "authors", authors,
-                         "documenters", documentors,
-                         "logo", transparent,
+			 "program-name", "GTK+ Code Demos",
+			 "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
+						     PACKAGE_VERSION,
+						     gtk_get_major_version (),
+						     gtk_get_minor_version (),
+						     gtk_get_micro_version ()),
+			 "copyright", "(C) 1997-2009 The GTK+ Team",
+			 "license-type", GTK_LICENSE_LGPL_2_1,
+			 "website", "http://www.gtk.org",
+			 "comments", "Program to demonstrate GTK+ functions.",
+			 "authors", authors,
+			 "documenters", documentors,
+			 "logo", transparent,
                         "title", "About GTK+ Code Demos",
-                         NULL);
+			 NULL);

  g_object_unref (transparent);
 }
@@ -204,11 +194,6 @@ static GtkToggleActionEntry toggle_entries[] = {
    "Prefer Dark Theme",                       /* tooltip */
    G_CALLBACK (activate_action),
    FALSE },                                   /* is_active */
-  { "HideTitlebar", NULL,
-    "_Hide Titlebar when maximized", NULL,
-    "Hide Titlebar when maximized",
-    G_CALLBACK (activate_action),
-    FALSE }
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);

@@ -263,11 +248,10 @@ static const gchar *ui_info =
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
 "      <menuitem action='DarkTheme'/>"
-"      <menuitem action='HideTitlebar'/>"
 "      <menu action='ColorMenu'>"
-"       <menuitem action='Red'/>"
-"       <menuitem action='Green'/>"
-"       <menuitem action='Blue'/>"
+"	<menuitem action='Red'/>"
+"	<menuitem action='Green'/>"
+"	<menuitem action='Blue'/>"
 "      </menu>"
 "      <menu action='ShapeMenu'>"
 "        <menuitem action='Square'/>"
@@ -333,10 +317,10 @@ register_stock_icons (void)
      pixbuf = NULL;
      filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
      if (filename)
-        {
-          pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-          g_free (filename);
-        }
+	{
+	  pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+	  g_free (filename);
+	}

      /* Register icon to accompany stock item */
      if (pixbuf != NULL)
@@ -371,8 +355,8 @@ update_statusbar (GtkTextBuffer *buffer,
  GtkTextIter iter;

  gtk_statusbar_pop (statusbar, 0); /* clear any previous message,
-                                     * underflow is allowed
-                                     */
+				     * underflow is allowed
+				     */

  count = gtk_text_buffer_get_char_count (buffer);

@@ -423,7 +407,7 @@ do_appwindow (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Application Window");
      gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");

@@ -432,7 +416,7 @@ do_appwindow (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);

-      table = gtk_grid_new ();
+      table = gtk_table_new (1, 5, FALSE);

      gtk_container_add (GTK_CONTAINER (window), table);

@@ -441,52 +425,60 @@ do_appwindow (GtkWidget *do_widget)

      action_group = gtk_action_group_new ("AppWindowActions");
      open_action = g_object_new (tool_menu_action_get_type (),
-                                  "name", "Open",
-                                  "label", "_Open",
-                                  "tooltip", "Open a file",
-                                  "stock-id", GTK_STOCK_OPEN,
-                                  NULL);
+				  "name", "Open",
+				  "label", "_Open",
+				  "tooltip", "Open a file",
+				  "stock-id", GTK_STOCK_OPEN,
+				  NULL);
      gtk_action_group_add_action (action_group, open_action);
      g_object_unref (open_action);
      gtk_action_group_add_actions (action_group,
-                                    entries, n_entries,
-                                    window);
+				    entries, n_entries,
+				    window);
      gtk_action_group_add_toggle_actions (action_group,
-                                           toggle_entries, n_toggle_entries,
-                                           NULL);
+					   toggle_entries, n_toggle_entries,
+					   NULL);
      gtk_action_group_add_radio_actions (action_group,
-                                          color_entries, n_color_entries,
-                                          COLOR_RED,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
+					  color_entries, n_color_entries,
+					  COLOR_RED,
+					  G_CALLBACK (activate_radio_action),
+					  NULL);
      gtk_action_group_add_radio_actions (action_group,
-                                          shape_entries, n_shape_entries,
-                                          SHAPE_SQUARE,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
+					  shape_entries, n_shape_entries,
+					  SHAPE_SQUARE,
+					  G_CALLBACK (activate_radio_action),
+					  NULL);

      merge = gtk_ui_manager_new ();
      g_object_set_data_full (G_OBJECT (window), "ui-manager", merge,
-                              g_object_unref);
+			      g_object_unref);
      gtk_ui_manager_insert_action_group (merge, action_group, 0);
      gtk_window_add_accel_group (GTK_WINDOW (window),
-                                  gtk_ui_manager_get_accel_group (merge));
+				  gtk_ui_manager_get_accel_group (merge));

      if (!gtk_ui_manager_add_ui_from_string (merge, ui_info, -1, &error))
-        {
-          g_message ("building menus failed: %s", error->message);
-          g_error_free (error);
-        }
+	{
+	  g_message ("building menus failed: %s", error->message);
+	  g_error_free (error);
+	}

      bar = gtk_ui_manager_get_widget (merge, "/MenuBar");
      gtk_widget_show (bar);
-      gtk_widget_set_halign (bar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), bar, 0, 0, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+			bar,
+                        /* X direction */          /* Y direction */
+                        0, 1,                      0, 1,
+                        GTK_EXPAND | GTK_FILL,     0,
+                        0,                         0);

      bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
      gtk_widget_show (bar);
-      gtk_widget_set_halign (bar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), bar, 0, 1, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+			bar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   1, 2,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);

      /* Create document
       */
@@ -503,8 +495,12 @@ do_appwindow (GtkWidget *do_widget)
      g_signal_connect (infobar, "response",
                        G_CALLBACK (gtk_widget_hide), NULL);

-      gtk_widget_set_halign (infobar, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), infobar, 0, 2, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        infobar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   2, 3,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);

      sw = gtk_scrolled_window_new (NULL, NULL);

@@ -515,11 +511,12 @@ do_appwindow (GtkWidget *do_widget)
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
                                           GTK_SHADOW_IN);

-      gtk_widget_set_halign (sw, GTK_ALIGN_FILL);
-      gtk_widget_set_valign (sw, GTK_ALIGN_FILL);
-      gtk_widget_set_hexpand (sw, TRUE);
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_grid_attach (GTK_GRID (table), sw, 0, 3, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        sw,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   3, 4,
+                        GTK_EXPAND | GTK_FILL,  GTK_EXPAND | GTK_FILL,
+                        0,                      0);

      gtk_window_set_default_size (GTK_WINDOW (window),
                                   200, 200);
@@ -533,12 +530,16 @@ do_appwindow (GtkWidget *do_widget)
      /* Create statusbar */

      statusbar = gtk_statusbar_new ();
-      gtk_widget_set_halign (sw, GTK_ALIGN_FILL);
-      gtk_grid_attach (GTK_GRID (table), statusbar, 0, 4, 1, 1);
+      gtk_table_attach (GTK_TABLE (table),
+                        statusbar,
+                        /* X direction */       /* Y direction */
+                        0, 1,                   4, 5,
+                        GTK_EXPAND | GTK_FILL,  0,
+                        0,                      0);

      /* Show text widget info in the statusbar */
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents));
-
+      
      g_signal_connect_object (buffer,
                               "changed",
                               G_CALLBACK (update_statusbar),
@@ -568,3 +569,4 @@ do_appwindow (GtkWidget *do_widget)

  return window;
 }
+
@@ -23,14 +23,14 @@ apply_changes_gradually (gpointer data)
  if (fraction < 1.0)
    {
      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return G_SOURCE_CONTINUE;
+      return TRUE;
    }
  else
    {
      /* Close automatically once changes are fully applied. */
      gtk_widget_destroy (assistant);
      assistant = NULL;
-      return G_SOURCE_REMOVE;
+      return FALSE;
    }
 }

@@ -101,7 +101,6 @@ create_page1 (GtkWidget *assistant)
  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);

  entry = gtk_entry_new ();
-  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);
@@ -147,19 +146,22 @@ create_page3 (GtkWidget *assistant)
 static void
 create_page4 (GtkWidget *assistant)
 {
-  progress_bar = gtk_progress_bar_new ();
-  gtk_widget_set_halign (progress_bar, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (progress_bar, GTK_ALIGN_CENTER);
+  GtkWidget *page;

-  gtk_widget_show (progress_bar);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
+  page = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
+
+  progress_bar = gtk_progress_bar_new ();
+  gtk_container_add (GTK_CONTAINER (page), progress_bar);
+
+  gtk_widget_show_all (page);
+  gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
+  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
+  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");

  /* This prevents the assistant window from being
   * closed while we're "busy" applying changes.
   */
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), progress_bar, FALSE);
+  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
 }

 GtkWidget*
@@ -33,7 +33,7 @@ do_builder (GtkWidget *do_widget)
  static GtkWidget *window = NULL;
  GError *err = NULL;
  gchar *filename;
-
+  
  if (!window)
    {
      builder = gtk_builder_new ();
@@ -41,16 +41,16 @@ do_builder (GtkWidget *do_widget)
      gtk_builder_add_from_file (builder, filename, &err);
      g_free (filename);
      if (err)
-        {
-          g_error ("ERROR: %s\n", err->message);
-          return NULL;
-        }
+	{
+	  g_error ("ERROR: %s\n", err->message);
+	  return NULL;
+	}
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
    }

  if (!gtk_widget_get_visible (window))
@@ -58,7 +58,7 @@ do_builder (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {	 
      gtk_widget_destroy (window);
      window = NULL;
    }
@@ -7,14 +7,14 @@

 static GtkWidget *
 create_bbox (gint  horizontal,
-             char *title,
-             gint  spacing,
-             gint  layout)
+	     char *title, 
+	     gint  spacing,
+	     gint  layout)
 {
  GtkWidget *frame;
  GtkWidget *bbox;
  GtkWidget *button;
-
+	
  frame = gtk_frame_new (title);

  if (horizontal)
@@ -27,13 +27,13 @@ create_bbox (gint  horizontal,

  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-
+  
  button = gtk_button_new_from_stock (GTK_STOCK_OK);
  gtk_container_add (GTK_CONTAINER (bbox), button);
-
+  
  button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
  gtk_container_add (GTK_CONTAINER (bbox), button);
-
+  
  button = gtk_button_new_from_stock (GTK_STOCK_HELP);
  gtk_container_add (GTK_CONTAINER (bbox), button);

@@ -49,68 +49,68 @@ do_button_box (GtkWidget *do_widget)
  GtkWidget *hbox;
  GtkWidget *frame_horz;
  GtkWidget *frame_vert;
-
+	
  if (!window)
  {
    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
    gtk_window_set_screen (GTK_WINDOW (window),
-                           gtk_widget_get_screen (do_widget));
+			   gtk_widget_get_screen (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
-
+    
    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed),
-                      &window);
-
+		      G_CALLBACK (gtk_widget_destroyed),
+		      &window);
+    
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
+    
    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
-
+    
    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
+			TRUE, TRUE, 0);

-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-                        TRUE, TRUE, 5);
-
-    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);
+    
+    gtk_box_pack_start (GTK_BOX (vbox), 
+			create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);

    frame_vert = gtk_frame_new ("Vertical Button Boxes");
    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
-
+    
    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
+			TRUE, TRUE, 0);

-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
+			TRUE, TRUE, 5);

-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
+			TRUE, TRUE, 5);

-    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
-                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox), 
+			create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+			TRUE, TRUE, 5);
  }

  if (!gtk_widget_get_visible (window))
@@ -118,7 +118,7 @@ do_button_box (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {	 
      gtk_widget_destroy (window);
      window = NULL;
    }
@@ -78,8 +78,7 @@ find_toplevel_at_pointer (GdkDisplay *display)
  GdkWindow *pointer_window;
  GtkWidget *widget = NULL;

-  pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (),
-                                                      NULL, NULL);
+  pointer_window = gdk_display_get_window_at_pointer (display, NULL, NULL);

  /* The user data field of a GdkWindow is used to store a pointer
   * to the widget that created it.
@@ -96,8 +95,8 @@ find_toplevel_at_pointer (GdkDisplay *display)

 static gboolean
 button_release_event_cb (GtkWidget       *widget,
-                         GdkEventButton  *event,
-                         gboolean        *clicked)
+			 GdkEventButton  *event,
+			 gboolean        *clicked)
 {
  *clicked = TRUE;
  return TRUE;
@@ -109,7 +108,7 @@ button_release_event_cb (GtkWidget       *widget,
 */
 static GtkWidget *
 query_for_toplevel (GdkScreen  *screen,
-                    const char *prompt)
+		    const char *prompt)
 {
  GdkDisplay *display = gdk_screen_get_display (screen);
  GtkWidget *popup, *label, *frame;
@@ -132,34 +131,32 @@ query_for_toplevel (GdkScreen  *screen,
  gtk_widget_show_all (popup);
  cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);

-  if (gdk_device_grab (gtk_get_current_event_device (),
-                       gtk_widget_get_window (popup),
-                       GDK_OWNERSHIP_NONE,
-                       FALSE,
-                       GDK_BUTTON_RELEASE_MASK,
-                       cursor,
-                       GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
+  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
+			GDK_BUTTON_RELEASE_MASK,
+			NULL,
+			cursor,
+			GDK_CURRENT_TIME) == GDK_GRAB_SUCCESS)
    {
      gboolean clicked = FALSE;

      g_signal_connect (popup, "button-release-event",
-                        G_CALLBACK (button_release_event_cb), &clicked);
+			G_CALLBACK (button_release_event_cb), &clicked);

      /* Process events until clicked is set by button_release_event_cb.
       * We pass in may_block=TRUE since we want to wait if there
       * are no events currently.
       */
      while (!clicked)
-        g_main_context_iteration (NULL, TRUE);
+	g_main_context_iteration (NULL, TRUE);

      toplevel = find_toplevel_at_pointer (gdk_screen_get_display (screen));
      if (toplevel == popup)
-        toplevel = NULL;
+	toplevel = NULL;
    }

  g_object_unref (cursor);
  gtk_widget_destroy (popup);
-  gdk_flush ();                 /* Really release the grab */
+  gdk_flush ();			/* Really release the grab */

  return toplevel;
 }
@@ -174,8 +171,8 @@ query_change_display (ChangeDisplayInfo *info)
  GtkWidget *toplevel;

  toplevel = query_for_toplevel (screen,
-                                 "Please select the toplevel\n"
-                                 "to move to the new screen");
+				 "Please select the toplevel\n"
+				 "to move to the new screen");

  if (toplevel)
    gtk_window_set_screen (GTK_WINDOW (toplevel), info->current_screen);
@@ -196,19 +193,19 @@ fill_screens (ChangeDisplayInfo *info)
      gint i;

      for (i = 0; i < n_screens; i++)
-        {
-          GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
-          GtkTreeIter iter;
+	{
+	  GdkScreen *screen = gdk_display_get_screen (info->current_display, i);
+	  GtkTreeIter iter;

-          gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
-          gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
-                              SCREEN_COLUMN_NUMBER, i,
-                              SCREEN_COLUMN_SCREEN, screen,
-                              -1);
+	  gtk_list_store_append (GTK_LIST_STORE (info->screen_model), &iter);
+	  gtk_list_store_set (GTK_LIST_STORE (info->screen_model), &iter,
+			      SCREEN_COLUMN_NUMBER, i,
+			      SCREEN_COLUMN_SCREEN, screen,
+			      -1);

-          if (i == 0)
-            gtk_tree_selection_select_iter (info->screen_selection, &iter);
-        }
+	  if (i == 0)
+	    gtk_tree_selection_select_iter (info->screen_selection, &iter);
+	}
    }
 }

@@ -218,8 +215,8 @@ fill_screens (ChangeDisplayInfo *info)
 */
 static void
 response_cb (GtkDialog         *dialog,
-             gint               response_id,
-             ChangeDisplayInfo *info)
+	     gint               response_id,
+	     ChangeDisplayInfo *info)
 {
  if (response_id == GTK_RESPONSE_OK)
    query_change_display (info);
@@ -233,7 +230,7 @@ response_cb (GtkDialog         *dialog,
 */
 static void
 open_display_cb (GtkWidget         *button,
-                 ChangeDisplayInfo *info)
+		 ChangeDisplayInfo *info)
 {
  GtkWidget *content_area;
  GtkWidget *dialog;
@@ -243,11 +240,11 @@ open_display_cb (GtkWidget         *button,
  GdkDisplay *result = NULL;

  dialog = gtk_dialog_new_with_buttons ("Open Display",
-                                        GTK_WINDOW (info->window),
-                                        GTK_DIALOG_MODAL,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OK, GTK_RESPONSE_OK,
-                                        NULL);
+					GTK_WINDOW (info->window),
+					GTK_DIALOG_MODAL,
+					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					GTK_STOCK_OK, GTK_RESPONSE_OK,
+					NULL);

  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
  display_entry = gtk_entry_new ();
@@ -267,25 +264,25 @@ open_display_cb (GtkWidget         *button,
    {
      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
      if (response_id != GTK_RESPONSE_OK)
-        break;
+	break;

      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
-                                                0, -1);
+						0, -1);

      if (strcmp (new_screen_name, "") != 0)
-        {
-          result = gdk_display_open (new_screen_name);
-          if (!result)
-            {
-              gchar *error_msg =
-                g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
-                                  new_screen_name);
-              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
-              g_free (error_msg);
-            }
+	{
+	  result = gdk_display_open (new_screen_name);
+	  if (!result)
+	    {
+	      gchar *error_msg =
+		g_strdup_printf  ("Can't open display :\n\t%s\nplease try another one\n",
+				  new_screen_name);
+	      gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
+	      g_free (error_msg);
+	    }

-          g_free (new_screen_name);
-        }
+	  g_free (new_screen_name);
+	}
    }

  gtk_widget_destroy (dialog);
@@ -296,7 +293,7 @@ open_display_cb (GtkWidget         *button,
 */
 static void
 close_display_cb (GtkWidget         *button,
-                  ChangeDisplayInfo *info)
+		  ChangeDisplayInfo *info)
 {
  if (info->current_display)
    gdk_display_close (info->current_display);
@@ -308,7 +305,7 @@ close_display_cb (GtkWidget         *button,
 */
 static void
 display_changed_cb (GtkTreeSelection  *selection,
-                    ChangeDisplayInfo *info)
+		    ChangeDisplayInfo *info)
 {
  GtkTreeModel *model;
  GtkTreeIter iter;
@@ -317,8 +314,8 @@ display_changed_cb (GtkTreeSelection  *selection,
    g_object_unref (info->current_display);
  if (gtk_tree_selection_get_selected (selection, &model, &iter))
    gtk_tree_model_get (model, &iter,
-                        DISPLAY_COLUMN_DISPLAY, &info->current_display,
-                        -1);
+			DISPLAY_COLUMN_DISPLAY, &info->current_display,
+			-1);
  else
    info->current_display = NULL;

@@ -330,7 +327,7 @@ display_changed_cb (GtkTreeSelection  *selection,
 */
 static void
 screen_changed_cb (GtkTreeSelection  *selection,
-                   ChangeDisplayInfo *info)
+		   ChangeDisplayInfo *info)
 {
  GtkTreeModel *model;
  GtkTreeIter iter;
@@ -339,8 +336,8 @@ screen_changed_cb (GtkTreeSelection  *selection,
    g_object_unref (info->current_screen);
  if (gtk_tree_selection_get_selected (selection, &model, &iter))
    gtk_tree_model_get (model, &iter,
-                        SCREEN_COLUMN_SCREEN, &info->current_screen,
-                        -1);
+			SCREEN_COLUMN_SCREEN, &info->current_screen,
+			-1);
  else
    info->current_screen = NULL;
 }
@@ -352,10 +349,10 @@ screen_changed_cb (GtkTreeSelection  *selection,
 */
 static void
 create_frame (ChangeDisplayInfo *info,
-              const char        *title,
-              GtkWidget        **frame,
-              GtkWidget        **tree_view,
-              GtkWidget        **button_vbox)
+	      const char        *title,
+	      GtkWidget        **frame,
+	      GtkWidget        **tree_view,
+	      GtkWidget        **button_vbox)
 {
  GtkTreeSelection *selection;
  GtkWidget *scrollwin;
@@ -369,9 +366,9 @@ create_frame (ChangeDisplayInfo *info,

  scrollwin = gtk_scrolled_window_new (NULL, NULL);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
-                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
-                                       GTK_SHADOW_IN);
+				       GTK_SHADOW_IN);
  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);

  *tree_view = gtk_tree_view_new ();
@@ -429,20 +426,20 @@ create_display_frame (ChangeDisplayInfo *info)
  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);

  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
-                                                            G_TYPE_STRING,
-                                                            GDK_TYPE_DISPLAY);
+							    G_TYPE_STRING,
+							    GDK_TYPE_DISPLAY);

  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);

  column = gtk_tree_view_column_new_with_attributes ("Name",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", DISPLAY_COLUMN_NAME,
-                                                     NULL);
+						     gtk_cell_renderer_text_new (),
+						     "text", DISPLAY_COLUMN_NAME,
+						     NULL);
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);

  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
  g_signal_connect (selection, "changed",
-                    G_CALLBACK (display_changed_cb), info);
+		    G_CALLBACK (display_changed_cb), info);

  return frame;
 }
@@ -460,20 +457,20 @@ create_screen_frame (ChangeDisplayInfo *info)
  create_frame (info, "Screen", &frame, &tree_view, &button_vbox);

  info->screen_model = (GtkTreeModel *)gtk_list_store_new (SCREEN_NUM_COLUMNS,
-                                                           G_TYPE_INT,
-                                                           GDK_TYPE_SCREEN);
+							   G_TYPE_INT,
+							   GDK_TYPE_SCREEN);

  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->screen_model);

  column = gtk_tree_view_column_new_with_attributes ("Number",
-                                                     gtk_cell_renderer_text_new (),
-                                                     "text", SCREEN_COLUMN_NUMBER,
-                                                     NULL);
+						     gtk_cell_renderer_text_new (),
+						     "text", SCREEN_COLUMN_NUMBER,
+						     NULL);
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);

  info->screen_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
  g_signal_connect (info->screen_selection, "changed",
-                    G_CALLBACK (screen_changed_cb), info);
+		    G_CALLBACK (screen_changed_cb), info);

  return frame;
 }
@@ -483,8 +480,8 @@ create_screen_frame (ChangeDisplayInfo *info)
 */
 static void
 display_closed_cb (GdkDisplay        *display,
-                   gboolean           is_error,
-                   ChangeDisplayInfo *info)
+		   gboolean           is_error,
+		   ChangeDisplayInfo *info)
 {
  GtkTreeIter iter;
  gboolean valid;
@@ -496,13 +493,13 @@ display_closed_cb (GdkDisplay        *display,
      GdkDisplay *tmp_display;

      gtk_tree_model_get (info->display_model, &iter,
-                          DISPLAY_COLUMN_DISPLAY, &tmp_display,
-                          -1);
+			  DISPLAY_COLUMN_DISPLAY, &tmp_display,
+			  -1);
      if (tmp_display == display)
-        {
-          gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
-          break;
-        }
+	{
+	  gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
+	  break;
+	}
    }
 }

@@ -512,27 +509,27 @@ display_closed_cb (GdkDisplay        *display,
 */
 static void
 add_display (ChangeDisplayInfo *info,
-             GdkDisplay        *display)
+	     GdkDisplay        *display)
 {
  const gchar *name = gdk_display_get_name (display);
  GtkTreeIter iter;

  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
-                      DISPLAY_COLUMN_NAME, name,
-                      DISPLAY_COLUMN_DISPLAY, display,
-                      -1);
+		      DISPLAY_COLUMN_NAME, name,
+		      DISPLAY_COLUMN_DISPLAY, display,
+		      -1);

  g_signal_connect (display, "closed",
-                    G_CALLBACK (display_closed_cb), info);
+		    G_CALLBACK (display_closed_cb), info);
 }

 /* Called when a new display is opened
 */
 static void
 display_opened_cb (GdkDisplayManager *manager,
-                   GdkDisplay        *display,
-                   ChangeDisplayInfo *info)
+		   GdkDisplay        *display,
+		   ChangeDisplayInfo *info)
 {
  add_display (info, display);
 }
@@ -554,7 +551,7 @@ initialize_displays (ChangeDisplayInfo *info)
  g_slist_free (tmp_list);

  g_signal_connect (manager, "display-opened",
-                    G_CALLBACK (display_opened_cb), info);
+		    G_CALLBACK (display_opened_cb), info);
 }

 /* Cleans up when the toplevel is destroyed; we remove the
@@ -569,13 +566,13 @@ destroy_info (ChangeDisplayInfo *info)
  GSList *tmp_list;

  g_signal_handlers_disconnect_by_func (manager,
-                                        display_opened_cb,
-                                        info);
+					display_opened_cb,
+					info);

  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
    g_signal_handlers_disconnect_by_func (tmp_list->data,
-                                          display_closed_cb,
-                                          info);
+					  display_closed_cb,
+					  info);

  g_slist_free (tmp_list);

@@ -593,7 +590,7 @@ destroy_info (ChangeDisplayInfo *info)

 static void
 destroy_cb (GObject            *object,
-            ChangeDisplayInfo **info)
+	    ChangeDisplayInfo **info)
 {
  destroy_info (*info);
  *info = NULL;
@@ -616,18 +613,18 @@ do_changedisplay (GtkWidget *do_widget)
      info = g_new0 (ChangeDisplayInfo, 1);

      info->window = gtk_dialog_new_with_buttons ("Change Screen or display",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
-                                            "Change",         GTK_RESPONSE_OK,
-                                            NULL);
+					    GTK_WINDOW (do_widget),
+					    0,
+					    GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
+					    "Change",         GTK_RESPONSE_OK,
+					    NULL);

      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);

      g_signal_connect (info->window, "response",
-                        G_CALLBACK (response_cb), info);
+			G_CALLBACK (response_cb), info);
      g_signal_connect (info->window, "destroy",
-                        G_CALLBACK (destroy_cb), &info);
+			G_CALLBACK (destroy_cb), &info);

      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));

@@ -172,7 +172,7 @@ button_press (GtkWidget      *widget,
  GtkWidget *menu;
  GtkWidget *item;

-  if (button->button != GDK_BUTTON_SECONDARY)
+  if (button->button != 3)
    return FALSE;

  menu = gtk_menu_new ();
@@ -36,17 +36,26 @@ change_color_callback (GtkWidget *button,
 {
  GtkWidget *dialog;
  GtkColorSelection *colorsel;
-  GtkColorChooserDialog *selection_dialog;
+  GtkColorSelectionDialog *selection_dialog;
  gint response;

-  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+  dialog = gtk_color_selection_dialog_new ("Changing color");
+
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+
+  gtk_color_selection_set_previous_rgba (colorsel, &color);
+  gtk_color_selection_set_current_rgba (colorsel, &color);
+  gtk_color_selection_set_has_palette (colorsel, TRUE);

  response = gtk_dialog_run (GTK_DIALOG (dialog));

  if (response == GTK_RESPONSE_OK)
    {
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+      gtk_color_selection_get_current_rgba (colorsel, &color);
+
      gtk_widget_override_background_color (da, 0, &color);
    }

@@ -1,15 +1,15 @@
-/* Combo boxes
+/* Combo boxes 
 *
 * The ComboBox widget allows to select one option out of a list.
 * The ComboBoxEntry additionally allows the user to enter a value
- * that is not in the list of options.
+ * that is not in the list of options. 
 *
 * How the options are displayed is controlled by cell renderers.
 */

 #include <gtk/gtk.h>

-enum
+enum 
 {
  PIXBUF_COL,
  TEXT_COL
@@ -20,16 +20,16 @@ strip_underscore (const gchar *text)
 {
  gchar *p, *q;
  gchar *result;
-
+  
  result = g_strdup (text);
  p = q = result;
-  while (*p)
+  while (*p) 
    {
      if (*p != '_')
-        {
-          *q = *p;
-          q++;
-        }
+	{
+	  *q = *p;
+	  q++;
+	}
      p++;
    }
  *q = '\0';
@@ -46,7 +46,7 @@ create_stock_icon_store (void)
    GTK_STOCK_NEW,
    GTK_STOCK_CLEAR,
    NULL,
-    GTK_STOCK_OPEN
+    GTK_STOCK_OPEN    
  };

  GtkStockItem item;
@@ -58,50 +58,50 @@ create_stock_icon_store (void)
  gint i;

  cellview = gtk_cell_view_new ();
-
+  
  store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);

  for (i = 0; i < G_N_ELEMENTS (stock_id); i++)
    {
      if (stock_id[i])
-        {
-          pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
-                                                  GTK_ICON_SIZE_BUTTON);
-          gtk_stock_lookup (stock_id[i], &item);
-          label = strip_underscore (item.label);
-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              PIXBUF_COL, pixbuf,
-                              TEXT_COL, label,
-                              -1);
-          g_object_unref (pixbuf);
-          g_free (label);
-        }
+	{
+	  pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+					          GTK_ICON_SIZE_BUTTON);
+	  gtk_stock_lookup (stock_id[i], &item);
+	  label = strip_underscore (item.label);
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, pixbuf,
+			      TEXT_COL, label,
+			      -1);
+	  g_object_unref (pixbuf);
+	  g_free (label);
+	}
      else
-        {
-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              PIXBUF_COL, NULL,
-                              TEXT_COL, "separator",
-                              -1);
-        }
+	{
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      PIXBUF_COL, NULL,
+			      TEXT_COL, "separator",
+			      -1);
+	}
    }

  gtk_widget_destroy (cellview);
-
+  
  return GTK_TREE_MODEL (store);
 }

 /* A GtkCellLayoutDataFunc that demonstrates how one can control
- * sensitivity of rows. This particular function does nothing
+ * sensitivity of rows. This particular function does nothing 
 * useful and just makes the second row insensitive.
 */
 static void
 set_sensitive (GtkCellLayout   *cell_layout,
-               GtkCellRenderer *cell,
-               GtkTreeModel    *tree_model,
-               GtkTreeIter     *iter,
-               gpointer         data)
+	       GtkCellRenderer *cell,
+	       GtkTreeModel    *tree_model,
+	       GtkTreeIter     *iter,
+	       gpointer         data)
 {
  GtkTreePath *path;
  gint *indices;
@@ -116,13 +116,13 @@ set_sensitive (GtkCellLayout   *cell_layout,
 }

 /* A GtkTreeViewRowSeparatorFunc that demonstrates how rows can be
- * rendered as separators. This particular function does nothing
+ * rendered as separators. This particular function does nothing 
 * useful and just turns the fourth row into a separator.
 */
 static gboolean
 is_separator (GtkTreeModel *model,
-              GtkTreeIter  *iter,
-              gpointer      data)
+	      GtkTreeIter  *iter,
+	      gpointer      data)
 {
  GtkTreePath *path;
  gboolean result;
@@ -141,11 +141,11 @@ create_capital_store (void)
    gchar *group;
    gchar *capital;
  } capitals[] = {
-    { "A - B", NULL },
+    { "A - B", NULL }, 
    { NULL, "Albany" },
    { NULL, "Annapolis" },
    { NULL, "Atlanta" },
-    { NULL, "Augusta" },
+    { NULL, "Augusta" }, 
    { NULL, "Austin" },
    { NULL, "Baton Rouge" },
    { NULL, "Bismarck" },
@@ -199,36 +199,36 @@ create_capital_store (void)
    { NULL, "Trenton" },
    { NULL, NULL }
  };
-
+  
  GtkTreeIter iter, iter2;
  GtkTreeStore *store;
  gint i;

  store = gtk_tree_store_new (1, G_TYPE_STRING);
-
+  
  for (i = 0; capitals[i].group || capitals[i].capital; i++)
    {
      if (capitals[i].group)
-        {
-          gtk_tree_store_append (store, &iter, NULL);
-          gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
-        }
+	{
+	  gtk_tree_store_append (store, &iter, NULL);
+	  gtk_tree_store_set (store, &iter, 0, capitals[i].group, -1);
+	}
      else if (capitals[i].capital)
-        {
-          gtk_tree_store_append (store, &iter2, &iter);
-          gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
-        }
+	{
+	  gtk_tree_store_append (store, &iter2, &iter);
+	  gtk_tree_store_set (store, &iter2, 0, capitals[i].capital, -1);
+	}
    }
-
+  
  return GTK_TREE_MODEL (store);
 }

 static void
 is_capital_sensitive (GtkCellLayout   *cell_layout,
-                      GtkCellRenderer *cell,
-                      GtkTreeModel    *tree_model,
-                      GtkTreeIter     *iter,
-                      gpointer         data)
+		      GtkCellRenderer *cell,
+		      GtkTreeModel    *tree_model,
+		      GtkTreeIter     *iter,
+		      gpointer         data)
 {
  gboolean sensitive;

@@ -274,8 +274,8 @@ struct _MaskEntryClass
 static void mask_entry_editable_init (GtkEditableInterface *iface);

 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                                mask_entry_editable_init));
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+						mask_entry_editable_init));


 static void
@@ -286,10 +286,10 @@ mask_entry_set_background (MaskEntry *entry)
  if (entry->mask)
    {
      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
-        {
-          gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
-          return;
-        }
+	{
+	  gtk_widget_override_color (GTK_WIDGET (entry), 0, &error_color);
+	  return;
+	}
    }

  gtk_widget_override_color (GTK_WIDGET (entry), 0, NULL);
@@ -338,58 +338,58 @@ do_combobox (GtkWidget *do_widget)
    gtk_window_set_screen (GTK_WINDOW (window),
                           gtk_widget_get_screen (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Combo boxes");
-
+   
    g_signal_connect (window, "destroy",
                      G_CALLBACK (gtk_widget_destroyed),
                      &window);
-
+    
    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
    gtk_container_add (GTK_CONTAINER (window), vbox);

    /* A combobox demonstrating cell renderers, separators and
-     *  insensitive rows
+     *  insensitive rows 
     */
    frame = gtk_frame_new ("Some stock icons");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
+    
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
    model = create_stock_icon_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
    gtk_container_add (GTK_CONTAINER (box), combo);
-
+    
    renderer = gtk_cell_renderer_pixbuf_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "pixbuf", PIXBUF_COL,
-                                    NULL);
+				    "pixbuf", PIXBUF_COL, 
+				    NULL);

    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        set_sensitive,
-                                        NULL, NULL);
-
+					renderer,
+					set_sensitive,
+					NULL, NULL);
+    
    renderer = gtk_cell_renderer_text_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "text", TEXT_COL,
-                                    NULL);
+				    "text", TEXT_COL,
+				    NULL);

    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        set_sensitive,
-                                        NULL, NULL);
-
-    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
-                                          is_separator, NULL, NULL);
+					renderer,
+					set_sensitive,
+					NULL, NULL);

+    gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), 
+					  is_separator, NULL, NULL);
+    
    gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-
+    
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
@@ -398,7 +398,7 @@ do_combobox (GtkWidget *do_widget)
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
    model = create_capital_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
@@ -407,12 +407,12 @@ do_combobox (GtkWidget *do_widget)
    renderer = gtk_cell_renderer_text_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-                                    "text", 0,
-                                    NULL);
+				    "text", 0,
+				    NULL);
    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-                                        renderer,
-                                        is_capital_sensitive,
-                                        NULL, NULL);
+					renderer,
+					is_capital_sensitive,
+					NULL, NULL);

    path = gtk_tree_path_new_from_indices (0, 8, -1);
    gtk_tree_model_get_iter (model, &iter, path);
@@ -423,18 +423,18 @@ do_combobox (GtkWidget *do_widget)
     */
    frame = gtk_frame_new ("Editable");
    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
-
+    
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_set_border_width (GTK_CONTAINER (box), 5);
    gtk_container_add (GTK_CONTAINER (frame), box);
-
+    
    combo = gtk_combo_box_text_new_with_entry ();
    fill_combo_entry (combo);
    gtk_container_add (GTK_CONTAINER (box), combo);
-
+    
    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
-
+     
    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
    gtk_container_add (GTK_CONTAINER (combo), entry);

@@ -464,7 +464,7 @@ do_combobox (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {    
      gtk_widget_destroy (window);
      window = NULL;
    }
@@ -11,17 +11,17 @@ static GtkWidget *entry2 = NULL;

 static void
 message_dialog_clicked (GtkButton *button,
-                        gpointer   user_data)
+			gpointer   user_data)
 {
  GtkWidget *dialog;
  static gint i = 1;

  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
-                                   "This message box has been popped up the following\n"
-                                   "number of times:");
+				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				   GTK_MESSAGE_INFO,
+				   GTK_BUTTONS_OK,
+				   "This message box has been popped up the following\n"
+				   "number of times:");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "%d", i);
  gtk_dialog_run (GTK_DIALOG (dialog));
@@ -31,7 +31,7 @@ message_dialog_clicked (GtkButton *button,

 static void
 interactive_dialog_clicked (GtkButton *button,
-                            gpointer   user_data)
+			    gpointer   user_data)
 {
  GtkWidget *content_area;
  GtkWidget *dialog;
@@ -44,13 +44,13 @@ interactive_dialog_clicked (GtkButton *button,
  gint response;

  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
-                                        GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_STOCK_OK,
-                                        GTK_RESPONSE_OK,
+					GTK_WINDOW (window),
+					GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
+					GTK_STOCK_OK,
+					GTK_RESPONSE_OK,
                                        "_Non-stock Button",
                                        GTK_RESPONSE_CANCEL,
-                                        NULL);
+					NULL);

  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

@@ -61,25 +61,29 @@ interactive_dialog_clicked (GtkButton *button,
  stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
  gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);

-  table = gtk_grid_new ();
-  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
-  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 4);
  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
-  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table),
+			     label,
+			     0, 1, 0, 1);
  local_entry1 = gtk_entry_new ();
  gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
-  gtk_grid_attach (GTK_GRID (table), local_entry1, 1, 0, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), local_entry1, 1, 2, 0, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);

  label = gtk_label_new_with_mnemonic ("E_ntry 2");
-  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table),
+			     label,
+			     0, 1, 1, 2);

  local_entry2 = gtk_entry_new ();
  gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
-  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), local_entry2, 1, 2, 1, 2);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
-
+  
  gtk_widget_show_all (hbox);
  response = gtk_dialog_run (GTK_DIALOG (dialog));

@@ -102,12 +106,12 @@ do_dialog (GtkWidget *do_widget)
  GtkWidget *button;
  GtkWidget *table;
  GtkWidget *label;
-
+  
  if (!window)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");

      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
@@ -125,7 +129,7 @@ do_dialog (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (message_dialog_clicked), NULL);
+			G_CALLBACK (message_dialog_clicked), NULL);
      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);

      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
@@ -138,27 +142,33 @@ do_dialog (GtkWidget *do_widget)

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (interactive_dialog_clicked), NULL);
+			G_CALLBACK (interactive_dialog_clicked), NULL);
      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);

-      table = gtk_grid_new ();
-      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+      table = gtk_table_new (2, 2, FALSE);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 4);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 4);
      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
-      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table),
+				 label,
+				 0, 1, 0, 1);

      entry1 = gtk_entry_new ();
-      gtk_grid_attach (GTK_GRID (table), entry1, 1, 0, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table), entry1, 1, 2, 0, 1);
      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry1);

      label = gtk_label_new_with_mnemonic ("E_ntry 2");
-      gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
+      
+      gtk_table_attach_defaults (GTK_TABLE (table),
+				 label,
+				 0, 1, 1, 2);

      entry2 = gtk_entry_new ();
-      gtk_grid_attach (GTK_GRID (table), entry2, 1, 1, 1, 1);
+      gtk_table_attach_defaults (GTK_TABLE (table), entry2, 1, 2, 1, 2);
+      gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
    }

  if (!gtk_widget_get_visible (window))
@@ -166,7 +176,7 @@ do_dialog (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {	 
      gtk_widget_destroy (window);
      window = NULL;
    }
@@ -97,7 +97,7 @@ scribble_button_press_event (GtkWidget      *widget,
  if (surface == NULL)
    return FALSE; /* paranoia check, in case we haven't gotten a configure event */

-  if (event->button == GDK_BUTTON_PRIMARY)
+  if (event->button == 1)
    draw_brush (widget, event->x, event->y);

  /* We've handled the event, stop processing */
@@ -126,7 +126,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
   * can cope.
   */

-  gdk_window_get_device_position (event->window, event->device, &x, &y, &state);
+  gdk_window_get_pointer (event->window, &x, &y, &state);

  if (state & GDK_BUTTON1_MASK)
    draw_brush (widget, x, y);
@@ -6,7 +6,7 @@
 * GtkCellRenderer::editing-started signal to do custom setup of the
 * editable widget.
 *
- * The cell renderers used in this demo are GtkCellRendererText,
+ * The cell renderers used in this demo are GtkCellRendererText, 
 * GtkCellRendererCombo and GtkCellRendererProgress.
 */

@@ -48,27 +48,27 @@ add_items (void)
  g_return_if_fail (articles != NULL);

  foo.number = 3;
-  foo.product = g_strdup ("bottles of coke");
+  foo.product = "bottles of coke";
  foo.yummy = 20;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 5;
-  foo.product = g_strdup ("packages of noodles");
+  foo.product = "packages of noodles";
  foo.yummy = 50;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 2;
-  foo.product = g_strdup ("packages of chocolate chip cookies");
+  foo.product = "packages of chocolate chip cookies";
  foo.yummy = 90;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 1;
-  foo.product = g_strdup ("can vanilla ice cream");
+  foo.product = "can vanilla ice cream";
  foo.yummy = 60;
  g_array_append_vals (articles, &foo, 1);

  foo.number = 6;
-  foo.product = g_strdup ("eggs");
+  foo.product = "eggs";
  foo.yummy = 10;
  g_array_append_vals (articles, &foo, 1);
 }
@@ -205,7 +205,7 @@ editing_started (GtkCellRenderer *cell,
                 const gchar     *path,
                 gpointer         data)
 {
-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable),
+  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable), 
                                        separator_row, NULL, NULL);
 }

@@ -259,7 +259,7 @@ cell_edited (GtkCellRendererText *cell,
 }

 static void
-add_columns (GtkTreeView  *treeview,
+add_columns (GtkTreeView  *treeview, 
             GtkTreeModel *items_model,
             GtkTreeModel *numbers_model)
 {
@@ -306,6 +306,8 @@ add_columns (GtkTreeView  *treeview,
                                               -1, "Yummy", renderer,
                                               "value", COLUMN_ITEM_YUMMY,
                                               NULL);
+  
+
 }

 GtkWidget *
@@ -20,17 +20,17 @@ do_entry_buffer (GtkWidget *do_widget)
  if (!window)
  {
    window = gtk_dialog_new_with_buttons ("GtkEntryBuffer",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
+		      G_CALLBACK (gtk_widget_destroy), NULL);
    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+		      G_CALLBACK (gtk_widget_destroyed), &window);

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

@@ -64,3 +64,5 @@ do_entry_buffer (GtkWidget *do_widget)

  return window;
 }
+
+
@@ -15,7 +15,7 @@ create_completion_model (void)
 {
  GtkListStore *store;
  GtkTreeIter iter;
-
+  
  store = gtk_list_store_new (1, G_TYPE_STRING);

  /* Append one word */
@@ -29,7 +29,7 @@ create_completion_model (void)
  /* And another word */
  gtk_list_store_append (store, &iter);
  gtk_list_store_set (store, &iter, 0, "totally", -1);
-
+  
  return GTK_TREE_MODEL (store);
 }

@@ -43,51 +43,51 @@ do_entry_completion (GtkWidget *do_widget)
  GtkWidget *entry;
  GtkEntryCompletion *completion;
  GtkTreeModel *completion_model;
-
+  
  if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+  {
+    window = gtk_dialog_new_with_buttons ("GtkEntryCompletion",
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
+    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+    g_signal_connect (window, "response",
+		      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+		      G_CALLBACK (gtk_widget_destroyed), &window);

-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+    label = gtk_label_new (NULL);
+    gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
+    gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

-      /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+    /* Create our entry */
+    entry = gtk_entry_new ();
+    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);

-      /* Create the completion object */
-      completion = gtk_entry_completion_new ();
+    /* Create the completion object */
+    completion = gtk_entry_completion_new ();

-      /* Assign the completion to the entry */
-      gtk_entry_set_completion (GTK_ENTRY (entry), completion);
-      g_object_unref (completion);
-
-      /* Create a tree model and use it as the completion model */
-      completion_model = create_completion_model ();
-      gtk_entry_completion_set_model (completion, completion_model);
-      g_object_unref (completion_model);
-
-      /* Use model column 0 as the text column */
-      gtk_entry_completion_set_text_column (completion, 0);
-    }
+    /* Assign the completion to the entry */
+    gtk_entry_set_completion (GTK_ENTRY (entry), completion);
+    g_object_unref (completion);
+    
+    /* Create a tree model and use it as the completion model */
+    completion_model = create_completion_model ();
+    gtk_entry_completion_set_model (completion, completion_model);
+    g_object_unref (completion_model);
+    
+    /* Use model column 0 as the text column */
+    gtk_entry_completion_set_text_column (completion, 0);
+  }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show_all (window);
@@ -96,3 +96,5 @@ do_entry_completion (GtkWidget *do_widget)

  return window;
 }
+
+
@@ -17,21 +17,21 @@ do_expander (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *label;
  GtkWidget *expander;
-
+  
  if (!window)
  {
    window = gtk_dialog_new_with_buttons ("GtkExpander",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
+					  GTK_WINDOW (do_widget),
+					  0,
+					  GTK_STOCK_CLOSE,
+					  GTK_RESPONSE_NONE,
+					  NULL);
    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
+		      G_CALLBACK (gtk_widget_destroy), NULL);
    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+		      G_CALLBACK (gtk_widget_destroyed), &window);

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

@@ -57,3 +57,5 @@ do_expander (GtkWidget *do_widget)

  return window;
 }
+
+
@@ -116,7 +116,7 @@ if (defined @child_arrays) {
 }

 # toplevel
-print "\nDemo gtk_demos[] = {\n";
+print "\nDemo testgtk_demos[] = {\n";

 $first = 1;
 foreach $href (@demos) {
@@ -1,8 +1,8 @@
 /* Text Widget/Hypertext
 *
- * Usually, tags modify the appearance of text in the view, e.g. making it
- * bold or colored or underlined. But tags are not restricted to appearance.
- * They can also affect the behavior of mouse and key presses, as this demo
+ * Usually, tags modify the appearance of text in the view, e.g. making it 
+ * bold or colored or underlined. But tags are not restricted to appearance. 
+ * They can also affect the behavior of mouse and key presses, as this demo 
 * shows.
 */

@@ -12,19 +12,19 @@
 /* Inserts a piece of text into the buffer, giving it the usual
 * appearance of a hyperlink in a web browser: blue and underlined.
 * Additionally, attaches some data on the tag, to make it recognizable
- * as a link.
+ * as a link. 
 */
-static void
-insert_link (GtkTextBuffer *buffer,
-             GtkTextIter   *iter,
-             gchar         *text,
+static void 
+insert_link (GtkTextBuffer *buffer, 
+             GtkTextIter   *iter, 
+             gchar         *text, 
             gint           page)
 {
  GtkTextTag *tag;
-
-  tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                    "foreground", "blue",
-                                    "underline", PANGO_UNDERLINE_SINGLE,
+  
+  tag = gtk_text_buffer_create_tag (buffer, NULL, 
+                                    "foreground", "blue", 
+                                    "underline", PANGO_UNDERLINE_SINGLE, 
                                    NULL);
  g_object_set_data (G_OBJECT (tag), "page", GINT_TO_POINTER (page));
  gtk_text_buffer_insert_with_tags (buffer, iter, text, -1, tag, NULL);
@@ -34,7 +34,7 @@ insert_link (GtkTextBuffer *buffer,
 * hypertext app, this method would parse a file to identify the links.
 */
 static void
-show_page (GtkTextBuffer *buffer,
+show_page (GtkTextBuffer *buffer, 
           gint           page)
 {
  GtkTextIter iter;
@@ -51,7 +51,7 @@ show_page (GtkTextBuffer *buffer,
    }
  else if (page == 2)
    {
-      gtk_text_buffer_insert (buffer, &iter,
+      gtk_text_buffer_insert (buffer, &iter, 
                              "A tag is an attribute that can be applied to some range of text. "
                              "For example, a tag might be called \"bold\" and make the text inside "
                              "the tag bold. However, the tag concept is more general than that; "
@@ -60,27 +60,27 @@ show_page (GtkTextBuffer *buffer,
                              "user can't edit it, or countless other things.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
    }
-  else if (page == 3)
+  else if (page == 3) 
    {
      GtkTextTag *tag;
-
-      tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                        "weight", PANGO_WEIGHT_BOLD,
+  
+      tag = gtk_text_buffer_create_tag (buffer, NULL, 
+                                        "weight", PANGO_WEIGHT_BOLD, 
                                        NULL);
      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext:\n", -1, tag, NULL);
-      gtk_text_buffer_insert (buffer, &iter,
+      gtk_text_buffer_insert (buffer, &iter, 
                              "machine-readable text that is not sequential but is organized "
                              "so that related items of information are connected.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
    }
 }

-/* Looks at all tags covering the position of iter in the text view,
+/* Looks at all tags covering the position of iter in the text view, 
 * and if one of them is a link, follow it by showing the page identified
 * by the data attached to it.
 */
 static void
-follow_if_link (GtkWidget   *text_view,
+follow_if_link (GtkWidget   *text_view, 
                GtkTextIter *iter)
 {
  GSList *tags = NULL, *tagp = NULL;
@@ -98,7 +98,7 @@ follow_if_link (GtkWidget   *text_view,
        }
    }

-  if (tags)
+  if (tags) 
    g_slist_free (tags);
 }

@@ -113,10 +113,10 @@ key_press_event (GtkWidget *text_view,

  switch (event->keyval)
    {
-      case GDK_KEY_Return:
+      case GDK_KEY_Return: 
      case GDK_KEY_KP_Enter:
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
-        gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+        gtk_text_buffer_get_iter_at_mark (buffer, &iter, 
                                          gtk_text_buffer_get_insert (buffer));
        follow_if_link (text_view, &iter);
        break;
@@ -144,7 +144,7 @@ event_after (GtkWidget *text_view,

  event = (GdkEventButton *)ev;

-  if (event->button != GDK_BUTTON_PRIMARY)
+  if (event->button != 1)
    return FALSE;

  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
@@ -154,7 +154,7 @@ event_after (GtkWidget *text_view,
  if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
    return FALSE;

-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                         GTK_TEXT_WINDOW_WIDGET,
                                         event->x, event->y, &x, &y);

@@ -169,7 +169,7 @@ static gboolean hovering_over_link = FALSE;
 static GdkCursor *hand_cursor = NULL;
 static GdkCursor *regular_cursor = NULL;

-/* Looks at all tags covering the position (x, y) in the text view,
+/* Looks at all tags covering the position (x, y) in the text view, 
 * and if one of them is a link, change the cursor to the "hands" cursor
 * typically used by web browsers.
 */
@@ -183,14 +183,14 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
  gboolean hovering = FALSE;

  gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
-
+  
  tags = gtk_text_iter_get_tags (&iter);
  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
    {
      GtkTextTag *tag = tagp->data;
      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));

-      if (page != 0)
+      if (page != 0) 
        {
          hovering = TRUE;
          break;
@@ -207,11 +207,11 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
        gdk_window_set_cursor (gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT), regular_cursor);
    }

-  if (tags)
+  if (tags) 
    g_slist_free (tags);
 }

-/* Update the cursor image if the pointer moved.
+/* Update the cursor image if the pointer moved. 
 */
 static gboolean
 motion_notify_event (GtkWidget      *text_view,
@@ -219,12 +219,35 @@ motion_notify_event (GtkWidget      *text_view,
 {
  gint x, y;

-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                         GTK_TEXT_WINDOW_WIDGET,
                                         event->x, event->y, &x, &y);

  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);

+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          NULL, NULL, NULL);
+  return FALSE;
+}
+
+/* Also update the cursor image if the window becomes visible
+ * (e.g. when a window covering it got iconified).
+ */
+static gboolean
+visibility_notify_event (GtkWidget          *text_view,
+                         GdkEventVisibility *event)
+{
+  gint wx, wy, bx, by;
+
+  gdk_window_get_pointer (gtk_widget_get_window (text_view),
+                          &wx, &wy, NULL);
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         wx, wy, &bx, &by);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), bx, by);
+
  return FALSE;
 }

@@ -241,13 +264,13 @@ do_hypertext (GtkWidget *do_widget)

      hand_cursor = gdk_cursor_new (GDK_HAND2);
      regular_cursor = gdk_cursor_new (GDK_XTERM);
-
+      
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window),
                                   450, 450);
-
+      
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

@@ -256,15 +279,17 @@ do_hypertext (GtkWidget *do_widget)

      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      g_signal_connect (view, "key-press-event",
+      g_signal_connect (view, "key-press-event", 
                        G_CALLBACK (key_press_event), NULL);
-      g_signal_connect (view, "event-after",
+      g_signal_connect (view, "event-after", 
                        G_CALLBACK (event_after), NULL);
-      g_signal_connect (view, "motion-notify-event",
+      g_signal_connect (view, "motion-notify-event", 
                        G_CALLBACK (motion_notify_event), NULL);
+      g_signal_connect (view, "visibility-notify-event", 
+                        G_CALLBACK (visibility_notify_event), NULL);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-
+      
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
@@ -289,3 +314,4 @@ do_hypertext (GtkWidget *do_widget)

  return window;
 }
+
@@ -85,23 +85,23 @@ fill_store (GtkListStore *store)

      /* We ignore hidden files that start with a '.' */
      if (name[0] != '.')
-        {
-          path = g_build_filename (parent, name, NULL);
+	{
+	  path = g_build_filename (parent, name, NULL);

-          is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
+	  is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);

-          display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);
+	  display_name = g_filename_to_utf8 (name, -1, NULL, NULL, NULL);

-          gtk_list_store_append (store, &iter);
-          gtk_list_store_set (store, &iter,
-                              COL_PATH, path,
-                              COL_DISPLAY_NAME, display_name,
-                              COL_IS_DIRECTORY, is_dir,
-                              COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
-                              -1);
-          g_free (path);
-          g_free (display_name);
-        }
+	  gtk_list_store_append (store, &iter);
+	  gtk_list_store_set (store, &iter,
+			      COL_PATH, path,
+			      COL_DISPLAY_NAME, display_name,
+			      COL_IS_DIRECTORY, is_dir,
+			      COL_PIXBUF, is_dir ? folder_pixbuf : file_pixbuf,
+			      -1);
+	  g_free (path);
+	  g_free (display_name);
+	}

      name = g_dir_read_name (dir);
    }
@@ -110,9 +110,9 @@ fill_store (GtkListStore *store)

 static gint
 sort_func (GtkTreeModel *model,
-           GtkTreeIter  *a,
-           GtkTreeIter  *b,
-           gpointer      user_data)
+	   GtkTreeIter  *a,
+	   GtkTreeIter  *b,
+	   gpointer      user_data)
 {
  gboolean is_dir_a, is_dir_b;
  gchar *name_a, *name_b;
@@ -124,14 +124,14 @@ sort_func (GtkTreeModel *model,


  gtk_tree_model_get (model, a,
-                      COL_IS_DIRECTORY, &is_dir_a,
-                      COL_DISPLAY_NAME, &name_a,
-                      -1);
+		      COL_IS_DIRECTORY, &is_dir_a,
+		      COL_DISPLAY_NAME, &name_a,
+		      -1);

  gtk_tree_model_get (model, b,
-                      COL_IS_DIRECTORY, &is_dir_b,
-                      COL_DISPLAY_NAME, &name_b,
-                      -1);
+		      COL_IS_DIRECTORY, &is_dir_b,
+		      COL_DISPLAY_NAME, &name_b,
+		      -1);

  if (!is_dir_a && is_dir_b)
    ret = 1;
@@ -154,26 +154,26 @@ create_store (void)
  GtkListStore *store;

  store = gtk_list_store_new (NUM_COLS,
-                              G_TYPE_STRING,
-                              G_TYPE_STRING,
-                              GDK_TYPE_PIXBUF,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_STRING,
+			      G_TYPE_STRING,
+			      GDK_TYPE_PIXBUF,
+			      G_TYPE_BOOLEAN);

  /* Set sort column and function */
  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
-                                           sort_func,
-                                           NULL, NULL);
+					   sort_func,
+					   NULL, NULL);
  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-                                        GTK_SORT_ASCENDING);
+					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+					GTK_SORT_ASCENDING);

  return store;
 }

 static void
 item_activated (GtkIconView *icon_view,
-                GtkTreePath *tree_path,
-                gpointer     user_data)
+		GtkTreePath *tree_path,
+		gpointer     user_data)
 {
  GtkListStore *store;
  gchar *path;
@@ -183,11 +183,11 @@ item_activated (GtkIconView *icon_view,
  store = GTK_LIST_STORE (user_data);

  gtk_tree_model_get_iter (GTK_TREE_MODEL (store),
-                           &iter, tree_path);
+			   &iter, tree_path);
  gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
-                      COL_PATH, &path,
-                      COL_IS_DIRECTORY, &is_dir,
-                      -1);
+		      COL_PATH, &path,
+		      COL_IS_DIRECTORY, &is_dir,
+		      -1);

  if (!is_dir)
    {
@@ -207,7 +207,7 @@ item_activated (GtkIconView *icon_view,

 static void
 up_clicked (GtkToolItem *item,
-            gpointer     user_data)
+	    gpointer     user_data)
 {
  GtkListStore *store;
  gchar *dir_name;
@@ -223,12 +223,12 @@ up_clicked (GtkToolItem *item,

  /* Maybe de-sensitize the up button */
  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-                            strcmp (parent, "/") != 0);
+			    strcmp (parent, "/") != 0);
 }

 static void
 home_clicked (GtkToolItem *item,
-              gpointer     user_data)
+	      gpointer     user_data)
 {
  GtkListStore *store;

@@ -241,7 +241,7 @@ home_clicked (GtkToolItem *item,

  /* Sensitize the up button */
  gtk_widget_set_sensitive (GTK_WIDGET (up_button),
-                            TRUE);
+			    TRUE);
 }

 static void close_window(void)
@@ -267,96 +267,96 @@ do_iconview (GtkWidget *do_widget)
      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);

      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "GtkIconView demo");

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (close_window), NULL);
+			G_CALLBACK (close_window), NULL);

      error = NULL;
      if (!load_pixbufs (&error))
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load an image: %s",
-                                           error->message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load an image: %s",
+					   error->message);

-          g_error_free (error);
+	  g_error_free (error);

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          gtk_widget_show (dialog);
-        }
+	  gtk_widget_show (dialog);
+	}
      else
-        {
-          GtkWidget *sw;
-          GtkWidget *icon_view;
-          GtkListStore *store;
-          GtkWidget *vbox;
-          GtkWidget *tool_bar;
-          GtkToolItem *home_button;
+	{
+	  GtkWidget *sw;
+	  GtkWidget *icon_view;
+	  GtkListStore *store;
+	  GtkWidget *vbox;
+	  GtkWidget *tool_bar;
+	  GtkToolItem *home_button;

-          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-          gtk_container_add (GTK_CONTAINER (window), vbox);
+	  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	  gtk_container_add (GTK_CONTAINER (window), vbox);

-          tool_bar = gtk_toolbar_new ();
-          gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);
+	  tool_bar = gtk_toolbar_new ();
+	  gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE, 0);

-          up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-          gtk_tool_item_set_is_important (up_button, TRUE);
-          gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-          gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
+	  up_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
+	  gtk_tool_item_set_is_important (up_button, TRUE);
+	  gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);

-          home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
-          gtk_tool_item_set_is_important (home_button, TRUE);
-          gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
+	  home_button = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+	  gtk_tool_item_set_is_important (home_button, TRUE);
+	  gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);


-          sw = gtk_scrolled_window_new (NULL, NULL);
-          gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                               GTK_SHADOW_ETCHED_IN);
-          gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                          GTK_POLICY_AUTOMATIC,
-                                          GTK_POLICY_AUTOMATIC);
+	  sw = gtk_scrolled_window_new (NULL, NULL);
+	  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+					       GTK_SHADOW_ETCHED_IN);
+	  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+					  GTK_POLICY_AUTOMATIC,
+					  GTK_POLICY_AUTOMATIC);

-          gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+	  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);

-          /* Create the store and fill it with the contents of '/' */
-          parent = g_strdup ("/");
-          store = create_store ();
-          fill_store (store);
+	  /* Create the store and fill it with the contents of '/' */
+	  parent = g_strdup ("/");
+	  store = create_store ();
+	  fill_store (store);

-          icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
-          gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-                                            GTK_SELECTION_MULTIPLE);
-          g_object_unref (store);
+	  icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store));
+	  gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
+					    GTK_SELECTION_MULTIPLE);
+	  g_object_unref (store);

-          /* Connect to the "clicked" signal of the "Up" tool button */
-          g_signal_connect (up_button, "clicked",
-                            G_CALLBACK (up_clicked), store);
+	  /* Connect to the "clicked" signal of the "Up" tool button */
+	  g_signal_connect (up_button, "clicked",
+			    G_CALLBACK (up_clicked), store);

-          /* Connect to the "clicked" signal of the "Home" tool button */
-          g_signal_connect (home_button, "clicked",
-                            G_CALLBACK (home_clicked), store);
+	  /* Connect to the "clicked" signal of the "Home" tool button */
+	  g_signal_connect (home_button, "clicked",
+			    G_CALLBACK (home_clicked), store);

-          /* We now set which model columns that correspond to the text
-           * and pixbuf of each item
-           */
-          gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
-          gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);
+	  /* We now set which model columns that correspond to the text
+	   * and pixbuf of each item
+	   */
+	  gtk_icon_view_set_text_column (GTK_ICON_VIEW (icon_view), COL_DISPLAY_NAME);
+	  gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (icon_view), COL_PIXBUF);

-          /* Connect to the "item-activated" signal */
-          g_signal_connect (icon_view, "item-activated",
-                            G_CALLBACK (item_activated), store);
-          gtk_container_add (GTK_CONTAINER (sw), icon_view);
+	  /* Connect to the "item-activated" signal */
+	  g_signal_connect (icon_view, "item-activated",
+			    G_CALLBACK (item_activated), store);
+	  gtk_container_add (GTK_CONTAINER (sw), icon_view);

-          gtk_widget_grab_focus (icon_view);
-        }
+	  gtk_widget_grab_focus (icon_view);
+	}
    }

  if (!gtk_widget_get_visible (window))
@@ -369,3 +369,4 @@ do_iconview (GtkWidget *do_widget)

  return window;
 }
+
@@ -47,10 +47,10 @@ create_store (void)

 static void
 set_cell_color (GtkCellLayout   *cell_layout,
-                GtkCellRenderer *cell,
-                GtkTreeModel    *tree_model,
-                GtkTreeIter     *iter,
-                gpointer         data)
+		GtkCellRenderer *cell,
+		GtkTreeModel    *tree_model,
+		GtkTreeIter     *iter,
+		gpointer         data)
 {
  gchar *text;
  GdkColor color;
@@ -76,9 +76,9 @@ set_cell_color (GtkCellLayout   *cell_layout,

 static void
 edited (GtkCellRendererText *cell,
-        gchar               *path_string,
-        gchar               *text,
-        gpointer             data)
+	gchar               *path_string,
+	gchar               *text,
+	gpointer             data)
 {
  GtkTreeModel *model;
  GtkTreeIter iter;
@@ -89,7 +89,7 @@ edited (GtkCellRendererText *cell,

  gtk_tree_model_get_iter (model, &iter, path);
  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                      COL_TEXT, text, -1);
+		      COL_TEXT, text, -1);

  gtk_tree_path_free (path);
 }
@@ -106,11 +106,11 @@ do_iconview_edit (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      store = create_store ();
      fill_store (store);
@@ -119,29 +119,29 @@ do_iconview_edit (GtkWidget *do_widget)
      g_object_unref (store);

      gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
-                                        GTK_SELECTION_SINGLE);
+					GTK_SELECTION_SINGLE);
      gtk_icon_view_set_item_orientation (GTK_ICON_VIEW (icon_view),
-                                          GTK_ORIENTATION_HORIZONTAL);
+				          GTK_ORIENTATION_HORIZONTAL);
      gtk_icon_view_set_columns (GTK_ICON_VIEW (icon_view), 2);
      gtk_icon_view_set_reorderable (GTK_ICON_VIEW (icon_view), TRUE);

      renderer = gtk_cell_renderer_pixbuf_new ();
      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-                                  renderer, TRUE);
+				  renderer, TRUE);
      gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (icon_view),
-                                          renderer,
-                                          set_cell_color,
-                                          NULL, NULL);
+					  renderer,
+					  set_cell_color,
+					  NULL, NULL);

      renderer = gtk_cell_renderer_text_new ();
      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view),
-                                  renderer, TRUE);
+				  renderer, TRUE);
      g_object_set (renderer, "editable", TRUE, NULL);
      g_signal_connect (renderer, "edited", G_CALLBACK (edited), icon_view);
      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-                                      renderer,
-                                      "text", COL_TEXT,
-                                      NULL);
+				      renderer,
+				      "text", COL_TEXT,
+				      NULL);

      gtk_container_add (GTK_CONTAINER (window), icon_view);
    }
@@ -156,3 +156,4 @@ do_iconview_edit (GtkWidget *do_widget)

  return window;
 }
+
@@ -25,7 +25,7 @@ static FILE* image_stream = NULL;

 static void
 progressive_prepared_callback (GdkPixbufLoader *loader,
-                               gpointer         data)
+			       gpointer		data)
 {
  GdkPixbuf *pixbuf;
  GtkWidget *image;
@@ -44,11 +44,11 @@ progressive_prepared_callback (GdkPixbufLoader *loader,

 static void
 progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint                 x,
-                              gint                 y,
-                              gint                 width,
-                              gint                 height,
-                              gpointer     data)
+                              gint		   x,
+                              gint		   y,
+                              gint		   width,
+                              gint		   height,
+                              gpointer	   data)
 {
  GtkWidget *image;

@@ -86,97 +86,97 @@ progressive_timeout (gpointer data)
      bytes_read = fread (buf, 1, 256, image_stream);

      if (ferror (image_stream))
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failure reading image file 'alphatest.png': %s",
-                                           g_strerror (errno));
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failure reading image file 'alphatest.png': %s",
+					   g_strerror (errno));

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          fclose (image_stream);
-          image_stream = NULL;
+	  fclose (image_stream);
+	  image_stream = NULL;

-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);

-          load_timeout = 0;
+	  load_timeout = 0;

-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}

      if (!gdk_pixbuf_loader_write (pixbuf_loader,
-                                    buf, bytes_read,
-                                    &error))
-        {
-          GtkWidget *dialog;
+				    buf, bytes_read,
+				    &error))
+	{
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Failed to load image: %s",
-                                           error->message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Failed to load image: %s",
+					   error->message);

-          g_error_free (error);
+	  g_error_free (error);

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          fclose (image_stream);
-          image_stream = NULL;
+	  fclose (image_stream);
+	  image_stream = NULL;

-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);

-          load_timeout = 0;
+	  load_timeout = 0;

-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}

      if (feof (image_stream))
-        {
-          fclose (image_stream);
-          image_stream = NULL;
+	{
+	  fclose (image_stream);
+	  image_stream = NULL;

-          /* Errors can happen on close, e.g. if the image
-           * file was truncated we'll know on close that
-           * it was incomplete.
-           */
-          error = NULL;
-          if (!gdk_pixbuf_loader_close (pixbuf_loader,
-                                        &error))
-            {
-              GtkWidget *dialog;
+	  /* Errors can happen on close, e.g. if the image
+	   * file was truncated we'll know on close that
+	   * it was incomplete.
+	   */
+	  error = NULL;
+	  if (!gdk_pixbuf_loader_close (pixbuf_loader,
+					&error))
+	    {
+	      GtkWidget *dialog;

-              dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                               GTK_DIALOG_DESTROY_WITH_PARENT,
-                                               GTK_MESSAGE_ERROR,
-                                               GTK_BUTTONS_CLOSE,
-                                               "Failed to load image: %s",
-                                               error->message);
+	      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					       GTK_DIALOG_DESTROY_WITH_PARENT,
+					       GTK_MESSAGE_ERROR,
+					       GTK_BUTTONS_CLOSE,
+					       "Failed to load image: %s",
+					       error->message);

-              g_error_free (error);
+	      g_error_free (error);

-              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+	      g_signal_connect (dialog, "response",
+				G_CALLBACK (gtk_widget_destroy), NULL);

-              gtk_widget_show (dialog);
+	      gtk_widget_show (dialog);

-              g_object_unref (pixbuf_loader);
-              pixbuf_loader = NULL;
+	      g_object_unref (pixbuf_loader);
+	      pixbuf_loader = NULL;

-              load_timeout = 0;
+	      load_timeout = 0;

-              return FALSE; /* uninstall the timeout */
-            }
+	      return FALSE; /* uninstall the timeout */
+	    }

-          g_object_unref (pixbuf_loader);
-          pixbuf_loader = NULL;
-        }
+	  g_object_unref (pixbuf_loader);
+	  pixbuf_loader = NULL;
+	}
    }
  else
    {
@@ -190,55 +190,55 @@ progressive_timeout (gpointer data)
       */
      filename = demo_find_file ("alphatest.png", &error);
      if (error)
-        {
-          error_message = g_strdup (error->message);
-          g_error_free (error);
-        }
+	{
+	  error_message = g_strdup (error->message);
+	  g_error_free (error);
+	}
      else
-        {
-          image_stream = g_fopen (filename, "rb");
-          g_free (filename);
+	{
+	  image_stream = g_fopen (filename, "rb");
+	  g_free (filename);

-          if (!image_stream)
-            error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
-                                             g_strerror (errno));
-        }
+	  if (!image_stream)
+	    error_message = g_strdup_printf ("Unable to open image file 'alphatest.png': %s",
+					     g_strerror (errno));
+	}

      if (image_stream == NULL)
-        {
-          GtkWidget *dialog;
+	{
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "%s", error_message);
-          g_free (error_message);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "%s", error_message);
+	  g_free (error_message);

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          gtk_widget_show (dialog);
+	  gtk_widget_show (dialog);

-          load_timeout = 0;
+	  load_timeout = 0;

-          return FALSE; /* uninstall the timeout */
-        }
+	  return FALSE; /* uninstall the timeout */
+	}

      if (pixbuf_loader)
-        {
-          gdk_pixbuf_loader_close (pixbuf_loader, NULL);
-          g_object_unref (pixbuf_loader);
-          pixbuf_loader = NULL;
-        }
+	{
+	  gdk_pixbuf_loader_close (pixbuf_loader, NULL);
+	  g_object_unref (pixbuf_loader);
+	  pixbuf_loader = NULL;
+	}

      pixbuf_loader = gdk_pixbuf_loader_new ();

      g_signal_connect (pixbuf_loader, "area-prepared",
-                        G_CALLBACK (progressive_prepared_callback), image);
+			G_CALLBACK (progressive_prepared_callback), image);

      g_signal_connect (pixbuf_loader, "area-updated",
-                        G_CALLBACK (progressive_updated_callback), image);
+			G_CALLBACK (progressive_updated_callback), image);
    }

  /* leave timeout installed */
@@ -256,13 +256,13 @@ start_progressive_loading (GtkWidget *image)
   * pauses in the reading process.
   */
  load_timeout = gdk_threads_add_timeout (150,
-                                progressive_timeout,
-                                image);
+				progressive_timeout,
+				image);
 }

 static void
 cleanup_callback (GObject   *object,
-                  gpointer   data)
+		  gpointer   data)
 {
  if (load_timeout)
    {
@@ -314,6 +314,7 @@ do_images (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *image;
  GtkWidget *label;
+  GtkWidget *align;
  GtkWidget *button;
  GdkPixbuf *pixbuf;
  GIcon     *gicon;
@@ -324,13 +325,13 @@ do_images (GtkWidget *do_widget)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Images");

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (cleanup_callback), NULL);
+			G_CALLBACK (cleanup_callback), NULL);

      gtk_container_set_border_width (GTK_CONTAINER (window), 8);

@@ -340,14 +341,17 @@ do_images (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Image loaded from a file</u>");
+			    "<u>Image loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

      /* demo_find_file() looks in the current directory first,
       * so you can run gtk-demo without installing GTK, then looks
@@ -356,34 +360,34 @@ do_images (GtkWidget *do_widget)
      pixbuf = NULL;
      filename = demo_find_file ("gtk-logo-rgb.gif", &error);
      if (filename)
-        {
-          pixbuf = gdk_pixbuf_new_from_file (filename, &error);
-          g_free (filename);
-        }
+	{
+	  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
+	  g_free (filename);
+	}

      if (error)
-        {
-          /* This code shows off error handling. You can just use
-           * gtk_image_new_from_file() instead if you don't want to report
-           * errors to the user. If the file doesn't load when using
-           * gtk_image_new_from_file(), a "missing image" icon will
-           * be displayed instead.
-           */
-          GtkWidget *dialog;
+	{
+	  /* This code shows off error handling. You can just use
+	   * gtk_image_new_from_file() instead if you don't want to report
+	   * errors to the user. If the file doesn't load when using
+	   * gtk_image_new_from_file(), a "missing image" icon will
+	   * be displayed instead.
+	   */
+	  GtkWidget *dialog;

-          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                           GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_ERROR,
-                                           GTK_BUTTONS_CLOSE,
-                                           "Unable to open image file 'gtk-logo-rgb.gif': %s",
-                                           error->message);
-          g_error_free (error);
+	  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   "Unable to open image file 'gtk-logo-rgb.gif': %s",
+					   error->message);
+	  g_error_free (error);

-          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);

-          gtk_widget_show (dialog);
-        }
+	  gtk_widget_show (dialog);
+	}

      image = gtk_image_new_from_pixbuf (pixbuf);

@@ -394,14 +398,17 @@ do_images (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Animation loaded from a file</u>");
+			    "<u>Animation loaded from a file</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

      filename = demo_find_file ("floppybuddy.gif", NULL);
      image = gtk_image_new_from_file (filename);
@@ -413,14 +420,17 @@ do_images (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Symbolic themed icon</u>");
+			    "<u>Symbolic themed icon</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
@@ -432,14 +442,17 @@ do_images (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Progressive image loading</u>");
+			    "<u>Progressive image loading</u>");
      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+      /* The alignment keeps the frame from growing when users resize
+       * the window
+       */
+      align = gtk_alignment_new (0.5, 0.5, 0, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -15,10 +15,10 @@ on_bar_response (GtkInfoBar *info_bar,
  GtkWidget *dialog;

  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_INFO,
-                                   GTK_BUTTONS_OK,
-                                   "You clicked a button on an info bar");
+				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+				   GTK_MESSAGE_INFO,
+				   GTK_BUTTONS_OK,
+				   "You clicked a button on an info bar");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "Your response has id %d", response_id);
  gtk_dialog_run (GTK_DIALOG (dialog));
@@ -54,22 +54,16 @@ do_links (GtkWidget *do_widget)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Links");
      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                             "title=\"plain text\">text</a> may be marked up\n"
                             "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>\n"
-                             "and they work fine with other markup, like when\n"
-                             "searching on <a href=\"http://www.google.com/\">"
-                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
-                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
-                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
-                             "</a>.");
+                             "or activated via <a href=\"keynav\">keynav</a>");
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
      g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
      gtk_container_add (GTK_CONTAINER (window), label);
@@ -60,7 +60,7 @@ spinner_timeout (gpointer data)
  guint pulse;

  if (model == NULL)
-    return G_SOURCE_REMOVE;
+    return FALSE;

  gtk_tree_model_get_iter_first (model, &iter);
  gtk_tree_model_get (model, &iter,
@@ -77,7 +77,7 @@ spinner_timeout (gpointer data)
                      COLUMN_ACTIVE, TRUE,
                      -1);

-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }

 static GtkTreeModel *
@@ -43,7 +43,7 @@ get_democodedir (void)
    {
      result = g_win32_get_package_installation_directory_of_module (NULL);
      if (result == NULL)
-        result = "unknown-location";
+	result = "unknown-location";

      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
    }
@@ -59,19 +59,19 @@ get_democodedir (void)
 * demo_find_file:
 * @base: base filename
 * @err:  location to store error, or %NULL.
- *
+ * 
 * Looks for @base first in the current directory, then in the
 * location GTK+ where it will be installed on make install,
 * returns the first file found.
- *
+ * 
 * Return value: the filename, if found or %NULL
- */
+ **/
 gchar *
 demo_find_file (const char *base,
-                GError    **err)
+		GError    **err)
 {
  g_return_val_if_fail (err == NULL || *err == NULL, NULL);
-
+  
  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
      g_file_test (base, G_FILE_TEST_EXISTS))
    return g_strdup (base);
@@ -79,12 +79,12 @@ demo_find_file (const char *base,
    {
      char *filename = g_build_filename (DEMOCODEDIR, base, NULL);
      if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-        {
-          g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-                       "Cannot find demo data file \"%s\"", base);
-          g_free (filename);
-          return NULL;
-        }
+	{
+	  g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
+		       "Cannot find demo data file \"%s\"", base);
+	  g_free (filename);
+	  return NULL;
+	}
      return filename;
    }
 }
@@ -98,12 +98,12 @@ window_closed_cb (GtkWidget *window, gpointer data)

  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
-                      STYLE_COLUMN, &style,
-                      -1);
+		      STYLE_COLUMN, &style,
+		      -1);
  if (style == PANGO_STYLE_ITALIC)
    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
-                        STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                        -1);
+			STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			-1);

  gtk_tree_path_free (cbdata->path);
  g_free (cbdata);
@@ -113,17 +113,17 @@ gboolean
 read_line (FILE *stream, GString *str)
 {
  int n_read = 0;
-
+  
 #ifdef HAVE_FLOCKFILE
  flockfile (stream);
 #endif

  g_string_truncate (str, 0);
-
+  
  while (1)
    {
      int c;
-
+      
 #ifdef HAVE_FLOCKFILE
      c = getc_unlocked (stream);
 #else
@@ -131,31 +131,31 @@ read_line (FILE *stream, GString *str)
 #endif

      if (c == EOF)
-        goto done;
+	goto done;
      else
-        n_read++;
+	n_read++;

      switch (c)
-        {
-        case '\r':
-        case '\n':
-          {
+	{
+	case '\r':
+	case '\n':
+	  {
 #ifdef HAVE_FLOCKFILE
-            int next_c = getc_unlocked (stream);
+	    int next_c = getc_unlocked (stream);
 #else
-            int next_c = getc (stream);
+	    int next_c = getc (stream);
 #endif
-
-            if (!(next_c == EOF ||
-                  (c == '\r' && next_c == '\n') ||
-                  (c == '\n' && next_c == '\r')))
-              ungetc (next_c, stream);
-
-            goto done;
-          }
-        default:
-          g_string_append_c (str, c);
-        }
+	    
+	    if (!(next_c == EOF ||
+		  (c == '\r' && next_c == '\n') ||
+		  (c == '\n' && next_c == '\r')))
+	      ungetc (next_c, stream);
+	    
+	    goto done;
+	  }
+	default:
+	  g_string_append_c (str, c);
+	}
    }

 done:
@@ -333,10 +333,10 @@ static gchar *control[] =
 };
 void
 parse_chars (gchar     *text,
-             gchar    **end_ptr,
-             gint      *state,
-             gchar    **tag,
-             gboolean   start)
+	     gchar    **end_ptr,
+	     gint      *state,
+	     gchar    **tag,
+	     gboolean   start)
 {
  gint i;
  gchar *next_token;
@@ -346,11 +346,11 @@ parse_chars (gchar     *text,
    {
      *end_ptr = strstr (text, "*/");
      if (*end_ptr)
-        {
-          *end_ptr += 2;
-          *state = STATE_NORMAL;
-          *tag = "comment";
-        }
+	{
+	  *end_ptr += 2;
+	  *state = STATE_NORMAL;
+	  *tag = "comment";
+	}
      return;
    }

@@ -362,9 +362,9 @@ parse_chars (gchar     *text,
    {
      *end_ptr = strstr (text, "*/");
      if (*end_ptr)
-        *end_ptr += 2;
+	*end_ptr += 2;
      else
-        *state = STATE_IN_COMMENT;
+	*state = STATE_IN_COMMENT;
      *tag = "comment";
      return;
    }
@@ -381,29 +381,29 @@ parse_chars (gchar     *text,
  if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
    {
      if (strstr (text, "("))
-        {
-          *end_ptr = strstr (text, "(");
-          *tag = "function";
-          return;
-        }
+	{
+	  *end_ptr = strstr (text, "(");
+	  *tag = "function";
+	  return;
+	}
    }
  /* check for types */
  for (i = 0; types[i] != NULL; i++)
    if (!strncmp (text, types[i], strlen (types[i])) ||
        (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
      {
-        *end_ptr = text + strlen (types[i]);
-        *tag = "type";
-        return;
+	*end_ptr = text + strlen (types[i]);
+	*tag = "type";
+	return;
      }

  /* check for control */
  for (i = 0; control[i] != NULL; i++)
    if (!strncmp (text, control[i], strlen (control[i])))
      {
-        *end_ptr = text + strlen (control[i]);
-        *tag = "control";
-        return;
+	*end_ptr = text + strlen (control[i]);
+	*tag = "control";
+	return;
      }

  /* check for string */
@@ -414,18 +414,18 @@ parse_chars (gchar     *text,
      *end_ptr = text + 1;
      *tag = "string";
      while (**end_ptr != '\000')
-        {
-          if (**end_ptr == '\"' && !maybe_escape)
-            {
-              *end_ptr += 1;
-              return;
-            }
-          if (**end_ptr == '\\')
-            maybe_escape = TRUE;
-          else
-            maybe_escape = FALSE;
-          *end_ptr += 1;
-        }
+	{
+	  if (**end_ptr == '\"' && !maybe_escape)
+	    {
+	      *end_ptr += 1;
+	      return;
+	    }
+	  if (**end_ptr == '\\')
+	    maybe_escape = TRUE;
+	  else
+	    maybe_escape = FALSE;
+	  *end_ptr += 1;
+	}
      return;
    }

@@ -434,36 +434,36 @@ parse_chars (gchar     *text,
    {
      next_token = strstr (text, tokens[i]);
      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
    }

  for (i = 0; types[i] != NULL; i++)
    {
      next_token = strstr (text, types[i]);
      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
    }

  for (i = 0; control[i] != NULL; i++)
    {
      next_token = strstr (text, control[i]);
      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+	{
+	  if (*end_ptr)
+	    *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
+	  else
+	    *end_ptr = next_token;
+	}
    }
 }

@@ -488,25 +488,25 @@ fontify (void)
      start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);

      do
-        {
-          parse_chars (start_ptr, &end_ptr, &state, &tag, start);
+	{
+	  parse_chars (start_ptr, &end_ptr, &state, &tag, start);

-          start = FALSE;
-          if (end_ptr)
-            {
-              tmp_iter = start_iter;
-              gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-            }
-          else
-            {
-              tmp_iter = next_iter;
-            }
-          if (tag)
-            gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
+	  start = FALSE;
+	  if (end_ptr)
+	    {
+	      tmp_iter = start_iter;
+	      gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
+	    }
+	  else
+	    {
+	      tmp_iter = next_iter;
+	    }
+	  if (tag)
+	    gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);

-          start_iter = tmp_iter;
-          start_ptr = end_ptr;
-        }
+	  start_iter = tmp_iter;
+	  start_ptr = end_ptr;
+	}
      while (end_ptr);

      g_free (text);
@@ -533,7 +533,7 @@ load_file (const gchar *filename)

  g_free (current_file);
  current_file = g_strdup (filename);
-
+  
  gtk_text_buffer_get_bounds (info_buffer, &start, &end);
  gtk_text_buffer_delete (info_buffer, &start, &end);

@@ -564,101 +564,101 @@ load_file (const gchar *filename)
      gchar *p = buffer->str;
      gchar *q;
      gchar *r;
-
+      
      switch (state)
-        {
-        case 0:
-          /* Reading title */
-          while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
-            p++;
-          r = p;
-          while (*r != '/' && strlen (r))
-            r++;
-          if (strlen (r) > 0)
-            p = r + 1;
-          q = p + strlen (p);
-          while (q > p && g_ascii_isspace (*(q - 1)))
-            q--;
+	{
+	case 0:
+	  /* Reading title */
+	  while (*p == '/' || *p == '*' || g_ascii_isspace (*p))
+	    p++;
+	  r = p;
+	  while (*r != '/' && strlen (r))
+	    r++;
+	  if (strlen (r) > 0)
+	    p = r + 1;
+	  q = p + strlen (p);
+	  while (q > p && g_ascii_isspace (*(q - 1)))
+	    q--;

-          if (q > p)
-            {
-              int len_chars = g_utf8_pointer_to_offset (p, q);
+	  if (q > p)
+	    {
+	      int len_chars = g_utf8_pointer_to_offset (p, q);

-              end = start;
+	      end = start;

-              g_assert (strlen (p) >= q - p);
-              gtk_text_buffer_insert (info_buffer, &end, p, q - p);
-              start = end;
+	      g_assert (strlen (p) >= q - p);
+	      gtk_text_buffer_insert (info_buffer, &end, p, q - p);
+	      start = end;

-              gtk_text_iter_backward_chars (&start, len_chars);
-              gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);
+	      gtk_text_iter_backward_chars (&start, len_chars);
+	      gtk_text_buffer_apply_tag_by_name (info_buffer, "title", &start, &end);

-              start = end;
+	      start = end;
+	      
+	      state++;
+	    }
+	  break;
+	    
+	case 1:
+	  /* Reading body of info section */
+	  while (g_ascii_isspace (*p))
+	    p++;
+	  if (*p == '*' && *(p + 1) == '/')
+	    {
+	      gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
+	      state++;
+	    }
+	  else
+	    {
+	      int len;
+	      
+	      while (*p == '*' || g_ascii_isspace (*p))
+		p++;

-              state++;
-            }
-          break;
+	      len = strlen (p);
+	      while (g_ascii_isspace (*(p + len - 1)))
+		len--;
+	      
+	      if (len > 0)
+		{
+		  if (in_para)
+		    gtk_text_buffer_insert (info_buffer, &start, " ", 1);

-        case 1:
-          /* Reading body of info section */
-          while (g_ascii_isspace (*p))
-            p++;
-          if (*p == '*' && *(p + 1) == '/')
-            {
-              gtk_text_buffer_get_iter_at_offset (source_buffer, &start, 0);
-              state++;
-            }
-          else
-            {
-              int len;
+		  g_assert (strlen (p) >= len);
+		  gtk_text_buffer_insert (info_buffer, &start, p, len);
+		  in_para = 1;
+		}
+	      else
+		{
+		  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
+		  in_para = 0;
+		}
+	    }
+	  break;

-              while (*p == '*' || g_ascii_isspace (*p))
-                p++;
-
-              len = strlen (p);
-              while (g_ascii_isspace (*(p + len - 1)))
-                len--;
-
-              if (len > 0)
-                {
-                  if (in_para)
-                    gtk_text_buffer_insert (info_buffer, &start, " ", 1);
-
-                  g_assert (strlen (p) >= len);
-                  gtk_text_buffer_insert (info_buffer, &start, p, len);
-                  in_para = 1;
-                }
-              else
-                {
-                  gtk_text_buffer_insert (info_buffer, &start, "\n", 1);
-                  in_para = 0;
-                }
-            }
-          break;
-
-        case 2:
-          /* Skipping blank lines */
-          while (g_ascii_isspace (*p))
-            p++;
-          if (*p)
-            {
-              p = buffer->str;
-              state++;
-              /* Fall through */
-            }
-          else
-            break;
-
-        case 3:
-          /* Reading program body */
-          gtk_text_buffer_insert (source_buffer, &start, p, -1);
-          gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
-          break;
-        }
+	case 2:
+	  /* Skipping blank lines */
+	  while (g_ascii_isspace (*p))
+	    p++;
+	  if (*p)
+	    {
+	      p = buffer->str;
+	      state++;
+	      /* Fall through */
+	    }
+	  else
+	    break;
+	  
+	case 3:
+	  /* Reading program body */
+	  gtk_text_buffer_insert (source_buffer, &start, p, -1);
+	  gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
+	  break;
+	}
    }

  fclose (file);
-
+  
  fontify ();

  g_string_free (buffer, TRUE);
@@ -667,7 +667,7 @@ load_file (const gchar *filename)
 void
 row_activated_cb (GtkTreeView       *tree_view,
                  GtkTreePath       *path,
-                  GtkTreeViewColumn *column)
+		  GtkTreeViewColumn *column)
 {
  GtkTreeIter iter;
  PangoStyle style;
@@ -676,49 +676,49 @@ row_activated_cb (GtkTreeView       *tree_view,
  GtkTreeModel *model;

  model = gtk_tree_view_get_model (tree_view);
-
+  
  gtk_tree_model_get_iter (model, &iter, path);
  gtk_tree_model_get (GTK_TREE_MODEL (model),
-                      &iter,
-                      FUNC_COLUMN, &func,
-                      STYLE_COLUMN, &style,
-                      -1);
+		      &iter,
+		      FUNC_COLUMN, &func,
+		      STYLE_COLUMN, &style,
+		      -1);

  if (func)
    {
      gtk_tree_store_set (GTK_TREE_STORE (model),
-                          &iter,
-                          STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
-                          -1);
+			  &iter,
+			  STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+			  -1);
      window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
-
+      
      if (window != NULL)
-        {
-          CallbackData *cbdata;
-
-          cbdata = g_new (CallbackData, 1);
-          cbdata->model = model;
-          cbdata->path = gtk_tree_path_copy (path);
-
-          g_signal_connect (window, "destroy",
-                            G_CALLBACK (window_closed_cb), cbdata);
-        }
+	{
+	  CallbackData *cbdata;
+	  
+	  cbdata = g_new (CallbackData, 1);
+	  cbdata->model = model;
+	  cbdata->path = gtk_tree_path_copy (path);
+	  
+	  g_signal_connect (window, "destroy",
+			    G_CALLBACK (window_closed_cb), cbdata);
+	}
    }
 }

 static void
 selection_cb (GtkTreeSelection *selection,
-              GtkTreeModel     *model)
+	      GtkTreeModel     *model)
 {
  GtkTreeIter iter;
-  GValue value = G_VALUE_INIT;
+  GValue value = {0, };

  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
    return;

  gtk_tree_model_get_value (model, &iter,
-                            FILENAME_COLUMN,
-                            &value);
+			    FILENAME_COLUMN,
+			    &value);
  if (g_value_get_string (&value))
    load_file (g_value_get_string (&value));
  g_value_unset (&value);
@@ -726,7 +726,7 @@ selection_cb (GtkTreeSelection *selection,

 static GtkWidget *
 create_text (GtkTextBuffer **buffer,
-             gboolean        is_source)
+	     gboolean        is_source)
 {
  GtkWidget *scrolled_window;
  GtkWidget *text_view;
@@ -734,20 +734,20 @@ create_text (GtkTextBuffer **buffer,

  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_AUTOMATIC,
+				  GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
-                                       GTK_SHADOW_IN);
-
+				       GTK_SHADOW_IN);
+  
  text_view = gtk_text_view_new ();
-
+  
  *buffer = gtk_text_buffer_new (NULL);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), *buffer);
  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);

  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
-
+  
  if (is_source)
    {
      font_desc = pango_font_description_from_string ("monospace");
@@ -767,7 +767,7 @@ create_text (GtkTextBuffer **buffer,
      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view),
                                            2);
    }
-
+  
  return scrolled_window;
 }

@@ -782,7 +782,7 @@ create_tree (void)
  GtkTreeIter iter;
  GtkWidget *box, *label, *scrolled_window;

-  Demo *d = gtk_demos;
+  Demo *d = testgtk_demos;

  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
  tree_view = gtk_tree_view_new ();
@@ -790,7 +790,7 @@ create_tree (void)
  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));

  gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
-                               GTK_SELECTION_BROWSE);
+			       GTK_SELECTION_BROWSE);
  gtk_widget_set_size_request (tree_view, 200, -1);

  /* this code only supports 1 level of children. If we
@@ -803,46 +803,46 @@ create_tree (void)
      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);

      gtk_tree_store_set (GTK_TREE_STORE (model),
-                          &iter,
-                          TITLE_COLUMN, d->title,
-                          FILENAME_COLUMN, d->filename,
-                          FUNC_COLUMN, d->func,
-                          STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                          -1);
+			  &iter,
+			  TITLE_COLUMN, d->title,
+			  FILENAME_COLUMN, d->filename,
+			  FUNC_COLUMN, d->func,
+			  STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			  -1);

      d++;

      if (!children)
-        continue;
-
+	continue;
+      
      while (children->title)
-        {
-          GtkTreeIter child_iter;
+	{
+	  GtkTreeIter child_iter;

-          gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
-
-          gtk_tree_store_set (GTK_TREE_STORE (model),
-                              &child_iter,
-                              TITLE_COLUMN, children->title,
-                              FILENAME_COLUMN, children->filename,
-                              FUNC_COLUMN, children->func,
-                              STYLE_COLUMN, PANGO_STYLE_NORMAL,
-                              -1);
-
-          children++;
-        }
+	  gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
+	  
+	  gtk_tree_store_set (GTK_TREE_STORE (model),
+			      &child_iter,
+			      TITLE_COLUMN, children->title,
+			      FILENAME_COLUMN, children->filename,
+			      FUNC_COLUMN, children->func,
+			      STYLE_COLUMN, PANGO_STYLE_NORMAL,
+			      -1);
+	  
+	  children++;
+	}
    }

  cell = gtk_cell_renderer_text_new ();

  column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
-                                                     cell,
-                                                     "text", TITLE_COLUMN,
-                                                     "style", STYLE_COLUMN,
-                                                     NULL);
-
+						     cell,
+						     "text", TITLE_COLUMN,
+						     "style", STYLE_COLUMN,
+						     NULL);
+  
  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
-                               GTK_TREE_VIEW_COLUMN (column));
+			       GTK_TREE_VIEW_COLUMN (column));

  gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (selection), &iter);
@@ -852,11 +852,11 @@ create_tree (void)

  gtk_tree_view_collapse_all (GTK_TREE_VIEW (tree_view));
  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
-
+  				    
  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
+				  GTK_POLICY_NEVER,
+				  GTK_POLICY_AUTOMATIC);
  gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);

  label = gtk_label_new ("Widget (double click for demo)");
@@ -895,21 +895,21 @@ setup_default_icon (void)
  if (err)
    {
      GtkWidget *dialog;
-
+      
      dialog = gtk_message_dialog_new (NULL, 0,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Failed to read icon file: %s",
-                                       err->message);
+				       GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_CLOSE,
+				       "Failed to read icon file: %s",
+				       err->message);
      g_error_free (err);

      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
    }

  if (pixbuf)
    {
-      GList *list;
+      GList *list;      
      GdkPixbuf *transparent;

      /* The gtk-logo-rgb icon has a white background, make it transparent */
@@ -936,20 +936,22 @@ main (int argc, char **argv)
   * these few lines, which are just a hack so gtk-demo will work
   * in the GTK tree without installing it.
   */
-  if (g_file_test ("../../modules/input/immodules.cache", G_FILE_TEST_EXISTS))
+  if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
+                   G_FILE_TEST_EXISTS))
    {
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
    }
  /* -- End of hack -- */
-
+  
  gtk_init (&argc, &argv);

  setup_default_icon ();
-
+  
  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
  gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos");
  g_signal_connect_after (window, "destroy",
-                    G_CALLBACK (gtk_main_quit), NULL);
+		    G_CALLBACK (gtk_main_quit), NULL);

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_container_add (GTK_CONTAINER (window), hbox);
@@ -961,8 +963,8 @@ main (int argc, char **argv)
  gtk_box_pack_start (GTK_BOX (hbox), notebook, TRUE, TRUE, 0);

  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&info_buffer, FALSE),
-                            gtk_label_new_with_mnemonic ("_Info"));
+			    create_text (&info_buffer, FALSE),
+			    gtk_label_new_with_mnemonic ("_Info"));

  gtk_text_buffer_create_tag (info_buffer, "title",
                              "font", "Sans 18",
@@ -970,8 +972,8 @@ main (int argc, char **argv)
  g_object_unref (info_buffer);

  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            create_text (&source_buffer, TRUE),
-                            gtk_label_new_with_mnemonic ("_Source"));
+			    create_text (&source_buffer, TRUE),
+			    gtk_label_new_with_mnemonic ("_Source"));


  gtk_text_buffer_create_tag (source_buffer, "comment",
@@ -996,12 +998,13 @@ main (int argc, char **argv)
                              "foreground", "DarkGoldenrod4",
                              NULL);
  g_object_unref (source_buffer);
-
+  
  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  gtk_widget_show_all (window);
+  

-  load_file (gtk_demos[0].filename);
-
+  load_file (testgtk_demos[0].filename);
+  
  gtk_main ();

  return 0;
@@ -30,7 +30,8 @@
 #include <stdio.h>

 static GtkWidget *
-create_menu (gint     depth)
+create_menu (gint     depth,
+	     gboolean tearoff)
 {
  GtkWidget *menu;
  GtkWidget *menuitem;
@@ -44,6 +45,13 @@ create_menu (gint     depth)
  menu = gtk_menu_new ();
  group = NULL;

+  if (tearoff)
+    {
+      menuitem = gtk_tearoff_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
+      gtk_widget_show (menuitem);
+    }
+
  for (i = 0, j = 1; i < 5; i++, j++)
    {
      sprintf (buf, "item %2d - %d", depth, j);
@@ -53,9 +61,9 @@ create_menu (gint     depth)
      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
      gtk_widget_show (menuitem);
      if (i == 3)
-        gtk_widget_set_sensitive (menuitem, FALSE);
+	gtk_widget_set_sensitive (menuitem, FALSE);

-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (depth - 1, TRUE));
    }

  return menu;
@@ -98,10 +106,10 @@ do_menus (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Menus");
      g_signal_connect (window, "destroy",
-                        G_CALLBACK(gtk_widget_destroyed), &window);
+			G_CALLBACK(gtk_widget_destroyed), &window);

      accel_group = gtk_accel_group_new ();
      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
@@ -120,7 +128,7 @@ do_menus (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE, 0);
      gtk_widget_show (menubar);

-      menu = create_menu (2);
+      menu = create_menu (2, TRUE);

      menuitem = gtk_menu_item_new_with_label ("test\nline2");
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
@@ -128,12 +136,12 @@ do_menus (GtkWidget *do_widget)
      gtk_widget_show (menuitem);

      menuitem = gtk_menu_item_new_with_label ("foo");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3, TRUE));
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);

      menuitem = gtk_menu_item_new_with_label ("bar");
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4, TRUE));
      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
      gtk_widget_show (menuitem);

@@ -144,13 +152,13 @@ do_menus (GtkWidget *do_widget)

      button = gtk_button_new_with_label ("Flip");
      g_signal_connect (button, "clicked",
-                        G_CALLBACK (change_orientation), menubar);
+			G_CALLBACK (change_orientation), menubar);
      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
      gtk_widget_show (button);

      button = gtk_button_new_with_label ("Close");
      g_signal_connect_swapped (button, "clicked",
-                                G_CALLBACK(gtk_widget_destroy), window);
+				G_CALLBACK(gtk_widget_destroy), window);
      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
      gtk_widget_set_can_default (button, TRUE);
      gtk_widget_grab_default (button);
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_New</attribute>
-        <attribute name="action">app.new</attribute>
-        <attribute name="accel">&lt;Primary&gt;n</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Open</attribute>
-        <attribute name="action">app.open</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Save</attribute>
-        <attribute name="action">app.save</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Save _As...</attribute>
-        <attribute name="action">app.save-as</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="menubar">
-    <submenu>
-      <attribute name="label" translatable="yes">_Preferences</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
-          <attribute name="action">app.dark</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Hide Titlebar when maximized</attribute>
-          <attribute name="action">win.titlebar</attribute>
-        </item>
-        <submenu>
-          <attribute name="label" translatable="yes">_Color</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Red</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">red</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Green</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">green</attribute>
-              <attribute name="accel">&lt;Primary&gt;g</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Blue</attribute>
-              <attribute name="action">app.color</attribute>
-              <attribute name="target">blue</attribute>
-              <attribute name="accel">&lt;Primary&gt;b</attribute>
-            </item>
-          </section>
-        </submenu>
-        <submenu>
-          <attribute name="label" translatable="yes">_Shape</attribute>
-          <section>
-            <item>
-              <attribute name="label" translatable="yes">_Square</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">square</attribute>
-              <attribute name="accel">&lt;Primary&gt;s</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Rectangle</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">rectangle</attribute>
-              <attribute name="accel">&lt;Primary&gt;r</attribute>
-            </item>
-            <item>
-              <attribute name="label" translatable="yes">_Oval</attribute>
-              <attribute name="action">win.shape</attribute>
-              <attribute name="target">oval</attribute>
-              <attribute name="accel">&lt;Primary&gt;o</attribute>
-            </item>
-          </section>
-        </submenu>
-        <item>
-          <attribute name="label" translatable="yes">_Bold</attribute>
-          <attribute name="action">win.bold</attribute>
-          <attribute name="accel">&lt;Primary&gt;b</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.about</attribute>
-        <attribute name="accel">&lt;Primary&gt;a</attribute>
-      </item>
-    </submenu>
-  </menu>
-</interface>
@@ -1,698 +0,0 @@
-/* Multitouch
- *
- * Demonstrates some general multitouch event handling,
- * using GdkTouchCluster in order to get grouped motion
- * events for the touches within a cluster. Each of the
- * created rectangles has one of those GdkTouchCluster
- * objects.
- *
- * Touch events are also enabled on additional widgets,
- * enabling simultaneous touch interaction on those. Not
- * all widgets are prepared for multitouch interaction,
- * as there are constraints that not all widgets may
- * apply to.
- */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include "demo-common.h"
-
-#define RECT_BORDER_WIDTH 6
-
-static GtkWidget *window = NULL;
-static GtkWidget *area = NULL;
-static GtkWidget *red = NULL;
-static GtkWidget *green = NULL;
-static GtkWidget *blue = NULL;
-static GtkWidget *alpha = NULL;
-
-static GQueue *shapes = NULL;
-
-typedef struct {
-  GdkTouchCluster *cluster;
-  GdkRGBA color;
-
-  gdouble angle;
-  gdouble zoom;
-
-  gdouble center_x;
-  gdouble center_y;
-
-  gdouble x;
-  gdouble y;
-  gdouble width;
-  gdouble height;
-
-  gdouble base_zoom;
-  gdouble base_angle;
-  gdouble initial_distance;
-  gdouble initial_angle;
-
-  GdkPoint points[4];
-} ShapeInfo;
-
-static void
-calculate_rotated_point (gdouble  angle,
-                         gdouble  zoom,
-                         gdouble  center_x,
-                         gdouble  center_y,
-                         gdouble  point_x,
-                         gdouble  point_y,
-                         gdouble *ret_x,
-                         gdouble *ret_y)
-{
-  gdouble distance, xd, yd, ang;
-
-  if (angle == 0)
-    {
-      *ret_x = point_x;
-      *ret_y = point_y;
-      return;
-    }
-
-  xd = center_x - point_x;
-  yd = center_y - point_y;
-
-  if (xd == 0 && yd == 0)
-    {
-      *ret_x = center_x;
-      *ret_y = center_y;
-      return;
-    }
-
-  distance = sqrt ((xd * xd) + (yd * yd));
-  distance *= zoom;
-
-  ang = atan2 (xd, yd);
-
-  /* Invert angle */
-  ang = (2 * G_PI) - ang;
-
-  /* Shift it 270° */
-  ang += 3 * (G_PI / 2);
-
-  /* And constraint it to 0°-360° */
-  ang = fmod (ang, 2 * G_PI);
-  ang += angle;
-
-  *ret_x = center_x + (distance * cos (ang));
-  *ret_y = center_y + (distance * sin (ang));
-}
-
-static void
-shape_info_allocate_input_rect (ShapeInfo *info)
-{
-  gint width, height, i;
-
-  width = info->width;
-  height = info->height;
-
-  /* Top/left */
-  info->points[0].x = info->x - info->center_x;
-  info->points[0].y = info->y - info->center_y;
-
-  /* Top/right */
-  info->points[1].x = info->x - info->center_x + width;
-  info->points[1].y = info->y - info->center_y;
-
-  /* Bottom/right */
-  info->points[2].x = info->x - info->center_x + width;
-  info->points[2].y = info->y - info->center_y + height;
-
-  /* Bottom/left */
-  info->points[3].x = info->x - info->center_x;
-  info->points[3].y = info->y - info->center_y + height;
-
-  for (i = 0; i < 4; i++)
-    {
-      gdouble ret_x, ret_y;
-
-      calculate_rotated_point (info->angle,
-                               info->zoom,
-                               info->x,
-                               info->y,
-                               (gdouble) info->points[i].x,
-                               (gdouble) info->points[i].y,
-                               &ret_x,
-                               &ret_y);
-
-      info->points[i].x = (gint) ret_x;
-      info->points[i].y = (gint) ret_y;
-    }
-}
-
-static void
-shape_info_bounding_rect (ShapeInfo    *info,
-                          GdkRectangle *rect)
-{
-  gint i, left, right, top, bottom;
-
-  left = top = G_MAXINT;
-  right = bottom = 0;
-
-  for (i = 0; i < 4; i++)
-    {
-      if (info->points[i].x < left)
-        left = info->points[i].x;
-
-      if (info->points[i].x > right)
-        right = info->points[i].x;
-
-      if (info->points[i].y < top)
-        top = info->points[i].y;
-
-      if (info->points[i].y > bottom)
-        bottom = info->points[i].y;
-    }
-
-  rect->x = left - 20;
-  rect->y = top - 20;
-  rect->width = right - left + 40;
-  rect->height = bottom - top + 40;
-}
-
-static gboolean
-shape_info_point_in (ShapeInfo *info,
-                     gint       x,
-                     gint       y)
-{
-  GdkPoint *left, *right, *top, *bottom;
-  gint i;
-
-  left = right = top = bottom = NULL;
-
-  for (i = 0; i < 4; i++)
-    {
-      GdkPoint *p = &info->points[i];
-
-      if (!left ||
-          p->x < left->x ||
-          (p->x == left->x && p->y > left->y))
-        left = p;
-
-      if (!right ||
-          p->x > right->x ||
-          (p->x == right->x && p->y < right->y))
-        right = p;
-    }
-
-  for (i = 0; i < 4; i++)
-    {
-      GdkPoint *p = &info->points[i];
-
-      if (p == left || p == right)
-        continue;
-
-      if (!top ||
-          p->y < top->y)
-        top = p;
-
-      if (!bottom ||
-          p->y > bottom->y)
-        bottom = p;
-    }
-
-  g_assert (left && right && top && bottom);
-
-  if (x < left->x ||
-      x > right->x ||
-      y < top->y ||
-      y > bottom->y)
-    return FALSE;
-
-  /* Check whether point is above the sides
-   * between leftmost and topmost, and
-   * topmost and rightmost corners.
-   */
-  if (x <= top->x)
-    {
-      if (left->y - ((left->y - top->y) * (((gdouble) x - left->x) / (top->x - left->x))) > y)
-        return FALSE;
-    }
-  else
-    {
-      if (top->y + ((right->y - top->y) * (((gdouble) x - top->x) / (right->x - top->x))) > y)
-        return FALSE;
-    }
-
-  /* Check whether point is below the sides
-   * between leftmost and bottom, and
-   * bottom and rightmost corners.
-   */
-  if (x <= bottom->x)
-    {
-      if (left->y + ((bottom->y - left->y) * (((gdouble) x - left->x) / (bottom->x - left->x))) < y)
-        return FALSE;
-    }
-  else
-    {
-      if (bottom->y - ((bottom->y - right->y) * (((gdouble) x - bottom->x) / (right->x - bottom->x))) < y)
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-static ShapeInfo *
-shape_info_new (gdouble  x,
-                gdouble  y,
-                gdouble  width,
-                gdouble  height,
-                GdkRGBA *color)
-{
-  ShapeInfo *info;
-
-  info = g_slice_new0 (ShapeInfo);
-  info->cluster = NULL;
-  info->color = *color;
-
-  info->x = x;
-  info->y = y;
-  info->width = width;
-  info->height = height;
-
-  info->angle = 0;
-  info->zoom = 1;
-
-  info->base_zoom = 1;
-  info->base_angle = 0;
-  info->initial_distance = 0;
-  info->initial_angle = 0;
-
-  shape_info_allocate_input_rect (info);
-
-  g_queue_push_tail (shapes, info);
-
-  return info;
-}
-
-static void
-shape_info_free (ShapeInfo *info)
-{
-  g_slice_free (ShapeInfo, info);
-}
-
-static void
-shape_info_draw (cairo_t   *cr,
-                 ShapeInfo *info)
-{
-  cairo_save (cr);
-
-  cairo_translate (cr,
-                   info->points[0].x + RECT_BORDER_WIDTH / 2,
-                   info->points[0].y + RECT_BORDER_WIDTH / 2);
-
-  cairo_scale (cr, info->zoom, info->zoom);
-  cairo_rotate (cr, info->angle);
-
-  cairo_rectangle (cr, 0, 0,
-                   info->width - RECT_BORDER_WIDTH,
-                   info->height - RECT_BORDER_WIDTH);
-  gdk_cairo_set_source_rgba (cr, &info->color);
-  cairo_fill_preserve (cr);
-
-  cairo_set_line_width (cr, RECT_BORDER_WIDTH);
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_stroke (cr);
-
-  cairo_restore (cr);
-}
-
-static void
-shape_update_scales (ShapeInfo *info)
-{
-  gtk_range_set_value (GTK_RANGE (red), info->color.red);
-  gtk_range_set_value (GTK_RANGE (green), info->color.green);
-  gtk_range_set_value (GTK_RANGE (blue), info->color.blue);
-  gtk_range_set_value (GTK_RANGE (alpha), info->color.alpha);
-}
-
-static void
-range_value_changed_cb (GtkRange *range,
-                        gpointer  user_data)
-{
-  GtkWidget *widget;
-  GdkRectangle rect;
-  ShapeInfo *shape;
-  gdouble value;
-
-  widget = GTK_WIDGET (range);
-  shape = g_queue_peek_head (shapes);
-
-  if (!shape)
-    return;
-
-  value = gtk_range_get_value (range);
-
-  if (widget == red)
-    shape->color.red = value;
-  else if (widget == green)
-    shape->color.green = value;
-  else if (widget == blue)
-    shape->color.blue = value;
-  else if (widget == alpha)
-    shape->color.alpha = value;
-
-  shape_info_bounding_rect (shape, &rect);
-  gdk_window_invalidate_rect (gtk_widget_get_window (area),
-                              &rect, FALSE);
-}
-
-static gboolean
-draw_cb (GtkWidget *widget,
-         cairo_t   *cr,
-         gpointer   user_data)
-{
-  GList *l;
-
-  cairo_save (cr);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_paint (cr);
-
-  for (l = shapes->tail; l; l = l->prev)
-    shape_info_draw (cr, l->data);
-
-  cairo_restore (cr);
-
-  return FALSE;
-}
-
-static gboolean
-button_press_cb (GtkWidget *widget,
-                 GdkEvent  *event,
-                 gpointer   user_data)
-{
-  ShapeInfo *shape = NULL;
-  guint touch_id;
-
-  if (gdk_event_get_touch_id (event, &touch_id))
-    {
-      GList *l;
-
-      for (l = shapes->tail; l; l = l->prev)
-        {
-          ShapeInfo *info = l->data;
-
-          if (shape_info_point_in (info,
-                                   (gint) event->button.x,
-                                   (gint) event->button.y))
-            shape = info;
-        }
-
-      if (!shape)
-        return FALSE;
-
-      /* Put on top */
-      g_queue_remove (shapes, shape);
-      g_queue_push_head (shapes, shape);
-
-      shape_update_scales (shape);
-
-      if (!shape->cluster)
-        shape->cluster = gdk_window_create_touch_cluster (gtk_widget_get_window (widget),
-                                                          gdk_event_get_device (event));
-      else if (gdk_touch_cluster_get_n_touches (shape->cluster) == 0)
-        {
-          /* Only change cluster device if there were no touches */
-          gdk_touch_cluster_set_device (shape->cluster,
-                                        gdk_event_get_device (event));
-        }
-
-      gdk_touch_cluster_add_touch (shape->cluster, touch_id);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-multitouch_cb (GtkWidget *widget,
-               GdkEvent  *event,
-               gpointer   user_data)
-{
-  ShapeInfo *info = NULL;
-  gboolean new_center = FALSE;
-  gboolean new_position = FALSE;
-  gdouble event_x, event_y;
-  cairo_region_t *region;
-  GdkRectangle rect;
-  GList *l;
-
-  for (l = shapes->head; l; l = l->next)
-    {
-      ShapeInfo *shape = l->data;
-
-      if (event->multitouch.group == shape->cluster)
-        {
-          info = shape;
-          break;
-        }
-    }
-
-  if (!info)
-    return FALSE;
-
-  shape_info_bounding_rect (info, &rect);
-  region = cairo_region_create_rectangle ((cairo_rectangle_int_t *) &rect);
-
-  if (event->multitouch.n_events == 1)
-    {
-      /* Update center if we just got to
-       * this situation from either way */
-      if (event->type == GDK_MULTITOUCH_ADDED ||
-          event->type == GDK_MULTITOUCH_REMOVED)
-        new_center = TRUE;
-
-      event_x = event->multitouch.events[0]->x;
-      event_y = event->multitouch.events[0]->y;
-      new_position = TRUE;
-    }
-  else if (event->multitouch.n_events == 2)
-    {
-      gdouble distance, angle;
-
-      gdk_events_get_center ((GdkEvent *) event->multitouch.events[0],
-                             (GdkEvent *) event->multitouch.events[1],
-                             &event_x, &event_y);
-
-      gdk_events_get_distance ((GdkEvent *) event->multitouch.events[0],
-                               (GdkEvent *) event->multitouch.events[1],
-                               &distance);
-
-      gdk_events_get_angle ((GdkEvent *) event->multitouch.events[0],
-                            (GdkEvent *) event->multitouch.events[1],
-                            &angle);
-
-      if (event->type == GDK_MULTITOUCH_ADDED)
-        {
-          /* Second touch was just added, update base zoom/angle */
-          info->base_zoom = info->zoom;
-          info->base_angle = info->angle;
-          info->initial_angle = angle;
-          info->initial_distance = distance;
-          new_center = TRUE;
-        }
-
-      info->zoom = MAX (info->base_zoom * (distance / info->initial_distance), 1.0);
-      info->angle = info->base_angle + (angle - info->initial_angle);
-      new_position = TRUE;
-    }
-
-  if (new_center)
-    {
-      gdouble origin_x, origin_y;
-
-      origin_x = info->x - info->center_x;
-      origin_y = info->y - info->center_y;
-
-      calculate_rotated_point (- info->angle,
-                               1 / info->zoom,
-                               info->x - origin_x,
-                               info->y - origin_y,
-                               event_x - origin_x,
-                               event_y - origin_y,
-                               &info->center_x,
-                               &info->center_y);
-    }
-
-  if (new_position)
-    {
-      info->x = event_x;
-      info->y = event_y;
-    }
-
-  shape_info_allocate_input_rect (info);
-
-  shape_info_bounding_rect (info, &rect);
-  cairo_region_union_rectangle (region, (cairo_rectangle_int_t *) &rect);
-  gdk_window_invalidate_region (gtk_widget_get_window (widget), region, FALSE);
-
-  return TRUE;
-}
-
-static void
-window_destroyed_cb (GtkWidget *widget,
-                     gpointer   user_data)
-{
-  g_queue_foreach (shapes, (GFunc) shape_info_free, NULL);
-  g_queue_free (shapes);
-
-  shapes = NULL;
-  window = NULL;
-}
-
-static void
-new_rectangle_clicked_cb (GtkButton *button,
-                          gpointer   user_data)
-{
-  GdkRectangle rect;
-  ShapeInfo *info;
-  GdkRGBA color;
-
-  color.red = color.green = color.blue = color.alpha = 0.5;
-  info = shape_info_new (0, 0, 100, 150, &color);
-
-  shape_info_bounding_rect (info, &rect);
-  gdk_window_invalidate_rect (gtk_widget_get_window (area), &rect, FALSE);
-}
-
-GtkWidget *
-create_drawing_area (void)
-{
-  area = gtk_drawing_area_new ();
-
-  gtk_widget_add_events (area,
-                         GDK_TOUCH_MASK |
-                         GDK_POINTER_MOTION_MASK |
-                         GDK_BUTTON_PRESS_MASK |
-                         GDK_BUTTON_RELEASE_MASK);
-
-  gtk_widget_set_size_request (area, 600, 600);
-
-  g_signal_connect (area, "draw",
-                    G_CALLBACK (draw_cb), NULL);
-  g_signal_connect (area, "button-press-event",
-                    G_CALLBACK (button_press_cb), NULL);
-  g_signal_connect (area, "multitouch-event",
-                    G_CALLBACK (multitouch_cb), NULL);
-
-  return area;
-}
-
-GtkWidget *
-create_scale (void)
-{
-  GtkWidget *scale;
-
-  scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0, 1, 0.01);
-  gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
-
-  gtk_widget_set_vexpand (scale, TRUE);
-  gtk_widget_set_margin_left (scale, 15);
-  gtk_widget_set_margin_right (scale, 15);
-
-  gtk_widget_add_events (scale, GDK_TOUCH_MASK);
-
-  g_signal_connect (scale, "value-changed",
-                    G_CALLBACK (range_value_changed_cb), NULL);
-  return scale;
-}
-
-GtkWidget *
-create_window (void)
-{
-  GtkWidget *grid, *label, *button;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Multitouch demo");
-  g_signal_connect (window, "destroy",
-                    G_CALLBACK (window_destroyed_cb), NULL);
-
-  grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (window), grid);
-
-  area = create_drawing_area ();
-  gtk_grid_attach (GTK_GRID (grid),
-                   area, 0, 0, 1, 3);
-  gtk_widget_set_hexpand (area, TRUE);
-  gtk_widget_set_vexpand (area, TRUE);
-
-  /* "red" label/scale */
-  label = gtk_label_new ("Red");
-  gtk_widget_set_vexpand (label, FALSE);
-  gtk_grid_attach (GTK_GRID (grid),
-                   label, 1, 0, 1, 1);
-
-  red = create_scale ();
-  gtk_grid_attach (GTK_GRID (grid),
-                   red, 1, 1, 1, 1);
-
-  /* "green" label/scale */
-  label = gtk_label_new ("Green");
-  gtk_widget_set_vexpand (label, FALSE);
-  gtk_grid_attach (GTK_GRID (grid),
-                   label, 2, 0, 1, 1);
-
-  green = create_scale ();
-  gtk_grid_attach (GTK_GRID (grid),
-                   green, 2, 1, 1, 1);
-
-  /* "blue" label/scale */
-  label = gtk_label_new ("Blue");
-  gtk_widget_set_vexpand (label, FALSE);
-  gtk_grid_attach (GTK_GRID (grid),
-                   label, 3, 0, 1, 1);
-
-  blue = create_scale ();
-  gtk_grid_attach (GTK_GRID (grid),
-                   blue, 3, 1, 1, 1);
-
-  /* "alpha" label/scale */
-  label = gtk_label_new ("Alpha");
-  gtk_widget_set_vexpand (label, FALSE);
-  gtk_grid_attach (GTK_GRID (grid),
-                   label, 4, 0, 1, 1);
-
-  alpha = create_scale ();
-  gtk_grid_attach (GTK_GRID (grid),
-                   alpha, 4, 1, 1, 1);
-
-  /* button */
-  button = gtk_button_new_from_stock (GTK_STOCK_NEW);
-  gtk_widget_add_events (button, GDK_TOUCH_MASK);
-  gtk_grid_attach (GTK_GRID (grid),
-                   button, 1, 2, 4, 1);
-  gtk_widget_set_vexpand (button, FALSE);
-
-  g_signal_connect (button, "clicked",
-                    G_CALLBACK (new_rectangle_clicked_cb), NULL);
-
-  gtk_widget_show_all (grid);
-
-  return window;
-}
-
-GtkWidget *
-do_multitouch (GtkWidget *do_widget)
-{
-  if (!shapes)
-    shapes = g_queue_new ();
-
-  if (!window)
-    window = create_window ();
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-
-      g_queue_foreach (shapes, (GFunc) shape_info_free, NULL);
-      g_queue_free (shapes);
-      shapes = NULL;
-    }
-
-  return window;
-}
@@ -613,3 +613,4 @@ do_offscreen_window (GtkWidget *do_widget)

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

  return window;
 }
+
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<schemalist>
-
-  <enum id='org.gtk.Demo.Color'>
-    <value nick='red'   value='0'/>
-    <value nick='green' value='1'/>
-    <value nick='blue'  value='2'/>
-  </enum>
-
-  <schema id='org.gtk.Demo' path='/org/gtk/Demo/'>
-    <key name='color' enum='org.gtk.Demo.Color'>
-      <default>'red'</default>
-    </key>
-  </schema>
-
-</schemalist>
@@ -23,7 +23,7 @@ do_overlay (GtkWidget *do_widget)
                             gtk_widget_get_screen (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window),
                                   450, 450);
-
+      
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

@@ -15,7 +15,7 @@

 void
 toggle_resize (GtkWidget *widget,
-               GtkWidget *child)
+	       GtkWidget *child)
 {
  GtkWidget *parent;
  GtkPaned *paned;
@@ -43,7 +43,7 @@ toggle_resize (GtkWidget *widget,

 void
 toggle_shrink (GtkWidget *widget,
-               GtkWidget *child)
+	       GtkWidget *child)
 {
  GtkWidget *parent;
  GtkPaned *paned;
@@ -70,10 +70,10 @@ toggle_shrink (GtkWidget *widget,
 }

 GtkWidget *
-create_pane_options (GtkPaned    *paned,
-                     const gchar *frame_label,
-                     const gchar *label1,
-                     const gchar *label2)
+create_pane_options (GtkPaned	 *paned,
+		     const gchar *frame_label,
+		     const gchar *label1,
+		     const gchar *label2)
 {
  GtkWidget *child1, *child2;
  GtkWidget *frame;
@@ -86,38 +86,47 @@ create_pane_options (GtkPaned    *paned,

  frame = gtk_frame_new (frame_label);
  gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
-
-  table = gtk_grid_new ();
+  
+  table = gtk_table_new (3, 2, TRUE);
  gtk_container_add (GTK_CONTAINER (frame), table);
-
+  
  label = gtk_label_new (label1);
-  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
-
+  gtk_table_attach_defaults (GTK_TABLE (table), label,
+			     0, 1, 0, 1);
+  
  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_grid_attach (GTK_GRID (table), check_button, 0, 1, 1, 1);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     0, 1, 1, 2);
  g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_resize), child1);
+		    G_CALLBACK (toggle_resize), child1);

  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_grid_attach (GTK_GRID (table), check_button, 0, 2, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     0, 1, 2, 3);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
  g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_shrink), child1);
+		    G_CALLBACK (toggle_shrink), child1);

  label = gtk_label_new (label2);
-  gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
-
+  gtk_table_attach_defaults (GTK_TABLE (table), label,
+			     1, 2, 0, 1);
+  
  check_button = gtk_check_button_new_with_mnemonic ("_Resize");
-  gtk_grid_attach (GTK_GRID (table), check_button, 1, 1, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     1, 2, 1, 2);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
  g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_resize), child2);
+		    G_CALLBACK (toggle_resize), child2);

  check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
-  gtk_grid_attach (GTK_GRID (table), check_button, 1, 2, 1, 1);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
+  gtk_table_attach_defaults (GTK_TABLE (table), check_button,
+			     1, 2, 2, 3);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
+			       TRUE);
  g_signal_connect (check_button, "toggled",
-                    G_CALLBACK (toggle_shrink), child2);
+		    G_CALLBACK (toggle_shrink), child2);

  return frame;
 }
@@ -136,10 +145,10 @@ do_panes (GtkWidget *do_widget)
    {
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));

      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_window_set_title (GTK_WINDOW (window), "Panes");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@@ -158,7 +167,7 @@ do_panes (GtkWidget *do_widget)
      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
      gtk_widget_set_size_request (frame, 60, 60);
      gtk_paned_add1 (GTK_PANED (hpaned), frame);
-
+      
      button = gtk_button_new_with_mnemonic ("_Hi there");
      gtk_container_add (GTK_CONTAINER(frame), button);

@@ -175,18 +184,18 @@ do_panes (GtkWidget *do_widget)
      /* Now create toggle buttons to control sizing */

      gtk_box_pack_start (GTK_BOX (vbox),
-                          create_pane_options (GTK_PANED (hpaned),
-                                               "Horizontal",
-                                               "Left",
-                                               "Right"),
-                          FALSE, FALSE, 0);
+			  create_pane_options (GTK_PANED (hpaned),
+					       "Horizontal",
+					       "Left",
+					       "Right"),
+			  FALSE, FALSE, 0);

      gtk_box_pack_start (GTK_BOX (vbox),
-                          create_pane_options (GTK_PANED (vpaned),
-                                               "Vertical",
-                                               "Top",
-                                               "Bottom"),
-                          FALSE, FALSE, 0);
+			  create_pane_options (GTK_PANED (vpaned),
+					       "Vertical",
+					       "Top",
+					       "Bottom"),
+			  FALSE, FALSE, 0);

      gtk_widget_show_all (vbox);
    }
@@ -25,9 +25,9 @@ do_pickers (GtkWidget *do_widget)

    gtk_container_set_border_width (GTK_CONTAINER (window), 10);

-    table = gtk_grid_new ();
-    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+    table = gtk_table_new (5, 2, FALSE);
+    gtk_table_set_col_spacing (GTK_TABLE (table), 0, 10);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 3);
    gtk_container_add (GTK_CONTAINER (window), table);

    gtk_container_set_border_width (GTK_CONTAINER (table), 10);
@@ -35,44 +35,40 @@ do_pickers (GtkWidget *do_widget)
    label = gtk_label_new ("Color:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_color_button_new ();
-    gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 0, 1);

    label = gtk_label_new ("Font:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_font_button_new ();
-    gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 1, 2);

    label = gtk_label_new ("File:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_file_chooser_button_new ("Pick a File",
                                          GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 2, 3);

    label = gtk_label_new ("Folder:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    picker = gtk_file_chooser_button_new ("Pick a Folder",
                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);

    label = gtk_label_new ("Mail:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 4, 1, 1);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 4, 1, 1);
+    gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+    gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 4, 5);
  }

  if (!gtk_widget_get_visible (window))
@@ -71,7 +71,7 @@ load_pixbufs (GError **error)

  background = gdk_pixbuf_new_from_file (filename, error);
  g_free (filename);
-
+  
  if (!background)
    return FALSE; /* Note that "error" was filled with a GError */

@@ -83,10 +83,10 @@ load_pixbufs (GError **error)
      filename = demo_find_file (image_names[i], error);
      if (!filename)
        return FALSE; /* Note that "error" was filled with a GError */
-
+      
      images[i] = gdk_pixbuf_new_from_file (filename, error);
      g_free (filename);
-
+      
      if (!images[i])
        return FALSE; /* Note that "error" was filled with a GError */
    }
@@ -180,7 +180,7 @@ timeout (gpointer data)
  GDK_THREADS_LEAVE ();

  frame_num++;
-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }

 static guint timeout_id;
@@ -26,8 +26,8 @@ typedef struct

 static void
 begin_print (GtkPrintOperation *operation,
-             GtkPrintContext   *context,
-             gpointer           user_data)
+	     GtkPrintContext   *context,
+	     gpointer           user_data)
 {
  PrintData *data = (PrintData *)user_data;
  char *contents;
@@ -55,9 +55,9 @@ begin_print (GtkPrintOperation *operation,

 static void
 draw_page (GtkPrintOperation *operation,
-           GtkPrintContext   *context,
-           gint               page_nr,
-           gpointer           user_data)
+	   GtkPrintContext   *context,
+	   gint               page_nr,
+	   gpointer           user_data)
 {
  PrintData *data = (PrintData *)user_data;
  cairo_t *cr;
@@ -132,8 +132,8 @@ draw_page (GtkPrintOperation *operation,

 static void
 end_print (GtkPrintOperation *operation,
-           GtkPrintContext   *context,
-           gpointer           user_data)
+	   GtkPrintContext   *context,
+	   gpointer           user_data)
 {
  PrintData *data = (PrintData *)user_data;

@@ -159,11 +159,11 @@ do_printing (GtkWidget *do_widget)
  data->font_size = 12.0;

  g_signal_connect (G_OBJECT (operation), "begin-print",
-                    G_CALLBACK (begin_print), data);
+		    G_CALLBACK (begin_print), data);
  g_signal_connect (G_OBJECT (operation), "draw-page",
-                    G_CALLBACK (draw_page), data);
+		    G_CALLBACK (draw_page), data);
  g_signal_connect (G_OBJECT (operation), "end-print",
-                    G_CALLBACK (end_print), data);
+		    G_CALLBACK (end_print), data);

  gtk_print_operation_set_use_full_page (operation, FALSE);
  gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS);
@@ -195,14 +195,14 @@ do_printing (GtkWidget *do_widget)
      GtkWidget *dialog;

      dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "%s", error->message);
+				       GTK_DIALOG_DESTROY_WITH_PARENT,
+				       GTK_MESSAGE_ERROR,
+				       GTK_BUTTONS_CLOSE,
+				       "%s", error->message);
      g_error_free (error);

      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);

      gtk_widget_show (dialog);
    }
@@ -75,7 +75,7 @@ create_fancy_attr_list_for_layout (PangoLayout *layout)
  for (p = text; (p = strstr (p, HEART)); p += strlen (HEART))
    {
      PangoAttribute *attr;
-
+      
      attr = pango_attr_shape_new_with_data (&ink_rect,
                                             &logical_rect,
                                             GUINT_TO_POINTER (g_utf8_get_char (p)),
@@ -152,7 +152,7 @@ rotated_text_draw (GtkWidget *widget,

      /* Inform Pango to re-layout the text with the new transformation matrix */
      pango_cairo_update_layout (cr, layout);
-
+    
      pango_layout_get_pixel_size (layout, &width, &height);
      cairo_move_to (cr, - width / 2, - RADIUS * .9);
      pango_cairo_show_layout (cr, layout);
@@ -166,7 +166,7 @@ rotated_text_draw (GtkWidget *widget,
  g_object_unref (layout);
  g_object_unref (context);
  cairo_pattern_destroy (pattern);
-
+  
  return FALSE;
 }

@@ -29,7 +29,8 @@ static gboolean
 search_progress (gpointer data)
 {
  gtk_entry_progress_pulse (GTK_ENTRY (data));
-  return G_SOURCE_CONTINUE;
+
+  return TRUE;
 }

 static void
@@ -2,9 +2,9 @@
 *
 * GtkSizeGroup provides a mechanism for grouping a number of
 * widgets together so they all request the same amount of space.
- * This is typically useful when you want a column of widgets to
+ * This is typically useful when you want a column of widgets to 
 * have the same size, but you can't use a GtkTable widget.
- *
+ * 
 * Note that size groups only affect the amount of space requested,
 * not the size that the widgets finally receive. If you want the
 * widgets in a GtkSizeGroup to actually be the same size, you need
@@ -26,7 +26,7 @@ create_combo_box (const char **strings)
  const char **str;

  combo_box = gtk_combo_box_text_new ();
-
+  
  for (str = strings; *str; str++)
    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);

@@ -36,11 +36,11 @@ create_combo_box (const char **strings)
 }

 static void
-add_row (GtkGrid      *table,
-         int           row,
-         GtkSizeGroup *size_group,
-         const char   *label_text,
-         const char  **options)
+add_row (GtkTable     *table,
+	 int           row,
+	 GtkSizeGroup *size_group,
+	 const char   *label_text,
+	 const char  **options)
 {
  GtkWidget *combo_box;
  GtkWidget *label;
@@ -48,18 +48,23 @@ add_row (GtkGrid      *table,
  label = gtk_label_new_with_mnemonic (label_text);
  gtk_widget_set_halign (label, GTK_ALIGN_START);
  gtk_widget_set_valign (label, GTK_ALIGN_END);
-  gtk_widget_set_hexpand (label, TRUE);
-  gtk_grid_attach (table, label, 0, row, 1, 1);
-
+  gtk_table_attach (GTK_TABLE (table), label,
+		    0, 1,                  row, row + 1,
+		    GTK_EXPAND | GTK_FILL, 0,
+		    0,                     0);
+  
  combo_box = create_combo_box (options);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
  gtk_size_group_add_widget (size_group, combo_box);
-  gtk_grid_attach (table, combo_box, 1, row, 1, 1);
+  gtk_table_attach (GTK_TABLE (table), combo_box,
+		    1, 2,                  row, row + 1,
+		    0,                     0,
+		    0,                     0);
 }

 static void
 toggle_grouping (GtkToggleButton *check_button,
-                 GtkSizeGroup    *size_group)
+		 GtkSizeGroup    *size_group)
 {
  GtkSizeGroupMode new_mode;

@@ -71,7 +76,7 @@ toggle_grouping (GtkToggleButton *check_button,
    new_mode = GTK_SIZE_GROUP_HORIZONTAL;
  else
    new_mode = GTK_SIZE_GROUP_NONE;
-
+  
  gtk_size_group_set_mode (size_group, new_mode);
 }

@@ -88,29 +93,29 @@ do_sizegroup (GtkWidget *do_widget)
  static const char *color_options[] = {
    "Red", "Green", "Blue", NULL
  };
-
+  
  static const char *dash_options[] = {
    "Solid", "Dashed", "Dotted", NULL
  };
-
+  
  static const char *end_options[] = {
    "Square", "Round", "Arrow", NULL
  };
-
+  
  if (!window)
    {
      window = gtk_dialog_new_with_buttons ("GtkSizeGroup",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+					    GTK_WINDOW (do_widget),
+					    0,
+					    GTK_STOCK_CLOSE,
+					    GTK_RESPONSE_NONE,
+					    NULL);
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
+      
      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+			G_CALLBACK (gtk_widget_destroy), NULL);
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));

@@ -119,40 +124,42 @@ do_sizegroup (GtkWidget *do_widget)
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);

      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-      /* Create one frame holding color options */
+      
+      /* Create one frame holding color options
+       */
      frame = gtk_frame_new ("Color Options");
      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

-      table = gtk_grid_new ();
+      table = gtk_table_new (2, 2, FALSE);
      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
      gtk_container_add (GTK_CONTAINER (frame), table);

-      add_row (GTK_GRID (table), 0, size_group, "_Foreground", color_options);
-      add_row (GTK_GRID (table), 1, size_group, "_Background", color_options);
+      add_row (GTK_TABLE (table), 0, size_group, "_Foreground", color_options);
+      add_row (GTK_TABLE (table), 1, size_group, "_Background", color_options);

-      /* And another frame holding line style options */
+      /* And another frame holding line style options
+       */
      frame = gtk_frame_new ("Line Options");
      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);

-      table = gtk_grid_new ();
+      table = gtk_table_new (2, 2, FALSE);
      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
-      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
-      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
+      gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+      gtk_table_set_col_spacings (GTK_TABLE (table), 10);
      gtk_container_add (GTK_CONTAINER (frame), table);

-      add_row (GTK_GRID (table), 0, size_group, "_Dashing", dash_options);
-      add_row (GTK_GRID (table), 1, size_group, "_Line ends", end_options);
+      add_row (GTK_TABLE (table), 0, size_group, "_Dashing", dash_options);
+      add_row (GTK_TABLE (table), 1, size_group, "_Line ends", end_options);

      /* And a check button to turn grouping on and off */
      check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE, 0);
-
+      
      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
      g_signal_connect (check_button, "toggled",
-                        G_CALLBACK (toggle_grouping), size_group);
+			G_CALLBACK (toggle_grouping), size_group);
    }

  if (!gtk_widget_get_visible (window))
@@ -93,3 +93,5 @@ do_spinner (GtkWidget *do_widget)

  return window;
 }
+
+
@@ -35,7 +35,7 @@ stock_item_info_free (StockItemInfo *info)
  g_free (info->accel_str);
  if (info->small_icon)
    g_object_unref (info->small_icon);
-
+  
  g_free (info);
 }

@@ -48,7 +48,7 @@ stock_item_info_copy (StockItemInfo *src)
  info->id = g_strdup (src->id);
  info->macro = g_strdup (src->macro);
  info->accel_str = g_strdup (src->accel_str);
-
+  
  info->item = src->item;

  info->small_icon = src->small_icon;
@@ -82,9 +82,9 @@ id_to_macro (const gchar *id)
  /* gtk-foo-bar -> GTK_STOCK_FOO_BAR */

  macro = g_string_new (NULL);
-
+  
  cp = id;
-
+  
  if (strncmp (cp, "gtk-", 4) == 0)
    {
      g_string_append (macro, "GTK_STOCK_");
@@ -94,11 +94,11 @@ id_to_macro (const gchar *id)
  while (*cp)
    {
      if (*cp == '-')
-        g_string_append_c (macro, '_');
+	g_string_append_c (macro, '_');
      else if (g_ascii_islower (*cp))
-        g_string_append_c (macro, g_ascii_toupper (*cp));
+	g_string_append_c (macro, g_ascii_toupper (*cp));
      else
-        g_string_append_c (macro, *cp);
+	g_string_append_c (macro, *cp);

      cp++;
    }
@@ -112,7 +112,7 @@ create_model (void)
  GtkListStore *store;
  GSList *ids;
  GSList *tmp_list;
-
+  
  store = gtk_list_store_new (2, STOCK_ITEM_INFO_TYPE, G_TYPE_STRING);

  ids = gtk_stock_list_ids ();
@@ -124,9 +124,9 @@ create_model (void)
      GtkStockItem item;
      GtkTreeIter iter;
      GtkIconSet *icon_set;
-
+      
      info.id = tmp_list->data;
-
+      
      if (gtk_stock_lookup (info.id, &item))
        {
          info.item = item;
@@ -165,19 +165,19 @@ create_model (void)
              ++i;
            }
          g_free (sizes);
-
-          info.small_icon = gtk_widget_render_icon_pixbuf (window,
+          
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
                                                           info.id,
                                                           size);
-
+          
          if (size != GTK_ICON_SIZE_MENU)
            {
              /* Make the result the proper size for our thumbnail */
              gint w, h;
              GdkPixbuf *scaled;
-
+              
              gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-
+              
              scaled = gdk_pixbuf_scale_simple (info.small_icon,
                                                w, h,
                                                GDK_INTERP_BILINEAR);
@@ -200,7 +200,7 @@ create_model (void)
        }

      info.macro = id_to_macro (info.id);
-
+      
      gtk_list_store_append (store, &iter);
      gtk_list_store_set (store, &iter, 0, &info, 1, info.id, -1);

@@ -208,10 +208,10 @@ create_model (void)
      g_free (info.accel_str);
      if (info.small_icon)
        g_object_unref (info.small_icon);
-
+      
      tmp_list = g_slist_next (tmp_list);
    }
-
+  
  g_slist_foreach (ids, (GFunc)g_free, NULL);
  g_slist_free (ids);

@@ -235,16 +235,16 @@ get_largest_size (const char *id)
  for (i = 0; i < n_sizes; i++)
    {
      gint width, height;
-
+      
      gtk_icon_size_lookup (sizes[i], &width, &height);

      if (width * height > best_pixels)
-        {
-          best_size = sizes[i];
-          best_pixels = width * height;
-        }
+	{
+	  best_size = sizes[i];
+	  best_pixels = width * height;
+	}
    }
-
+  
  g_free (sizes);

  return best_size;
@@ -257,7 +257,7 @@ selection_changed (GtkTreeSelection *selection)
  StockItemDisplay *display;
  GtkTreeModel *model;
  GtkTreeIter iter;
-
+  
  treeview = gtk_tree_selection_get_tree_view (selection);
  display = g_object_get_data (G_OBJECT (treeview), "stock-display");

@@ -265,7 +265,7 @@ selection_changed (GtkTreeSelection *selection)
    {
      StockItemInfo *info;
      gchar *str;
-
+      
      gtk_tree_model_get (model, &iter,
                          0, &info,
                          -1);
@@ -313,21 +313,21 @@ selection_changed (GtkTreeSelection *selection)

 static void
 macro_set_func_text (GtkTreeViewColumn *tree_column,
-                     GtkCellRenderer   *cell,
-                     GtkTreeModel      *model,
-                     GtkTreeIter       *iter,
-                     gpointer           data)
+		     GtkCellRenderer   *cell,
+		     GtkTreeModel      *model,
+		     GtkTreeIter       *iter,
+		     gpointer           data)
 {
  StockItemInfo *info;
-
+  
  gtk_tree_model_get (model, iter,
                      0, &info,
                      -1);
-
+  
  g_object_set (GTK_CELL_RENDERER (cell),
                "text", info->macro,
                NULL);
-
+  
  stock_item_info_free (info);
 }

@@ -339,15 +339,15 @@ id_set_func (GtkTreeViewColumn *tree_column,
             gpointer           data)
 {
  StockItemInfo *info;
-
+  
  gtk_tree_model_get (model, iter,
                      0, &info,
                      -1);
-
+  
  g_object_set (GTK_CELL_RENDERER (cell),
                "text", info->id,
                NULL);
-
+  
  stock_item_info_free (info);
 }

@@ -359,15 +359,15 @@ accel_set_func (GtkTreeViewColumn *tree_column,
                gpointer           data)
 {
  StockItemInfo *info;
-
+  
  gtk_tree_model_get (model, iter,
                      0, &info,
                      -1);
-
+  
  g_object_set (GTK_CELL_RENDERER (cell),
                "text", info->accel_str,
                NULL);
-
+  
  stock_item_info_free (info);
 }

@@ -379,21 +379,21 @@ label_set_func (GtkTreeViewColumn *tree_column,
                gpointer           data)
 {
  StockItemInfo *info;
-
+  
  gtk_tree_model_get (model, iter,
                      0, &info,
                      -1);
-
+  
  g_object_set (GTK_CELL_RENDERER (cell),
                "text", info->item.label,
                NULL);
-
+  
  stock_item_info_free (info);
 }

 GtkWidget *
 do_stock_browser (GtkWidget *do_widget)
-{
+{  
  if (!window)
    {
      GtkWidget *frame;
@@ -401,6 +401,7 @@ do_stock_browser (GtkWidget *do_widget)
      GtkWidget *hbox;
      GtkWidget *sw;
      GtkWidget *treeview;
+      GtkWidget *align;
      GtkTreeModel *model;
      GtkCellRenderer *cell_renderer;
      StockItemDisplay *display;
@@ -409,7 +410,7 @@ do_stock_browser (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Stock Icons and Items");
      gtk_window_set_default_size (GTK_WINDOW (window), -1, 500);

@@ -426,31 +427,31 @@ do_stock_browser (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);

      model = create_model ();
-
+      
      treeview = gtk_tree_view_new_with_model (model);

      g_object_unref (model);

      gtk_container_add (GTK_CONTAINER (sw), treeview);
-
+      
      column = gtk_tree_view_column_new ();
      gtk_tree_view_column_set_title (column, "Macro");

      cell_renderer = gtk_cell_renderer_pixbuf_new ();
      gtk_tree_view_column_pack_start (column,
-                                       cell_renderer,
-                                       FALSE);
+				       cell_renderer,
+				       FALSE);
      gtk_tree_view_column_set_attributes (column, cell_renderer,
-                                           "stock_id", 1, NULL);
+					   "stock_id", 1, NULL);
      cell_renderer = gtk_cell_renderer_text_new ();
      gtk_tree_view_column_pack_start (column,
-                                       cell_renderer,
-                                       TRUE);
+				       cell_renderer,
+				       TRUE);
      gtk_tree_view_column_set_cell_data_func (column, cell_renderer,
-                                               macro_set_func_text, NULL, NULL);
+					       macro_set_func_text, NULL, NULL);

      gtk_tree_view_append_column (GTK_TREE_VIEW (treeview),
-                                   column);
+				   column);

      cell_renderer = gtk_cell_renderer_text_new ();
      gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (treeview),
@@ -478,10 +479,12 @@ do_stock_browser (GtkWidget *do_widget)
                                                  id_set_func,
                                                  NULL,
                                                  NULL);
-
+      
+      align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
+      gtk_box_pack_end (GTK_BOX (hbox), align, FALSE, FALSE, 0);
+      
      frame = gtk_frame_new ("Selected Item");
-      gtk_widget_set_valign (frame, GTK_ALIGN_START);
-      gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (align), frame);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
@@ -492,7 +495,7 @@ do_stock_browser (GtkWidget *do_widget)
                              "stock-display",
                              display,
                              g_free); /* free display with treeview */
-
+      
      display->type_label = gtk_label_new (NULL);
      display->macro_label = gtk_label_new (NULL);
      display->id_label = gtk_label_new (NULL);
@@ -504,7 +507,7 @@ do_stock_browser (GtkWidget *do_widget)

      gtk_box_pack_start (GTK_BOX (vbox), display->icon_image,
                          FALSE, FALSE, 0);
-
+      
      gtk_box_pack_start (GTK_BOX (vbox), display->label_accel_label,
                          FALSE, FALSE, 0);
      gtk_box_pack_start (GTK_BOX (vbox), display->macro_label,
@@ -514,11 +517,11 @@ do_stock_browser (GtkWidget *do_widget)

      selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
      gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
+      
      g_signal_connect (selection,
-                        "changed",
-                        G_CALLBACK (selection_changed),
-                        NULL);
+			"changed",
+			G_CALLBACK (selection_changed),
+			NULL);
    }

  if (!gtk_widget_get_visible (window))
@@ -526,7 +529,7 @@ do_stock_browser (GtkWidget *do_widget)
      gtk_widget_show_all (window);
    }
  else
-    {
+    {	 
      gtk_widget_destroy (window);
      window = NULL;
    }
@@ -1,6 +1,6 @@
 /* Text Widget/Automatic scrolling
 *
- * This example demonstrates how to use the gravity of
+ * This example demonstrates how to use the gravity of 
 * GtkTextMarks to keep a text view scrolled to the bottom
 * while appending text.
 */
@@ -20,14 +20,14 @@ scroll_to_end (GtkTextView *textview)
  static int count;

  buffer = gtk_text_view_get_buffer (textview);
-
-  /* Get "end" mark. It's located at the end of buffer because
+  
+  /* Get "end" mark. It's located at the end of buffer because 
   * of right gravity
   */
  mark = gtk_text_buffer_get_mark (buffer, "end");
  gtk_text_buffer_get_iter_at_mark (buffer, &iter, mark);

-  /* and insert some text at its position, the iter will be
+  /* and insert some text at its position, the iter will be 
   * revalidated after insertion to point to the end of inserted text
   */
  spaces = g_strnfill (count++, ' ');
@@ -43,13 +43,13 @@ scroll_to_end (GtkTextView *textview)
   */
  gtk_text_view_scroll_mark_onscreen (textview, mark);

-  /* Emulate typewriter behavior, shift to the left if we
+  /* Emulate typewriter behavior, shift to the left if we 
   * are far enough to the right.
   */
  if (count > 150)
    count = 0;

-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }

 /* Scroll to the bottom of the buffer.
@@ -64,7 +64,7 @@ scroll_to_bottom (GtkTextView *textview)
  static int count;

  buffer = gtk_text_view_get_buffer (textview);
-
+  
  /* Get end iterator */
  gtk_text_buffer_get_end_iter (buffer, &iter);

@@ -80,17 +80,17 @@ scroll_to_bottom (GtkTextView *textview)
                          -1);
  g_free (spaces);

-  /* Move the iterator to the beginning of line, so we don't scroll
-   * in horizontal direction
+  /* Move the iterator to the beginning of line, so we don't scroll 
+   * in horizontal direction 
   */
  gtk_text_iter_set_line_offset (&iter, 0);
-
+  
  /* and place the mark at iter. the mark will stay there after we
   * insert some text at the end because it has right gravity.
   */
  mark = gtk_text_buffer_get_mark (buffer, "scroll");
  gtk_text_buffer_move_mark (buffer, mark, &iter);
-
+  
  /* Scroll the mark onscreen.
   */
  gtk_text_view_scroll_mark_onscreen (textview, mark);
@@ -100,7 +100,7 @@ scroll_to_bottom (GtkTextView *textview)
  if (count > 40)
    count = 0;

-  return G_SOURCE_CONTINUE;
+  return TRUE;
 }

 static guint
@@ -114,30 +114,30 @@ setup_scroll (GtkTextView *textview,
  gtk_text_buffer_get_end_iter (buffer, &iter);

  if (to_end)
-    {
-      /* If we want to scroll to the end, including horizontal scrolling,
-       * then we just create a mark with right gravity at the end of the
-       * buffer. It will stay at the end unless explicitely moved with
-       * gtk_text_buffer_move_mark.
-       */
-      gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
-
-      /* Add scrolling timeout. */
-      return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
-    }
+  {
+    /* If we want to scroll to the end, including horizontal scrolling,
+     * then we just create a mark with right gravity at the end of the 
+     * buffer. It will stay at the end unless explicitely moved with 
+     * gtk_text_buffer_move_mark.
+     */
+    gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (50, (GSourceFunc) scroll_to_end, textview);
+  }
  else
-    {
-      /* If we want to scroll to the bottom, but not scroll horizontally,
-       * then an end mark won't do the job. Just create a mark so we can
-       * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-       * explicitely when needed. Use left gravity so the mark stays where
-       * we put it after inserting new text.
-       */
-      gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
-
-      /* Add scrolling timeout. */
-      return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
-    }
+  {
+    /* If we want to scroll to the bottom, but not scroll horizontally, 
+     * then an end mark won't do the job. Just create a mark so we can 
+     * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
+     * explicitely when needed. Use left gravity so the mark stays where 
+     * we put it after inserting new text.
+     */
+    gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);
+    
+    /* Add scrolling timeout. */
+    return g_timeout_add (100, (GSourceFunc) scroll_to_bottom, textview);
+  }
 }

 static void
@@ -163,7 +163,7 @@ create_text_view (GtkWidget *hbox,
  timeout = setup_scroll (GTK_TEXT_VIEW (textview), to_end);

  /* Remove the timeout in destroy handler, so we don't try to
-   * scroll destroyed widget.
+   * scroll destroyed widget. 
   */
  g_signal_connect (textview, "destroy",
                    G_CALLBACK (remove_timeout),
@@ -181,9 +181,9 @@ do_textscroll (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-
+      
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
      gtk_container_add (GTK_CONTAINER (window), hbox);
@@ -193,9 +193,9 @@ do_textscroll (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+      gtk_widget_show_all (window);
  else
-    gtk_widget_destroy (window);
+      gtk_widget_destroy (window);

  return window;
 }
@@ -561,6 +561,7 @@ recursive_attach_view (int                 depth,
  GtkWidget *child_view;
  GtkWidget *event_box;
  GdkRGBA color;
+  GtkWidget *align;

  if (depth > 4)
    return;
@@ -572,10 +573,11 @@ recursive_attach_view (int                 depth,
  gdk_rgba_parse (&color, "black");
  gtk_widget_override_background_color (event_box, 0, &color);

-  gtk_widget_set_halign (child_view, GTK_ALIGN_FILL);
-  gtk_widget_set_valign (child_view, GTK_ALIGN_FILL);
+  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+  gtk_container_set_border_width (GTK_CONTAINER (align), 1);

-  gtk_container_add (GTK_CONTAINER (event_box), child_view);
+  gtk_container_add (GTK_CONTAINER (event_box), align);
+  gtk_container_add (GTK_CONTAINER (align), child_view);

  gtk_text_view_add_child_at_anchor (view, event_box, anchor);

@@ -632,3 +634,4 @@ easter_egg_callback (GtkWidget *button,

  gtk_widget_show_all (window);
 }
+
@@ -350,7 +350,7 @@ interactive_canvas_real_drag_leave (gpointer data)
      gtk_widget_queue_draw (widget);
    }

-  return G_SOURCE_REMOVE;
+  return FALSE;
 }

 static void
@@ -1,248 +0,0 @@
-/* Transparent
- *
- * Use transparent background on GdkWindows to create a shadow effect on a GtkOverlay widget.
- */
-
-#include <gtk/gtk.h>
-
-#define SHADOW_OFFSET_X 7
-#define SHADOW_OFFSET_Y 7
-#define SHADOW_RADIUS 5
-
-static void
-draw_shadow_box (cairo_t   *cr,
-		 GdkRectangle rect,
-		 double radius,
-		 double transparency)
-{
-  cairo_pattern_t *pattern;
-  double x0, x1, x2, x3;
-  double y0, y1, y2, y3;
-
-  x0 = rect.x;
-  x1 = rect.x + radius;
-  x2 = rect.x + rect.width - radius;
-  x3 = rect.x + rect.width;
-  
-  y0 = rect.y;
-  y1 = rect.y + radius;
-  y2 = rect.y + rect.height - radius;
-  y3 = rect.y + rect.height;
-  
-   /* Fill non-border part */
-  cairo_set_source_rgba (cr, 0, 0, 0, transparency);
-  cairo_rectangle (cr,
-		   x1, y1, x2 - x1, y2 - y1);
-  cairo_fill (cr);
-
-  /* Upper border */
-
-  pattern = cairo_pattern_create_linear (0, y0, 0, y1);
-  
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x1, y0,
-		   x2 - x1, y1 - y0);
-  cairo_fill (cr);
-
-  /* Bottom border */
-
-  pattern = cairo_pattern_create_linear (0, y2, 0, y3);
-  
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x1, y2,
-		   x2 - x1, y3 - y2);
-  cairo_fill (cr);
-  
-  /* Left border */
-
-  pattern = cairo_pattern_create_linear (x0, 0, x1, 0);
-  
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, 0.0);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, transparency);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x0, y1,
-		   x1 - x0, y2 - y1);
-  cairo_fill (cr);
-
-  /* Right border */
-
-  pattern = cairo_pattern_create_linear (x2, 0, x3, 0);
-  
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x2, y1,
-		   x3 - x2, y2 - y1);
-  cairo_fill (cr);
-
-  /* NW corner */
-  
-  pattern = cairo_pattern_create_radial (x1, y1, 0,
-					 x1, y1, radius);
-
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x0, y0,
-		   x1 - x0, y1 - y0);
-  cairo_fill (cr);
-
-  /* NE corner */
-  
-  pattern = cairo_pattern_create_radial (x2, y1, 0,
-					 x2, y1, radius);
-
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x2, y0,
-		   x3 - x2, y1 - y0);
-  cairo_fill (cr);
-
-  /* SW corner */
-  
-  pattern = cairo_pattern_create_radial (x1, y2, 0,
-					 x1, y2, radius);
-
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x0, y2,
-		   x1 - x0, y3 - y2);
-  cairo_fill (cr);
-
-  /* SE corner */
-  
-  pattern = cairo_pattern_create_radial (x2, y2, 0,
-					 x2, y2, radius);
-
-  cairo_pattern_add_color_stop_rgba (pattern, 0.0, 0.0, 0, 0, transparency);
-  cairo_pattern_add_color_stop_rgba (pattern, 1.0, 0.0, 0, 0, 0.0);
-  
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  
-  cairo_rectangle (cr,
-		   x2, y2,
-		   x3 - x2, y3 - y2);
-  cairo_fill (cr);
-}
-
-static gboolean
-draw_callback (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
-{
-  GdkRectangle rect;
-
-  gtk_widget_get_allocation (widget, &rect);
-  rect.x += SHADOW_OFFSET_X;
-  rect.y += SHADOW_OFFSET_Y;
-  rect.width -= SHADOW_OFFSET_X;
-  rect.height -= SHADOW_OFFSET_Y;
-
-  draw_shadow_box (cr,
-		   rect, SHADOW_RADIUS, 0.4);
-  
-  return FALSE;
-}
-
-GtkWidget *
-do_transparent (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkWidget *sw;
-      GtkWidget *overlay;
-      GtkWidget *align;
-      GtkWidget *entry;
-      GdkRGBA transparent = {0, 0, 0, 0};
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "Transparent");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
-      view = gtk_text_view_new ();
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-
-      overlay = gtk_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (overlay), sw);
-      gtk_container_add (GTK_CONTAINER (window), overlay);
-
-      gtk_widget_override_background_color (overlay, 0, &transparent);
-
-      align = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
-      gtk_alignment_set_padding (GTK_ALIGNMENT (align),
-				 0, SHADOW_OFFSET_Y, 0, SHADOW_OFFSET_X);
-      g_signal_connect (align, "draw", G_CALLBACK (draw_callback), NULL);
-      
-      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (align), entry);
-      
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), align);
-      gtk_widget_set_halign (align, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (align, GTK_ALIGN_START);
-
-      gtk_widget_show_all (overlay);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
@@ -170,14 +170,14 @@ create_model (void)

  /* create tree store */
  model = gtk_tree_store_new (NUM_COLUMNS,
-                              G_TYPE_STRING,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_STRING,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN);

  /* add data to the tree store */
  while (month->label)
@@ -186,35 +186,35 @@ create_model (void)

      gtk_tree_store_append (model, &iter, NULL);
      gtk_tree_store_set (model, &iter,
-                          HOLIDAY_NAME_COLUMN, month->label,
-                          ALEX_COLUMN, FALSE,
-                          HAVOC_COLUMN, FALSE,
-                          TIM_COLUMN, FALSE,
-                          OWEN_COLUMN, FALSE,
-                          DAVE_COLUMN, FALSE,
-                          VISIBLE_COLUMN, FALSE,
-                          WORLD_COLUMN, FALSE,
-                          -1);
+			  HOLIDAY_NAME_COLUMN, month->label,
+			  ALEX_COLUMN, FALSE,
+			  HAVOC_COLUMN, FALSE,
+			  TIM_COLUMN, FALSE,
+			  OWEN_COLUMN, FALSE,
+			  DAVE_COLUMN, FALSE,
+			  VISIBLE_COLUMN, FALSE,
+			  WORLD_COLUMN, FALSE,
+			  -1);

      /* add children */
      while (holiday->label)
-        {
-          GtkTreeIter child_iter;
+	{
+	  GtkTreeIter child_iter;

-          gtk_tree_store_append (model, &child_iter, &iter);
-          gtk_tree_store_set (model, &child_iter,
-                              HOLIDAY_NAME_COLUMN, holiday->label,
-                              ALEX_COLUMN, holiday->alex,
-                              HAVOC_COLUMN, holiday->havoc,
-                              TIM_COLUMN, holiday->tim,
-                              OWEN_COLUMN, holiday->owen,
-                              DAVE_COLUMN, holiday->dave,
-                              VISIBLE_COLUMN, TRUE,
-                              WORLD_COLUMN, holiday->world_holiday,
-                              -1);
+	  gtk_tree_store_append (model, &child_iter, &iter);
+	  gtk_tree_store_set (model, &child_iter,
+			      HOLIDAY_NAME_COLUMN, holiday->label,
+			      ALEX_COLUMN, holiday->alex,
+			      HAVOC_COLUMN, holiday->havoc,
+			      TIM_COLUMN, holiday->tim,
+			      OWEN_COLUMN, holiday->owen,
+			      DAVE_COLUMN, holiday->dave,
+			      VISIBLE_COLUMN, TRUE,
+			      WORLD_COLUMN, holiday->world_holiday,
+			      -1);

-          holiday++;
-        }
+	  holiday++;
+	}

      month++;
    }
@@ -224,8 +224,8 @@ create_model (void)

 static void
 item_toggled (GtkCellRendererToggle *cell,
-              gchar                 *path_str,
-              gpointer               data)
+	      gchar                 *path_str,
+	      gpointer               data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
@@ -245,7 +245,7 @@ item_toggled (GtkCellRendererToggle *cell,

  /* set new value */
  gtk_tree_store_set (GTK_TREE_STORE (model), &iter, column,
-                      toggle_item, -1);
+		      toggle_item, -1);

  /* clean up */
  gtk_tree_path_free (path);
@@ -264,10 +264,10 @@ add_columns (GtkTreeView *treeview)
  g_object_set (renderer, "xalign", 0.0, NULL);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Holiday",
-                                                            renderer, "text",
-                                                            HOLIDAY_NAME_COLUMN,
-                                                            NULL);
+							    -1, "Holiday",
+							    renderer, "text",
+							    HOLIDAY_NAME_COLUMN,
+							    NULL);
  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

@@ -279,18 +279,18 @@ add_columns (GtkTreeView *treeview)
  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Alex",
-                                                            renderer,
-                                                            "active",
-                                                            ALEX_COLUMN,
-                                                            "visible",
-                                                            VISIBLE_COLUMN,
-                                                            "activatable",
-                                                            WORLD_COLUMN, NULL);
+							    -1, "Alex",
+							    renderer,
+							    "active",
+							    ALEX_COLUMN,
+							    "visible",
+							    VISIBLE_COLUMN,
+							    "activatable",
+							    WORLD_COLUMN, NULL);

  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

@@ -302,17 +302,17 @@ add_columns (GtkTreeView *treeview)
  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Havoc",
-                                                            renderer,
-                                                            "active",
-                                                            HAVOC_COLUMN,
-                                                            "visible",
-                                                            VISIBLE_COLUMN,
-                                                            NULL);
+							    -1, "Havoc",
+							    renderer,
+							    "active",
+							    HAVOC_COLUMN,
+							    "visible",
+							    VISIBLE_COLUMN,
+							    NULL);

  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

@@ -324,18 +324,18 @@ add_columns (GtkTreeView *treeview)
  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Tim",
-                                                            renderer,
-                                                            "active",
-                                                            TIM_COLUMN,
-                                                            "visible",
-                                                            VISIBLE_COLUMN,
-                                                            "activatable",
-                                                            WORLD_COLUMN, NULL);
+							    -1, "Tim",
+							    renderer,
+							    "active",
+							    TIM_COLUMN,
+							    "visible",
+							    VISIBLE_COLUMN,
+							    "activatable",
+							    WORLD_COLUMN, NULL);

  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

@@ -347,17 +347,17 @@ add_columns (GtkTreeView *treeview)
  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Owen",
-                                                            renderer,
-                                                            "active",
-                                                            OWEN_COLUMN,
-                                                            "visible",
-                                                            VISIBLE_COLUMN,
-                                                            NULL);
+							    -1, "Owen",
+							    renderer,
+							    "active",
+							    OWEN_COLUMN,
+							    "visible",
+							    VISIBLE_COLUMN,
+							    NULL);

  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);

@@ -369,17 +369,17 @@ add_columns (GtkTreeView *treeview)
  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

  col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-                                                            -1, "Dave",
-                                                            renderer,
-                                                            "active",
-                                                            DAVE_COLUMN,
-                                                            "visible",
-                                                            VISIBLE_COLUMN,
-                                                            NULL);
+							    -1, "Dave",
+							    renderer,
+							    "active",
+							    DAVE_COLUMN,
+							    "visible",
+							    VISIBLE_COLUMN,
+							    NULL);

  column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1);
  gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
  gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
  gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
 }
@@ -397,25 +397,25 @@ do_tree_store (GtkWidget *do_widget)
      /* create window, etc */
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-                          FALSE, FALSE, 0);
+			  gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
+			  FALSE, FALSE, 0);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+					   GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_AUTOMATIC,
+				      GTK_POLICY_AUTOMATIC);
      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);

      /* create model */
@@ -426,7 +426,7 @@ do_tree_store (GtkWidget *do_widget)
      g_object_unref (model);
      gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
      gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
-                                   GTK_SELECTION_MULTIPLE);
+				   GTK_SELECTION_MULTIPLE);

      add_columns (GTK_TREE_VIEW (treeview));

@@ -434,7 +434,7 @@ do_tree_store (GtkWidget *do_widget)

      /* expand all rows after the treeview widget has been realized */
      g_signal_connect (treeview, "realize",
-                        G_CALLBACK (gtk_tree_view_expand_all), NULL);
+			G_CALLBACK (gtk_tree_view_expand_all), NULL);
      gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
    }

@@ -15,8 +15,8 @@ activate_action (GtkAction *action)
 static void
 activate_radio_action (GtkAction *action, GtkRadioAction *current)
 {
-  g_message ("Radio action \"%s\" selected",
-             gtk_action_get_name (GTK_ACTION (current)));
+  g_message ("Radio action \"%s\" selected", 
+	     gtk_action_get_name (GTK_ACTION (current)));
 }

 static GtkActionEntry entries[] = {
@@ -27,30 +27,30 @@ static GtkActionEntry entries[] = {
  { "HelpMenu", NULL, "_Help" },               /* name, stock id, label */
  { "New", GTK_STOCK_NEW,                      /* name, stock id */
    "_New", "<control>N",                      /* label, accelerator */
-    "Create a new file",                       /* tooltip */
-    G_CALLBACK (activate_action) },
+    "Create a new file",                       /* tooltip */ 
+    G_CALLBACK (activate_action) },      
  { "Open", GTK_STOCK_OPEN,                    /* name, stock id */
-    "_Open","<control>O",                      /* label, accelerator */
+    "_Open","<control>O",                      /* label, accelerator */     
    "Open a file",                             /* tooltip */
-    G_CALLBACK (activate_action) },
+    G_CALLBACK (activate_action) }, 
  { "Save", GTK_STOCK_SAVE,                    /* name, stock id */
-    "_Save","<control>S",                      /* label, accelerator */
+    "_Save","<control>S",                      /* label, accelerator */     
    "Save current file",                       /* tooltip */
    G_CALLBACK (activate_action) },
  { "SaveAs", GTK_STOCK_SAVE,                  /* name, stock id */
-    "Save _As...", NULL,                       /* label, accelerator */
+    "Save _As...", NULL,                       /* label, accelerator */     
    "Save to a file",                          /* tooltip */
    G_CALLBACK (activate_action) },
  { "Quit", GTK_STOCK_QUIT,                    /* name, stock id */
-    "_Quit", "<control>Q",                     /* label, accelerator */
+    "_Quit", "<control>Q",                     /* label, accelerator */     
    "Quit",                                    /* tooltip */
    G_CALLBACK (activate_action) },
  { "About", NULL,                             /* name, stock id */
-    "_About", "<control>A",                    /* label, accelerator */
-    "About",                                   /* tooltip */
+    "_About", "<control>A",                    /* label, accelerator */     
+    "About",                                   /* tooltip */  
    G_CALLBACK (activate_action) },
  { "Logo", "demo-gtk-logo",                   /* name, stock id */
-     NULL, NULL,                               /* label, accelerator */
+     NULL, NULL,                               /* label, accelerator */     
    "GTK+",                                    /* tooltip */
    G_CALLBACK (activate_action) },
 };
@@ -59,9 +59,9 @@ static guint n_entries = G_N_ELEMENTS (entries);

 static GtkToggleActionEntry toggle_entries[] = {
  { "Bold", GTK_STOCK_BOLD,                    /* name, stock id */
-     "_Bold", "<control>B",                    /* label, accelerator */
+     "_Bold", "<control>B",                    /* label, accelerator */     
    "Bold",                                    /* tooltip */
-    G_CALLBACK (activate_action),
+    G_CALLBACK (activate_action), 
    TRUE },                                    /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
@@ -74,13 +74,13 @@ enum {

 static GtkRadioActionEntry color_entries[] = {
  { "Red", NULL,                               /* name, stock id */
-    "_Red", "<control>R",                      /* label, accelerator */
+    "_Red", "<control>R",                      /* label, accelerator */     
    "Blood", COLOR_RED },                      /* tooltip, value */
  { "Green", NULL,                             /* name, stock id */
-    "_Green", "<control>G",                    /* label, accelerator */
+    "_Green", "<control>G",                    /* label, accelerator */     
    "Grass", COLOR_GREEN },                    /* tooltip, value */
  { "Blue", NULL,                              /* name, stock id */
-    "_Blue", "<control>B",                     /* label, accelerator */
+    "_Blue", "<control>B",                     /* label, accelerator */     
    "Sky", COLOR_BLUE },                       /* tooltip, value */
 };
 static guint n_color_entries = G_N_ELEMENTS (color_entries);
@@ -93,18 +93,18 @@ enum {

 static GtkRadioActionEntry shape_entries[] = {
  { "Square", NULL,                            /* name, stock id */
-    "_Square", "<control>S",                   /* label, accelerator */
+    "_Square", "<control>S",                   /* label, accelerator */     
    "Square",  SHAPE_SQUARE },                 /* tooltip, value */
  { "Rectangle", NULL,                         /* name, stock id */
-    "_Rectangle", "<control>R",                /* label, accelerator */
+    "_Rectangle", "<control>R",                /* label, accelerator */     
    "Rectangle", SHAPE_RECTANGLE },            /* tooltip, value */
  { "Oval", NULL,                              /* name, stock id */
-    "_Oval", "<control>O",                     /* label, accelerator */
-    "Egg", SHAPE_OVAL },                       /* tooltip, value */
+    "_Oval", "<control>O",                     /* label, accelerator */     
+    "Egg", SHAPE_OVAL },                       /* tooltip, value */  
 };
 static guint n_shape_entries = G_N_ELEMENTS (shape_entries);

-static const gchar *ui_info =
+static const gchar *ui_info = 
 "<ui>"
 "  <menubar name='MenuBar'>"
 "    <menu action='FileMenu'>"
@@ -117,9 +117,9 @@ static const gchar *ui_info =
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
 "      <menu action='ColorMenu'>"
-"       <menuitem action='Red'/>"
-"       <menuitem action='Green'/>"
-"       <menuitem action='Blue'/>"
+"	<menuitem action='Red'/>"
+"	<menuitem action='Green'/>"
+"	<menuitem action='Blue'/>"
 "      </menu>"
 "      <menu action='ShapeMenu'>"
 "        <menuitem action='Square'/>"
@@ -144,7 +144,7 @@ GtkWidget *
 do_ui_manager (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-
+  
  if (!window)
    {
      GtkWidget *box1;
@@ -158,49 +158,50 @@ do_ui_manager (GtkWidget *do_widget)

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-
+			     gtk_widget_get_screen (do_widget));
+      
      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (gtk_true), NULL);
+			G_CALLBACK (gtk_true), NULL);

      actions = gtk_action_group_new ("Actions");
      gtk_action_group_add_actions (actions, entries, n_entries, NULL);
-      gtk_action_group_add_toggle_actions (actions,
-                                           toggle_entries, n_toggle_entries,
-                                           NULL);
-      gtk_action_group_add_radio_actions (actions,
-                                          color_entries, n_color_entries,
-                                          COLOR_RED,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
-      gtk_action_group_add_radio_actions (actions,
-                                          shape_entries, n_shape_entries,
-                                          SHAPE_OVAL,
-                                          G_CALLBACK (activate_radio_action),
-                                          NULL);
+      gtk_action_group_add_toggle_actions (actions, 
+					   toggle_entries, n_toggle_entries, 
+					   NULL);
+      gtk_action_group_add_radio_actions (actions, 
+					  color_entries, n_color_entries, 
+					  COLOR_RED,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);
+      gtk_action_group_add_radio_actions (actions, 
+					  shape_entries, n_shape_entries, 
+					  SHAPE_OVAL,
+					  G_CALLBACK (activate_radio_action), 
+					  NULL);

      ui = gtk_ui_manager_new ();
      gtk_ui_manager_insert_action_group (ui, actions, 0);
      g_object_unref (actions);
-      gtk_window_add_accel_group (GTK_WINDOW (window),
-                                  gtk_ui_manager_get_accel_group (ui));
+      gtk_window_add_accel_group (GTK_WINDOW (window), 
+				  gtk_ui_manager_get_accel_group (ui));
      gtk_window_set_title (GTK_WINDOW (window), "UI Manager");
      gtk_container_set_border_width (GTK_CONTAINER (window), 0);

+      
      if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error))
-        {
-          g_message ("building menus failed: %s", error->message);
-          g_error_free (error);
-        }
+	{
+	  g_message ("building menus failed: %s", error->message);
+	  g_error_free (error);
+	}

      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_container_add (GTK_CONTAINER (window), box1);
-
+      
      gtk_box_pack_start (GTK_BOX (box1),
-                          gtk_ui_manager_get_widget (ui, "/MenuBar"),
-                          FALSE, FALSE, 0);
+			  gtk_ui_manager_get_widget (ui, "/MenuBar"),
+			  FALSE, FALSE, 0);

      label = gtk_label_new ("Type\n<alt>\nto start");
      gtk_widget_set_size_request (label, 200, 200);
@@ -208,16 +209,18 @@ do_ui_manager (GtkWidget *do_widget)
      gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);

+
      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);

+
      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
      gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);

      button = gtk_button_new_with_label ("close");
      g_signal_connect_swapped (button, "clicked",
-                                G_CALLBACK (gtk_widget_destroy), window);
+				G_CALLBACK (gtk_widget_destroy), window);
      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
      gtk_widget_set_can_default (button, TRUE);
      gtk_widget_grab_default (button);
@@ -1,31 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-bin_PROGRAMS = gtk3-widget-factory
-
-gtk3_widget_factory_SOURCES = \
-	widget-factory.c	\
-	widget_factory_resources.c
-
-BUILT_SOURCES = \
-	widget_factory_resources.c
-
-gtk3_widget_factory_DEPENDENCIES = \
-	$(top_builddir)/gtk/libgtk-3.la
-
-gtk3_widget_factory_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-gtk3_widget_factory_LDADD = \
-	$(top_builddir)/gdk/libgdk-3.la \
-	$(top_builddir)/gtk/libgtk-3.la \
-	$(GTK_DEP_LIBS)
-
-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 += \
-	widget-factory.ui \
-	widget-factory.gresource.xml \
-	gtk-logo-256.png
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/logos">
-    <file>gtk-logo-256.png</file>
-  </gresource>
-  <gresource prefix="/ui">
-    <file preprocess="xml-stripblanks">widget-factory.ui</file>
-  </gresource>
-</gresources>
@@ -9,11 +9,10 @@ DOC_MODULE=gdk3
 DOC_MAIN_SGML_FILE=gdk-docs.sgml

 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards=GDK_DISABLE_DEPRECATED \
-             --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
+SCAN_OPTIONS=--deprecated-guards="GDK_ENABLE_BROKEN|GDK_DISABLE_DEPRECATED"

 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gdk $(top_srcdir)/gdk/x11
+DOC_SOURCE_DIR=../../../gdk ../../../gdk/x11

 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gdk/*.h $(top_srcdir)/gdk/x11/gdkx.h
@@ -33,7 +33,6 @@
    <xi:include href="xml/windows.xml" />
    <xi:include href="xml/events.xml" />
    <xi:include href="xml/event_structs.xml" />
-    <xi:include href="xml/touchcluster.xml" />
    <xi:include href="xml/keys.xml" />
    <xi:include href="xml/selections.xml" />
    <xi:include href="xml/dnd.xml" />
@@ -62,10 +61,6 @@
    <title>Index of new symbols in 3.2</title>
    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-4" role="3.4">
-    <title>Index of new symbols in 3.4</title>
-    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

@@ -74,7 +74,6 @@ gdk_grab_status_get_type
 gdk_gravity_get_type
 gdk_input_mode_get_type
 gdk_input_source_get_type
-gdk_modifier_intent_get_type
 gdk_modifier_type_get_type
 gdk_notify_type_get_type
 gdk_property_state_get_type
@@ -199,7 +198,6 @@ gdk_screen_make_display_name
 gdk_screen_get_n_monitors
 gdk_screen_get_primary_monitor
 gdk_screen_get_monitor_geometry
-gdk_screen_get_monitor_workarea
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
 gdk_screen_get_monitor_height_mm
@@ -367,9 +365,7 @@ gdk_window_restack
 gdk_window_focus
 gdk_window_register_dnd
 gdk_window_begin_resize_drag
-gdk_window_begin_resize_drag_for_device
 gdk_window_begin_move_drag
-gdk_window_begin_move_drag_for_device
 gdk_window_constrain_size
 gdk_window_beep

@@ -633,7 +629,6 @@ gdk_keymap_get_caps_lock_state
 gdk_keymap_get_num_lock_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
-gdk_keymap_get_modifier_mask

 <SUBSECTION>
 gdk_keyval_name
@@ -757,11 +752,6 @@ GdkEventMask
 GDK_CURRENT_TIME
 GDK_PRIORITY_EVENTS
 GDK_PRIORITY_REDRAW
-GDK_EVENT_PROPAGATE
-GDK_EVENT_STOP
-GDK_BUTTON_PRIMARY
-GDK_BUTTON_MIDDLE
-GDK_BUTTON_SECONDARY

 <SUBSECTION>
 gdk_events_pending
@@ -781,13 +771,10 @@ gdk_event_get_root_coords
 gdk_event_get_scroll_direction
 gdk_event_get_state
 gdk_event_get_time
-gdk_event_get_touch_id
 gdk_event_request_motions
 gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
-gdk_event_triggers_context_menu
-gdk_event_get_touch_id

 <SUBSECTION>
 gdk_event_handler_set
@@ -835,7 +822,6 @@ GdkEventWindowState
 GdkEventSetting
 GdkEventOwnerChange
 GdkEventGrabBroken
-GdkEventMultiTouch

 <SUBSECTION>
 GdkScrollDirection
@@ -863,29 +849,6 @@ gdk_event_get_type
 gdk_owner_change_get_type
 </SECTION>

-<SECTION>
-<TITLE>Multitouch</TITLE>
-<FILE>touchcluster</FILE>
-GdkTouchCluster
-gdk_touch_cluster_add_touch
-gdk_touch_cluster_remove_touch
-gdk_touch_cluster_remove_all
-gdk_touch_cluster_set_device
-gdk_touch_cluster_get_device
-gdk_touch_cluster_get_touches
-
-<SUBSECTION>
-gdk_window_create_touch_cluster
-gdk_window_remove_touch_cluster
-
-<SUBSECTION Standard>
-GDK_TYPE_TOUCH_CLUSTER
-
-<SUBSECTION Private>
-gdk_touch_cluster_get_type
-</SECTION>
-
-
 <SECTION>
 <TITLE>Cursors</TITLE>
 <FILE>cursors</FILE>
@@ -993,7 +956,6 @@ gdk_x11_screen_supports_net_wm_hint
 gdk_x11_window_foreign_new_for_display
 gdk_x11_window_lookup_for_display
 gdk_x11_window_get_xid
-gdk_x11_window_set_hide_titlebar_when_maximized
 gdk_x11_window_set_theme_variant
 gdk_x11_window_set_user_time
 gdk_x11_window_move_to_current_desktop
@@ -1020,98 +982,6 @@ gdk_x11_display_string_to_compound_text
 gdk_x11_display_utf8_to_compound_text
 gdk_x11_free_compound_text

-<SUBSECTION Standard>
-GDK_TYPE_X11_APP_LAUNCH_CONTEXT
-GDK_X11_APP_LAUNCH_CONTEXT
-GDK_X11_APP_LAUNCH_CONTEXT_CLASS
-GDK_IS_X11_APP_LAUNCH_CONTEXT
-GDK_IS_X11_APP_LAUNCH_CONTEXT_CLASS
-GDK_X11_APP_LAUNCH_CONTEXT_GET_CLASS
-GDK_TYPE_X11_CURSOR
-GDK_X11_CURSOR
-GDK_X11_CURSOR_CLASS
-GDK_IS_X11_CURSOR
-GDK_IS_X11_CURSOR_CLASS
-GDK_X11_CURSOR_GET_CLASS
-GDK_TYPE_X11_DEVICE_CORE
-GDK_X11_DEVICE_CORE
-GDK_X11_DEVICE_CORE_CLASS
-GDK_IS_X11_DEVICE_CORE
-GDK_IS_X11_DEVICE_CORE_CLASS
-GDK_X11_DEVICE_CORE_GET_CLASS
-GDK_TYPE_X11_DEVICE_MANAGER_CORE
-GDK_X11_DEVICE_MANAGER_CORE
-GDK_X11_DEVICE_MANAGER_CORE_CLASS
-GDK_IS_X11_DEVICE_MANAGER_CORE
-GDK_IS_X11_DEVICE_MANAGER_CORE_CLASS
-GDK_X11_DEVICE_MANAGER_CORE_GET_CLASS
-GDK_TYPE_X11_DEVICE_MANAGER_XI2
-GDK_X11_DEVICE_MANAGER_XI2
-GDK_X11_DEVICE_MANAGER_XI2_CLASS
-GDK_IS_X11_DEVICE_MANAGER_XI2
-GDK_IS_X11_DEVICE_MANAGER_XI2_CLASS
-GDK_X11_DEVICE_MANAGER_XI2_GET_CLASS
-GDK_TYPE_X11_DEVICE_MANAGER_XI
-GDK_X11_DEVICE_MANAGER_XI
-GDK_X11_DEVICE_MANAGER_XI_CLASS
-GDK_IS_X11_DEVICE_MANAGER_XI
-GDK_IS_X11_DEVICE_MANAGER_XI_CLASS
-GDK_X11_DEVICE_MANAGER_XI_GET_CLASS
-GDK_TYPE_X11_DEVICE_XI2
-GDK_X11_DEVICE_XI2
-GDK_X11_DEVICE_XI2_CLASS
-GDK_IS_X11_DEVICE_XI2
-GDK_IS_X11_DEVICE_XI2_CLASS
-GDK_X11_DEVICE_XI2_GET_CLASS
-GDK_TYPE_X11_DEVICE_XI
-GDK_X11_DEVICE_XI
-GDK_X11_DEVICE_XI_CLASS
-GDK_IS_X11_DEVICE_XI
-GDK_IS_X11_DEVICE_XI_CLASS
-GDK_X11_DEVICE_XI_GET_CLASS
-GDK_TYPE_X11_DISPLAY
-GDK_X11_DISPLAY
-GDK_X11_DISPLAY_CLASS
-GDK_IS_X11_DISPLAY
-GDK_IS_X11_DISPLAY_CLASS
-GDK_X11_DISPLAY_GET_CLASS
-GDK_TYPE_X11_DISPLAY_MANAGER
-GDK_X11_DISPLAY_MANAGER
-GDK_X11_DISPLAY_MANAGER_CLASS
-GDK_IS_X11_DISPLAY_MANAGER
-GDK_IS_X11_DISPLAY_MANAGER_CLASS
-GDK_X11_DISPLAY_MANAGER_GET_CLASS
-GDK_TYPE_X11_DRAG_CONTEXT
-GDK_X11_DRAG_CONTEXT
-GDK_X11_DRAG_CONTEXT_CLASS
-GDK_IS_X11_DRAG_CONTEXT
-GDK_IS_X11_DRAG_CONTEXT_CLASS
-GDK_X11_DRAG_CONTEXT_GET_CLASS
-GDK_TYPE_X11_KEYMAP
-GDK_X11_KEYMAP
-GDK_X11_KEYMAP_CLASS
-GDK_IS_X11_KEYMAP
-GDK_IS_X11_KEYMAP_CLASS
-GDK_X11_KEYMAP_GET_CLASS
-GDK_TYPE_X11_SCREEN
-GDK_X11_SCREEN
-GDK_X11_SCREEN_CLASS
-GDK_IS_X11_SCREEN
-GDK_IS_X11_SCREEN_CLASS
-GDK_X11_SCREEN_GET_CLASS
-GDK_TYPE_X11_VISUAL
-GDK_X11_VISUAL
-GDK_X11_VISUAL_CLASS
-GDK_IS_X11_VISUAL
-GDK_IS_X11_VISUAL_CLASS
-GDK_X11_VISUAL_GET_CLASS
-GDK_TYPE_X11_WINDOW
-GDK_X11_WINDOW
-GDK_X11_WINDOW_CLASS
-GDK_IS_X11_WINDOW
-GDK_IS_X11_WINDOW_CLASS
-GDK_X11_WINDOW_GET_CLASS
-
 <SUBSECTION Private>
 gdk_x11_app_launch_context_get_type
 gdk_x11_cursor_get_type
@@ -9,6 +9,5 @@ gdk_display_manager_get_type
 gdk_drag_context_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
-gdk_touch_cluster_get_type
 gdk_visual_get_type
 gdk_window_get_type
@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=gtk-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"

 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=$(top_srcdir)/gtk
+DOC_SOURCE_DIR=../../../gtk

 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gtk/*.h
@@ -119,13 +119,11 @@ content_files =					\
 	running.sgml				\
 	building.sgml				\
 	compiling.sgml				\
-	device-interaction-patterns.xml		\
 	drawing-model.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-unique-GtkApplication.xml	\
-	migrating-smclient-GtkApplication.xml	\
+	migrating-GtkApplication.xml		\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	objects_grouped.sgml			\
@@ -143,14 +141,12 @@ content_files =					\
 	overview.xml

 expand_content_files = 				\
-	device-interaction-patterns.xml		\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
 	migrating-2to3.xml			\
 	migrating-checklist.sgml		\
-	migrating-unique-GtkApplication.xml	\
-	migrating-smclient-GtkApplication.xml	\
+	migrating-GtkApplication.xml		\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
 	question_index.sgml			\
@@ -289,7 +285,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
 	$(srcdir)/images/colorsel.png					\
-	$(srcdir)/images/colorchooser.png				\
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
 	$(srcdir)/images/entry.png					\
@@ -299,7 +294,6 @@ HTML_IMAGES = \
 	$(srcdir)/images/filechooser.png				\
 	$(srcdir)/images/font-button.png				\
 	$(srcdir)/images/fontsel.png					\
-	$(srcdir)/images/fontchooser.png				\
 	$(srcdir)/images/frame.png					\
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
@@ -371,10 +365,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/handles.png					\
 	$(srcdir)/images/extensions.png					\
 	$(srcdir)/images/numerableicon.png				\
-	$(srcdir)/images/numerableicon2.png				\
-	$(srcdir)/images/bloatpad-osx.png				\
-	$(srcdir)/images/bloatpad-gnome.png				\
-	$(srcdir)/images/bloatpad-xfce.png
+	$(srcdir)/images/numerableicon2.png

 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
@@ -47,20 +47,9 @@ $ cc `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </para>

 <para>
-Deprecated GTK+ functions are annotated to make the compiler
-emit warnings when they are used (e.g. with gcc, you need to use
-the -Wdeprecated-declarations option). If these warnings are
-problematic, they can be turned off by defining the preprocessor
-symbol GDK_DISABLE_DEPRECATION_WARNINGS by using the commandline
-option <literal>-DGDK_DISABLE_DEPRECATION_WARNINGS</literal>
-</para>
-
-<para>
-The older deprecation mechanism of hiding deprecated interfaces
-entirely from the compiler by using the preprocessor symbol
-GTK_DISABLE_DEPRECATED is still used for deprecated macros,
-enumeration values, etc. To detect uses of these in your code,
-use the commandline option <literal>-DGTK_DISABLE_DEPRECATED</literal>.
+If you want to make sure that your program doesn't use any deprecated
+functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED
+by using the command line option <literal>-DGTK_DISABLE_DEPRECATED=1</literal>.
 There are similar symbols GDK_DISABLE_DEPRECATED,
 GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
 GLib.
@@ -1,578 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-]>
-<chapter id="gtk-device-interaction-patterns">
-  <title>Multitouch and other device interaction patterns</title>
-
-  <para>
-    Depending on the platform, GTK+ is able to handle a wide range of input
-    devices. Those are offered to applications in a 2-level hierarchy, with
-    virtual devices (or master devices) representing the visual cursors
-    displayed in the screen, which are each controlled by a number of physical
-    devices (or slave devices). Those devices can respectively be retrieved
-    from an input event with gdk_event_get_device() and
-    gdk_event_get_source_device().
-  </para>
-
-  <para>
-    In X11, GTK+ uses XInput2 for input events, which caters for a fully dynamic
-    device hierarchy, and support for multiple virtual pointer/keyboard pairs.
-  </para>
-
-  <example>
-    <title>Listing and modifying the device hierarchy</title>
-    <programlisting>
-      carlos@sacarino:~$ xinput list
-      ⎡ Virtual core pointer                          id=2    [master pointer  (3)]
-      ⎜   ↳ Virtual core XTEST pointer                id=4    [slave  pointer  (2)]
-      ⎜   ↳ Wacom ISDv4 E6 Pen stylus                 id=10   [slave  pointer  (2)]
-      ⎜   ↳ Wacom ISDv4 E6 Finger touch               id=11   [slave  pointer  (2)]
-      ⎜   ↳ SynPS/2 Synaptics TouchPad                id=13   [slave  pointer  (2)]
-      ⎜   ↳ TPPS/2 IBM TrackPoint                     id=14   [slave  pointer  (2)]
-      ⎜   ↳ Wacom ISDv4 E6 Pen eraser                 id=16   [slave  pointer  (2)]
-      ⎣ Virtual core keyboard                         id=3    [master keyboard (2)]
-          ↳ Virtual core XTEST keyboard               id=5    [slave  keyboard (3)]
-          ↳ Power Button                              id=6    [slave  keyboard (3)]
-          ↳ Video Bus                                 id=7    [slave  keyboard (3)]
-          ↳ Sleep Button                              id=8    [slave  keyboard (3)]
-          ↳ Integrated Camera                         id=9    [slave  keyboard (3)]
-          ↳ AT Translated Set 2 keyboard              id=12   [slave  keyboard (3)]
-          ↳ ThinkPad Extra Buttons                    id=15   [slave  keyboard (3)]
-
-      carlos@sacarino:~$ xinput create-master eek
-      carlos@sacarino:~$ xinput list
-      ...
-      ⎡ eek pointer                                   id=17   [master pointer  (18)]
-      ⎜   ↳ eek XTEST pointer                         id=19   [slave  pointer  (17)]
-      ⎣ eek keyboard                                  id=18   [master keyboard (17)]
-          ↳ eek XTEST keyboard                        id=20   [slave  keyboard (18)]
-
-      carlos@sacarino:~$ xinput reattach 10 17
-      carlos@sacarino:~$ xinput list
-      ...
-      ⎡ eek pointer                                   id=17   [master pointer  (18)]
-      ⎜   ↳ Wacom ISDv4 E6 Pen stylus                 id=10   [slave  pointer  (17)]
-      ⎜   ↳ eek XTEST pointer                         id=19   [slave  pointer  (17)]
-      ⎣ eek keyboard                                  id=18   [master keyboard (17)]
-          ↳ eek XTEST keyboard                        id=20   [slave  keyboard (18)]
-    </programlisting>
-  </example>
-
-  <para>
-    Anytime a virtual device is added or removed, or a physical device
-    is attached to another virtual device, or left floating (detached
-    from any virtual device), #GdkDeviceManager will emit the corresponding
-    #GdkDeviceManager::device-added, #GdkDeviceManager::device-removed, or
-    #GdkDeviceManager::device-changed signals.
-  </para>
-
-  <section id="gtk-device-patterns-client-pointer">
-    <title>The client pointer</title>
-
-    <para>
-      In X11, Under the presence of multiple virtual pointers, GDK and XInput2
-      use the "client pointer" principle to allow several legacy applications
-      to interact simultaneously with different virtual pointer/keyboard pairs,
-      it would be usually set by the window manager for a focused window, so
-      different application windows could operate on different client pointers.
-      gdk_device_manager_get_client_pointer() may be called to get the client
-      pointer #GdkDevice
-    </para>
-
-    <para>
-      Under the hood, X11 uses the client pointer (or its paired keyboard) to
-      satisfy core calls such as XGrabPointer/Keyboard, XQueryPointer and
-      others that have been superseded by XInput2.
-    </para>
-
-    <para>
-      In platforms without multidevice features, gdk_device_manager_get_client_pointer()
-      will return the only virtual pointer available.
-    </para>
-  </section>
-
-  <section id="gtk-device-patterns-simple">
-    <title>Simple device handling</title>
-
-    <para>
-      There are applications that could have little gain in knowing about
-      multiple devices, although there are situations where a device could
-      be needed (i.e. popping up a menu on the pointer coordinates).
-    </para>
-
-    <para>
-      For such applications, the client pointer may be a good enough
-      approximation for these operations. Under the presence of multiple
-      device pairs, this gives a behavior that is most similar to that
-      of legacy applications (i.e. gtk+2).
-    </para>
-
-    <example>
-      <title>Getting the client pointer and keyboard</title>
-      <programlisting>
-        GdkDisplay *display;
-        GdkDeviceManager *device_manager;
-        GdkDevice *client_pointer, client_keyboard;
-
-        display = gdk_display_get_default ();
-        device_manager = gdk_display_get_device_manager (display);
-        client_pointer = gdk_device_manager_get_client_pointer (device_manager);
-
-        /* Or if we need a keyboard too */
-        client_keyboard = gdk_device_get_associated_device (client_pointer);
-      </programlisting>
-    </example>
-  </section>
-
-  <section id="gtk-device-patterns-multiple-devices">
-    <title>Dealing with multiple devices</title>
-
-    <para>
-      There may be several usecases to deal with multiple devices, including,
-      but not limited to:
-    </para>
-
-    <orderedlist>
-      <listitem>
-        Retrieving advanced information from an input device: i.e. stylus pressure/tilt
-        in drawing applications.
-      </listitem>
-      <listitem>
-        Receiving events from a dedicated input device: i.e. joysticks in games.
-      </listitem>
-      <listitem>
-        Collaborative interfaces, handling simultaneous input from multiple users.
-      </listitem>
-    </orderedlist>
-
-    <para>
-      However, the patterns to make them work are very similar.
-    </para>
-
-    <section>
-      <title>Event handling</title>
-
-      <para>
-        Each device will emit its own event stream, this means
-        that you will need to check the GdkEvent you get in
-        your event handlers
-      </para>
-
-      <example>
-        <title>Reacting differently to devices</title>
-        <programlisting>
-          static gboolean
-          my_widget_motion_notify (GtkWidget      *widget,
-                                   GdkEventMotion *event)
-          {
-            GdkDevice *device, *source_device;
-
-            device = gdk_event_get_device ((GdkEvent *) event);
-            source_device = gdk_event_get_source_device ((GdkEvent *) event);
-
-            g_print ("Motion event by '%s', coming from HW device '%s'\n",
-                     gdk_device_get_name (device),
-                     gdk_device_get_name (source_device));
-
-            /* Handle touch devices differently */
-            if (gdk_device_get_source (source_device) == GDK_SOURCE_TOUCH)
-              {
-                ...
-              }
-            else
-              {
-                ...
-              }
-            return TRUE;
-          }
-        </programlisting>
-      </example>
-
-      <para>
-        The mechanism above could also be used for fine grained event discarding
-        (i.e. so rubberband selection doesn't jump to another pointer entering
-        the widget for example)
-      </para>
-
-      <example>
-        <title>Reacting differently to devices</title>
-        <programlisting>
-          static gboolean
-          my_widget_button_press (Gtkwidget      *widget,
-                                  GdkEventButton *event)
-          {
-            GET_PRIV(widget)->current_pointer = gdk_event_get_device ((GdkEvent *) event);
-            ...
-          }
-
-          static gboolean
-          my_widget_button_release (Gtkwidget      *widget,
-                                    GdkEventButton *event)
-          {
-            GET_PRIV(widget)->current_pointer = NULL;
-            ...
-          }
-
-          static gboolean
-          my_widget_motion_notify (Gtkwidget      *widget,
-                                   GdkEventMotion *event)
-          {
-            if (gdk_event_get_device (event) !=
-                GET_PRIV(widget)->current_pointer)
-              return FALSE;
-
-            ...
-          }
-        </programlisting>
-      </example>
-    </section>
-
-    <section>
-      <title>Grabs</title>
-
-      <para>
-        Grabs are a mechanism to coerce a device into sending events to
-        a window, but with multidevice there's an other side of the coin,
-        how other devices are supposed to interact while the grab is in
-        effect.
-      </para>
-
-      <para>
-        The GdkGrabOwnership enum passed to gdk_device_grab() may be used
-        to block other devices' interaction. %GDK_OWNERSHIP_NONE applies
-        no restrictions, allowing other devices to interact, even with
-        the grab window. %GDK_OWNERSHIP_WINDOW blocks other devices from
-        interacting with the grab window, but they'll still be able to
-        interact with the rest of the application, whereas
-        %GDK_OWNERSHIP_APPLICATION will render the whole application
-        insensitive to input from other devices. Different devices may
-        have simultaneous grabs on the same or different windows.
-      </para>
-
-      <example>
-        <title>Grabbing as a result of an input event</title>
-        <programlisting>
-          gboolean
-          my_widget_button_press (GtkWidget      *widget,
-                                  GdkEventButton *event)
-          {
-            GdkDevice *pointer, *keyboard;
-
-            pointer = gdk_event_get_device ((GdkEvent *) event);
-            keyboard = gdk_device_get_associated_device (pointer);
-
-            /* Grab both keyboard/pointer, other devices will be
-             * unable to interact with the widget window meanwhile
-             */
-            gdk_device_grab (pointer,
-                             gtk_widget_get_window (widget),
-                             GDK_OWNERSHIP_WINDOW,
-                             ...);
-            gdk_device_grab (keyboard,
-                             gtk_widget_get_window (widget),
-                             GDK_OWNERSHIP_WINDOW,
-                             ...);
-
-            return FALSE;
-          }
-        </programlisting>
-      </example>
-
-      <para>
-        For GTK+ grabs, there's only a boolean value, equivalent to
-        %GDK_OWNERSHIP_NONE and %GDK_OWNERSHIP_WINDOW, but the mechanism
-        is quite similar.
-      </para>
-
-      <para>
-        Once the device is grabbed, there may be different situations
-        that could break the grabs, so the widget needs to listen to
-        #GdkGrabBrokenEvent and the #GtkWidget::grab-notify signal to
-        handle these situations.
-      </para>
-
-      <example>
-        <title>Handling broken grabs</title>
-        <programlisting>
-          static gboolean
-          my_widget_grab_broken (GtkWidget          *widget,
-                                 GdkEventGrabBroken *event)
-          {
-            MyWidgetPrivate *priv = GET_PRIV (widget);
-
-            if (gdk_event_get_device (event) == priv->grab_pointer)
-              {
-                /* Undo state */
-                ...
-                priv->grab_pointer = NULL;
-                return TRUE;
-              }
-
-            return FALSE;
-          }
-
-          static void
-          my_widget_grab_notify (GtkWidget *widget,
-                                 gboolean   was_grabbed)
-          {
-            MyWidgetPrivate *priv = GET_PRIV (widget);
-
-            if (gtk_widget_device_is_shadowed (widget, priv->grab_device))
-              {
-                /* Device was "shadowed" by another widget's grab,
-                 * release and undo state
-                 */
-                ...
-                priv->grab_pointer = NULL;
-              }
-          }
-        </programlisting>
-      </example>
-    </section>
-
-    <section>
-      <title>Handling multipointer</title>
-
-      <para>
-        Widgets do react by default to every virtual device, although
-        by default they are set in a compatibility mode that makes them
-        behave better with multiple pointers, without necessarily
-        being multipointer aware.
-      </para>
-
-      <para>
-        This compatibility mode most notably disables per-device
-        enter/leave events, so these are stacked, and the crossing
-        events are only emitted when the first pointer enters the
-        window, and after the last pointer leaves it. This behavior
-        is controlled through gtk_widget_set_support_multidevice()
-      </para>
-    </section>
-
-    <section>
-      <title>Reading device axis values</title>
-
-      <para>
-        Button and motion events provide further information about
-        the device axes' current state. Note the device axes are
-        hardware and driver dependent, therefore the set of axes
-        is not set in stone, although there are a few more common ones.
-      </para>
-
-      <example>
-        <title>Getting to know the axes provided by a device</title>
-        <programlisting>
-          carlos@sacarino:~$ xinput list "Wacom ISDv4 E6 Pen stylus"  |grep "Label"
-                          Label: Abs X
-                          Label: Abs Y
-                          Label: Abs Pressure
-                          Label: Abs Tilt X
-                          Label: Abs Tilt Y
-                          Label: Abs Wheel
-        </programlisting>
-      </example>
-
-      <example>
-        <title>Getting an axis value</title>
-        <programlisting>
-          gboolean
-          my_widget_motion_notify (GtkWidget      *widget,
-                                   GdkEventMotion *event)
-          {
-            GdkAtom *label_atom;
-            gdouble pressure;
-
-            label_atom = gdk_atom_intern_static_string ("Abs Pressure");
-            gdk_device_get_axis_value (gdk_event_get_device ((GdkEvent *) event),
-                                       event->axes, label_atom, &amp;pressure);
-
-            /* Do something with pressure */
-            ...
-
-            return TRUE;
-          }
-        </programlisting>
-      </example>
-
-      <para>
-        All pointer devices report axes information, master and slave. to
-        achieve this, master pointers modify their list of axes at runtime
-        to reflect those of the currently routed slave, emitting
-        #GdkDevice::changed as the routed slave device changes.
-      </para>
-    </section>
-
-    <section>
-      <title>Dealing with slave (or floating) devices</title>
-
-      <para>
-        By default, GTK+ listens to all master devices, and typically
-        all slave devices will be attached to a master device. so
-        gdk_event_get_source_device() is the recommended way to deal
-        with the physical device triggering the event.
-      </para>
-
-      <para>
-        In more specialized setups, some devices could be floating
-        (i.e. tablets that don't route events through any virtual
-        pointer, but are expected to interact with drawing applications).
-        In that case, such specialized applications could want to interact
-        directly with the device. To do so, the device must be enabled,
-        and the widget wanting its events needs to add the event mask.
-      </para>
-
-      <example>
-        <title>Enabling events for a slave device</title>
-        <programlisting>
-          GdkDevice *device;
-
-          /* Gets the first device found with the given GdkInputSource */
-          device = get_device (gtk_widget_get_display (widget),
-                               GDK_SOURCE_PEN);
-          gdk_device_set_mode (device, GDK_MODE_SCREEN);
-          gtk_widget_add_device_events (widget, device,
-                                        GDK_BUTTON_PRESS_MASK |
-                                        GDK_BUTTON_RELEASE_MASK |
-                                        GDK_POINTER_MOTION_MASK);
-        </programlisting>
-      </example>
-
-      <para>
-        After these calls, the widget would specifically receive events
-        from the physical device, regardless of it being floating or
-        connected to a master device. In this second case, and if you
-        want exclusive control of the device, you can temporarily detach
-        the stylus device from its master by doing a GDK grab on it.
-      </para>
-
-      <para>
-        For events coming directly from slave devices, both
-        gdk_event_get_device() and gdk_event_get_source_device() will
-        return the same device of type %GDK_DEVICE_TYPE_SLAVE or
-        %GDK_DEVICE_TYPE_FLOATING.
-      </para>
-
-      <note>
-        This is less useful than it used to be in GTK+2/XInput1, at least
-        for attached slaves, as there is gdk_event_get_source_device(),
-        and master devices' events provide axes information.
-      </note>
-    </section>
-  </section>
-
-  <section id="gtk-device-patterns-multitouch-widgets">
-    <title>Multitouch in GTK+ widgets</title>
-
-    <para>
-      Since version 3.4, GTK+ offers support for multitouch devices through a new
-      set of events and higher level tools like #GdkTouchCluster and
-      #GtkGesturesInterpreter.
-    </para>
-
-    <para>
-      If the widget does not have %GDK_TOUCH_MASK set in the event mask, it will
-      only be allowed to interact with the touch emulating pointer events, and will
-      only receive pointer events.
-    </para>
-
-    <para>
-      If the widget does have %GDK_TOUCH_MASK enabled, it will be able to receive
-      events of type %GDK_TOUCH_PRESS, %GDK_TOUCH_RELEASE and %GDK_TOUCH_MOTION,
-      which will be respectively emitted through the #GtkWidget::button-press-event,
-      #GtkWidget::button-release-event and #GtkWidget::motion-notify-event signals.
-      There may be multiple, simultaneous sequences of events, those will be
-      recognized and referenced by their touch ID. See gdk_event_get_touch_id().
-    </para>
-
-    <para>
-      #GtkWidget<!-- -->s may create GdkTouchCluster<!-- -->s via
-      gdk_window_create_touch_cluster(), those may be used to group
-      touch events together, which are notified through #GdkEventMultitouch,
-      this event will be emitted in #GtkWidget<!-- -->s through the
-      #GtkWidget::multitouch-event signal.
-    </para>
-
-    <para>
-      Widgets may also handle gestures being performed on them,
-      gtk_widget_enable_gesture() and gtk_widget_disable_gesture() are
-      provided as a simple API, although widgets may also create a
-      #GtkGesturesInterpreter and feed it events directly.
-    </para>
-  </section>
-
-  <section id="gtk-device-patterns-multitouch">
-    <title>Multitouch across a widget hierarchy</title>
-
-    <para>
-      Fully touch driven applications might not want to confine multitouch
-      operations within a single widget, but rather offer simultaneous
-      interaction with multiple widgets.
-    </para>
-    <para>
-      GTK+ is able to provide such experience, although it does not enable
-      %GDK_TOUCH_MASK by default on its stock widgets. If a widget meets the
-      following requirements, it is ready to be used in a multitouch UI:
-    </para>
-
-    <orderedlist>
-      <listitem>
-        The widget handles #GtkWidget::button-press-event, #GtkWidget::button-release-event
-        and #GtkWidget::motion-notify-event, and does something meaningful while the button 1
-        is pressed. If any explicit check on the event type being %GDK_BUTTON_PRESS,
-        %GDK_BUTTON_RELEASE or %GDK_MOTION_NOTIFY is performed, the event types
-        %GDK_TOUCH_PRESS, %GDK_TOUCH_RELEASE or %GDK_TOUCH_MOTION also need to be handled.
-      </listitem>
-      <listitem>
-        The widget relies on the implicit grab as long as the button press/touch is active,
-        GDK or GTK+ grabs would break the implicit grabs other touch sequences may have on
-        other widgets.
-      </listitem>
-      <listitem>
-        The widget does not require (or opts out) keyboard interaction while a touch is
-        active on it. Touch interaction does not necessarily bring the keyboard focus with it.
-      </listitem>
-      <listitem>
-        If the widget is only meant to interact with one touch sequence at a time (i.e.
-        buttons), it has to be able to discern and reject operations on any later touch
-        sequence as long as the touch it is interacting with remains active.
-      </listitem>
-    </orderedlist>
-
-    <para>
-      If a widget meets those requirements, enabling %GDK_TOUCH_MASK on it will suffice
-      to make it handle multitouch events in a way that doesn't disrupt other touch
-      operations.
-    </para>
-
-    <example>
-      <title>Enabling touch events on a widget</title>
-      <programlisting>
-        gtk_widget_add_events (widget, GDK_TOUCH_MASK);
-      </programlisting>
-    </example>
-
-    <note>
-      Not all GTK+ stock widgets are immediately suitable for handling touch
-      events, there could be even design reasons on some of those which render
-      them unsuitable.
-    </note>
-  </section>
-
-  <section id="gtk-device-patterns-recommendations">
-    <title>Recommendations</title>
-
-    <orderedlist>
-      <listitem>
-        Device operations often come up as a result of input events, favor
-        gdk_event_get_device() and gtk_get_current_event_device() before
-        gdk_device_manager_get_client_pointer().
-      </listitem>
-
-      <listitem>
-        Store the devices the widget is currently interacting with, handle
-        GdkEventGrabBroken and #GtkWidget::grab-notify to undo/nullify these.
-      </listitem>
-    </orderedlist>
-  </section>
-</chapter>
@@ -68,12 +68,6 @@
    <xi:include href="xml/gtkstyle.xml" />
  </part>

-  <part id="multitouch-and-multidevice">
-    <title>Interacting with input devices</title>
-    <xi:include href="xml/device-interaction-patterns.xml" />
-    <xi:include href="xml/gtkgesturesinterpreter.xml" />
-  </part>
-
  <part id="gtkobjects">
    <title>GTK+ Widgets and Objects</title>

@@ -215,22 +209,18 @@

    <chapter id="SelectorWidgets">
      <title>Selectors (Color/File/Font)</title>
-      <xi:include href="xml/gtkcolorchooser.xml" />
      <xi:include href="xml/gtkcolorbutton.xml" />
-      <xi:include href="xml/gtkcolorchooserwidget.xml" />
-      <xi:include href="xml/gtkcolorchooserdialog.xml" />
-      <xi:include href="xml/gtkcolorsel.xml" />
      <xi:include href="xml/gtkcolorseldlg.xml" />
+      <xi:include href="xml/gtkcolorsel.xml" />
      <xi:include href="xml/gtkhsv.xml" />
      <xi:include href="xml/gtkfilechooser.xml" />
      <xi:include href="xml/gtkfilechooserbutton.xml" />
      <xi:include href="xml/gtkfilechooserdialog.xml" />
      <xi:include href="xml/gtkfilechooserwidget.xml" />
      <xi:include href="xml/gtkfilefilter.xml" />
-      <xi:include href="xml/gtkfontchooser.xml" />
      <xi:include href="xml/gtkfontbutton.xml" />
-      <xi:include href="xml/gtkfontchooserwidget.xml" />
-      <xi:include href="xml/gtkfontchooserdialog.xml" />
+      <xi:include href="xml/gtkfontchooser.xml" />
+      <xi:include href="xml/gtkfontchooserdlg.xml" />
      <xi:include href="xml/gtkfontsel.xml" />
      <xi:include href="xml/gtkfontseldlg.xml" />
    </chapter>
@@ -348,8 +338,6 @@
    <chapter id="Application">
      <title>Application support</title>
      <xi:include href="xml/gtkapplication.xml" />
-      <xi:include href="xml/gtkapplicationwindow.xml" />
-      <xi:include href="xml/gtkactionable.xml" />
    </chapter>
  </part>

@@ -366,12 +354,11 @@
      </para>
    </partintro>

+    <xi:include href="xml/migrating-checklist.sgml" />
    <xi:include href="xml/migrating-2to3.xml" />
    <xi:include href="xml/migrating-GtkStyleContext.xml" />
-    <xi:include href="xml/migrating-unique-GtkApplication.xml" />
-    <xi:include href="xml/migrating-smclient-GtkApplication.xml" />
+    <xi:include href="xml/migrating-GtkApplication.xml" />
    <xi:include href="xml/migrating-GtkGrid.xml" />
-    <xi:include href="xml/migrating-checklist.sgml" />
  </part>

  <part>
@@ -398,10 +385,6 @@
    <title>Index of new symbols in 3.2</title>
    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-4" role="3.4">
-    <title>Index of new symbols in 3.4</title>
-    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

@@ -37,7 +37,6 @@ gtk_about_dialog_get_logo
 gtk_about_dialog_set_logo
 gtk_about_dialog_get_logo_icon_name
 gtk_about_dialog_set_logo_icon_name
-gtk_about_dialog_add_credit_section
 gtk_show_about_dialog
 <SUBSECTION Standard>
 GTK_ABOUT_DIALOG
@@ -77,9 +76,6 @@ gtk_accelerator_valid
 gtk_accelerator_parse
 gtk_accelerator_name
 gtk_accelerator_get_label
-gtk_accelerator_parse_with_keycode
-gtk_accelerator_name_with_keycode
-gtk_accelerator_get_label_with_keycode
 gtk_accelerator_set_default_mod_mask
 gtk_accelerator_get_default_mod_mask

@@ -309,7 +305,6 @@ gtk_adjustment_get_lower
 gtk_adjustment_get_page_increment
 gtk_adjustment_get_page_size
 gtk_adjustment_get_step_increment
-gtk_adjustment_get_minimum_increment
 gtk_adjustment_get_upper
 gtk_adjustment_set_lower
 gtk_adjustment_set_page_increment
@@ -907,7 +902,6 @@ gtk_container_child_get_property
 gtk_container_child_set_property
 gtk_container_child_get_valist
 gtk_container_child_set_valist
-gtk_container_child_notify
 gtk_container_forall
 gtk_container_get_border_width
 gtk_container_set_border_width
@@ -1136,7 +1130,6 @@ gtk_entry_completion_get_model
 gtk_entry_completion_set_match_func
 gtk_entry_completion_set_minimum_key_length
 gtk_entry_completion_get_minimum_key_length
-gtk_entry_completion_compute_prefix
 gtk_entry_completion_complete
 gtk_entry_completion_get_completion_prefix
 gtk_entry_completion_insert_prefix
@@ -1487,13 +1480,12 @@ gtk_font_selection_dialog_get_type
 <FILE>gtkfontchooser</FILE>
 <TITLE>GtkFontChooser</TITLE>
 GtkFontChooser
-gtk_font_chooser_get_font_family
-gtk_font_chooser_get_font_face
-gtk_font_chooser_get_font_size
-gtk_font_chooser_get_font
-gtk_font_chooser_set_font
-gtk_font_chooser_get_font_desc
-gtk_font_chooser_set_font_desc
+gtk_font_chooser_new
+gtk_font_chooser_get_family
+gtk_font_chooser_get_face
+gtk_font_chooser_get_size
+gtk_font_chooser_get_font_name
+gtk_font_chooser_set_font_name
 gtk_font_chooser_get_preview_text
 gtk_font_chooser_set_preview_text
 gtk_font_chooser_get_show_preview_entry
@@ -1502,43 +1494,29 @@ GtkFontFilterFunc
 gtk_font_chooser_set_filter_func

 <SUBSECTION Standard>
-GtkFontChooserIface
+GtkFontChooserClass
 GTK_TYPE_FONT_CHOOSER
 GTK_FONT_CHOOSER
-GTK_FONT_CHOOSER_IFACE
+GTK_FONT_CHOOSER_CLASS
 GTK_IS_FONT_CHOOSER
-GTK_IS_FONT_CHOOSER_IFACE
-GTK_FONT_CHOOSER_GET_IFACE
+GTK_IS_FONT_CHOOSER_CLASS
+GTK_FONT_CHOOSER_GET_CLASS

 <SUBSECTION Private>
+GtkFontChooserPrivate
 gtk_font_chooser_get_type
 </SECTION>

 <SECTION>
-<FILE>gtkfontchooserwidget</FILE>
-<TITLE>GtkFontChooserWidget</TITLE>
-GtkFontChooserWidget
-gtk_font_chooser_widget_new
-
-<SUBSECTION Standard>
-GtkFontChooserWidgetClass
-GTK_TYPE_FONT_CHOOSER_WIDGET
-GTK_FONT_CHOOSER_WIDGET
-GTK_FONT_CHOOSER_WIDGET_CLASS
-GTK_IS_FONT_CHOOSER_WIDGET
-GTK_IS_FONT_CHOOSER_WIDGET_CLASS
-GTK_FONT_CHOOSER_WIDGET_GET_CLASS
-
-<SUBSECTION Private>
-GtkFontChooserWidgetPrivate
-gtk_font_chooser_widget_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkfontchooserdialog</FILE>
+<FILE>gtkfontchooserdlg</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
 gtk_font_chooser_dialog_new
+gtk_font_chooser_dialog_get_font_chooser
+gtk_font_chooser_dialog_get_font_name
+gtk_font_chooser_dialog_set_font_name
+gtk_font_chooser_dialog_get_preview_text
+gtk_font_chooser_dialog_set_preview_text

 <SUBSECTION Standard>
 GtkFontChooserDialogClass
@@ -1579,51 +1557,6 @@ GtkFramePrivate
 gtk_frame_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkgesturesinterpreter</FILE>
-<TITLE>GtkGesturesInterpreter</TITLE>
-GtkGesturesInterpreter
-GtkGestureType
-gtk_gestures_interpreter_new
-gtk_gestures_interpreter_add_gesture
-gtk_gestures_interpreter_remove_gesture
-gtk_gestures_interpreter_feed_event
-gtk_gestures_interpreter_finish
-gtk_gestures_interpreter_get_n_active_strokes
-
-<SUBSECTION Gestures>
-GtkGestureStroke
-gtk_gesture_stroke_new
-gtk_gesture_stroke_copy
-gtk_gesture_stroke_free
-gtk_gesture_stroke_append_vector
-gtk_gesture_stroke_get_n_vectors
-gtk_gesture_stroke_get_vector
-GtkGesture
-GtkGestureFlags
-gtk_gesture_new
-gtk_gesture_copy
-gtk_gesture_free
-gtk_gesture_add_stroke
-gtk_gesture_get_n_strokes
-gtk_gesture_get_stroke
-gtk_gesture_get_flags
-gtk_gesture_register
-gtk_gesture_register_static
-gtk_gesture_lookup
-
-<SUBSECTION Standard>
-GTK_GESTURES_INTERPRETER
-GTK_IS_GESTURES_INTERPRETER
-GTK_TYPE_GESTURES_INTERPRETER
-GTK_IS_GESTURES_INTERPRETER_CLASS
-GTK_GESTURES_INTERPRETER_GET_CLASS
-<SUBSECTION Private>
-gtk_gestures_interpreter_get_type
-gtk_gesture_stroke_get_type
-gtk_gesture_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkhandlebox</FILE>
 <TITLE>GtkHandleBox</TITLE>
@@ -2105,7 +2038,6 @@ gtk_link_button_get_type
 <TITLE>GtkMenu</TITLE>
 GtkMenu
 gtk_menu_new
-gtk_menu_new_from_model
 gtk_menu_set_screen
 gtk_menu_reorder_child
 gtk_menu_attach
@@ -2150,7 +2082,6 @@ gtk_menu_get_type
 <TITLE>GtkMenuBar</TITLE>
 GtkMenuBar
 gtk_menu_bar_new
-gtk_menu_bar_new_from_model
 GtkPackDirection
 gtk_menu_bar_set_pack_direction
 gtk_menu_bar_get_pack_direction
@@ -2872,11 +2803,9 @@ gtk_scale_new
 gtk_scale_new_with_range
 gtk_scale_set_digits
 gtk_scale_set_draw_value
-gtk_scale_set_has_origin
 gtk_scale_set_value_pos
 gtk_scale_get_digits
 gtk_scale_get_draw_value
-gtk_scale_get_has_origin
 gtk_scale_get_value_pos
 gtk_scale_get_layout
 gtk_scale_get_layout_offsets
@@ -2984,9 +2913,6 @@ gtk_scrolled_window_get_min_content_width
 gtk_scrolled_window_set_min_content_width
 gtk_scrolled_window_get_min_content_height
 gtk_scrolled_window_set_min_content_height
-GtkKineticScrollingFlags
-gtk_scrolled_window_set_kinetic_scrolling
-gtk_scrolled_window_get_kinetic_scrolling

 <SUBSECTION Standard>
 GTK_SCROLLED_WINDOW
@@ -3399,7 +3325,6 @@ gtk_text_buffer_get_type
 GtkTextIter
 gtk_text_iter_get_buffer
 gtk_text_iter_copy
-gtk_text_iter_assign
 gtk_text_iter_free
 gtk_text_iter_get_offset
 gtk_text_iter_get_line
@@ -4360,7 +4285,6 @@ gtk_tree_view_column_cell_is_visible
 gtk_tree_view_column_focus_cell
 gtk_tree_view_column_queue_resize
 gtk_tree_view_column_get_tree_view
-gtk_tree_view_column_get_x_offset
 <SUBSECTION Standard>
 GTK_TREE_VIEW_COLUMN
 GTK_IS_TREE_VIEW_COLUMN
@@ -4406,7 +4330,6 @@ gtk_tree_view_remove_column
 gtk_tree_view_insert_column
 gtk_tree_view_insert_column_with_attributes
 gtk_tree_view_insert_column_with_data_func
-gtk_tree_view_get_n_columns
 gtk_tree_view_get_column
 gtk_tree_view_get_columns
 gtk_tree_view_move_column_after
@@ -5076,7 +4999,6 @@ GtkAllocation
 GtkSelectionData
 GtkWidgetAuxInfo
 GtkWidgetHelpType
-GtkCapturedEventFlags
 gtk_widget_new
 gtk_widget_destroy
 gtk_widget_in_destruction
@@ -5261,8 +5183,6 @@ gtk_widget_set_mapped
 gtk_widget_get_mapped
 gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
-gtk_widget_get_modifier_mask
-gtk_widget_release_captured_events

 <SUBSECTION>
 gtk_widget_get_path
@@ -5312,10 +5232,6 @@ gtk_widget_set_vexpand_set
 gtk_widget_queue_compute_expand
 gtk_widget_compute_expand

-<SUBSECTION Gestures>
-gtk_widget_enable_gesture
-gtk_widget_disable_gesture
-
 <SUBSECTION Standard>
 GTK_WIDGET
 GTK_IS_WIDGET
@@ -5351,9 +5267,7 @@ gtk_window_set_gravity
 gtk_window_get_gravity
 gtk_window_set_position
 gtk_window_set_transient_for
-gtk_window_set_attached_to
 gtk_window_set_destroy_with_parent
-gtk_window_set_hide_titlebar_when_maximized
 gtk_window_set_screen
 gtk_window_get_screen
 gtk_window_is_active
@@ -5399,7 +5313,6 @@ gtk_window_get_default_icon_list
 gtk_window_get_default_icon_name
 gtk_window_get_default_size
 gtk_window_get_destroy_with_parent
-gtk_window_get_hide_titlebar_when_maximized
 gtk_window_get_icon
 gtk_window_get_icon_list
 gtk_window_get_icon_name
@@ -5410,7 +5323,6 @@ gtk_window_get_role
 gtk_window_get_size
 gtk_window_get_title
 gtk_window_get_transient_for
-gtk_window_get_attached_to
 gtk_window_get_type_hint
 gtk_window_get_skip_taskbar_hint
 gtk_window_get_skip_pager_hint
@@ -5567,7 +5479,6 @@ GTK_CHECK_VERSION
 GtkWidgetPath
 gtk_widget_path_append_type
 gtk_widget_path_append_with_siblings
-gtk_widget_path_append_for_widget
 gtk_widget_path_copy
 gtk_widget_path_ref
 gtk_widget_path_unref
@@ -5721,12 +5632,6 @@ GTK_STYLE_CLASS_VIEW
 GTK_STYLE_CLASS_WARNING
 GTK_STYLE_CLASS_HORIZONTAL
 GTK_STYLE_CLASS_VERTICAL
-GTK_STYLE_CLASS_TOP
-GTK_STYLE_CLASS_BOTTOM
-GTK_STYLE_CLASS_LEFT
-GTK_STYLE_CLASS_RIGHT
-GTK_STYLE_CLASS_LINKED
-GTK_STYLE_CLASS_ARROW
 GTK_STYLE_REGION_COLUMN
 GTK_STYLE_REGION_COLUMN_HEADER
 GTK_STYLE_REGION_ROW
@@ -5739,7 +5644,6 @@ 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_set_parent
 gtk_style_context_get_path
 gtk_style_context_get_property
 gtk_style_context_get_screen
@@ -5748,7 +5652,6 @@ gtk_style_context_get_style
 gtk_style_context_get_style_property
 gtk_style_context_get_style_valist
 gtk_style_context_get_valist
-gtk_style_context_get_section
 gtk_style_context_get_color
 gtk_style_context_get_background_color
 gtk_style_context_get_border_color
@@ -5773,7 +5676,6 @@ gtk_style_context_restore
 gtk_style_context_save
 gtk_style_context_set_direction
 gtk_style_context_set_junction_sides
-gtk_style_context_set_parent
 gtk_style_context_set_path
 gtk_style_context_add_class
 gtk_style_context_remove_class
@@ -5809,7 +5711,6 @@ gtk_render_slider
 gtk_render_activity
 gtk_render_icon_pixbuf
 gtk_render_icon
-gtk_render_insertion_cursor

 <SUBSECTION Standard>
 GTK_TYPE_STYLE_CONTEXT
@@ -5914,7 +5815,6 @@ gtk_symbolic_color_new_name
 gtk_symbolic_color_new_shade
 gtk_symbolic_color_new_alpha
 gtk_symbolic_color_new_mix
-gtk_symbolic_color_new_win32
 gtk_symbolic_color_ref
 gtk_symbolic_color_unref
 gtk_symbolic_color_resolve
@@ -7068,20 +6968,6 @@ gtk_application_add_window
 gtk_application_remove_window
 gtk_application_get_windows

-<SUBSECTION>
-GtkApplicationInhibitFlags
-gtk_application_inhibit
-gtk_application_uninhibit
-gtk_application_is_inhibited
-GtkApplicationEndSessionStyle
-gtk_application_end_session
-
-<SUBSECTION>
-gtk_application_get_app_menu
-gtk_application_set_app_menu
-gtk_application_get_menubar
-gtk_application_set_menubar
-
 <SUBSECTION Standard>
 GtkApplicationClass
 GTK_TYPE_APPLICATION
@@ -7095,54 +6981,6 @@ gtk_application_get_type
 GtkApplicationPrivate
 </SECTION>

-<SECTION>
-<FILE>gtkapplicationwindow</FILE>
-<TITLE>GtkApplicationWindow</TITLE>
-GtkApplicationWindow
-gtk_application_window_new
-gtk_application_window_set_show_menubar
-gtk_application_window_get_show_menubar
-
-<SUBSECTION Standard>
-GtkApplicationWindowClass
-GTK_TYPE_APPLICATION_WINDOW
-GTK_APPLICATION_WINDOW
-GTK_APPLICATION_WINDOW_CLASS
-GTK_IS_APPLICATION_WINDOW
-GTK_IS_APPLICATION_WINDOW_CLASS
-GTK_APPLICATION_WINDOW_GET_CLASS
-
-<SUBSECTION Private>
-gtk_application_window_get_type
-GtkApplicationWindowPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkactionable</FILE>
-<TITLE>GtkActionable</TITLE>
-GtkActionable
-GtkActionableInterface
-
-<SUBSECTION>
-gtk_actionable_get_action_name
-gtk_actionable_set_action_name
-
-<SUBSECTION>
-gtk_actionable_get_action_target_value
-gtk_actionable_set_action_target_value
-gtk_actionable_set_action_target
-
-<SUBSECTION>
-gtk_actionable_set_detailed_action_name
-
-<SUBSECTION Standard>
-gtk_actionable_get_type
-GTK_ACTIONABLE
-GTK_ACTIONABLE_GET_IFACE
-GTK_IS_ACTIONABLE
-GTK_TYPE_ACTIONABLE
-</SECTION>
-
 <SECTION>
 <FILE>gtkgrid</FILE>
 <TITLE>GtkGrid</TITLE>
@@ -7232,8 +7070,6 @@ gtk_app_chooser_button_new
 gtk_app_chooser_button_append_custom_item
 gtk_app_chooser_button_append_separator
 gtk_app_chooser_button_set_active_custom_item
-gtk_app_chooser_button_get_show_default_item
-gtk_app_chooser_button_set_show_default_item
 gtk_app_chooser_button_get_show_dialog_item
 gtk_app_chooser_button_set_show_dialog_item
 gtk_app_chooser_button_get_heading
@@ -7337,7 +7173,6 @@ GtkLockButtonPrivate
 GtkOverlay

 gtk_overlay_new
-gtk_overlay_add_overlay

 <SUBSECTION Standard>
 GTK_TYPE_OVERLAY
@@ -7352,61 +7187,3 @@ GtkOverlayClass
 gtk_overlay_get_type
 GtkOverlayPrivate
 </SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooser</FILE>
-<TITLE>GtkColorChooser</TITLE>
-GtkColorChooser
-gtk_color_chooser_get_rgba
-gtk_color_chooser_set_rgba
-gtk_color_chooser_get_use_alpha
-gtk_color_chooser_set_use_alpha
-gtk_color_chooser_add_palette
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER
-GTK_COLOR_CHOOSER
-GTK_IS_COLOR_CHOOSER
-GTK_COLOR_CHOOSER_GET_IFACE
-
-<SUBSECTION Private>
-gtk_color_chooser_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooserwidget</FILE>
-<TITLE>GtkColorChooserWidget</TITLE>
-GtkColorChooserWidget
-gtk_color_chooser_widget_new
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER_WIDGET
-GTK_COLOR_CHOOSER_WIDGET
-GTK_COLOR_CHOOSER_WIDGET_CLASS
-GTK_IS_COLOR_CHOOSER_WIDGET
-GTK_IS_COLOR_CHOOSER_WIDGET_CLASS
-GTK_COLOR_CHOOSER_WIDGET_GET_CLASS
-
-<SUBSECTION Private>
-gtk_color_chooser_widget_get_type
-GtkColorChooserWidgetPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkcolorchooserdialog</FILE>
-<TITLE>GtkColorChooserDialog</TITLE>
-GtkColorChooserDialog
-gtk_color_chooser_dialog_new
-
-<SUBSECTION Standard>
-GTK_TYPE_COLOR_CHOOSER_DIALOG
-GTK_COLOR_CHOOSER_DIALOG
-GTK_COLOR_CHOOSER_DIALOG_CLASS
-GTK_IS_COLOR_CHOOSER_DIALOG
-GTK_IS_COLOR_CHOOSER_DIALOG_CLASS
-GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
-
-<SUBSECTION Private>
-GtkColorChooserDialogPrivate
-gtk_color_chooser_dialog_get_type
-</SECTION>
@@ -6,7 +6,6 @@ gtk_accel_group_get_type
 gtk_accel_label_get_type
 gtk_accel_map_get_type
 gtk_accessible_get_type
-gtk_actionable_get_type
 gtk_action_get_type
 gtk_action_group_get_type
 gtk_activatable_get_type
@@ -17,7 +16,6 @@ gtk_app_chooser_button_get_type
 gtk_app_chooser_dialog_get_type
 gtk_app_chooser_widget_get_type
 gtk_application_get_type
-gtk_application_window_get_type
 gtk_arrow_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
@@ -47,9 +45,6 @@ gtk_check_button_get_type
 gtk_check_menu_item_get_type
 gtk_clipboard_get_type
 gtk_color_button_get_type
-gtk_color_chooser_get_type
-gtk_color_chooser_dialog_get_type
-gtk_color_chooser_widget_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
 gtk_combo_box_get_type
@@ -71,13 +66,9 @@ gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
 gtk_fixed_get_type
 gtk_font_button_get_type
-gtk_font_chooser_get_type
-gtk_font_chooser_dialog_get_type
-gtk_font_chooser_widget_get_type
 gtk_font_selection_dialog_get_type
 gtk_font_selection_get_type
 gtk_frame_get_type
-gtk_gestures_interpreter_get_type
 gtk_grid_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type
@@ -1203,6 +1203,8 @@ gtk_arrow_draw (GtkWidget *widget,
  </para>
  </section>

+  <xi:include href="migrating-GtkStyleContext.xml" />
+
  </section>

 </chapter>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Denis Washington	cea5461353	Merge branch 'gtkbuilder-gbinding' into gtkbuilder-gbinding-transform	2011-08-30 08:38:03 +02:00
Denis Washington	143f943905	Merge branch 'master' into gtkbuilder-gbinding	2011-08-30 08:37:28 +02:00
Denis Washington	c2107aebe7	Moved transformation function support here from "gtkbuilder-gbinding" branch This is not ready yet, but should still have a branch for improvements.	2011-08-21 21:56:17 +02:00
Denis Washington	41ca2069c0	Remove support for transformation functions in GtkBuilder property binding code for now The added API would be a burden for language binding authors and requires another call after loading a UI file (like gtk_builder_connect_signals()). This still needs to be fleshed out more. The version with transformation functions were moved to a new "gtkbuilder-gbinding-transform" branch for reference.	2011-08-21 21:51:21 +02:00
Denis Washington	4405feaf59	Merge branch 'master' into gtkbuilder-gbinding	2011-08-21 21:36:22 +02:00
Denis Washington	09f188d2dd	Merge branch 'master' into gtkbuilder-gbinding	2011-08-19 12:43:57 +02:00
Denis Washington	173bd1618d	Introduce gtk_builder_create_bindings[_full](), add transformation function support Property bindings are not created implicitly by gtk_builder_add() anymore but by explicitly calling gtk_builder_create_bindings() or gtk_builder_create_bindings_full(), which are analog to the gtk_builder_signals() functions. This change is needed for the new support for transformation functions, which need to be located like signal handlers (via GModule or a custom function). A transormation function can be specified by adding a "transform-func" attribute to a <binding> tag with the function name. Also, updated the GtkBuilder documentation to reflect the changes and adjusted the test case (there is also a new test for transformation functions).	2011-07-23 10:56:22 +02:00
Denis Washington	65a846b64c	Merge branch 'master' into gtkbuilder-gbinding	2011-07-23 10:55:38 +02:00
Denis Washington	e24b186276	Merge branch 'master' into gtkbuilder-gbinding	2011-07-20 16:22:11 +02:00
Denis Washington	321961699b	Memory leak fix	2011-07-11 20:48:14 +02:00
Denis Washington	af67944475	Merge branch 'master' into gtkbuilder-gbinding	2011-07-09 12:37:06 +02:00
Denis Washington	21708559d0	Fix wrong comparison, makes multiple bindings per object work	2011-06-10 11:03:56 +02:00
Denis Washington	0df0306116	Fix typo in test file	2011-06-10 11:02:44 +02:00
Denis Washington	fe50aa8d04	(GSoC 2011) Add simple property binding syntax to GtkBuilder This is for my Google Summer of Code project, "GObject property binding support in GtkBuilder and Glade". (http://live.gnome.org/DenisWashington_GtkBuilder). Add the possibility to add <binding> tags to GtkBuilder object definitions which allow you to specify bindings between properties, i.e. that the value of one object property is always automatically updated to mirror the value of another (usually of another object) - a.k.a. GBinding. (http://developer.gnome.org/gobject/unstable/GBinding.html#GBindingFlags) So far only the simplest kinds of property bindings are implemented - no special GBinding flags or transformation functions are supported. (G_BINDING_SYNC_CREATE is always passed, however.)	2011-05-25 23:59:17 +02:00