Constrain the window to the minimum width for the natural height

GtkWindow now requests the minimum width for the natural height
of its child, or the opposite; depending on ->get_height_for_width.
Currently its not done for GTK_WINDOW_POPUP windows as the menushells
aren't working right yet.

INSTALL.in

@@ -3,9 +3,11 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.17.6,
-   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
+ - The GLib, Pango, ATK and cairo libraries, available at the same
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.23.6,
+   Pango 1.20, ATK 1.29.2 and cairo 1.6.0.
+
+ - gobject-introspection 0.6.7 or newer.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
    likely have these installed on your system already. If not

Makefile.am

@@ -6,6 +6,7 @@ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST +=			\
 	HACKING			\
@@ -242,7 +243,7 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds --enable-introspection
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

NEWS

@@ -1,3 +1,330 @@
+Overview of Changes from GTK+ 2.19.7 to 2.20.0
+==============================================
+
+* Support the tracker 0.8 api in the file chooser search code
+
+* Bug fixes:
+ 609929 Dragging between two windows cause the menu widget...
+ 613241 entry sends extra notify::text with "" on destroy
+ 610946 error during gtk+ build + nonsense error messages
+ 610176 Some cups1.2 feature use not shielded by API version-check
+ 612574 GtkMenuItem does not emit notify::label when label...
+ 612505 Entry layout not updated when underlying buffer changes
+ 612346 gdk_window_set_icon_name doesn't work
+ 612308 GTK+ Build error: redefinition of 'struct IPrintDialogCallback'
+ 611118 Set APPLICATION_ID when launching desktop app
+ 612768 DND cause crash in VNC environment
+ 612575 Improve docs of gtk_notebook_set_tab_label_packing
+ 605333 Confusing error in documentation
+ 613028 Do not get a GtkSettings for size lookup if...
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Dutch
+ Estonian
+ Finnish
+ Galician
+ Gujarati
+ Italian
+ Punjabi
+ Romanian
+ Spanish
+ Swedish
+ Traditional Chinese
+ Vietnamese
+
+
+Overview of Changes from GTK+ 2.19.6 to 2.19.7
+==============================================
+
+* Bug fixes:
+ 611707 Move documentation from templates to inline comments
+  69872 GTK_WIDGET_SET_FLAGS should be deprecated
+ 612066 empathy hangs when clicked on information about contact...
+ 557420 Some compose sequences don't work anymore...
+ 569042 gailbooleancell does not seem to attend to changes...
+ 600992 File chooser reference counting issues
+ 610905 gtk_drag_source_set need instrospection hint
+ 611051 Search Entry Clear Icon not accessible
+ 611217 Incorrect translator comment
+ 611317 Document targets in drag and drop
+ 611319 gtk_window_set_transient_for undocumented NULL value for parent
+ 611658 Update documentation for gtkvscrollbar
+ 611662 Update documentation for gtkvseparator
+ 611686 focus_in/focus_out in gailtreeview.c should return FALSE...
+ 611831 Move documentation to inline comments: GtkVBox
+ 612119 Do not scroll when middle pasting
+
+* Translation updates:
+ Afrikaans
+ Arabic
+ Basque
+ British English
+ Bulgarian
+ Czech
+ Danish
+ French
+ Galician
+ German
+ Greek
+ Hungarian
+ Lithuanian
+ Low German
+ Norwegian bokmål
+ Polish
+ Portuguese
+ Russian
+ Slovenian
+ Swedish
+
+
+Overview of Changes from GTK+ 2.19.5 to 2.19.6
+==============================================
+
+* Bugs fixed:
+ 610701 gnome-shell crashes frequently
+ 604799 Crash when button is pressed.
+ 609744 crash at parse_data_for_row_pseudocolor
+ 600789 gdk/gdkwindow.c "find_native_sibling_above" will crash
+ 610141 gtk_assistant_get_nth_page() function fails to deliver...
+ 609952 destroying a notebook window when the last tab got dragged...
+ 603923 [annotations] gtk_tree_store_newv/set_column_types
+ 610474 [annotations] Add allow-none
+ 609650 GtkPlug Embedded signal is not emitted when plug...
+ 610381 More space between toolbar icon and label
+ 548026 No accessor for GtkWidget.requisition
+ 609514 fix introspection comments for gtk_tree_view_get_path_at_pos
+ 610235 msgid in bad English
+ 607697 GDK_META_MASK always set on Alt-Enter with gtk+ 2.19.x
+ 610632 gtk_info_bar_set_default_response problem
+ 609172 gdk/directfb: little cleanups
+ 610184 gtk_assistant_set_current_page() segfaults...
+
+* Updated translations
+ Bulgarian
+ Czech
+ Estonian
+ German
+ Japanese
+ Korean
+ Lithuanian
+ Norwegian bokmål
+ Oriya
+ Polish
+ Romanian
+ Slovenian
+ Spanish
+
+
+Overview of Changes from GTK+ 2.19.4 to 2.19.5
+==============================================
+
+* GSEAL work:
+ - Add accessors for GtkPaned members
+ - Add gtk_widget_style_attach
+ - Seal GtkTextTag
+ - Deprecate GtkCurveType
+ - More GtkWidget flags accessors
+
+* Bugs fixed:
+ 403485 Move docs from tmpl/* to the source files
+ 556263 Deprecate GtkCurve
+ 554420 Seal GtkTextTag
+ 561816 Optimize gtk_paned_set_position notifications
+ 606288 Not using GtkOptionMenu deprecated symbols in test file
+ 607061 GtkPlug socket window is sometimes incorrectly unref'd
+ 607344 GtkCalendar: crash when using tooltips via glade
+ 607885 GtkPaned::handle lack accessor
+ 608162 gtktoolbutton doesn't create right proxy menu item...
+ 608345 wrong reference on gdk_keymap_translate_keyboard_state
+ 608370 dnd drag-dest signal handlers don't get correctly disconn...
+ 608410 GOK types backwards in text entry fields
+ 608615 DnD events sent to wrong window
+ 608807 Marks on GtkScale widgets can overlap
+ 609188 gdk/directfb: compiler warning in _gdk_windowing_pointer_grab()
+ 609191 gdk/directfb: use G_DEFINE_TYPE in gdkcolor-directfb
+ 609199 gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
+ 609201 gdk/directfb: max cursor size is artificially limited
+ 591186 GTK Menu Bar is unreadable under Windows 7
+
+* Updated translations
+ Bengali
+ Brazilian Portuguese
+ Czech
+ Estonian
+ French
+ Norwegian bokmål
+ Slovak
+ Spanish
+ Thai
+
+
+Overview of Changes from GTK+ 2.19.3 to 2.19.4
+==============================================
+
+* GSeal:
+ - New accessors for GtkEntry windows
+ - New accessors for GtkRange members
+
+* Bugs fixed:
+ 607082 Add accessors for sealed GtkRange members
+ 567729 Add GtkToolPalette
+ 591102 gdk_pixbuf_save() creates a zero-size file...
+ 600865 gnome-panel crashed with "BadPixmap...
+ 601412 action area presence makes gnome-terminal window grow...
+ 603144 Suspected wrong builtin page size: Chinese PRC6 and...
+ 606009 weirdness with clipping in abiword - csw
+ 606698 Misplaced declaration of gtk_print_job_set_status
+ 606761 pixops.c: variables are declared at middle of block
+ 607217 Mixing calls to _set_markup and _set_text causes...
+ 607269 gtk_label_set_attributes with empty list no longer...
+ 607322 Double-click doesn't work if the item is selected...
+ 607687 f-spot crashes when using themes using the pixmap...
+ 607778 Add accessors for GtkEntry's windows
+ 607770 Leak in GtkTreeView with HildonPannableArea
+ 603245 drawing artifacts with action widgets and long tab...
+
+* Updated translations:
+ Arabic
+ Asturian
+ Basque
+ Bengali
+ Bulgarian
+ Burmese
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Swedish
+
+
+Overview of Changes from GTK+ 2.19.2 to 2.19.3
+==============================================
+
+* GSeal:
+ - Deprecate widget flag macros
+   GTK_WIDGET_STATE
+   GTK_WIDGET_SAVED_STATE
+   GTK_WIDGET_FLAGS
+   GTK_WIDGET_TOPLEVEL
+   GTK_WIDGET_NO_WINDOW
+   GTK_WIDGET_COMPOSITE_CHILD
+   GTK_WIDGET_APP_PAINTABLE
+   GTK_WIDGET_CAN_DEFAULT
+   GTK_WIDGET_CAN_FOCUS
+   GTK_WIDGET_DOUBLE_BUFFERED
+   GTK_WIDGET_HAS_DEFAULT
+   GTK_WIDGET_HAS_GRAB
+   GTK_WIDGET_RECEIVES_DEFAULT
+ - Also deprecate the type macros
+   GTK_WIDGET_TYPE
+   GTK_OBJECT_TYPE_NAME
+   GTK_OBJECT_TYPE
+
+* GtkOffscreenWindow: A new toplevel container widget to manage
+  offscreen rendering of child widgets
+
+* OS X:
+ - Memory leak fixes and other improvements
+
+* Bugs:
+ 604901 Provide generic offscreen rendering container
+ 597100 There is a misprint in the documentation...
+ 598383 GtkWidget::state-changed signal should be documented
+ 602284 Need a way to retrieve the preedit string in a GtkTextView
+ 605090 Fix some compilation warnings
+ 605199 Contradiction in the description of function...
+ 606068 Setup libjpeg error handling earlier...
+ 606230 gtk_combo_box_set_active_iter & unsetting the active item
+ 606291 Fix some issues in "Migrating from GtkOptionMenu...
+ 606434 prop-editor should support GdkColor
+
+* Translations:
+ Asturian
+ Basque
+ Kannada
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Swedish
+ Thai
+ Ukrainian
+
+
+Overview of Changes from GTK+ 2.19.1 to 2.19.2
+==============================================
+
+* Introspection:
+ - Introspection data for gdk-pixbuf, gdk and gtk is now
+   included in GTK+ itself. As a consequence, the atk dependency
+   has been bumped to 2.29.2, and a gobject-introspection dependency
+   has been added. configure with --disable-introspection in order
+   to not build introspection data.
+
+* Client-side windows:
+ - Fix some issues with handling of button and motion events
+ - Fix damage reporting for drawing on offscreen windows
+ - Fix problems with handling of input extension events
+
+* Printing:
+ - Add api to handle printer hard margins
+
+* Simple IM Context:
+ - Sync with Xorg compose file
+ - Make Compose-vowel-minus combinations consistent
+
+* GDK:
+ - gdk_screen_get_primary_monitor: New function to get the
+   'primary' monitor in a multi-monitor setup
+
+* gdk-pixbuf has gained the ability to store and retrieve embedded
+  ICC color profiles in png and tiff images
+
+* Keyboard handling:
+ - Mnemonic underlines can now optionally be hidden until the Alt key
+   is pressed, this can be turned on with the gtk-auto-mnemonics setting
+ - Using the Super, Meta and Hyper modifiers in accelerators is working
+   more reliably
+
+* Bugs fixed:
+ 603652 Sporadic crashes with GtkSocket
+ 605008 the region of damage event doesn't be copied in gdk_event_copy
+ 588554 only show the accelerator when pressing alt
+ 601473 GDK_BUTTON?_MOTION_MASK appears to be broken
+ 601712 Add API for determining primary monitor
+  50942 selection/arrow key improvement
+ 427409 editing shortcut always fails with super key
+ 468989 need a way to get the printer's hard margins
+ 502266 gtk_tree_selection_get_selected_rows free example produces...
+ 592279 Introspection support
+ 597386 Cannot click buttons more than once without moving the mouse...
+ 599213 Use GtkCellEditable:editing_canceled property instead...
+ 599397 Button stuck at pressed look after screen rotation
+ 601383 gtk_icon_view_get_selected_items: example code gives...
+ 602099 Actions can be activatable too
+ 603619 the colormap of offscreen's pixmap doesn't inherit...
+ 603904 gdk_draw_line doesn't have expose area.
+ 604117 Add info about single includes when compiling GTK+ apps
+ 604289 Please permit progress pages to be final in a dialog
+ 604462 gtktoolitem.c: return-value is different type
+ 604747 Using gdk_draw_line, the expose area of damage event is wrong
+ 604787 property-notify-event is not delivered to a non-toplevel...
+ 604881 GtkCellEditable::editing-cancelled should be writable
+ 591085 GtkBuilder object ID bounded to GtkWidget "name" property
+
+* Updated translations:
+ Arabic
+ Estonian
+ Hebrew
+ Low German
+ Norwegian bokmål
+ Slovenian
+ Spanish
+ Telugu
+ Vietnamese
+
+
 Overview of Changes from GTK+ 2.19.0 to 2.19.1
 ==============================================
 

README.in

@@ -37,6 +37,15 @@ Release notes for 2.20
   which are doing so may need some adjustments, since the addition of the
   message area changed the internal widget hierarchy.
 
+* GtkBuilder no longer sets the "name" property of widgets to the ID
+  attribute of the <object>. Use gtk_buildable_get_name() instead of
+  gtk_widget_get_name() to obtain the ID.
+
+* GTK+ now includes introspection data, as a consequence, it gained a
+  dependency on gobject-introspection. It is possible to build without
+  introspection by passing --disable-introspection to configure.
+
+
 Release notes for 2.18
 ======================
 

autogen.sh

@@ -109,7 +109,7 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-$ACLOCAL $ACLOCAL_FLAGS || exit $?
+$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
 gtkdocize || exit $?

configure.in

@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 # require autoconf 2.54
-AC_PREREQ(2.54)
+AC_PREREQ(2.62)
 
 # Making releases:
 #   GTK_MICRO_VERSION += 1;
@@ -11,9 +11,9 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [19])
-m4_define([gtk_micro_version], [2])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_minor_version], [20])
+m4_define([gtk_micro_version], [1])
+m4_define([gtk_interface_age], [1])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.21.3])
+m4_define([glib_required_version], [2.23.6])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.6])
@@ -43,10 +43,12 @@ AC_INIT([gtk+], [gtk_version],
 
 AC_CONFIG_SRCDIR([gdk/gdktypes.h])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}
 
-AM_INIT_AUTOMAKE(no-define)
+AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
 AM_CONFIG_HEADER(config.h)
 
 # Support silent build rules, requires at least automake-1.11. Enable
@@ -129,6 +131,7 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -137,6 +140,7 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -147,6 +151,7 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
@@ -580,6 +585,7 @@ case $host in
   ;;
 esac
 
+AC_SUBST(MATH_LIB)
 #
 # see bug 162979
 #
@@ -1713,7 +1719,13 @@ fi
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 $X_PACKAGES cairo-$cairo_backend"
+# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
+if test "x$gdktarget" = "xx11"; then
+  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
+else
+  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
+fi
+
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 #
@@ -1970,6 +1982,11 @@ if test -n "$export_dynamic"; then
   GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
+##################################################
+# GObject introspection
+##################################################
+
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools

demos/Makefile.am

@@ -19,11 +19,14 @@ DEPS = 									\
 LDADDS = 								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/$(gtktargetlib)				\
+	$(GTK_DEP_LIBS)							\
+	$(MATH_LIB)
 
 noinst_PROGRAMS = 		\
 	testpixbuf-drawable 	\
 	testanimation 		\
+	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo
@@ -52,6 +55,7 @@ test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
+testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
@@ -59,6 +63,7 @@ pixbuf_demo_DEPENDENCIES = $(DEPS)
 testpixbuf_LDADD = $(LDADDS)
 testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
+testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
@@ -66,6 +71,7 @@ pixbuf_demo_LDADD = $(LDADDS)
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
 testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
+testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c

demos/gtk-demo/Makefile.am

@@ -62,7 +62,8 @@ DEPS = \
 LDADDS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)
+	$(top_builddir)/gtk/$(gtktargetlib)				\
+	$(GTK_DEP_LIBS)
 
 bin_PROGRAMS = gtk-demo
 

demos/gtk-demo/appwindow.c

@@ -595,7 +595,7 @@ do_appwindow (GtkWidget *do_widget)
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/assistant.c

@@ -153,7 +153,7 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_prepare), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (assistant))
+  if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
     {

demos/gtk-demo/builder.c

@@ -53,7 +53,7 @@ do_builder (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/button_box.c

@@ -113,7 +113,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/clipboard.c

@@ -314,7 +314,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/colorsel.c

@@ -125,7 +125,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (change_color_callback), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/combobox.c

@@ -440,7 +440,7 @@ do_combobox (GtkWidget *do_widget)
   
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/dialog.c

@@ -167,7 +167,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/drawingarea.c

@@ -57,7 +57,7 @@ scribble_expose_event (GtkWidget      *widget,
    */
 
   gdk_draw_drawable (widget->window,
-                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                     widget->style->fg_gc[gtk_widget_get_state (widget)],
                      pixmap,
                      /* Only copy the area that was exposed. */
                      event->area.x, event->area.y,
@@ -318,7 +318,7 @@ do_drawingarea (GtkWidget *do_widget)
 
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/editable_cells.c

@@ -381,7 +381,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/entry_buffer.c

@@ -54,7 +54,7 @@ do_entry_buffer (GtkWidget *do_widget)
     g_object_unref (buffer);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/entry_completion.c

@@ -86,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
     gtk_entry_completion_set_text_column (completion, 0);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/expander.c

@@ -47,7 +47,7 @@ do_expander (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (expander), label);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/hypertext.c

@@ -300,7 +300,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_show_all (sw);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/iconview.c

@@ -358,7 +358,7 @@ do_iconview (GtkWidget *do_widget)
 	}
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/iconview_edit.c

@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/images.c

@@ -450,7 +450,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/infobar.c

@@ -90,7 +90,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/links.c

@@ -70,7 +70,7 @@ do_links (GtkWidget *do_widget)
       gtk_widget_show (label);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/list_store.c

@@ -272,7 +272,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (window_closed), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
       if (timeout == 0) {

demos/gtk-demo/menus.c

@@ -191,12 +191,12 @@ do_menus (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/offscreen_window.c

@@ -166,7 +166,7 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
 static void
 gtk_rotated_bin_init (GtkRotatedBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -184,7 +184,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -229,7 +229,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -262,7 +262,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -331,7 +331,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
   GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -339,7 +339,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -382,7 +382,7 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   s = sin (bin->angle);
@@ -410,13 +410,13 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -436,7 +436,7 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
         child_allocation.width = MIN ((w - s * child_allocation.height) / c,
                                       (h - c * child_allocation.height) / s);
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 child_allocation.x,
                                 child_allocation.y,
@@ -466,7 +466,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
   gdouble s, c;
   gdouble w, h;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -474,7 +474,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
           GtkAllocation child_area;
           cairo_t *cr;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               child_area = bin->child->allocation;
@@ -566,7 +566,7 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (bin), button);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/offscreen_window2.c

@@ -104,7 +104,7 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
 static void
 gtk_mirror_bin_init (GtkMirrorBin *bin)
 {
-  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
+  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
 }
 
 GtkWidget *
@@ -122,7 +122,7 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ if (bin->child && gtk_widget_get_visible (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
@@ -167,7 +167,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   gint border_width;
   GtkRequisition child_requisition;
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   border_width = GTK_CONTAINER (widget)->border_width;
 
@@ -200,7 +200,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       attributes.width = bin->child->allocation.width;
       attributes.height = bin->child->allocation.height;
@@ -269,7 +269,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
   gboolean was_visible;
 
-  was_visible = GTK_WIDGET_VISIBLE (widget);
+  was_visible = gtk_widget_get_visible (widget);
 
   if (bin->child == widget)
     {
@@ -277,7 +277,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && GTK_WIDGET_VISIBLE (container))
+      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -306,7 +306,7 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
@@ -327,13 +327,13 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+  if (bin->child && gtk_widget_get_visible (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -344,7 +344,7 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
       child_allocation.height = child_requisition.height;
       child_allocation.width = child_requisition.width;
 
-      if (GTK_WIDGET_REALIZED (widget))
+      if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 allocation->x + border_width,
                                 allocation->y + border_width,
@@ -369,7 +369,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   gint width, height;
 
-  if (GTK_WIDGET_DRAWABLE (widget))
+  if (gtk_widget_is_drawable (widget))
     {
       if (event->window == widget->window)
         {
@@ -378,7 +378,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
           cairo_matrix_t matrix;
           cairo_pattern_t *mask;
 
-          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+          if (bin->child && gtk_widget_get_visible (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               gdk_drawable_get_size (pixmap, &width, &height);
@@ -487,7 +487,7 @@ do_offscreen_window2 (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/panes.c

@@ -180,7 +180,7 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_show_all (vbox);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/pickers.c

@@ -59,7 +59,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/pixbufs.c

@@ -260,7 +260,7 @@ do_pixbufs (GtkWidget *do_widget)
         }
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/rotated_text.c

@@ -223,7 +223,7 @@ do_rotated_text (GtkWidget *do_widget)
       pango_attr_list_unref (attrs);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/search_entry.c

@@ -1,6 +1,6 @@
-/* Entry/Search Entry 
+/* Entry/Search Entry
  *
- * GtkEntry allows to display icons and progress information. 
+ * GtkEntry allows to display icons and progress information.
  * This demo shows how to use these features in a search entry.
  */
 
@@ -45,21 +45,21 @@ finish_search (GtkButton *button)
   show_find_button ();
   g_source_remove (search_progress_id);
   search_progress_id = 0;
-  
+
   return FALSE;
 }
 
 static gboolean
 start_search_feedback (gpointer data)
 {
-  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
+  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
                                            (GSourceFunc)search_progress, data,
                                            (GDestroyNotify)search_progress_done);
   return FALSE;
 }
 
 static void
-start_search (GtkButton *button, 
+start_search (GtkButton *button,
               GtkEntry  *entry)
 {
   show_cancel_button ();
@@ -77,16 +77,99 @@ stop_search (GtkButton *button,
 }
 
 static void
-icon_press_cb (GtkEntry       *entry, 
+clear_entry (GtkEntry *entry)
+{
+  gtk_entry_set_text (entry, "");
+}
+
+static void
+search_by_name (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_FIND);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by name\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_description (GtkWidget *item,
+                       GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_EDIT);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by description\n"
+                                   "Click here to change the search type");
+}
+
+static void
+search_by_file (GtkWidget *item,
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_OPEN);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by file name\n"
+                                   "Click here to change the search type");
+}
+
+GtkWidget *
+create_search_menu (GtkWidget *entry)
+{
+  GtkWidget *menu;
+  GtkWidget *item;
+  GtkWidget *image;
+
+  menu = gtk_menu_new ();
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _name");
+  image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_name), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _description");
+  image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_description), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_image_menu_item_new_with_mnemonic ("Search by _file name");
+  image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
+  g_signal_connect (item, "activate",
+                    G_CALLBACK (search_by_file), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  gtk_widget_show_all (menu);
+
+  return menu;
+}
+
+static void
+icon_press_cb (GtkEntry       *entry,
                gint            position,
                GdkEventButton *event,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
                     event->button, event->time);
-  else 
-    gtk_entry_set_text (entry, "");
+  else
+    clear_entry (entry);
 }
 
 static void
@@ -97,7 +180,7 @@ text_changed_cb (GtkEntry   *entry,
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry, 
+  gtk_entry_set_icon_sensitive (entry,
                                 GTK_ENTRY_ICON_SECONDARY,
                                 has_text);
   gtk_widget_set_sensitive (button, has_text);
@@ -114,45 +197,6 @@ activate_cb (GtkEntry  *entry,
 
 }
 
-static void
-search_by_name (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_FIND);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by name\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_description (GtkWidget *item, 
-                       GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_EDIT);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by description\n"
-                                   "Click here to change the search type");
-} 
-                
-static void
-search_by_file (GtkWidget *item, 
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_OPEN);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by file name\n"
-                                   "Click here to change the search type");
-} 
-
 static void
 search_entry_destroyed (GtkWidget  *widget)
 {
@@ -165,7 +209,35 @@ search_entry_destroyed (GtkWidget  *widget)
   window = NULL;
 }
 
-                
+static void
+entry_populate_popup (GtkEntry *entry,
+                      GtkMenu  *menu,
+                      gpointer user_data)
+{
+  GtkWidget *item;
+  GtkWidget *search_menu;
+  gboolean has_text;
+
+  has_text = gtk_entry_get_text_length (entry) > 0;
+
+  item = gtk_separator_menu_item_new ();
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("C_lear");
+  gtk_widget_show (item);
+  g_signal_connect_swapped (item, "activate",
+                            G_CALLBACK (clear_entry), entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+  gtk_widget_set_sensitive (item, has_text);
+
+  search_menu = create_search_menu (GTK_WIDGET (entry));
+  item = gtk_menu_item_new_with_label ("Search by");
+  gtk_widget_show (item);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_menu);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+}
+
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
@@ -173,19 +245,17 @@ do_search_entry (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
-  GtkWidget *item;
-  GtkWidget *image;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
-  
+
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("Search Entry",
                                             GTK_WINDOW (do_widget),
- 					    0,
-					    GTK_STOCK_CLOSE,
-					    GTK_RESPONSE_NONE,
-					    NULL);
+                                            0,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_NONE,
+                                            NULL);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "response",
@@ -216,59 +286,43 @@ do_search_entry (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
 
       find_button = gtk_button_new_with_label ("Find");
-      g_signal_connect (find_button, "clicked", 
+      g_signal_connect (find_button, "clicked",
                         G_CALLBACK (start_search), entry);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
       gtk_widget_show (find_button);
 
       cancel_button = gtk_button_new_with_label ("Cancel");
-      g_signal_connect (cancel_button, "clicked", 
+      g_signal_connect (cancel_button, "clicked",
                         G_CALLBACK (stop_search), NULL);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
       gtk_widget_show (cancel_button);
 
       /* Set up the search icon */
       search_by_name (NULL, GTK_ENTRY (entry));
-      
+
       /* Set up the clear icon */
-      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
-                                     GTK_ENTRY_ICON_SECONDARY, 
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
                                      GTK_STOCK_CLEAR);
       text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
 
-      g_signal_connect (entry, "icon-press", 
+      g_signal_connect (entry, "icon-press",
                         G_CALLBACK (icon_press_cb), NULL);
-      g_signal_connect (entry, "notify::text", 
+      g_signal_connect (entry, "notify::text",
                         G_CALLBACK (text_changed_cb), find_button);
-      g_signal_connect (entry, "activate", 
+      g_signal_connect (entry, "activate",
                         G_CALLBACK (activate_cb), NULL);
 
       /* Create the menu */
-      menu = gtk_menu_new ();
+      menu = create_search_menu (entry);
       gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
 
-      item = gtk_image_menu_item_new_with_label ("Search by name");
-      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by description");
-      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      item = gtk_image_menu_item_new_with_label ("Search by file name");
-      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-      gtk_widget_show_all (menu);
+      /* add accessible alternatives for icon functionality */
+      g_signal_connect (entry, "populate-popup",
+                        G_CALLBACK (entry_populate_popup), NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {
@@ -279,5 +333,3 @@ do_search_entry (GtkWidget *do_widget)
 
   return window;
 }
-
-

demos/gtk-demo/sizegroup.c

@@ -158,7 +158,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (toggle_grouping), size_group);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/spinner.c

@@ -83,7 +83,7 @@ do_spinner (GtkWidget *do_widget)
     on_play_clicked (NULL, NULL);
   }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/stock_browser.c

@@ -532,7 +532,7 @@ do_stock_browser (GtkWidget *do_widget)
 			NULL);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/textscroll.c

@@ -191,7 +191,7 @@ do_textscroll (GtkWidget *do_widget)
       create_text_view (hbox, FALSE);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/textview.c

@@ -500,7 +500,7 @@ do_textview (GtkWidget *do_widget)
       gtk_widget_show_all (vpaned);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/toolpalette.c

@@ -151,9 +151,9 @@ palette_drop_item (GtkToolItem      *drag_item,
 }
 
 static void
-palette_drop_group (GtkToolPalette *palette,
-                    GtkWidget      *drag_group,
-                    GtkWidget      *drop_group)
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
 {
   gint drop_position = -1;
 
@@ -173,8 +173,9 @@ palette_drag_data_received (GtkWidget        *widget,
                             guint             time,
                             gpointer          data)
 {
-  GtkWidget *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget *drag_item = NULL, *drop_group = NULL;
+  GtkToolItemGroup *drop_group = NULL;
+  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
+  GtkWidget        *drag_item = NULL;
 
   while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
     drag_palette = gtk_widget_get_parent (drag_palette);
@@ -188,10 +189,12 @@ palette_drag_data_received (GtkWidget        *widget,
     }
 
   if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette), drag_item, drop_group);
+    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
+                        GTK_TOOL_ITEM_GROUP (drag_item),
+                        drop_group);
   else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
     palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                       GTK_TOOL_ITEM_GROUP (drop_group),
+                       drop_group,
                        x - GTK_WIDGET (drop_group)->allocation.x,
                        y - GTK_WIDGET (drop_group)->allocation.y);
 }
@@ -613,7 +616,7 @@ do_toolpalette (GtkWidget *do_widget)
                                 gtk_label_new ("Interactive DnD Mode"));
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/tree_store.c

@@ -438,7 +438,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/ui_manager.c

@@ -221,7 +221,7 @@ do_ui_manager (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK (gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);

demos/testpixbuf-color.c

@@ -0,0 +1,161 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+
+#include "config.h"
+#include <stdio.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#define ICC_PROFILE             "/usr/share/color/icc/bluish.icc"
+#define ICC_PROFILE_SIZE        3966
+
+static gboolean
+save_image_png (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
+{
+	gchar *contents = NULL;
+	gchar *contents_encode = NULL;
+	gsize length;
+	gboolean ret;
+	gint len;
+
+	/* get icc file */
+	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
+	if (!ret)
+		goto out;
+	contents_encode = g_base64_encode ((const guchar *) contents, length);
+	ret = gdk_pixbuf_save (pixbuf, filename, "png", error,
+			       "tEXt::Software", "Hello my name is dave",
+			       "icc-profile", contents_encode,
+			       NULL);
+	len = strlen (contents_encode);
+	g_debug ("ICC profile was %i bytes", len);
+out:
+	g_free (contents);
+	g_free (contents_encode);
+	return ret;
+}
+
+static gboolean
+save_image_tiff (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
+{
+	gchar *contents = NULL;
+	gchar *contents_encode = NULL;
+	gsize length;
+	gboolean ret;
+	gint len;
+
+	/* get icc file */
+	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
+	if (!ret)
+		goto out;
+	contents_encode = g_base64_encode ((const guchar *) contents, length);
+	ret = gdk_pixbuf_save (pixbuf, filename, "tiff", error,
+			       "icc-profile", contents_encode,
+			       NULL);
+	len = strlen (contents_encode);
+	g_debug ("ICC profile was %i bytes", len);
+out:
+	g_free (contents);
+	g_free (contents_encode);
+	return ret;
+}
+
+static gboolean
+save_image_verify (const gchar *filename, GError **error)
+{
+	gboolean ret = FALSE;
+	GdkPixbuf *pixbuf = NULL;
+	const gchar *option;
+	gchar *icc_profile = NULL;
+	gsize len = 0;
+
+	/* load */
+	pixbuf = gdk_pixbuf_new_from_file (filename, error);
+	if (pixbuf == NULL)
+		goto out;
+
+	/* check values */
+	option = gdk_pixbuf_get_option (pixbuf, "icc-profile");
+	if (option == NULL) {
+		*error = g_error_new (1, 0, "no profile set");
+		goto out;
+	}
+
+	/* decode base64 */
+	icc_profile = (gchar *) g_base64_decode (option, &len);
+	if (len != ICC_PROFILE_SIZE) {
+		*error = g_error_new (1, 0,
+		                      "profile length invalid, got %" G_GSIZE_FORMAT,
+		                      len);
+		g_file_set_contents ("error.icc", icc_profile, len, NULL);
+		goto out;
+	}
+
+	/* success */
+	ret = TRUE;
+out:
+	if (pixbuf != NULL)
+		g_object_unref (pixbuf);
+	g_free (icc_profile);
+	return ret;
+}
+
+int
+main (int argc, char **argv)
+{
+	GdkWindow *root;
+	GdkPixbuf *pixbuf;
+	gboolean ret;
+	gint retval = 1;
+	GError *error = NULL;
+
+	gtk_init (&argc, &argv);
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
+
+	root = gdk_get_default_root_window ();
+	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
+					       0, 0, 0, 0, 150, 160);
+
+	/* PASS */
+	g_debug ("try to save PNG with a profile");
+	ret = save_image_png ("icc-profile.png", pixbuf, &error);
+	if (!ret) {
+		g_warning ("FAILED: did not save image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to save TIFF with a profile");
+	ret = save_image_tiff ("icc-profile.tiff", pixbuf, &error);
+	if (!ret) {
+		g_warning ("FAILED: did not save image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to load PNG and get color attributes");
+	ret = save_image_verify ("icc-profile.png", &error);
+	if (!ret) {
+		g_warning ("FAILED: did not load image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* PASS */
+	g_debug ("try to load TIFF and get color attributes");
+	ret = save_image_verify ("icc-profile.tiff", &error);
+	if (!ret) {
+		g_warning ("FAILED: did not load image: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* success */
+	retval = 0;
+	g_debug ("ALL OKAY!");
+out:
+	return retval;
+}

docs/RELEASE-HOWTO

@@ -7,6 +7,7 @@ dependencies:
 * gtk-doc
 * docbook-utils
 Without those packages make distcheck will *not* pass.
+Make sure that gtk-doc is the latest released version.
 
 
  0) Go back to a pristine working directory. With git, this works:
@@ -101,7 +102,7 @@ Without those packages make distcheck will *not* pass.
     summary of changes.
 
 18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to gnome-hackers.
+    gtk-devel-list. Set reply-to to desktop-devel-list.
 
 19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web cvs module.
+    in the gtk-web git module.

docs/reference/gdk-pixbuf/gdk-pixbuf.sgml

@@ -186,4 +186,7 @@
       </address>
     </para>
   </appendix>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk-pixbuf/tmpl/animation.sgml

@@ -152,6 +152,11 @@ An opaque struct representing a simple animation.
 </para>
 
 
+<!-- ##### ARG GdkPixbufSimpleAnim:loop ##### -->
+<para>
+
+</para>
+
 <!-- ##### FUNCTION gdk_pixbuf_simple_anim_new ##### -->
 <para>
 

docs/reference/gdk/gdk-docs.sgml

@@ -107,5 +107,12 @@
   <index id="api-index-2-18" role="2.18">
     <title>Index of new symbols in 2.18</title>
     <xi:include href="xml/api-index-2.18.xml"><xi:fallback /></xi:include>
-  </index>  
+  </index>
+  <index id="api-index-2-20" role="2.20">
+    <title>Index of new symbols in 2.20</title>
+    <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
+  </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gdk/gdk-sections.txt

@@ -215,6 +215,7 @@ gdk_screen_list_visuals
 gdk_screen_get_toplevel_windows
 gdk_screen_make_display_name
 gdk_screen_get_n_monitors
+gdk_screen_get_primary_monitor
 gdk_screen_get_monitor_geometry
 gdk_screen_get_monitor_at_point
 gdk_screen_get_monitor_at_window
@@ -1005,6 +1006,8 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_add_virtual_modifiers
+gdk_keymap_map_virtual_modifiers
 
 <SUBSECTION>
 gdk_keyval_name

docs/reference/gdk/tmpl/event_structs.sgml

@@ -221,7 +221,7 @@ Generated when all or part of a window becomes visible and needs to be
 redrawn.
 </para>
 
-@type: the type of the event (%GDK_EXPOSE).
+@type: the type of the event (%GDK_EXPOSE or %GDK_DAMAGE).
 @window: the window which received the event.
 @send_event: %TRUE if the event was sent explicitly (e.g. using 
 <function>XSendEvent</function>).

docs/reference/gdk/tmpl/gdkscreen.sgml

@@ -253,6 +253,15 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_screen_get_primary_monitor ##### -->
+<para>
+
+</para>
+
+@screen: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_screen_get_monitor_geometry ##### -->
 <para>
 

docs/reference/gdk/tmpl/input_devices.sgml

@@ -228,15 +228,12 @@ Specifies how an axis of a device is used.
 
 
 <!-- ##### FUNCTION gdk_device_get_state ##### -->
-<para>
-Gets the current state of a device.
-</para>
 
-@device: a #GdkDevice.
-@window: a #GdkWindow.
-@axes: an array of doubles to store the values of the axes of @device in, 
-  or %NULL.
-@mask: location to store the modifiers, or %NULL.
+
+@device: 
+@window: 
+@axes: 
+@mask: 
 
 
 <!-- ##### FUNCTION gdk_device_get_history ##### -->

docs/reference/gdk/tmpl/keys.sgml

@@ -34,7 +34,7 @@ When it makes sense, key values can be converted to and from
 Unicode characters with gdk_keyval_to_unicode() and gdk_unicode_to_keyval().
 </para>
 
-<para>
+<para id="key-group-explanation">
 One #GdkKeymap object exists for each user display. gdk_keymap_get_default() 
 returns the #GdkKeymap for the default display; to obtain keymaps for other 
 displays, use gdk_keymap_get_for_display(). A keymap
@@ -234,6 +234,16 @@ Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_keymap_map_virtual_modifiers ##### -->
+<para>
+
+</para>
+
+@keymap: 
+@state: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_keyval_name ##### -->
 <para>
 Converts a key value into a symbolic name.

docs/reference/gdk/tmpl/pixmaps.sgml

@@ -77,76 +77,45 @@ for the new pixmap. Can be %NULL, if the depth is given.
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@filename: the filename of a file containing XPM data.
-@Returns: the #GdkPixmap
+
+@drawable: 
+@mask: 
+@transparent_color: 
+@filename: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm ##### -->
-<para>
-Create a pixmap from a XPM file using a particular colormap.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap. Can be %NULL if @colormap is given.
-@colormap: the #GdkColormap that the new pixmap will be use.
-  If omitted, the colormap for @window will be used.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@filename: the filename of a file containing XPM data.
-@Returns: the #GdkPixmap.
+
+@drawable: 
+@colormap: 
+@mask: 
+@transparent_color: 
+@filename: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap.
-@mask: Pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: This color will be used for the pixels
-that are transparent in the input file. Can be %NULL
-in which case a default color will be used.
-@data: Pointer to a string containing the XPM data.
-@Returns: the #GdkPixmap
+
+@drawable: 
+@mask: 
+@transparent_color: 
+@data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gdk_pixmap_colormap_create_from_xpm_d ##### -->
-<para>
-Create a pixmap from data in XPM format using a particular
-colormap.
-</para>
 
-@drawable: a #GdkDrawable, used to determine default values
-for the new pixmap. Can be %NULL if @colormap is given.
-@colormap: the #GdkColormap that the new pixmap will be use.
-  If omitted, the colormap for @window will be used.
-@mask: a pointer to a place to store a bitmap representing
-the transparency mask of the XPM file. Can be %NULL,
-in which case transparency will be ignored.
-@transparent_color: the color to be used for the pixels
-that are transparent in the input file. Can be %NULL,
-in which case a default color will be used.
-@data: Pointer to a string containing the XPM data.
-@Returns: the #GdkPixmap.
+
+@drawable: 
+@colormap: 
+@mask: 
+@transparent_color: 
+@data: 
+@Returns: 
 
 
 <!-- ##### MACRO gdk_pixmap_ref ##### -->

docs/reference/gtk/building.sgml

@@ -244,17 +244,24 @@ How to compile GTK+ itself
 	<para>
 	  The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
 	  library provides Pango with a standard way of locating
-	  fonts and matching them against font names. 
+	  fonts and matching them against font names.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <ulink url="http://www.cairographics.org">Cairo</ulink>
-          is a graphics library that supports vector graphics and image 
+          is a graphics library that supports vector graphics and image
           compositing. Both Pango and GTK+ use cairo for much of their
           drawing.
         </para>
       </listitem>
+      <listitem>
+	<para>
+	  <ulink url="http://live.gnome.org/GObjectIntrospection">gobject-introspection</ulink>
+          is a framework for making introspection data available to
+          language bindings.
+        </para>
+      </listitem>
       <listitem>
         <para>
           The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink> 
@@ -368,6 +375,9 @@ How to compile GTK+ itself
 	  <group>
 	    <arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
 	  </group>
+          <group>
+	    <arg>--disable-introspection</arg>
+          </group>
 	</cmdsynopsis>
       </para>
 
@@ -580,7 +590,13 @@ How to compile GTK+ itself
           for the Linux framebuffer.
 	</para>
       </formalpara>
+      <formalpara>
+        <title><systemitem>--disable-introspection</systemitem></title>
 
+        <para>
+          Build without introspection support.
+        </para>
+      </formalpara>
     </refsect1>
 
 </refentry>

docs/reference/gtk/compiling.sgml

@@ -69,12 +69,17 @@ toplevel headers <filename>gtk.h</filename>, <filename>gdk.h</filename>,
 If you want to make sure that your program follows this recommended
 practise, you can define the preprocessor symbols GTK_DISABLE_SINGLE_INCLUDES
 and GDK_PIXBUF_DISABLE_SINGLE_INCLUDES to make GTK+ generate an error
-when individual headers are directly included. 
+when individual headers are directly included.
+There are some exceptions: <filename>gdkkeysyms.h</filename> is not included in
+<filename>gdk.h</filename> because the file is quite large; see
+<link linkend="gdk-Keyboard-Handling">Key Values documentation</link>.
+<filename>gdkx.h</filename> must be included independently because It's
+platform-specific; see
+<link linkend="gdk-X-Window-System-Interaction">X Window System Interaction</link>
+documentation.
+The same for <filename>gtkunixprint.h</filename> if you use the non-portable
+<link linkend="GtkPrintUnixDialog">GtkPrintUnixDialog</link> API.
 </para>
 
 </refsect1>
 </refentry>
-
-
-
-

docs/reference/gtk/drawing-model.xml

@@ -124,11 +124,10 @@
 	However, in practice it is convenient to have widgets which do
 	not have a <classname>GdkWindow</classname> of their own, but
 	rather share the one from their parent widget.  Such widgets
-	have the <constant>GTK_NO_WINDOW</constant> <link
-	linkend="GtkWidgetFlags">widget flag</link> turned on; this
-	can be tested easily with the <link
-	linkend="GTK-WIDGET-NO-WINDOW-CAPS"><function>GTK_WIDGET_NO_WINDOW()</function></link>
-	macro.  As such, these are called <firstterm>no-window
+	have called <function>gtk_widget_set_has_window</function> to
+	disable it; this can be tested easily with the <link
+	linkend="gtk-widget-get-has-window"><function>gtk_widget_get_has_window()</function></link>
+	function.  As such, these are called <firstterm>no-window
 	widgets</firstterm>.
       </para>
 
@@ -444,7 +443,7 @@ my_widget_init (MyWidget *widget)
 {
   ...
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED);
+  gtk_widget_set_double_buffered (widget, FALSE);
 
   ...
 }
@@ -508,7 +507,7 @@ static gint
 gtk_window_expose (GtkWidget      *widget,
 		   GdkEventExpose *event)
 {
-  if (!GTK_WIDGET_APP_PAINTABLE (widget))
+  if (!gtk_widget_get_app_paintable (widget))
     gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, 
                         GTK_SHADOW_NONE, event->area, widget, "base", 0, 0, -1, -1);
 

docs/reference/gtk/glossary.xml

@@ -195,9 +195,8 @@
       <para>
 	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
-	linkend="parent">parent's</glossterm>.  Such a widget has the
-	%GTK_NO_WINDOW <link linkend="GtkWidgetFlags">flag</link> set, and 
-        can be tested with the GTK_WIDGET_NO_WINDOW() macro.  See
+	linkend="parent">parent's</glossterm>.  This can be tested with
+	the gtk_widget_get_has_window() function.  See
 	<xref linkend="window-no-window-widgets"/> for a detailed
 	description of this flag.
       </para>

docs/reference/gtk/gtk-docs.sgml

@@ -150,6 +150,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtkwindowgroup.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
+      <xi:include href="xml/gtkoffscreenwindow.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
@@ -499,4 +500,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
     <title>Index of new symbols in 2.20</title>
     <xi:include href="xml/api-index-2.20.xml"><xi:fallback /></xi:include>
   </index>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
 </book>

docs/reference/gtk/gtk-sections.txt

@@ -1336,6 +1336,8 @@ gtk_entry_set_icon_tooltip_markup
 gtk_entry_get_icon_tooltip_markup
 gtk_entry_set_icon_drag_source
 gtk_entry_get_current_icon_drag_source
+gtk_entry_get_icon_window
+gtk_entry_get_text_window
 
 <SUBSECTION Standard>
 GTK_ENTRY
@@ -2799,6 +2801,25 @@ GTK_OBJECT_SET_FLAGS
 GTK_OBJECT_UNSET_FLAGS
 </SECTION>
 
+<SECTION>
+<FILE>gtkoffscreenwindow</FILE>
+<TITLE>GtkOffscreenWindow</TITLE>
+GtkOffscreenWindow
+gtk_offscreen_window_new
+gtk_offscreen_window_get_pixmap
+gtk_offscreen_window_get_pixbuf
+<SUBSECTION Standard>
+GTK_OFFSCREEN_WINDOW
+GTK_IS_OFFSCREEN_WINDOW
+GTK_TYPE_OFFSCREEN_WINDOW
+GTK_OFFSCREEN_WINDOW_CLASS
+GTK_IS_OFFSCREEN_WINDOW_CLASS
+GTK_OFFSCREEN_WINDOW_GET_CLASS
+
+<SUBSECTION Private>
+gtk_offscreen_window_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkoptionmenu</FILE>
 <TITLE>GtkOptionMenu</TITLE>
@@ -2834,6 +2855,7 @@ gtk_paned_get_child2
 gtk_paned_set_gutter_size
 gtk_paned_set_position
 gtk_paned_get_position
+gtk_paned_get_handle_window
 <SUBSECTION Standard>
 GTK_PANED
 GTK_IS_PANED
@@ -3079,6 +3101,13 @@ gtk_range_set_upper_stepper_sensitivity
 gtk_range_get_upper_stepper_sensitivity
 gtk_range_get_flippable
 gtk_range_set_flippable
+gtk_range_get_min_slider_size
+gtk_range_get_range_rect
+gtk_range_get_slider_range
+gtk_range_get_slider_size_fixed
+gtk_range_set_min_slider_size
+gtk_range_set_slider_size_fixed
+
 <SUBSECTION Standard>
 GTK_RANGE
 GTK_IS_RANGE
@@ -3655,6 +3684,7 @@ gtk_status_icon_set_has_tooltip
 gtk_status_icon_get_has_tooltip
 gtk_status_icon_set_title
 gtk_status_icon_get_title
+gtk_status_icon_set_name
 gtk_status_icon_set_visible
 gtk_status_icon_get_visible
 gtk_status_icon_set_blinking
@@ -5656,6 +5686,7 @@ gtk_widget_send_expose
 gtk_widget_style_get
 gtk_widget_style_get_property
 gtk_widget_style_get_valist
+gtk_widget_style_attach
 gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_child_notify
@@ -5714,11 +5745,17 @@ gtk_widget_set_visible
 gtk_widget_has_default
 gtk_widget_has_focus
 gtk_widget_has_grab
+gtk_widget_has_rc_style
 gtk_widget_is_drawable
 gtk_widget_is_toplevel
 gtk_widget_set_window
 gtk_widget_set_receives_default
 gtk_widget_get_receives_default
+gtk_widget_set_realized
+gtk_widget_get_realized
+gtk_widget_set_mapped
+gtk_widget_get_mapped
+gtk_widget_get_requisition
 
 <SUBSECTION>
 gtk_requisition_copy
@@ -5842,6 +5879,8 @@ gtk_window_set_icon_name
 gtk_window_set_auto_startup_notification
 gtk_window_get_opacity
 gtk_window_set_opacity
+gtk_window_get_mnemonics_visible
+gtk_window_set_mnemonics_visible
 <SUBSECTION Standard>
 GTK_WINDOW
 GTK_IS_WINDOW
@@ -7111,6 +7150,7 @@ gtk_print_context_get_dpi_y
 gtk_print_context_get_pango_fontmap
 gtk_print_context_create_pango_context
 gtk_print_context_create_pango_layout
+gtk_print_context_get_hard_margins
 
 <SUBSECTION Standard>
 GTK_TYPE_PRINT_CONTEXT

docs/reference/gtk/gtk.types

@@ -104,6 +104,7 @@ gtk_misc_get_type
 gtk_mount_operation_get_type
 gtk_notebook_get_type
 gtk_object_get_type
+gtk_offscreen_window_get_type
 gtk_old_editable_get_type
 gtk_option_menu_get_type
 gtk_orientable_get_type

docs/reference/gtk/migrating-GtkComboBox.sgml

@@ -20,7 +20,7 @@
     editable case. 
     The selection of the display style — menu or list —
     is no longer done at the API level, but has been made themeable via
-    the style property #GtkComboBox:appearance.
+    the style property #GtkComboBox:appears-as-list.
   </para>
 
   <section id="migrating-GtkOptionMenu">
@@ -28,7 +28,7 @@
     
     <para>
       Here is an example of a simple, but typical use of 
-      #GtkOptionMenu:
+      #GtkOptionMenu<!---->:
       <informalexample><programlisting>
 GtkWidget *option_menu, *menu, *menu_item;
 
@@ -47,12 +47,12 @@ gtk_widget_show (menu_item);
 
 gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkOptionMenu::changed
       signal on the option menu and use gtk_option_menu_get_history()
       to retrieve the index of the selected item.
     </para>
     <para>
-      And here is how it would be done with a #GtkComboBox:
+      And here is how it would be done with a #GtkComboBox<!---->:
       <informalexample><programlisting>
 GtkWidget *combo_box;
 
@@ -129,7 +129,7 @@ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
     <title>Migrating from GtkCombo to GtkComboBoxEntry</title>
 
     <para>
-      Here is an example of a simple, but typical use of a #GtkCombo:
+      Here is an example of a simple, but typical use of a #GtkCombo<!---->:
       <informalexample><programlisting>
 GtkWidget *combo;
 GList *items = NULL;
@@ -141,13 +141,13 @@ items = g_list_append (items, "Third Item");
 combo = gtk_combo_new (<!-- -->);
 gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkCombo::changed
       signal on the combo and use 
       <literal>gtk_entry_get_text (GTK_ENTRY (combo->entry))</literal>
       to retrieve the selected text.
     </para>
     <para>
-      And here is how it would be done using #GtkComboBoxEntry:
+      And here is how it would be done using #GtkComboBoxEntry<!---->:
       <informalexample><programlisting>
 combo_box = gtk_combo_box_entry_new_text (<!-- -->);
 
@@ -155,7 +155,7 @@ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "First Item");
 gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Second Item");
 gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "Third Item");
       </programlisting></informalexample>
-      In order to react to the user's selection, connect to the "changed"
+      In order to react to the user's selection, connect to the #GtkComboBox::changed
       signal on the combo and use 
       <literal>gtk_entry_get_text (GTK_ENTRY (GTK_BIN (combo_box)->child))</literal>
       to retrieve the selected text.

docs/reference/gtk/tmpl/filesystem.sgml

@@ -1,106 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Filesystem utilities
-
-<!-- ##### SECTION Short_Description ##### -->
-
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkMountOperation ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkMountOperation:is-showing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMountOperation:parent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMountOperation:screen ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_mount_operation_new ##### -->
-<para>
-
-</para>
-
-@parent: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_is_showing ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_set_parent ##### -->
-<para>
-
-</para>
-
-@op: 
-@parent: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_get_parent ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_set_screen ##### -->
-<para>
-
-</para>
-
-@op: 
-@screen: 
-
-
-<!-- ##### FUNCTION gtk_mount_operation_get_screen ##### -->
-<para>
-
-</para>
-
-@op: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_show_uri ##### -->
-<para>
-
-</para>
-
-@screen: 
-@uri: 
-@timestamp: 
-@error: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkaccellabel.sgml

@@ -1,158 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkAccelLabel
-
-<!-- ##### SECTION Short_Description ##### -->
-A label which displays an accelerator key on the right of the text
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkAccelLabel widget is a subclass of #GtkLabel that also displays an
-accelerator key on the right of the label text, e.g. 'Ctl+S'.
-It is commonly used in menus to show the keyboard short-cuts for commands.
-</para>
-<para>
-The accelerator key to display is not set explicitly.
-Instead, the #GtkAccelLabel displays the accelerators which have been added to
-a particular widget. This widget is set by calling
-gtk_accel_label_set_accel_widget().
-</para>
-<para>
-For example, a #GtkMenuItem widget may have an accelerator added to emit the
-"activate" signal when the 'Ctl+S' key combination is pressed.
-A #GtkAccelLabel is created and added to the #GtkMenuItem, and
-gtk_accel_label_set_accel_widget() is called with the #GtkMenuItem as the
-second argument. The #GtkAccelLabel will now display 'Ctl+S' after its label.
-</para>
-<para>
-Note that creating a #GtkMenuItem with gtk_menu_item_new_with_label() (or
-one of the similar functions for #GtkCheckMenuItem and #GtkRadioMenuItem)
-automatically adds a #GtkAccelLabel to the #GtkMenuItem and calls
-gtk_accel_label_set_accel_widget() to set it up for you.
-</para>
-<para>
-A #GtkAccelLabel will only display accelerators which have %GTK_ACCEL_VISIBLE
-set (see #GtkAccelFlags).
-A #GtkAccelLabel can display multiple accelerators and even signal names,
-though it is almost always used to display just one accelerator key.
-</para>
-
-<example>
-<title>Creating a simple menu item with an accelerator key.</title>
-<programlisting>
-  GtkWidget *save_item;
-  GtkAccelGroup *accel_group;
-
-  /* Create a GtkAccelGroup and add it to the window. */
-  accel_group = gtk_accel_group_new (<!-- -->);
-  gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
-  /* Create the menu item using the convenience function. */
-  save_item = gtk_menu_item_new_with_label ("Save");
-  gtk_widget_show (save_item);
-  gtk_container_add (GTK_CONTAINER (menu), save_item);
-
-  /* Now add the accelerator to the GtkMenuItem. Note that since we called
-     gtk_menu_item_new_with_label(<!-- -->) to create the GtkMenuItem the
-     GtkAccelLabel is automatically set up to display the GtkMenuItem
-     accelerators. We just need to make sure we use GTK_ACCEL_VISIBLE here. */
-  gtk_widget_add_accelerator (save_item, "activate", accel_group,
-                              GDK_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term><link linkend="gtk-keyboard-accelerators">Keyboard Accelerators</link>
-</term>
-<listitem><para>installing and using keyboard short-cuts.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>#GtkItemFactory</term>
-<listitem><para>an easier way to create menus.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkAccelLabel ##### -->
-<para>
-The #GtkAccelLabel-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkAccelLabel:accel-closure ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkAccelLabel:accel-widget ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_accel_label_new ##### -->
-<para>
-Creates a new #GtkAccelLabel.
-</para>
-
-@string: the label string. Must be non-%NULL.
-@Returns: a new #GtkAccelLabel.
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_closure ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_closure: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### -->
-<para>
-
-</para>
-
-@accel_label: 
-@accel_widget: 
-
-
-<!-- ##### FUNCTION gtk_accel_label_get_accel_width ##### -->
-<para>
-Returns the width needed to display the accelerator key(s).
-This is used by menus to align all of the #GtkMenuItem widgets, and shouldn't
-be needed by applications.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: the width needed to display the accelerator key(s).
-
-
-<!-- ##### FUNCTION gtk_accel_label_refetch ##### -->
-<para>
-Recreates the string representing the accelerator keys.
-This should not be needed since the string is automatically updated whenever
-accelerators are added or removed from the associated widget.
-</para>
-
-@accel_label: a #GtkAccelLabel.
-@Returns: always returns %FALSE.
-
-

docs/reference/gtk/tmpl/gtkaction.sgml

@@ -70,6 +70,11 @@ and should not be accessed directly.
 
 </para>
 
+<!-- ##### ARG GtkAction:always-show-image ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkAction:gicon ##### -->
 <para>
 
@@ -337,6 +342,24 @@ and should not be accessed directly.
 @proxy: 
 
 
+<!-- ##### FUNCTION gtk_action_get_always_show_image ##### -->
+<para>
+
+</para>
+
+@action: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_action_set_always_show_image ##### -->
+<para>
+
+</para>
+
+@action: 
+@always_show: 
+
+
 <!-- ##### FUNCTION gtk_action_get_accel_path ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkbindings.sgml

@@ -156,6 +156,7 @@ a #GtkBindingEntry.
 @signals: 	action signals of this entry
 
 <!-- ##### STRUCT GtkBindingSignal ##### -->
+<anchor id="keybinding-signals"/>
 <para>
 A #GtkBindingSignal stores the necessary information to activate a widget
 in response to a key press via a signal emission.

docs/reference/gtk/tmpl/gtkbuilder.sgml

@@ -116,6 +116,12 @@ allows the application to retrieve them from the builder with
 gtk_builder_get_object(). An id is also necessary to use the
 object as property value in other parts of the UI definition.
 </para>
+<note><para>Prior to 2.20, GtkBuilder was setting the "name"
+property of constructed widgets to the "id" attribute. In GTK+
+2.20 or newer, you have to use gtk_buildable_get_name() instead
+of gtk_widget_get_name() to obtain the "id", or set the "name"
+property in your UI definition.
+</para></note>
 <para>
 Setting properties of objects is pretty straightforward with
 the &lt;property&gt; element: the "name" attribute specifies

docs/reference/gtk/tmpl/gtkdnd.sgml

@@ -348,17 +348,14 @@ a widget.
 
 <!-- ##### FUNCTION gtk_drag_source_set ##### -->
 <para>
-Sets up a widget so that GTK+ will start a drag
-operation when the user clicks and drags on the
-widget. The widget must have a window.
+
 </para>
 
-@widget: a #GtkWidget
-@start_button_mask: the bitmask of buttons that can start the drag
-@targets: the table of targets that the drag will support
-@n_targets: the number of items in @targets
-@actions: the bitmask of possible actions for a drag from this
- widget.
+@widget:
+@start_button_mask:
+@targets:
+@n_targets:
+@actions:
 
 
 <!-- ##### FUNCTION gtk_drag_source_set_icon ##### -->

docs/reference/gtk/tmpl/gtkdrawingarea.sgml

@@ -56,7 +56,7 @@ gboolean
 expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   gdk_draw_arc (widget->window,
-                widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                widget->style->fg_gc[gtk_widget_get_state (widget)],
                 TRUE,
                 0, 0, widget->allocation.width, widget->allocation.height,
                 0, 64 * 360);

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -161,6 +161,14 @@ The #GtkEntry-struct struct contains only private data.
 @entry: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL GtkEntry::preedit-changed ##### -->
+<para>
+
+</para>
+
+@entry: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL GtkEntry::toggle-overwrite ##### -->
 <para>
 
@@ -1011,3 +1019,22 @@ Specifies the side of the entry at which an icon is placed.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_entry_get_icon_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@icon_pos: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_entry_get_text_window ##### -->
+<para>
+
+</para>
+
+@entry: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkimage.sgml

@@ -1,518 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkImage
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget displaying an image
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkImage widget displays an image. Various kinds of object 
-can be displayed as an image; most typically, you would load a 
-#GdkPixbuf ("pixel buffer") from a file, and then display that. 
-There's a convenience function to do this, gtk_image_new_from_file(),
-used as follows:
-<informalexample><programlisting>
-  GtkWidget *image;
-  image = gtk_image_new_from_file ("myfile.png");
-</programlisting></informalexample>
-If the file isn't loaded successfully, the image will contain a
-"broken image" icon similar to that used in many web browsers.
-If you want to handle errors in loading the file yourself, 
-for example by displaying an error message, then load the image with
-gdk_pixbuf_new_from_file(), then create the #GtkImage with 
-gtk_image_new_from_pixbuf().
-</para>
-<para>
-The image file may contain an animation, if so the #GtkImage will 
-display an animation (#GdkPixbufAnimation) instead of a static image.
-</para>
-<para>
-#GtkImage is a subclass of #GtkMisc, which implies that you can 
-align it (center, left, right) and add padding to it, using 
-#GtkMisc methods.
-</para>
-<para>
-#GtkImage is a "no window" widget (has no #GdkWindow of its own), 
-so by default does not receive events. If you want to receive events
-on the image, such as button clicks, place the image inside a 
-#GtkEventBox, then connect to the event signals on the event box.
-<example>
-<title>Handling button press events on a 
-<structname>GtkImage</structname>.</title>
-<programlisting>
-  static gboolean
-  button_press_callback (GtkWidget      *event_box, 
-                         GdkEventButton *event,
-                         gpointer        data)
-  {
-    g_print ("Event box clicked at coordinates &percnt;f,&percnt;f\n", 
-             event->x, event->y);
-
-    /* Returning TRUE means we handled the event, so the signal 
-     * emission should be stopped (don't call any further 
-     * callbacks that may be connected). Return FALSE
-     * to continue invoking callbacks.
-     */
-    return TRUE;
-  }
-
-  static GtkWidget*
-  create_image (void)
-  {
-    GtkWidget *image;
-    GtkWidget *event_box;
-
-    image = gtk_image_new_from_file ("myfile.png");
-
-    event_box = gtk_event_box_new (<!-- -->);
-
-    gtk_container_add (GTK_CONTAINER (event_box), image);
-
-    g_signal_connect (G_OBJECT (event_box), 
-                      "button_press_event",
-                      G_CALLBACK (button_press_callback),
-                      image);
-
-    return image;
-  }
-</programlisting>
-</example>
-</para>
-<para>
-When handling events on the event box, keep in mind that coordinates
-in the image may be different from event box coordinates due to 
-the alignment and padding settings on the image (see #GtkMisc). 
-The simplest way to solve this is to set the alignment to 0.0
-(left/top), and set the padding to zero. Then the origin of 
-the image will be the same as the origin of the event box.
-</para>
-
-<para>
-Sometimes an application will want to avoid depending on external data
-files, such as image files. GTK+ comes with a program to avoid this,
-called <application>gdk-pixbuf-csource</application>. This program
-allows you to convert an image into a C variable declaration, which
-can then be loaded into a #GdkPixbuf using
-gdk_pixbuf_new_from_inline().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GdkPixbuf
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkImage ##### -->
-<para>
-This struct contain private data only and should be accessed by the functions
-below.
-</para>
-
-
-<!-- ##### ARG GtkImage:file ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:gicon ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:icon-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:mask ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixbuf-animation ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixel-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:pixmap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:stock ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkImage:storage-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkImageType ##### -->
-<para>
-Describes the image data representation used by a #GtkImage. If you
-want to get the image from the widget, you can only get the
-currently-stored representation. e.g.  if the
-gtk_image_get_storage_type() returns #GTK_IMAGE_PIXBUF, then you can
-call gtk_image_get_pixbuf() but not gtk_image_get_stock().  For empty
-images, you can request any storage type (call any of the "get"
-functions), but they will all return %NULL values.
-</para>
-
-@GTK_IMAGE_EMPTY: there is no image displayed by the widget
-@GTK_IMAGE_PIXMAP: the widget contains a #GdkPixmap
-@GTK_IMAGE_IMAGE: the widget contains a #GdkImage
-@GTK_IMAGE_PIXBUF: the widget contains a #GdkPixbuf
-@GTK_IMAGE_STOCK: the widget contains a stock icon name (see <xref linkend="gtk-Stock-Items"/>)
-@GTK_IMAGE_ICON_SET: the widget contains a #GtkIconSet
-@GTK_IMAGE_ANIMATION: the widget contains a #GdkPixbufAnimation
-@GTK_IMAGE_ICON_NAME: the widget contains a named icon. 
-  This image type was added in GTK+ 2.6
-@GTK_IMAGE_GICON: the widget contains a #GIcon.
-  This image type was added in GTK+ 2.14
-
-<!-- ##### FUNCTION gtk_image_get_icon_set ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_set: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@gdk_image: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixbuf ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixmap ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixmap: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_get_stock ##### -->
-<para>
-
-</para>
-
-@image: 
-@stock_id: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_animation ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_get_icon_name ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_name: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_gicon ##### -->
-<para>
-
-</para>
-
-@image: 
-@gicon: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_storage_type ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_file ##### -->
-<para>
-
-</para>
-
-@filename: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_icon_set ##### -->
-<para>
-
-</para>
-
-@icon_set: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@mask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_pixmap ##### -->
-<para>
-
-</para>
-
-@pixmap: 
-@mask: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_stock ##### -->
-<para>
-
-</para>
-
-@stock_id: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_animation ##### -->
-<para>
-
-</para>
-
-@animation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_icon_name ##### -->
-<para>
-
-</para>
-
-@icon_name: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_new_from_gicon ##### -->
-<para>
-
-</para>
-
-@icon: 
-@size: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_file ##### -->
-<para>
-
-</para>
-
-@image: 
-@filename: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_icon_set ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_set: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_image ##### -->
-<para>
-
-</para>
-
-@image: 
-@gdk_image: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_pixbuf ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixbuf: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_pixmap ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixmap: 
-@mask: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_stock ##### -->
-<para>
-
-</para>
-
-@image: 
-@stock_id: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_animation ##### -->
-<para>
-
-</para>
-
-@image: 
-@animation: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_icon_name ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon_name: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_set_from_gicon ##### -->
-<para>
-
-</para>
-
-@image: 
-@icon: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_image_clear ##### -->
-<para>
-
-</para>
-
-@image: 
-
-
-<!-- ##### FUNCTION gtk_image_new ##### -->
-<para>
-
-</para>
-
-@Returns: the #GtkImage
-<!-- # Unused Parameters # -->
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_set ##### -->
-<para>
-Sets the #GtkImage.
-</para>
-
-@image: a #GtkImage
-@val: a #GdkImage
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_get ##### -->
-<para>
-Gets the #GtkImage.
-</para>
-
-@image: a #GtkImage
-@val: return location for a #GdkImage
-@mask: a #GdkBitmap that indicates which parts of the image should be transparent.
-
-
-<!-- ##### FUNCTION gtk_image_set_pixel_size ##### -->
-<para>
-
-</para>
-
-@image: 
-@pixel_size: 
-
-
-<!-- ##### FUNCTION gtk_image_get_pixel_size ##### -->
-<para>
-
-</para>
-
-@image: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -755,6 +755,26 @@ Deprecated compatibility macro.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_notebook_set_action_widget ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@widget: 
+@pack_type: 
+
+
+<!-- ##### FUNCTION gtk_notebook_get_action_widget ##### -->
+<para>
+
+</para>
+
+@notebook: 
+@pack_type: 
+@Returns: 
+
+
 <!-- ##### USER_FUNCTION GtkNotebookWindowCreationFunc ##### -->
 <para>
 A function used by GtkNotebook when a detachable tab is dropped

docs/reference/gtk/tmpl/gtkobject.sgml

@@ -113,18 +113,16 @@ if all references are released.
 
 <!-- ##### MACRO GTK_OBJECT_TYPE ##### -->
 <para>
-Gets the type of an object.
+
 </para>
 
-@object: a #GtkObject.
 
 
 <!-- ##### MACRO GTK_OBJECT_TYPE_NAME ##### -->
 <para>
-Gets the name of an objects type.
+
 </para>
 
-@object: a #GtkObject.
 
 
 <!-- ##### ENUM GtkObjectFlags ##### -->

docs/reference/gtk/tmpl/gtkplug.sgml

@@ -1,126 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPlug
-
-<!-- ##### SECTION Short_Description ##### -->
-Toplevel for embedding into other processes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Together with #GtkSocket, #GtkPlug provides the ability
-to embed widgets from one process into another process
-in a fashion that is transparent to the user. One
-process creates a #GtkSocket widget and, passes the
-ID of that widgets window to the other process, 
-which then creates a #GtkPlug with that window ID.
-Any widgets contained in the #GtkPlug then will appear
-inside the first applications window.
-</para>
-
-<note>
-<para>
-The #GtkPlug and #GtkSocket widgets are currently not available 
-on all platforms supported by GTK+.
-</para>
-</note>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkSocket</term>
-<listitem><para>the widget that a #GtkPlug plugs into.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkPlug ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkPlug::embedded ##### -->
-<para>
-
-</para>
-
-@plug: the object which received the signal.
-
-<!-- ##### ARG GtkPlug:embedded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPlug:socket-window ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_plug_construct ##### -->
-<para>
-</para>
-
-@plug: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_construct_for_display ##### -->
-<para>
-
-</para>
-
-@plug: 
-@display: 
-@socket_id: 
-
-
-<!-- ##### FUNCTION gtk_plug_new ##### -->
-<para>
-</para>
-
-@socket_id: the window ID of the socket, or 0.
-@Returns: the new #GtkPlug widget.
-
-
-<!-- ##### FUNCTION gtk_plug_new_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@socket_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_id ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_embedded ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_plug_get_socket_window ##### -->
-<para>
-
-</para>
-
-@plug: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkprintcontext.sgml

@@ -184,3 +184,16 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_context_get_hard_margins ##### -->
+<para>
+
+</para>
+
+@context: 
+@top: 
+@bottom: 
+@left: 
+@right: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkprinter.sgml

@@ -295,6 +295,19 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_printer_get_hard_margins ##### -->
+<para>
+
+</para>
+
+@printer: 
+@top: 
+@bottom: 
+@left: 
+@right: 
+@Returns: 
+
+
 <!-- ##### USER_FUNCTION GtkPrinterFunc ##### -->
 <para>
 The type of function passed to gtk_enumerate_printers().

docs/reference/gtk/tmpl/gtkprogressbar.sgml

@@ -264,12 +264,10 @@ directions for the visible progress bar.
 
 
 <!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### -->
-<para>
-Creates a new #GtkProgressBar with an associated #GtkAdjustment.
-</para>
 
-@adjustment: a #GtkAdjustment.
-@Returns: a #GtkProgressBar.
+
+@adjustment: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_progress_bar_set_bar_style ##### -->

docs/reference/gtk/tmpl/gtkradiobutton.sgml

@@ -197,13 +197,9 @@ gtk_radio_button_get_group().
 
 
 <!-- ##### FUNCTION gtk_radio_button_get_group ##### -->
-<para>
-Retrieves the group assigned to a radio button.
-</para>
-
-@radio_button: a #GtkRadioButton.
-@Returns: a linked list containing all the radio buttons in the same group
-as @radio_button. The returned list is owned by the radio button
-and must not be modified or freed.
+
+
+@radio_button: 
+@Returns: 
 
 

docs/reference/gtk/tmpl/gtkradiomenuitem.sgml

@@ -80,13 +80,11 @@ Creates a new #GtkRadioMenuItem.
 
 
 <!-- ##### FUNCTION gtk_radio_menu_item_new_with_label ##### -->
-<para>
-Creates a new #GtkRadioMenuItem whose child is a simple #GtkLabel.
-</para>
 
-@group: the group to which the radio menu item is to be attached
-@label: the text for the label
-@Returns: a new #GtkRadioMenuItem
+
+@group: 
+@label: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_radio_menu_item_new_with_mnemonic ##### -->

docs/reference/gtk/tmpl/gtkrange.sgml

@@ -364,3 +364,58 @@ at the end of range widgets.
 @flippable: 
 
 
+<!-- ##### FUNCTION gtk_range_get_min_slider_size ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_range_get_range_rect ##### -->
+<para>
+
+</para>
+
+@range: 
+@range_rect: 
+
+
+<!-- ##### FUNCTION gtk_range_get_slider_range ##### -->
+<para>
+
+</para>
+
+@range: 
+@slider_start: 
+@slider_end: 
+
+
+<!-- ##### FUNCTION gtk_range_get_slider_size_fixed ##### -->
+<para>
+
+</para>
+
+@range: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_range_set_min_slider_size ##### -->
+<para>
+
+</para>
+
+@range: 
+@min_size: 
+
+
+<!-- ##### FUNCTION gtk_range_set_slider_size_fixed ##### -->
+<para>
+
+</para>
+
+@range: 
+@size_fixed: 
+
+

docs/reference/gtk/tmpl/gtksettings.sgml

@@ -66,6 +66,11 @@ GtkSettings instance for the default screen.
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-auto-mnemonics ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-button-images ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkspinbutton.sgml

@@ -246,13 +246,13 @@ GTK_SPIN_END</entry>
 
 <!-- ##### FUNCTION gtk_spin_button_configure ##### -->
 <para>
-Changes the properties of an existing spin button. The adjustment, climb rate, and number of decimal places are all changed accordingly, after this function call.
+
 </para>
 
-@spin_button: a #GtkSpinButton.
-@adjustment: a #GtkAdjustment.
-@climb_rate: the new climb rate.
-@digits: the number of decimal places to display in the spin button.
+@spin_button: 
+@adjustment: 
+@climb_rate: 
+@digits: 
 
 
 <!-- ##### FUNCTION gtk_spin_button_new ##### -->

docs/reference/gtk/tmpl/gtkstatusbar.sgml

@@ -150,3 +150,12 @@ below.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_statusbar_get_message_area ##### -->
+<para>
+
+</para>
+
+@statusbar: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkstatusicon.sgml

@@ -443,6 +443,15 @@ on Win32 doesn't allow to embed arbitrary widgets.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_status_icon_set_name ##### -->
+<para>
+
+</para>
+
+@status_icon: 
+@name: 
+
+
 <!-- ##### FUNCTION gtk_status_icon_set_visible ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkstyle.sgml

@@ -849,6 +849,9 @@ Does the same as gtk_style_apply_default_background().
 @style: 
 @window: 
 @state_type: 
+@area: 
+@widget: 
+@detail: 
 @step: 
 @x: 
 @y: 

docs/reference/gtk/tmpl/gtktextview.sgml

@@ -110,6 +110,14 @@ types related to the text widget and how they work together.
 @textview: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL GtkTextView::preedit-changed ##### -->
+<para>
+
+</para>
+
+@textview: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL GtkTextView::select-all ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtktoolitem.sgml

@@ -209,6 +209,15 @@ GtkToolItem
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_tool_item_get_ellipsize_mode ##### -->
+<para>
+
+</para>
+
+@tool_item: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_tool_item_get_icon_size ##### -->
 <para>
 
@@ -245,6 +254,24 @@ GtkToolItem
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_tool_item_get_text_alignment ##### -->
+<para>
+
+</para>
+
+@tool_item: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_tool_item_get_text_orientation ##### -->
+<para>
+
+</para>
+
+@tool_item: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_tool_item_retrieve_proxy_menu_item ##### -->
 <para>
 
@@ -290,3 +317,12 @@ GtkToolItem
 @tool_item: 
 
 
+<!-- ##### FUNCTION gtk_tool_item_get_text_size_group ##### -->
+<para>
+
+</para>
+
+@tool_item: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtktooltips.sgml

@@ -146,15 +146,12 @@ Sets the time between the user moving the mouse over a widget and the widget's t
 
 
 <!-- ##### FUNCTION gtk_tooltips_set_tip ##### -->
-<para>
-Adds a tooltip containing the message @tip_text to the specified #GtkWidget. 
-</para>
 
-@tooltips: a #GtkTooltips.
-@widget: the #GtkWidget you wish to associate the tip with.
-@tip_text: a string containing the tip itself.
-@tip_private: a string of any further information that may be useful if the user gets stuck.
-@Deprecated: 2.12:
+
+@tooltips: 
+@widget: 
+@tip_text: 
+@tip_private: 
 
 
 <!-- ##### FUNCTION gtk_tooltips_data_get ##### -->

docs/reference/gtk/tmpl/gtkvbox.sgml

@@ -1,49 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVBox
-
-<!-- ##### SECTION Short_Description ##### -->
-A vertical container box
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkVBox is a container that organizes child widgets into a single column.
-</para>
-
-<para>
-Use the #GtkBox packing interface to determine the arrangement,
-spacing, height, and alignment of GtkVBox children.
-</para>
-
-<para>
-All children are allocated the same width.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-
-<varlistentry>
-<term>#GtkHBox</term>
-<listitem><para>a sister class that organizes widgets into a row.</para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVBox ##### -->
-
-
-
-<!-- ##### FUNCTION gtk_vbox_new ##### -->
-<para>
-Creates a new GtkVBox.
-</para>
-
-@homogeneous: %TRUE if all children are to be given equal space allotments.
-@spacing: the number of pixels to place by default between children.
-@Returns: a new GtkVBox.
-
-

docs/reference/gtk/tmpl/gtkvscale.sgml

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

docs/reference/gtk/tmpl/gtkvscrollbar.sgml

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

docs/reference/gtk/tmpl/gtkvseparator.sgml

@@ -1,41 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkVSeparator
-
-<!-- ##### SECTION Short_Description ##### -->
-A vertical separator
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkVSeparator widget is a vertical separator, used to group the
-widgets within a window. It displays a vertical line with a shadow to
-make it appear sunken into the interface.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-<variablelist>
-<varlistentry>
-<term>#GtkHSeparator</term>
-<listitem><para>a horizontal separator.</para></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkVSeparator ##### -->
-<para>
-The #GtkVSeparator-struct struct contains private data only, and
-should be accessed using the functions below.
-</para>
-
-
-<!-- ##### FUNCTION gtk_vseparator_new ##### -->
-<para>
-Creates a new #GtkVSeparator.
-</para>
-
-@Returns: a new #GtkVSeparator.
-
-

docs/reference/gtk/tmpl/gtkwindow.sgml

@@ -154,6 +154,11 @@ window (synonymous with gtk_window_add_accel_group().
 
 </para>
 
+<!-- ##### ARG GtkWindow:mnemonics-visible ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkWindow:modal ##### -->
 <para>
 
@@ -1073,6 +1078,15 @@ Deprecated alias for gtk_window_set_position().
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_window_get_window_type ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_window_move ##### -->
 <para>
 
@@ -1209,3 +1223,21 @@ Deprecated alias for gtk_window_set_position().
 @opacity: 
 
 
+<!-- ##### FUNCTION gtk_window_get_mnemonics_visible ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_window_set_mnemonics_visible ##### -->
+<para>
+
+</para>
+
+@window: 
+@setting: 
+
+

docs/tools/Makefile.am

@@ -17,7 +17,8 @@ LDADDS = 								\
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
 	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)
+	$(GTK_DEP_LIBS)                   				\
+	$(GDK_DEP_LIBS)
 
 if USE_X11
 noinst_PROGRAMS = 		\