Use drag-motion in the arrow buttons to scroll when hovering

Code copied from Nautilus.  I think we'll have to tweak the timers a bit;
they seem a bit short right now.

Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite perf examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests perf examples
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

NEWS

@@ -1,278 +1,3 @@
-Overview of Changes in GTK+ 3.9.0 to 3.9.2
-==========================================
-
-* The GDK initialization code has been refactored. GdkDisplayManager
-  is no longer backend-specific.
-
-* The symbol exporting functionality has been refactored. We no longer
-  use .symbols files, and instead rely on explicit header annotations
-  for every exported symbol. the abicheck scripts are no longer used.
-
-* The GDK drawing and scrolling has been simplified. We no longer use
-  XCopyArea for scrolling, instead an offscreen cache is used. There
-  is a new debug flag, GTK_DEBUG=pixel-cache for this.
-
-* Window sizing issues have been addressed.
-
-* Implement height-for-width for GtkEventBox and GtkCheckButton
-
-* Custom titlebars can now be set from GtkBuilder files
-
-* Optionally install tests, when configured with --enable-installed-tests.
-  To run these tests, gnome-desktop-testing-runner can be used.
-
-* Native input methods are supported on OS X now.
-
-699739
-699140
-699633
-699901
-699750
-698051
-699929
-695120
-700007
-700053
-700054
-699239
-699104
-698361
-700079
-698933
-700056
-699690
-700301
-699970
-696640
-700578
-700575
-700465
-700233
-699289
-694273
-691921
-667759
-700737
-561221
-700844
-700787
-628902
-700979
-360131
-591969
-700864
-696001
-
-* Translation updates:
- Brazilian Portuguese
- English
- Hebrew
- Japanese
- Norwegian bokmål
- Russian
- Slovak
- Spanish
- Tajik
-
-
-Overview of Changes in GTK+ 3.7 to 3.9
-======================================
-
-* GtkFileChooser:
- - Always show fuse-mounted locations in shortcuts
- - GtkFileChooserButton has received a lot of fixes and tests have
-   been added for many of them
-
-* GtkWindow:
- - Initial support for client-side decorations has been added. This
-   is going to be used by default under Wayland. To try it with other
-   backends, set the GTK_CSD=1 environment variable.
- - gtk_window_set_titlebar: A new function that can set a custom,
-   client-side titlebar on toplevel windows.
-
-* Wayland:
- - Use client-side decorations
- - Implement maximization
- - Improve cursor handling
- - Improve multi-monitor handling
- - Support most GtkSettings (for now by reading GSettings directly)
- - Complete the keymap implementation
- - Add support for custom surfaces
- - Implement animated cursors
- - Support the WAYLAND_SOCKET environment variable
- - Implement frame synchronizatio
- - Document Wayland-specific APIs
-
-* Broadway:
- - Improve window size handling
- - Implement frame synchronization
- - Add support for password authentication
-
-* New APIs, widgets, feature additions:
- - GtkHeaderBar is a new widget similar to a GtkBox, with the extra
-   feature that it can center a child (typically a title), independent
-   of the other content.
- - GtkPlacesSidebar is the sidebar widget in the file chooser, exported
-   as a public widget - it will be shared with nautilus.
- - GtkStack is an alternative to GtkNotebook for showing one of several
-   child widgets at a time. It supports animated transitions. Tabs are
-   not built into this widgets, but instead provided by the separate
-   GtkStackSwitcher widget.
- - GtkRevealer is a new new widget that can hide or show its child
-   in an animated fashion.
- - GtkMenuTracker is a helper object that makes dealing with
-   GMenuModels easier and more efficient.
- - gtk_grid_remove_row/column: New functions to remove whole rows
-   or columns from a GtkGrid
- - Support for composite children has been added to GtkWidget. This
-   allows to create complex widgets from GtkBuilder ui files. All
-   complex GTK+ widgets have been converted to use this facility.
- - Baseline support was added to the GTK+ size allocation machinery.
-   Widgets can now export the baseline of the text they contain,
-   and containers can align their children wrt to their baselines.
-
-
-* Known problems, feature removals, compatibility caveats:
- - Handling of window size is currently in flux, and there are
-   some known problems with sizes unintentionally changing
- - Support for the Motif DND protocol has been dropped
- - Client-side decorations still have some issues when drawing
-   directly on toplevel windows or setting their background
- - Support for multiple screens per display has been removed. This
-   was only ever supported on X11, and is an exceedingly rare setup
-   nowadays. The display-screen relation is now 1:1, and we will do
-   some more simplification of displaymanager/display/screen/monitor
-   APIs.
- - gdk_window_get_display has been deprecated
- - gtk_widget_push_composite_child has been deprecated - this was
-   used for anything
- - GtkSwitch has been changed to draw focus internally, instead of
-   reserving space outside the switch for it. This may require some
-   application adjustment where margins were tweaked to 'correct'
-   the alignment of switches manually
-
-* Printing:
- - Avoid blocking when looking for avahi printers
- - Don't link against avahi-gobject, use D-Bus directly
-
-* Bugs fixed:
- 504901 GtkCellRendererCombo requires click-and-hold
- 586367 In local_only mode, file chooser should return native pa...
- 671939 [regression] crash on exit
- 672018 Need API to set global application state (busy, counters...
- 674051 Scrolling zoom in view - incorrect image display
- 674759 GtkLabel: wrong value of "mnemonic-keyval" when "use-mar...
- 675571 (out) or (inout) annotation possibly missing for gtk_men...
- 675649 gtk-demo: Fix typo
- 680241 Instructions on how to build a GTK app won't work with r...
- 681446 gtkdnd memory leak
- 685419 gtkprintbackendfile: Infinite loop in _cairo_write()
- 685420 Critical warnings when GtkPrintJob is released too early
- 688820 GIcon is a bad interface
- 688896 Add documentation for GtkWidget::show,hide,map,unmap,rea...
- 690275 scrolling on other windows is applied when coming back (...
- 691040 selection is reported incorrectly in file chooser button
- 692871 Need to expose output information to make GdkScreen API ...
- 694339 Fix build of GTK+ on Windows
- 694465 Allow backends to fail during initialisation
- 695200 Switching apps while a combobox open makes the parent wi...
- 695228 GdkPixbuf:ERROR:gdk-pixbuf-animation.c:242:gdk_pixbuf_an...
- 695278 Avoid passing a NULL title to setTitle
- 695304 GtkTextView: don't popdown a bubble if we don't have one
- 695312 Initial 'text' set in the non-numeric-only GtkSpinButton...
- 695375 GtkEntryAccessible: also handle entry icon tooltip NULL ...
- 695380 gtk_binding_entry_skip broken
- 695391 wayland documentation section id is "gtk-osx"
- 695473 treeview: fix a critical warning
- 695476 Drop the Motif DND protocol
- 695482 Universal Access panel appears jumbled and horrible afte...
- 695493 testgtk: issues with the color selection example
- 695495 testgtk: cursor example segfaults
- 695497 testgtk: lack of key repeat
- 695506 gtk-demo: link hovering unreliable
- 695682 Cannot build docs for wayland-only build
- 695714 Getting of printer info can hang
- 695772 Different appearance of menus within Audacious
- 695783 GtkApplication: Allow passing windows on non-X11 targets
- 695861 Allow to use custom surfaces for GdkWindows in Wayland
- 695874 GtkFontChooser docs
- 695895 Fix the gtk3-demo demo program on Windows
- 695945 implement minimize / maximize functionality
- 695948 GtkFontButton sets wrong show-preview-entry
- 695998 csd: enable shadows in the outer border
- 696051 vertical grid lines in rtl mode
- 696138 GtkWidget: some deprecation marks are missing
- 696171 GtkAssistant highlighted font unreadable
- 696202 Add GtkSpinner animation back to Win32 theme
- 696232 win32: do not crash on invalid utf8 conversion
- 696340 wayland: device list is populated async
- 696370 GtkOverlay doesn't work on top of GtkClutterEmbed
- 696429 wayland: Implement animated cursors
- 696457 gnome-ostree build broken by 3a9de35a6cefddc09aaf000e523...
- 696468 improve GMenuModel -> GtkMenu conversion
- 696546 gtk_print_backend_cups_finalize() crashes if cups_get_pr...
- 696553 Crash in avahi_create_browsers
- 696561 GtkApplicationWindow rendering broken
- 696608 css_image_value_parse: returning FALSE in pointer function
- 696622 gtk option printer widget segfault in epiphany
- 696623 GtkOverlay with a revealer produces warnings setting a m...
- 696767 a pair of memory leaks
- 696882 [regression] GtkWindow changes size after hide/show cycle
- 697048 GtkTextView: small code improvements
- 697144 Popup menu mnemonics fixes
- 697196 gtk_notebook_set_tab_reorderable boolean handling
- 697200 GtkWindow: notify::attached-to not emitted
- 697263 Impossible to set window transparency on 3.8
- 697275 gtk_window_set_default_size() doesn't work anymore
- 697427 Unreferencing GtkStatusIcon object causes abort
- 697673 Apps should connect only once when using Wayland
- 697795 xi2: Improve pointer emulation debug reporting
- 697886 dnd icon drawing broken on master
- 697947 A lot of GTK+ apps fail to launch with error "desktop_she...
- 698181 Document icon-shadow CSS property
- 698433 Geometry management broken in GtkBin widgets
- 698682 GtkSpinButton: don't constantly recreate style contexts f...
- 698864 wayland: improve integration with GdkFrameClock
- 699020 GtkImage: do not leak metrics in baseline align
- 699225 typo: Modifed -> Modified
-
-* Translation updates:
- Arabic
- Aragonese
- Assamese
- Belarusian
- Brazilian Portuguese
- British English
- Catalan
- Catalan (Valencian)
- Czech
- Danish
- Finnish
- French
- Galician
- German
- Greek
- Hindi
- Hungarian
- Indonesian
- Italian
- Kazakh
- Korean
- Latvian
- Malayalam
- Odia
- Persian
- Polish
- Punjabi
- Russian
- Serbian
- Simplified Chinese
- Slovenian
- Tajik
- Tamil
- Ukrainian
-
-
 Overview of Changes in GTK+ 3.7.12
 ==================================
 

README.in

@@ -81,17 +81,6 @@ Release notes for 3.10
   setups (not multi-monitor!) are very rare nowadays. If you really
   need multiple X screens, open them as separate displays.
 
-* The behavior of GtkBox::expand has been changed to never propagate
-  up. Previously, this was happening inconsistently. If you want the
-  expand to propagate, use the GtkWidget h/v expand properties.
-  If you experience sizing problems with widgets in ported code,
-  carefully check the expand and fill flags of your boxes.
-
-* GtkBin no longer provides default implementations for
-  get_height_for_width, subclasses now have to provide their own
-  implementation if they need height-for-width functionality.
-
-
 Release notes for 3.8
 =====================
 

build/win32/vs10/gengir.vcxproj

@@ -28,23 +28,19 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

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

@@ -28,23 +28,19 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [9])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -251,11 +251,10 @@ AC_ARG_ENABLE(debug,
                               [turn on debugging @<:@default=debug_default@:>@])],,
               [enable_debug=debug_default])
 
-AC_ARG_ENABLE(installed_tests,
-              AS_HELP_STRING([--enable-installed-tests],
-                             [Install test programs (default: no)]),,
-              [enable_installed_tests=no])
-AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
+AC_ARG_ENABLE(rebuilds,
+              [AS_HELP_STRING([--disable-rebuilds],
+                              [disable all source autogeneration rules])],,
+              [enable_rebuilds=yes])
 
 AC_ARG_ENABLE(gtk2-dependency,
               [AS_HELP_STRING([--enable-gtk2-dependency],
@@ -362,7 +361,6 @@ DISABLE_ON_QUARTZ=''
 if test "x$enable_quartz_backend" = xyes; then
   cairo_backends="$cairo_backends cairo-quartz"
   GDK_BACKENDS="$GDK_BACKENDS quartz"
-  backend_immodules="$backend_immodules,quartz"
   GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
@@ -510,6 +508,16 @@ PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
 
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 
+if test "$os_win32" != yes; then
+    # libtool option to control which symbols are exported
+    # right now, symbols starting with _ are not exported
+    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
+else
+    # We currently use .def files on Windows (for gdk and gtk)
+    LIBTOOL_EXPORT_OPTIONS=
+fi
+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
+
 dnl ******************************************************
 dnl * See whether to include shared library dependencies *
 dnl ******************************************************
@@ -544,6 +552,17 @@ AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
 
 AC_PATH_PROGS(PERL, perl5 perl)
 
+# We would like indent, but don't require it.
+AC_CHECK_PROG(INDENT, indent, indent)
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+  REBUILD=
+fi
+AC_SUBST(REBUILD)
+
 AC_CHECK_FUNCS(lstat mkstemp)
 AC_CHECK_FUNCS(localtime_r)
 
@@ -685,12 +704,6 @@ AM_PATH_GLIB_2_0(glib_required_version, :,
 *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
   gobject gmodule-no-export)
 
-PKG_PROG_PKG_CONFIG_FOR_BUILD
-GLIB_CFLAGS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --cflags glib-2.0 gobject-2.0 gmodule-no-export-2.0`
-GLIB_LIBS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --libs glib-2.0 gobject-2.0 gmodule-no-export-2.0`
-AC_SUBST(GLIB_CFLAGS_FOR_BUILD)
-AC_SUBST(GLIB_LIBS_FOR_BUILD)
-
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
 gtk_save_LIBS=$LIBS
@@ -862,7 +875,6 @@ AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
@@ -1230,6 +1242,7 @@ if test "$have_gio_unix" = "yes"; then
 else
   GDK_GIO_PACKAGE=gio-2.0
 fi
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
 
 # Check for Pango flags
 
@@ -1661,39 +1674,6 @@ else
   AC_MSG_RESULT([no])
 fi
 
-##################################################
-# Visibility handling
-##################################################
-
-GDK_HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
-    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
-    AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
-              [defines how to decorate public symbols while building])
-    CFLAGS="${CFLAGS} -fvisibility=hidden"
-    ;;
-  *)
-    dnl on other compilers, check if we can do -fvisibility=hidden
-    SAVED_CFLAGS="${CFLAGS}"
-    CFLAGS="-fvisibility=hidden"
-    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [int main (void) { return 0; }],
-                   AC_MSG_RESULT(yes)
-                   enable_fvisibility_hidden=yes,
-                   AC_MSG_RESULT(no)
-                   enable_fvisibility_hidden=no)
-    CFLAGS="${SAVED_CFLAGS}"
-
-    AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
-      AC_DEFINE([_GDK_EXTERN], [__attribute__((visibility("default"))) extern],
-                [defines how to decorate public symbols while building])
-      GDK_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ])
-    ;;
-esac
-AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)
-
 ##################################################
 # Output commands
 ##################################################
@@ -1782,14 +1762,11 @@ demos/pixbuf-demo/Makefile
 demos/widget-factory/Makefile
 examples/Makefile
 tests/Makefile
+tests/a11y/Makefile
+tests/css/Makefile
+tests/css/parser/Makefile
+tests/reftests/Makefile
 tests/visuals/Makefile
-testsuite/Makefile
-testsuite/a11y/Makefile
-testsuite/css/Makefile
-testsuite/css/parser/Makefile
-testsuite/gdk/Makefile
-testsuite/gtk/Makefile
-testsuite/reftests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk/Makefile
@@ -1812,6 +1789,7 @@ gdk/win32/rc/Makefile
 gdk/win32/rc/gdk.rc
 gdk/quartz/Makefile
 gdk/wayland/Makefile
+gdk/tests/Makefile
 gdk/gdkversionmacros.h
 gtk/Makefile
 gtk/makefile.msc
@@ -1819,6 +1797,7 @@ gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/a11y/Makefile
 gtk/native/Makefile
+gtk/tests/Makefile
 libgail-util/Makefile
 modules/Makefile
 modules/engines/Makefile

demos/gtk-demo/Makefile.am

@@ -42,7 +42,6 @@ demos =						\
 	revealer.c				\
 	rotated_text.c				\
 	search_entry.c				\
-	search_entry2.c				\
 	sizegroup.c				\
 	spinner.c				\
 	stack.c					\
@@ -87,7 +86,7 @@ gsettings_SCHEMAS = \
 
 @GSETTINGS_RULES@
 
-demos.h: $(demos) geninclude.pl
+demos.h: @REBUILD@ $(demos) geninclude.pl
 	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
 gtk3_demo_SOURCES = 		\

demos/gtk-demo/appwindow.c

@@ -5,9 +5,8 @@
  * This example uses GtkUIManager and GtkActionGroup.
  */
 
-#include "config.h"
-
 #include <gtk/gtk.h>
+#include "config.h"
 
 static GtkWidget *window = NULL;
 static GtkWidget *infobar = NULL;

demos/gtk-demo/demo.gresource.xml

@@ -116,7 +116,6 @@
     <file>revealer.c</file>
     <file>rotated_text.c</file>
     <file>search_entry.c</file>
-    <file>search_entry2.c</file>
     <file>sizegroup.c</file>
     <file>stack.c</file>
     <file>spinner.c</file>

demos/gtk-demo/main.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

demos/gtk-demo/search_entry2.c

@@ -1,96 +0,0 @@
-/* Entry/Delayed Search Entry
- *
- * GtkSearchEntry sets up GtkEntries ready for search. Search entries
- * have their "changed" signal delayed and should be used
- * when the searched operation is slow such as loads of entries
- * to search, or online searches.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-search_entry_destroyed (GtkWidget  *widget)
-{
-  window = NULL;
-}
-
-static void
-search_changed_cb (GtkSearchEntry *entry,
-                   GtkLabel       *result_label)
-{
-  const char *text;
-  text = gtk_entry_get_text (GTK_ENTRY (entry));
-  g_message ("search changed: %s", text);
-  gtk_label_set_text (result_label, text ? text : "");
-}
-
-GtkWidget *
-do_search_entry2 (GtkWidget *do_widget)
-{
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *label;
-  GtkWidget *entry;
-  GtkWidget *button;
-
-  if (!window)
-    {
-      window = gtk_dialog_new_with_buttons ("Search Entry #2",
-                                            GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (search_entry_destroyed), &window);
-
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo #2");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      /* Create our entry */
-      entry = gtk_search_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-
-      /* Result */
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
-
-      label = gtk_label_new ("Result:");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
-      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
-      g_signal_connect (entry, "changed",
-                        G_CALLBACK (search_changed_cb), label);
-
-      /* Give the focus to the close button */
-      button = gtk_dialog_get_widget_for_response (GTK_DIALOG (window), GTK_RESPONSE_NONE);
-      gtk_widget_grab_focus (button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/toolpalette.c

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

demos/widget-factory/widget-factory.c

@@ -78,35 +78,6 @@ on_page_toggled (GtkToggleButton *button,
   gtk_notebook_set_current_page (pages, page);
 }
 
-static void
-spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label)
-{
-  GtkWidget *w;
-  gint v;
-  gchar *text;
-
-  v = (int)gtk_adjustment_get_value (adjustment);
-
-  if ((v % 3) == 0)
-    {
-      text = g_strdup_printf ("%d is a multiple of 3", v);
-      gtk_label_set_label (GTK_LABEL (label), text);
-      g_free (text);
-    }
-
-  w = gtk_widget_get_ancestor (label, GTK_TYPE_REVEALER);
-  gtk_revealer_set_reveal_child (GTK_REVEALER (w), (v % 3) == 0);
-}
-
-static void
-dismiss (GtkWidget *button)
-{
-  GtkWidget *w;
-
-  w = gtk_widget_get_ancestor (button, GTK_TYPE_REVEALER);
-  gtk_revealer_set_reveal_child (GTK_REVEALER (w), FALSE);
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -115,7 +86,6 @@ main (int argc, char *argv[])
   GtkWidget  *widget;
   GtkWidget  *notebook;
   gboolean    dark = FALSE;
-  GtkAdjustment *adj;
 
   gtk_init (&argc, &argv);
 
@@ -144,14 +114,6 @@ main (int argc, char *argv[])
   widget = (GtkWidget*) gtk_builder_get_object (builder, "aboutmenuitem");
   g_signal_connect (widget, "activate", G_CALLBACK (show_about), window);
 
-  widget = (GtkWidget*) gtk_builder_get_object (builder, "page2dismiss");
-  g_signal_connect (widget, "clicked", G_CALLBACK (dismiss), NULL);
-
-  widget = (GtkWidget*) gtk_builder_get_object (builder, "page2note");
-  adj = (GtkAdjustment *) gtk_builder_get_object (builder, "adjustment2");
-  g_signal_connect (adj, "value-changed",
-                    G_CALLBACK (spin_value_changed), widget);
-
   g_object_unref (G_OBJECT (builder));
 
   gtk_widget_show (window);

demos/widget-factory/widget-factory.ui

@@ -54,23 +54,6 @@ Vestibulum in tortor diam, quis aliquet quam. Praesent ut justo neque, tempus ru
 Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar eleifend nisi.
 Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque.
 Suspendisse feugiat quam quis dolor accumsan cursus. </property>
-  </object>
-  <object class="GtkTextBuffer" id="textbuffer2">
-    <property name="text">* Translation updates:
- Aragonese
- Assamese
- Basque
- Brazilian Portuguese
- Dutch
- German
- Hebrew
- Hungarian
- Polish
- Portuguese
- Serbian
- Slovenian
- Spanish
- Uyghur</property>
   </object>
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkWindow" id="window">
@@ -2163,158 +2146,30 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
               </object>
             </child>
             <child>
-              <object class="GtkOverlay" id="page2">
+              <object class="GtkBox" id="page2">
                 <property name="visible">True</property>
-                <child type="overlay">
-                  <object class="GtkRevealer" id="page2revealer">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">start</property>
-                    <child>
-                      <object class="GtkFrame" id="page2frame">
-                        <property name="visible">True</property>
-                        <property name="margin-top">2</property>
-                        <child>
-                          <object class="GtkBox" id="page2box">
-                            <property name="visible">True</property>
-                            <property name="margin-top">10</property>
-                            <property name="margin-bottom">10</property>
-                            <property name="margin-left">10</property>
-                            <property name="margin-right">10</property>
-                            <property name="spacing">20</property>
-                            <child>
-                              <object class="GtkLabel" id="page2note">
-                                <property name="visible">True</property>
-                                <property name="hexpand">True</property>
-                                <property name="halign">start</property>
-                                <property name="label">NEWS!</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="page2dismiss">
-                                <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkImage" id="page2dismissi">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">window-close-symbolic</property>
-                                    <property name="icon-size">0</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <property name="border-width">6</property>
                 <child>
-                  <object class="GtkGrid" id="page2grid">
+                  <object class="GtkBox" id="page2box1">
                     <property name="visible">True</property>
-                    <property name="column-homogeneous">True</property>
-                    <property name="row-spacing">6</property>
-                    <property name="column-spacing">6</property>
-                    <property name="border-width">6</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="spacing">4</property>
                     <child>
-                      <object class="GtkBox" id="page2box1">
+                      <object class="GtkSpinButton" id="verticalspin1">
                         <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="spacing">4</property>
-                        <child>
-                          <object class="GtkSpinButton" id="verticalspin1">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="adjustment">adjustment2</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="verticalspin2">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="adjustment">adjustment1</property>
-                          </object>
-                        </child>
+                        <property name="orientation">vertical</property>
+                        <property name="adjustment">adjustment2</property>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="filler1">
+                      <object class="GtkSpinButton" id="verticalspin2">
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="adjustment">adjustment1</property>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="filler2">
-                        <property name="visible">True</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">2</property>
-                        <property name="top-attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkStackSwitcher" id="switcher">
-                        <property name="visible">True</property>
-                        <property name="stack">stack</property>
-                        <property name="halign">center</property>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkFrame" id="frame">
-                        <property name="visible">True</property>
-                        <property name="hexpand">False</property>
-                        <child>
-                          <object class="GtkStack" id="stack">
-                            <property name="visible">True</property>
-                            <property name="transition-type">crossfade</property>
-                            <property name="transition-duration">1000</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="swo">
-                                <property name="visible">True</property>
-                                <property name="shadow-type">none</property>
-                                <child>
-                                  <object class="GtkTextView" id="tvo">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="buffer">textbuffer2</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="name">page1</property>
-                                <property name="icon-name">document-open-recent-symbolic</property>
-                                <property name="title">News</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="imageo">
-                                <property name="visible">True</property>
-                                <property name="resource">/logos/gtk-logo-256.png</property>
-                              </object>
-                              <packing>
-                                <property name="name">page2</property>
-                                <property name="icon-name">system-shutdown-symbolic</property>
-                                <property name="title">Logo</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </child>

docs/reference/gdk/gdk-docs.sgml

@@ -76,10 +76,6 @@
     <title>Index of new symbols in 3.8</title>
     <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
   </index>
-  <index id="api-index-3-10" role="3.10">
-    <title>Index of new symbols in 3.10</title>
-    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
-  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 

docs/reference/gdk/gdk3-sections.txt

@@ -172,6 +172,7 @@ GdkDisplayClass
 <TITLE>GdkDisplayManager</TITLE>
 GdkDisplayManager
 gdk_display_manager_get
+gdk_display_manager_peek
 gdk_display_manager_get_default_display
 gdk_display_manager_set_default_display
 gdk_display_manager_list_displays
@@ -459,7 +460,6 @@ GdkModifierType
 gdk_window_get_parent
 gdk_window_get_toplevel
 gdk_window_get_children
-gdk_window_get_children_with_user_data
 gdk_window_peek_children
 gdk_window_get_events
 gdk_window_set_events

docs/reference/gtk/Makefile.am

@@ -21,9 +21,9 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
 	fnmatch.h			\
-	gtkactionmuxer.h		\
-	gtkactionobserver.h		\
-	gtkactionobservable.h		\
+	gactionmuxer.h			\
+	gactionobserver.h		\
+	gactionobservable.h		\
 	gtk9slice.h			\
 	gtkanimationdescription.h	\
 	gtkdebug.h			\
@@ -141,6 +141,7 @@ content_files =					\
 	migrating-smclient-GtkApplication.xml	\
 	migrating-GtkGrid.xml			\
 	migrating-GtkStyleContext.xml		\
+	objects_grouped.sgml			\
 	osx.sgml				\
 	broadway.xml				\
 	wayland.xml				\
@@ -300,7 +301,7 @@ HTML_IMAGES = \
 	$(srcdir)/images/appchooserdialog.png				\
 	$(srcdir)/images/assistant.png					\
 	$(srcdir)/images/box-packing.png				\
-	$(srcdir)/images/box-expand.png					\
+	$(srcdir)/images/box-expand.png				\
 	$(srcdir)/images/button.png					\
 	$(srcdir)/images/check-button.png				\
 	$(srcdir)/images/color-button.png				\
@@ -308,8 +309,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/colorchooser.png				\
 	$(srcdir)/images/combo-box.png					\
 	$(srcdir)/images/combo-box-entry.png				\
-	$(srcdir)/images/combo-box-text.png				\
 	$(srcdir)/images/entry.png					\
+	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/figure-hierarchical-drawing.png		\
 	$(srcdir)/images/figure-windowed-label.png			\
 	$(srcdir)/images/file-button.png				\
@@ -318,10 +319,8 @@ HTML_IMAGES = \
 	$(srcdir)/images/fontsel.png					\
 	$(srcdir)/images/fontchooser.png				\
 	$(srcdir)/images/frame.png					\
-	$(srcdir)/images/headerbar.png					\
 	$(srcdir)/images/icon-view.png					\
 	$(srcdir)/images/image.png					\
-	$(srcdir)/images/info-bar.png					\
 	$(srcdir)/images/label.png					\
 	$(srcdir)/images/levelbar.png					\
 	$(srcdir)/images/link-button.png				\
@@ -338,20 +337,15 @@ HTML_IMAGES = \
 	$(srcdir)/images/notebook.png					\
 	$(srcdir)/images/panes.png					\
 	$(srcdir)/images/pagesetupdialog.png				\
-	$(srcdir)/images/placessidebar.png				\
 	$(srcdir)/images/printdialog.png				\
 	$(srcdir)/images/progressbar.png				\
 	$(srcdir)/images/radio-group.png				\
 	$(srcdir)/images/recentchooserdialog.png			\
 	$(srcdir)/images/scales.png					\
-	$(srcdir)/images/scrollbar.png					\
 	$(srcdir)/images/scrolledwindow.png				\
-	$(srcdir)/images/search-entry.png				\
 	$(srcdir)/images/separator.png					\
 	$(srcdir)/images/spinbutton.png					\
 	$(srcdir)/images/spinner.png					\
-	$(srcdir)/images/stack.png					\
-	$(srcdir)/images/stackswitcher.png				\
 	$(srcdir)/images/statusbar.png					\
 	$(srcdir)/images/toggle-button.png				\
 	$(srcdir)/images/toolbar.png					\

docs/reference/gtk/building.sgml

@@ -402,11 +402,6 @@ How to compile GTK+ itself
             <arg choice="plain">--enable-gtk2-dependency</arg>
             <arg choice="plain">--disable-gtk2-dependency</arg>
           </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">--enable-installed-tests</arg>
-            <arg choice="plain">--disable-installed-tests</arg>
-          </group>
         </cmdsynopsis>
       </para>
 
@@ -629,19 +624,6 @@ How to compile GTK+ itself
           The default is to build gtk-update-icon-cache.
         </para>
       </formalpara>
-
-      <formalpara>
-        <title><systemitem>--enable-installed-tests</systemitem> or
-           <systemitem>--disable-installed-tests</systemitem></title>
-
-        <para>
-          Whether to install tests on the system. If enabled, tests
-          and their data are installed in <filename>${libexecdir}/gtk+/installed-tests</filename>.
-          Metadata for the tests is installed in <filename>${prefix}/share/installed-tests/gtk+</filename>.
-          To run the installed tests, gnome-desktop-testing-runner
-          can be used.
-        </para>
-      </formalpara>
     </refsect1>
 
 </refentry>

docs/reference/gtk/compiling.sgml

@@ -42,7 +42,7 @@ feature of the shell. If you enclose a command in backticks
 substituted into the command line before execution. So to compile
 a GTK+ Hello, World, you would type the following:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-3.0` hello.c -o hello `pkg-config --libs gtk+-3.0`
+$ cc `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>
 
@@ -67,7 +67,7 @@ this range will trigger compiler warnings.
 Here is how you would compile hello.c if you want to allow it
 to use symbols that were not deprecated in 3.2:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-3.0` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 hello.c -o hello `pkg-config --libs gtk+-3.0`
+$ cc -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_2 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>
 
@@ -75,7 +75,7 @@ $ cc `pkg-config --cflags gtk+-3.0` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 he
 And here is how you would compile hello.c if you don't want
 it to use any symbols that were introduced after 3.4:
 <programlisting>
-$ cc `pkg-config --cflags gtk+-3.0` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 hello.c -o hello `pkg-config --libs gtk+-3.0`
+$ cc -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 `pkg-config --cflags --libs gtk+-3.0` hello.c -o hello
 </programlisting>
 </para>
 

docs/reference/gtk/gtk3-sections.txt

@@ -2487,7 +2487,7 @@ gtk_paned_get_type
 
 <SECTION>
 <FILE>gtkplacessidebar</FILE>
-<TITLE>GtkPlacesSidebar</TITLE>
+<TITLE>GtkPlacesSidebar</FILE>
 GtkPlacesSidebar
 GtkPlacesOpenFlags
 gtk_places_sidebar_new
@@ -2495,14 +2495,11 @@ gtk_places_sidebar_set_open_flags
 gtk_places_sidebar_set_location
 gtk_places_sidebar_get_location
 gtk_places_sidebar_set_show_desktop
+gtk_places_sidebar_set_accept_uri_drops
 gtk_places_sidebar_add_shortcut
 gtk_places_sidebar_remove_shortcut
 gtk_places_sidebar_list_shortcuts
 gtk_places_sidebar_get_nth_bookmark
-gtk_places_sidebar_get_open_flags
-gtk_places_sidebar_get_show_connect_to_server
-gtk_places_sidebar_get_show_desktop
-gtk_places_sidebar_set_show_connect_to_server
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -5390,6 +5387,7 @@ gtk_widget_get_preferred_width_for_height
 gtk_widget_get_preferred_height_and_baseline_for_width
 gtk_widget_get_request_mode
 gtk_widget_get_preferred_size
+gtk_widget_get_preferred_size_and_baseline
 gtk_distribute_natural_allocation
 
 <SUBSECTION Alignment and Margins>
@@ -7142,7 +7140,6 @@ gtk_test_text_get
 gtk_test_text_set
 gtk_test_widget_click
 gtk_test_widget_send_key
-gtk_test_widget_wait_for_draw
 </SECTION>
 
 <SECTION>

docs/reference/gtk/gtk3.types.in

@@ -81,7 +81,6 @@ gtk_grid_get_type
 gtk_handle_box_get_type
 gtk_hbox_get_type
 gtk_hbutton_box_get_type
-gtk_header_bar_get_type
 gtk_hpaned_get_type
 gtk_hscale_get_type
 gtk_hscrollbar_get_type
@@ -120,7 +119,6 @@ gtk_page_setup_get_type
 @DISABLE_ON_W32@gtk_page_setup_unix_dialog_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
-gtk_places_sidebar_get_type
 @DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_plug_get_type
 @DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
@@ -156,8 +154,6 @@ gtk_size_group_get_type
 @DISABLE_ON_W32@@DISABLE_ON_QUARTZ@@DISABLE_ON_WAYLAND@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
-gtk_stack_get_type
-gtk_stack_switcher_get_type
 gtk_statusbar_get_type
 gtk_status_icon_get_type
 gtk_switch_get_type

docs/reference/gtk/objects_grouped.sgml

@@ -0,0 +1,141 @@
+<informaltable pgwide=1 frame="none">
+<tgroup cols="4">
+<colspec colwidth="1*">
+<colspec colwidth="1*">
+<colspec colwidth="1*">
+<colspec colwidth="1*">
+<tbody><row>
+<entry><literallayout>
+<emphasis>Windows &amp; Dialogs</emphasis>
+    <link linkend="GtkWindow">GtkWindow</link>
+    <link linkend="GtkDialog">GtkDialog</link>
+    <link linkend="GtkColorSelectionDialog">GtkColorSelectionDialog</link>
+    <link linkend="GtkFileSelection">GtkFileSelection</link>
+    <link linkend="GtkFontSelectionDialog">GtkFontSelectionDialog</link>
+    <link linkend="GtkInputDialog">GtkInputDialog</link>
+
+<emphasis>Containers</emphasis>
+    <link linkend="GtkHBox">GtkHBox</link>
+    <link linkend="GtkVBox">GtkVBox</link>
+    <link linkend="GtkTable">GtkTable</link>
+    <link linkend="GtkToolbar">GtkToolbar</link>
+    <link linkend="GtkHandleBox">GtkHandleBox</link>
+    <link linkend="GtkNotebook">GtkNotebook</link>
+    <link linkend="GtkFrame">GtkFrame</link>
+    <link linkend="GtkAspectFrame">GtkAspectFrame</link>
+    <link linkend="GtkFixed">GtkFixed</link>
+    <link linkend="GtkLayout">GtkLayout</link>
+    <link linkend="GtkScrolledWindow">GtkScrolledWindow</link>
+    <link linkend="GtkViewport">GtkViewport</link>
+    <link linkend="GtkEventBox">GtkEventBox</link>
+    <link linkend="GtkAlignment">GtkAlignment</link>
+    <link linkend="GtkHButtonBox">GtkHButtonBox</link>
+    <link linkend="GtkVButtonBox">GtkVButtonBox</link>
+    <link linkend="GtkHPaned">GtkHPaned</link>
+    <link linkend="GtkVPaned">GtkVPaned</link>
+</literallayout></entry>
+<entry><literallayout>
+<emphasis>Labels &amp; Buttons</emphasis>
+    <link linkend="GtkLabel">GtkLabel</link>
+    <link linkend="GtkAccelLabel">GtkAccelLabel</link>
+    <link linkend="GtkButton">GtkButton</link>
+    <link linkend="GtkCheckButton">GtkCheckButton</link>
+    <link linkend="GtkToggleButton">GtkToggleButton</link>
+    <link linkend="GtkRadioButton">GtkRadioButton</link>
+
+<emphasis>Data Entry Widgets</emphasis>
+    <link linkend="GtkEntry">GtkEntry</link>
+    <link linkend="GtkSpinButton">GtkSpinButton</link>
+    <link linkend="GtkTextView">GtkTextView</link>
+    <link linkend="GtkOptionMenu">GtkOptionMenu</link>
+    <link linkend="GtkCombo">GtkCombo</link>
+    <link linkend="GtkHScale">GtkHScale</link>
+    <link linkend="GtkVScale">GtkVScale</link>
+                    
+
+<emphasis>Lists &amp; Trees</emphasis>
+    <link linkend="GtkCList">GtkCList</link>
+    <link linkend="GtkCTree">GtkCTree</link>
+    <link linkend="GtkList">GtkList</link>
+    <link linkend="GtkListItem">GtkListItem</link>
+
+<emphasis>Text Widget Objects</emphasis>
+    <link linkend="GtkTextBuffer">GtkTextBuffer</link>
+    <link linkend="GtkTextTag">GtkTextTag</link>
+    <link linkend="GtkTextTagTable">GtkTextTagTable</link>
+    <link linkend="GtkTextView">GtkTextView</link>
+
+<emphasis>Tooltips</emphasis>
+    <link linkend="GtkTooltips">GtkTooltips</link>
+    <link linkend="GtkTipsQuery">GtkTipsQuery</link>
+</literallayout></entry>
+
+<entry><literallayout>
+<emphasis>Menus &amp; Menu Bars</emphasis>
+    <link linkend="GtkMenuBar">GtkMenuBar</link>
+    <link linkend="GtkMenu">GtkMenu</link>
+    <link linkend="GtkMenuItem">GtkMenuItem</link>
+    <link linkend="GtkCheckMenuItem">GtkCheckMenuItem</link>
+    <link linkend="GtkRadioMenuItem">GtkRadioMenuItem</link>
+    <link linkend="GtkTearoffMenuItem">GtkTearoffMenuItem</link>
+
+<emphasis>Graphical Widgets</emphasis>
+    <link linkend="GtkDrawingArea">GtkDrawingArea</link>
+    <link linkend="GtkImage">GtkImage</link>
+    <link linkend="GtkPixmap">GtkPixmap</link>
+    <link linkend="GtkPreview">GtkPreview</link>
+
+<emphasis>Misc. Widgets</emphasis>
+    <link linkend="GtkArrow">GtkArrow</link>
+    <link linkend="GtkCalendar">GtkCalendar</link>
+    <link linkend="GtkProgressBar">GtkProgressBar</link>
+    <link linkend="GtkStatusbar">GtkStatusbar</link>
+    <link linkend="GtkStrengthBar">GtkStrengthBar</link>
+    <link linkend="GtkHRuler">GtkHRuler</link>
+    <link linkend="GtkVRuler">GtkVRuler</link>
+    <link linkend="GtkHScrollbar">GtkHScrollbar</link>
+    <link linkend="GtkVScrollbar">GtkVScrollbar</link>
+    <link linkend="GtkHSeparator">GtkHSeparator</link>
+    <link linkend="GtkVSeparator">GtkVSeparator</link>
+    <link linkend="GtkColorSelection">GtkColorSelection</link>
+    <link linkend="GtkFontSelection">GtkFontSelection</link>
+</literallayout></entry>
+
+<entry><literallayout>
+<emphasis>Abstract Base Classes</emphasis>
+    <link linkend="GtkWidget">GtkWidget</link>
+    <link linkend="GtkObject">GtkObject</link>
+    <link linkend="GtkContainer">GtkContainer</link>
+    <link linkend="GtkBin">GtkBin</link>
+    <link linkend="GtkBox">GtkBox</link>
+    <link linkend="GtkButtonBox">GtkButtonBox</link>
+    <link linkend="GtkData">GtkData</link>
+    <link linkend="GtkEditable">GtkEditable</link>
+    <link linkend="GtkItem">GtkItem</link>
+    <link linkend="GtkMenuShell">GtkMenuShell</link>
+    <link linkend="GtkMisc">GtkMisc</link>
+    <link linkend="GtkPaned">GtkPaned</link>
+    <link linkend="GtkProgress">GtkProgress</link>
+    <link linkend="GtkRange">GtkRange</link>
+    <link linkend="GtkRuler">GtkRuler</link>
+    <link linkend="GtkScale">GtkScale</link>
+    <link linkend="GtkScrollbar">GtkScrollbar</link>
+    <link linkend="GtkSeparator">GtkSeparator</link>
+
+<emphasis>Integrating with other X Applications</emphasis>
+    <link linkend="GtkPlug">GtkPlug</link>
+    <link linkend="GtkSocket">GtkSocket</link>
+
+<emphasis>Misc. Objects</emphasis>
+    <link linkend="GtkAdjustment">GtkAdjustment</link>
+    <link linkend="GtkInvisible">GtkInvisible</link>
+</literallayout></entry>
+
+<entry><literallayout>
+<emphasis>Deprecated Objects</emphasis>
+    <link linkend="GtkText">GtkText</link>
+    <link linkend="GtkTree">GtkTree</link>
+    <link linkend="GtkTreeItem">GtkTreeItem</link>
+</literallayout></entry>
+</row>
+</tbody></tgroup></informaltable>

docs/reference/gtk/visual_index.xml

@@ -18,9 +18,6 @@
   <link linkend="GtkComboBox">
     <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkComboBoxText">
-    <inlinegraphic fileref="combo-box-text.png" format="PNG"></inlinegraphic>
-  </link>
   <link linkend="GtkEntry">
     <inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic>
   </link>
@@ -150,25 +147,4 @@
   <link linkend="GtkFontChooserDialog">
     <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
   </link>
-  <link linkend="GtkAboutDialog">
-    <inlinegraphic fileref="aboutdialog.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkInfoBar">
-    <inlinegraphic fileref="info-bar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkScrollbar">
-    <inlinegraphic fileref="scrollbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkHeaderBar">
-    <inlinegraphic fileref="headerbar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkPlacesSidebar">
-    <inlinegraphic fileref="placessidebar.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkStack">
-    <inlinegraphic fileref="stack.png" format="PNG"></inlinegraphic>
-  </link>
-  <link linkend="GtkStackSwitcher">
-    <inlinegraphic fileref="stackswitcher.png" format="PNG"></inlinegraphic>
-  </link>
 </para>

docs/tools/widgets.c

@@ -119,7 +119,6 @@ new_widget_info (const char *name,
     {
       info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_has_resize_grip (GTK_WINDOW (info->window), FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
       info->include_decorations = FALSE;
       gtk_widget_show_all (widget);
       gtk_container_add (GTK_CONTAINER (info->window), widget);
@@ -128,6 +127,7 @@ new_widget_info (const char *name,
 
   gtk_widget_set_app_paintable (info->window, TRUE);
   g_signal_connect (info->window, "focus", G_CALLBACK (gtk_true), NULL);
+  gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
 
   switch (size)
     {
@@ -400,6 +400,11 @@ create_combo_box_entry (void)
   GtkWidget *align;
   GtkWidget *child;
   GtkTreeModel *model;
+  
+  gtk_rc_parse_string ("style \"combo-box-entry-style\" {\n"
+		       "  GtkComboBox::appears-as-list = 1\n"
+		       "}\n"
+		       "widget_class \"GtkComboBoxEntry\" style \"combo-box-entry-style\"\n" );
 
   model = (GtkTreeModel *)gtk_list_store_new (1, G_TYPE_STRING);
   widget = g_object_new (GTK_TYPE_COMBO_BOX,
@@ -422,22 +427,14 @@ create_combo_box (void)
 {
   GtkWidget *widget;
   GtkWidget *align;
-  GtkCellRenderer *cell;
-  GtkListStore *store;
-
-  widget = gtk_combo_box_new ();
-  gtk_cell_layout_clear (GTK_CELL_LAYOUT (widget));
-  cell = gtk_cell_renderer_pixbuf_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), cell, FALSE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), cell, "icon-name", 0, NULL);
-  cell = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), cell, FALSE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), cell, "text", 1, NULL);
-
-  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-  gtk_list_store_insert_with_values (store, NULL, -1, 0, "edit-delete", 1, "Combo Box", -1);
-  gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
+  
+  gtk_rc_parse_string ("style \"combo-box-style\" {\n"
+		       "  GtkComboBox::appears-as-list = 0\n"
+		       "}\n"
+		       "widget_class \"GtkComboBox\" style \"combo-box-style\"\n" );
 
+  widget = gtk_combo_box_text_new ();
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Combo Box");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
@@ -445,38 +442,6 @@ create_combo_box (void)
   return new_widget_info ("combo-box", align, SMALL);
 }
 
-static WidgetInfo *
-create_combo_box_text (void)
-{
-  GtkWidget *widget;
-  GtkWidget *align;
-
-  widget = gtk_combo_box_text_new ();
-
-  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Combo Box Text");
-  gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-
-  return new_widget_info ("combo-box-text", align, SMALL);
-}
-
-static WidgetInfo *
-create_info_bar (void)
-{
-  GtkWidget *widget;
-  GtkWidget *align;
-
-  widget = gtk_info_bar_new_with_buttons ("Close", 0, NULL);
-  gtk_info_bar_set_message_type (GTK_INFO_BAR (widget), GTK_MESSAGE_INFO);
-  gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (widget))),
-                     gtk_label_new ("Info Bar"));
-
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-
-  return new_widget_info ("info-bar", align, SMALL);
-}
 static WidgetInfo *
 create_recent_chooser_dialog (void)
 {
@@ -714,12 +679,12 @@ create_panes (void)
   pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
-				 "shadow-type", GTK_SHADOW_IN,
+				 "shadow", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
   gtk_paned_pack2 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
-				 "shadow-type", GTK_SHADOW_IN,
+				 "shadow", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (hbox),
@@ -728,12 +693,12 @@ create_panes (void)
   pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
-				 "shadow-type", GTK_SHADOW_IN,
+				 "shadow", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
   gtk_paned_pack2 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
-				 "shadow-type", GTK_SHADOW_IN,
+				 "shadow", GTK_SHADOW_IN,
 				 NULL),
 		   FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (hbox),
@@ -1057,8 +1022,6 @@ create_scrolledwindow (void)
   GtkWidget *scrolledwin, *label;
 
   scrolledwin = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwin),
-                                  GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
   label = gtk_label_new ("Scrolled Window");
 
   gtk_container_add (GTK_CONTAINER (scrolledwin), label);
@@ -1066,26 +1029,6 @@ create_scrolledwindow (void)
   return new_widget_info ("scrolledwindow", scrolledwin, MEDIUM);
 }
 
-static WidgetInfo *
-create_scrollbar (void)
-{
-  GtkWidget *widget;
-  GtkWidget *vbox, *align;
-
-  widget = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-  gtk_widget_set_size_request (widget, 100, -1);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Scrollbar"),
-		      FALSE, FALSE, 0);
-
-  return new_widget_info ("scrollbar", vbox, SMALL);
-}
-
 static WidgetInfo *
 create_spinbutton (void)
 {
@@ -1300,131 +1243,11 @@ create_colorchooserdialog (void)
   return info;
 }
 
-static WidgetInfo *
-create_headerbar (void)
-{
-  GtkWidget *window;
-  GtkWidget *bar;
-  GtkWidget *align;
-  GtkWidget *view;
-  GtkWidget *button;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_widget_set_size_request (window, 220, 150);
-  gtk_container_add (GTK_CONTAINER (window), view);
-  bar = gtk_header_bar_new ();
-  gtk_header_bar_set_title (GTK_HEADER_BAR (bar), "Header Bar");
-  gtk_header_bar_set_subtitle (GTK_HEADER_BAR (bar), "(subtitle)");
-  gtk_window_set_titlebar (GTK_WINDOW (window), bar);
-  button = gtk_button_new ();
-  gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("bookmark-new-symbolic", GTK_ICON_SIZE_BUTTON));
-  gtk_widget_show_all (button);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (bar), button);
-
-  return new_widget_info ("headerbar", window, ASIS);
-}
-
-static WidgetInfo *
-create_placessidebar (void)
-{
-  GtkWidget *bar;
-  GtkWidget *vbox;
-  GtkWidget *align;
-
-  bar = gtk_places_sidebar_new ();
-  gtk_widget_set_size_request (bar, 150, 300);
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
-  gtk_container_add (GTK_CONTAINER (align), bar);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Places Sidebar"),
-                      FALSE, FALSE, 0);
-
-  return new_widget_info ("placessidebar", vbox, ASIS);
-}
-
-static WidgetInfo *
-create_stack (void)
-{
-  GtkWidget *stack;
-  GtkWidget *switcher;
-  GtkWidget *vbox;
-  GtkWidget *view;
-
-  stack = gtk_stack_new ();
-  gtk_widget_set_margin_top (stack, 10);
-  gtk_widget_set_margin_bottom (stack, 10);
-  gtk_widget_set_size_request (stack, 120, 120);
-  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_stack_add_titled (GTK_STACK (stack), view, "page1", "Page 1");
-  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_stack_add_titled (GTK_STACK (stack), view, "page2", "Page 2");
-
-  switcher = gtk_stack_switcher_new ();
-  gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (switcher), GTK_STACK (stack));
-  gtk_widget_set_halign (switcher, GTK_ALIGN_CENTER);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-
-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Stack"),
-                      FALSE, FALSE, 0);
-
-  return new_widget_info ("stack", vbox, ASIS);
-}
-
-static WidgetInfo *
-create_stack_switcher (void)
-{
-  GtkWidget *stack;
-  GtkWidget *switcher;
-  GtkWidget *vbox;
-  GtkWidget *view;
-
-  stack = gtk_stack_new ();
-  gtk_widget_set_margin_top (stack, 10);
-  gtk_widget_set_margin_bottom (stack, 10);
-  gtk_widget_set_size_request (stack, 120, 120);
-  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_stack_add_titled (GTK_STACK (stack), view, "page1", "Page 1");
-  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_stack_add_titled (GTK_STACK (stack), view, "page2", "Page 2");
-
-  switcher = gtk_stack_switcher_new ();
-  gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (switcher), GTK_STACK (stack));
-  gtk_widget_set_halign (switcher, GTK_ALIGN_CENTER);
-
-  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-
-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Stack Switcher"),
-                      FALSE, FALSE, 0);
-
-  return new_widget_info ("stackswitcher", vbox, ASIS);
-}
-
 GList *
 get_all_widgets (void)
 {
   GList *retval = NULL;
 
-  retval = g_list_prepend (retval, create_headerbar ());
-  retval = g_list_prepend (retval, create_placessidebar ());
-  retval = g_list_prepend (retval, create_stack ());
-  retval = g_list_prepend (retval, create_stack_switcher ());
   retval = g_list_prepend (retval, create_toolpalette ());
   retval = g_list_prepend (retval, create_spinner ());
   retval = g_list_prepend (retval, create_about_dialog ());
@@ -1434,7 +1257,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_color_button ());
   retval = g_list_prepend (retval, create_combo_box ());
   retval = g_list_prepend (retval, create_combo_box_entry ());
-  retval = g_list_prepend (retval, create_combo_box_text ());
   retval = g_list_prepend (retval, create_entry ());
   retval = g_list_prepend (retval, create_file_button ());
   retval = g_list_prepend (retval, create_font_button ());
@@ -1451,7 +1273,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_radio ());
   retval = g_list_prepend (retval, create_scales ());
   retval = g_list_prepend (retval, create_scrolledwindow ());
-  retval = g_list_prepend (retval, create_scrollbar ());
   retval = g_list_prepend (retval, create_separator ());
   retval = g_list_prepend (retval, create_spinbutton ());
   retval = g_list_prepend (retval, create_statusbar ());
@@ -1477,7 +1298,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_menu_button ());
   retval = g_list_prepend (retval, create_search_entry ());
   retval = g_list_prepend (retval, create_level_bar ());
-  retval = g_list_prepend (retval, create_info_bar ());
 
   return retval;
 }

gdk/Makefile.am

@@ -9,9 +9,9 @@ INTROSPECTION_COMPILER_ARGS = \
    --includedir=$(srcdir) \
    --includedir=.
 
-SUBDIRS = $(GDK_BACKENDS) .
+SUBDIRS = $(GDK_BACKENDS) . tests
 
-DIST_SUBDIRS = win32 x11 quartz broadway wayland
+DIST_SUBDIRS = win32 x11 quartz broadway wayland tests
 
 CLEANFILES =
 
@@ -23,12 +23,15 @@ EXTRA_DIST += 			\
 	gen-keyname-table.pl	\
 	gdkconfig.h.win32	\
 	gdkkeysyms-update.pl	\
+	gdk.def			\
 	gdkmarshalers.list	\
 	gdkwindowimpl.h		\
 	makefile.msc		\
+	gdk.symbols		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
-	gdkversionmacros.h.in
+	gdkversionmacros.h.in	\
+	abicheck.sh
 
 AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\
@@ -51,7 +54,8 @@ LDADD = 					\
 	-version-info $(LT_VERSION_INFO)	\
 	-export-dynamic 			\
 	-rpath $(libdir) 			\
-	$(no_undefined)
+	$(no_undefined)				\
+	$(LIBTOOL_EXPORT_OPTIONS)
 
 #
 # setup source file variables
@@ -140,11 +144,11 @@ gdk_c_sources = 				\
 	gdkwindowimpl.c
 
 gdk_built_sources = 				\
-	gdkenumtypes.h				\
 	gdkenumtypes.c				\
 	gdkmarshalers.h 			\
 	gdkmarshalers.c				\
-	gdkversionmacros.h
+	gdkversionmacros.h			\
+	gdkenumtypes.h
 
 #
 # setup GDK sources and their dependencies
@@ -162,7 +166,6 @@ common_sources = 		\
 	gdkmarshalers.h
 
 libgdk_3_la_SOURCES = $(common_sources)
-libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
 libgdk_3_la_LIBADD = $(GDK_DEP_LIBS)
 libgdk_3_la_LDFLAGS = $(LDADD)
 
@@ -171,7 +174,7 @@ libgdk_3_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
+libgdk_3_la_CFLAGS = -xobjective-c
 libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
@@ -297,6 +300,16 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+# This places the generated .def file in srcdir, since it is expected to be there.
+# (The one from a tarball is)
+gdk.def: gdk.symbols
+	$(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+
+TESTS_ENVIRONMENT = srcdir="$(srcdir)"
+if OS_LINUX
+TESTS = abicheck.sh
+endif
+
 lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
@@ -315,13 +328,13 @@ BUILT_SOURCES = \
 
 gdkenumtypes.h: stamp-gdkenumtypes.h
 	@true
-stamp-gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template
+stamp-gdkenumtypes.h: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.h.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
 		$(gdk_public_h_sources) ) >> xgen-geth \
 	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
 	&& rm -f xgen-geth \
 	&& echo timestamp > $(@F)
-gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
+gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
 		$(gdk_public_h_sources) ) > xgen-getc \
 	&& cp xgen-getc gdkenumtypes.c  \
@@ -330,11 +343,11 @@ gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template
 #
 # Marshaller generation
 #
-gdkmarshalers.h: gdkmarshalers.list
+gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
 	|| ( rm -f gdkmarshalers-h.tmp && exit 1)
-gdkmarshalers.c: gdkmarshalers.list
+gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
 	$(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
 	 $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp	\
 	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \

gdk/abicheck.sh

@@ -0,0 +1,5 @@
+#! /bin/sh
+
+cpp -P -DGDK_WINDOWING_X11  ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+nm -D -g --defined-only .libs/libgdk-3.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

gdk/broadway/Makefile.am

@@ -4,14 +4,13 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
 
-AM_CPPFLAGS =				\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DGDK_COMPILATION		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS)		\
+AM_CPPFLAGS =			\
+	-DG_LOG_DOMAIN=\"Gdk\"	\
+	-DGDK_COMPILATION	\
+	-I$(top_srcdir)		\
+	-I$(top_srcdir)/gdk	\
+	-I$(top_builddir)/gdk	\
+	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
 LDADDS = $(GDK_DEP_LIBS)
@@ -24,6 +23,7 @@ libgdkinclude_HEADERS = 	\
 	gdkbroadway.h
 
 libgdkbroadwayinclude_HEADERS = 	\
+	gdkbroadwaydisplaymanager.h	\
 	gdkbroadwaywindow.h		\
 	gdkbroadwaycursor.h		\
 	gdkbroadwayvisual.h
@@ -55,6 +55,7 @@ libgdk_broadway_la_SOURCES =		\
 	gdkdevicemanager-broadway.c \
 	gdkdisplay-broadway.c	\
 	gdkdisplay-broadway.h	\
+	gdkdisplaymanager-broadway.c	\
 	gdkdnd-broadway.c	\
 	gdkeventsource.c	\
 	gdkeventsource.h	\

gdk/broadway/gdkbroadway.h

@@ -32,6 +32,7 @@
 #include <gdk/broadway/gdkbroadwaywindow.h>
 #include <gdk/broadway/gdkbroadwaycursor.h>
 #include <gdk/broadway/gdkbroadwayvisual.h>
+#include <gdk/broadway/gdkbroadwaydisplaymanager.h>
 
 #undef __GDKBROADWAY_H_INSIDE__
 

gdk/broadway/gdkbroadwaycursor.h

@@ -47,7 +47,6 @@ typedef GdkCursor GdkBroadwayCursor;
 #endif
 typedef struct _GdkBroadwayCursorClass GdkBroadwayCursorClass;
 
-GDK_AVAILABLE_IN_ALL
 GType    gdk_broadway_cursor_get_type          (void);
 
 G_END_DECLS

gdk/broadway/gdkbroadwaydisplaymanager.h

@@ -38,7 +38,6 @@ typedef GdkDisplayManager _GdkBroadwayDisplayManager;
 #endif
 typedef struct _GdkDisplayManagerClass GdkBroadwayDisplayManagerClass;
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_broadway_display_manager_get_type (void);
 
 G_END_DECLS

gdk/broadway/gdkbroadwayvisual.h

@@ -38,7 +38,6 @@ typedef GdkVisual GdkBroadwayVisual;
 typedef struct _GdkBroadwayVisualClass GdkBroadwayVisualClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_broadway_visual_get_type (void);
 
 G_END_DECLS

gdk/broadway/gdkbroadwaywindow.h

@@ -43,10 +43,8 @@ typedef GdkWindow GdkBroadwayWindow;
 #endif
 typedef struct _GdkBroadwayWindowClass GdkBroadwayWindowClass;
 
-GDK_AVAILABLE_IN_ALL
 GType    gdk_broadway_window_get_type          (void);
 
-GDK_AVAILABLE_IN_ALL
 guint32  gdk_broadway_get_last_seen_time (GdkWindow       *window);
 
 G_END_DECLS

gdk/broadway/gdkdisplaymanager-broadway.c

@@ -0,0 +1,103 @@
+/* GDK - The GIMP Drawing Kit
+ * gdkdisplaymanager-broadway.c
+ *
+ * Copyright (C) 2005 Imendio AB
+ * Copyright 2010 Red Hat, Inc.
+ *
+ * Author: Matthias clasen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include "gdkdisplay-broadway.h"
+#include "gdkbroadwaydisplaymanager.h"
+#include "gdkprivate-broadway.h"
+
+#include "gdkdisplaymanagerprivate.h"
+#include "gdkinternals.h"
+
+struct _GdkBroadwayDisplayManager
+{
+  GdkDisplayManager parent;
+
+  gboolean init_failed;
+};
+
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkBroadwayDisplayManager, gdk_broadway_display_manager, GDK_TYPE_DISPLAY_MANAGER,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_broadway_display_manager_initable_init (GInitable     *initable,
+                                            GCancellable  *cancellable,
+                                            GError       **error)
+{
+  const gchar *display_name;
+  gint port;
+  GdkBroadwayServer *server;
+
+  display_name = g_getenv ("BROADWAY_DISPLAY");
+
+  port = 0;
+  if (display_name != NULL)
+    {
+      if (*display_name == ':')
+        display_name++;
+      port = strtol(display_name, NULL, 10);
+    }
+  if (port == 0)
+    port = 1;
+
+  server = _gdk_broadway_server_new (port, NULL);
+  if (server == NULL)
+    {
+      GDK_BROADWAY_DISPLAY_MANAGER (initable)->init_failed = TRUE;
+      return FALSE;
+    }
+
+  g_object_unref (server);
+
+  return TRUE;
+}
+
+void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_broadway_display_manager_initable_init;
+}
+
+static void
+gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
+{
+}
+
+static void
+gdk_broadway_display_manager_finalize (GObject *object)
+{
+  if (!GDK_BROADWAY_DISPLAY_MANAGER (object)->init_failed)
+    g_error ("A GdkBroadwayDisplayManager object was finalized. This should not happen");
+  G_OBJECT_CLASS (gdk_broadway_display_manager_parent_class)->finalize (object);
+}
+
+static void
+gdk_broadway_display_manager_class_init (GdkBroadwayDisplayManagerClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = gdk_broadway_display_manager_finalize;
+}

gdk/broadway/gdkwindow-broadway.c

@@ -1470,6 +1470,56 @@ _gdk_broadway_window_queue_antiexpose (GdkWindow *window,
   return TRUE;
 }
 
+static void
+copy_region (cairo_surface_t *surface,
+	     cairo_region_t *area,
+	     gint            dx,
+	     gint            dy)
+{
+  cairo_t *cr;
+
+  cr = cairo_create (surface);
+
+  gdk_cairo_region (cr, area);
+  cairo_clip (cr);
+
+  /* NB: This is a self-copy and Cairo doesn't support that yet.
+   * So we do a litle trick.
+   */
+  cairo_push_group (cr);
+
+  cairo_set_source_surface (cr, surface, dx, dy);
+  cairo_paint (cr);
+
+  cairo_pop_group_to_source (cr);
+  cairo_paint (cr);
+
+  cairo_destroy (cr);
+}
+
+void
+_gdk_broadway_window_translate (GdkWindow      *window,
+				cairo_region_t *area,
+				gint            dx,
+				gint            dy)
+{
+  GdkWindowImplBroadway *impl;
+  GdkBroadwayDisplay *broadway_display;
+
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+
+  if (impl->surface)
+    {
+      copy_region (impl->surface, area, dx, dy);
+      broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+
+      if (_gdk_broadway_server_window_translate (broadway_display->server,
+						 impl->id,
+						 area, dx, dy))
+	queue_flush (window);
+    }
+}
+
 guint32
 gdk_broadway_get_last_seen_time (GdkWindow  *window)
 {
@@ -1508,6 +1558,7 @@ gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
   impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
   impl_class->set_static_gravities = gdk_window_broadway_set_static_gravities;
   impl_class->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
+  impl_class->translate = _gdk_broadway_window_translate;
   impl_class->destroy = _gdk_broadway_window_destroy;
   impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
   impl_class->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;

gdk/gdk.c

@@ -26,7 +26,6 @@
 
 #define GDK_DISABLE_DEPRECATION_WARNINGS 1
 
-#include "gdkversionmacros.h"
 #include "gdkmain.h"
 
 #include "gdkinternals.h"
@@ -383,6 +382,9 @@ gdk_display_open_default_libgtk_only (void)
 
   g_return_val_if_fail (gdk_initialized, NULL);
 
+  if (gdk_display_manager_peek () == NULL)
+    return NULL;
+
   display = gdk_display_get_default ();
   if (display)
     return display;
@@ -667,12 +669,12 @@ gdk_init (int *argc, char ***argv)
  * </informalexample>
  *
  * Unfortunately, all of the above documentation holds with the X11
- * backend only. With the Win32 or Quartz backends, GDK and GTK+ calls
- * must occur only in the main thread (see below). When using Python,
- * even on X11 combining the GDK lock with other locks such as the
- * Python global interpreter lock can be complicated.
+ * backend only. With the Win32 backend, GDK and GTK+ calls should not
+ * be attempted from multiple threads at all. Combining the GDK lock
+ * with other locks such as the Python global interpreter lock can be
+ * complicated.
  *
- * For these reasons, the threading support has been deprecated in
+ * For these reason, the threading support has been deprecated in
  * GTK+ 3.6. Instead of calling GTK+ directly from multiple threads,
  * it is recommended to use g_idle_add(), g_main_context_invoke()
  * and similar functions to make these calls from the main thread

gdk/gdk.symbols

@@ -0,0 +1,617 @@
+/* This file lists all exported symbols. It is used to generate
+ * the gdk.def file used to control exports on Windows.
+ */
+gdk_add_option_entries_libgtk_only
+gdk_app_launch_context_get_type
+gdk_app_launch_context_new
+gdk_app_launch_context_set_desktop
+gdk_app_launch_context_set_display
+gdk_app_launch_context_set_icon
+gdk_app_launch_context_set_icon_name
+gdk_app_launch_context_set_screen
+gdk_app_launch_context_set_timestamp
+gdk_atom_intern
+gdk_atom_intern_static_string
+gdk_atom_name
+gdk_axis_use_get_type
+gdk_beep
+gdk_byte_order_get_type
+gdk_cairo_create
+gdk_cairo_get_clip_rectangle
+gdk_cairo_rectangle
+gdk_cairo_region
+gdk_cairo_region_create_from_surface
+gdk_cairo_set_source_color
+gdk_cairo_set_source_pixbuf
+gdk_cairo_set_source_rgba
+gdk_cairo_set_source_window
+gdk_color_copy
+gdk_color_equal
+gdk_color_free
+gdk_color_get_type
+gdk_color_hash
+gdk_color_parse
+gdk_color_to_string
+gdk_crossing_mode_get_type
+gdk_cursor_get_cursor_type
+gdk_cursor_get_display
+gdk_cursor_get_image
+gdk_cursor_get_type
+gdk_cursor_new
+gdk_cursor_new_for_display
+gdk_cursor_new_from_name
+gdk_cursor_new_from_pixbuf
+gdk_cursor_ref
+gdk_cursor_type_get_type
+gdk_cursor_unref
+gdk_device_free_history
+gdk_device_get_associated_device
+gdk_device_get_axis
+gdk_device_get_axis_use
+gdk_device_get_axis_value
+gdk_device_get_device_type
+gdk_device_get_display
+gdk_device_get_has_cursor
+gdk_device_get_history
+gdk_device_get_key
+gdk_device_get_mode
+gdk_device_get_name
+gdk_device_get_n_axes
+gdk_device_get_n_keys
+gdk_device_get_position
+gdk_device_get_source
+gdk_device_get_state
+gdk_device_get_type
+gdk_device_get_window_at_position
+gdk_device_grab
+gdk_device_grab_info_libgtk_only
+gdk_device_list_axes
+gdk_device_list_slave_devices
+gdk_device_manager_get_client_pointer
+gdk_device_manager_get_display
+gdk_device_manager_get_type
+gdk_device_manager_list_devices
+gdk_device_set_axis_use
+gdk_device_set_key
+gdk_device_set_mode
+gdk_device_type_get_type
+gdk_device_ungrab
+gdk_device_warp
+gdk_disable_multidevice
+gdk_display_beep
+gdk_display_close
+gdk_display_device_is_grabbed
+gdk_display_flush
+gdk_display_get_app_launch_context
+gdk_display_get_default
+gdk_display_get_default_cursor_size
+gdk_display_get_default_group
+gdk_display_get_default_screen
+gdk_display_get_device_manager
+gdk_display_get_event
+gdk_display_get_maximal_cursor_size
+gdk_display_get_name
+gdk_display_get_n_screens
+gdk_display_get_pointer
+gdk_display_get_screen
+gdk_display_get_type
+gdk_display_get_window_at_pointer
+gdk_display_has_pending
+gdk_display_is_closed
+gdk_display_keyboard_ungrab
+gdk_display_list_devices
+gdk_display_manager_get
+gdk_display_manager_peek
+gdk_display_manager_get_default_display
+gdk_display_manager_get_type
+gdk_display_manager_list_displays
+gdk_display_manager_open_display
+gdk_display_manager_set_default_display
+gdk_display_notify_startup_complete
+gdk_display_open
+gdk_display_open_default_libgtk_only
+gdk_display_peek_event
+gdk_display_pointer_is_grabbed
+gdk_display_pointer_ungrab
+gdk_display_put_event
+gdk_display_request_selection_notification
+gdk_display_set_double_click_distance
+gdk_display_set_double_click_time
+gdk_display_store_clipboard
+gdk_display_supports_clipboard_persistence
+gdk_display_supports_composite
+gdk_display_supports_cursor_alpha
+gdk_display_supports_cursor_color
+gdk_display_supports_input_shapes
+gdk_display_supports_selection_notification
+gdk_display_supports_shapes
+gdk_display_sync
+gdk_display_warp_pointer
+gdk_drag_abort
+gdk_drag_action_get_type
+gdk_drag_begin
+gdk_drag_begin_for_device
+gdk_drag_context_get_actions
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_device
+gdk_drag_context_get_protocol
+gdk_drag_context_get_selected_action
+gdk_drag_context_get_source_window
+gdk_drag_context_get_suggested_action
+gdk_drag_context_get_type
+gdk_drag_context_list_targets
+gdk_drag_context_set_device
+gdk_drag_drop
+gdk_drag_drop_succeeded
+gdk_drag_find_window_for_screen
+gdk_drag_get_selection
+gdk_drag_motion
+gdk_drag_protocol_get_type
+gdk_drag_status
+gdk_drop_finish
+gdk_drop_reply
+gdk_error_trap_pop
+gdk_error_trap_pop_ignored
+gdk_error_trap_push
+gdk_event_copy
+gdk_event_free
+gdk_event_get
+gdk_event_get_axis
+gdk_event_get_button
+gdk_event_get_click_count
+gdk_event_get_coords
+gdk_event_get_device
+gdk_event_get_keycode
+gdk_event_get_keyval
+gdk_event_get_root_coords
+gdk_event_get_screen
+gdk_event_get_scroll_direction
+gdk_event_get_scroll_deltas
+gdk_event_get_source_device
+gdk_event_get_state
+gdk_event_get_time
+gdk_event_get_event_sequence
+gdk_event_get_type
+gdk_event_handler_set
+gdk_event_mask_get_type
+gdk_event_new
+gdk_event_peek
+gdk_event_put
+gdk_event_request_motions
+gdk_event_set_device
+gdk_event_set_screen
+gdk_event_set_source_device
+gdk_event_triggers_context_menu
+gdk_events_get_angle
+gdk_events_get_center
+gdk_events_get_distance
+gdk_events_pending
+gdk_event_type_get_type
+gdk_filter_return_get_type
+gdk_flush
+gdk_frame_clock_begin_updating
+gdk_frame_clock_end_updating
+gdk_frame_clock_get_current_timings
+gdk_frame_clock_get_frame_counter
+gdk_frame_clock_get_frame_time
+gdk_frame_clock_get_history_start
+gdk_frame_clock_get_refresh_info
+gdk_frame_clock_get_timings
+gdk_frame_clock_get_type
+gdk_frame_clock_idle_get_type
+gdk_frame_clock_phase_get_type
+gdk_frame_clock_request_phase
+gdk_frame_timings_get_complete
+gdk_frame_timings_get_frame_counter
+gdk_frame_timings_get_frame_time
+gdk_frame_timings_get_predicted_presentation_time
+gdk_frame_timings_get_presentation_time
+gdk_frame_timings_get_refresh_interval
+gdk_frame_timings_get_type
+gdk_frame_timings_ref
+gdk_frame_timings_unref
+gdk_fullscreen_mode_get_type
+gdk_get_default_root_window
+gdk_get_display
+gdk_get_display_arg_name
+gdk_get_program_class
+gdk_get_show_events
+gdk_grab_ownership_get_type
+gdk_grab_status_get_type
+gdk_gravity_get_type
+gdk_init
+gdk_init_check
+gdk_input_mode_get_type
+gdk_input_source_get_type
+gdk_keyboard_grab
+gdk_keyboard_ungrab
+gdk_keymap_add_virtual_modifiers
+gdk_keymap_get_caps_lock_state
+gdk_keymap_get_default
+gdk_keymap_get_direction
+gdk_keymap_get_entries_for_keycode
+gdk_keymap_get_entries_for_keyval
+gdk_keymap_get_for_display
+gdk_keymap_get_modifier_mask
+gdk_keymap_get_modifier_state
+gdk_keymap_get_num_lock_state
+gdk_keymap_get_type
+gdk_keymap_have_bidi_layouts
+gdk_keymap_lookup_key
+gdk_keymap_map_virtual_modifiers
+gdk_keymap_translate_keyboard_state
+gdk_keyval_convert_case
+gdk_keyval_from_name
+gdk_keyval_is_lower
+gdk_keyval_is_upper
+gdk_keyval_name
+gdk_keyval_to_lower
+gdk_keyval_to_unicode
+gdk_keyval_to_upper
+gdk_list_visuals
+gdk_modifier_intent_get_type
+gdk_modifier_type_get_type
+gdk_notify_startup_complete
+gdk_notify_startup_complete_with_id
+gdk_notify_type_get_type
+gdk_offscreen_window_get_embedder
+gdk_offscreen_window_get_surface
+gdk_offscreen_window_get_type
+gdk_offscreen_window_set_embedder
+gdk_owner_change_get_type
+gdk_pango_context_get
+gdk_pango_context_get_for_screen
+gdk_pango_layout_get_clip_region
+gdk_pango_layout_line_get_clip_region
+gdk_parse_args
+gdk_pixbuf_get_from_surface
+gdk_pixbuf_get_from_window
+gdk_pointer_grab
+gdk_pointer_is_grabbed
+gdk_pointer_ungrab
+gdk_pre_parse_libgtk_only
+gdk_property_change
+gdk_property_delete
+gdk_property_get
+gdk_property_state_get_type
+gdk_prop_mode_get_type
+gdk_query_depths
+gdk_query_visual_types
+gdk_rectangle_get_type
+gdk_rectangle_intersect
+gdk_rectangle_union
+gdk_rgba_copy
+gdk_rgba_equal
+gdk_rgba_free
+gdk_rgba_get_type
+gdk_rgba_hash
+gdk_rgba_parse
+gdk_rgba_to_string
+gdk_screen_get_active_window
+gdk_screen_get_default
+gdk_screen_get_display
+gdk_screen_get_font_options
+gdk_screen_get_height
+gdk_screen_get_height_mm
+gdk_screen_get_monitor_at_point
+gdk_screen_get_monitor_at_window
+gdk_screen_get_monitor_geometry
+gdk_screen_get_monitor_workarea
+gdk_screen_get_monitor_height_mm
+gdk_screen_get_monitor_plug_name
+gdk_screen_get_monitor_width_mm
+gdk_screen_get_n_monitors
+gdk_screen_get_number
+gdk_screen_get_primary_monitor
+gdk_screen_get_resolution
+gdk_screen_get_rgba_visual
+gdk_screen_get_root_window
+gdk_screen_get_setting
+gdk_screen_get_system_visual
+gdk_screen_get_toplevel_windows
+gdk_screen_get_type
+gdk_screen_get_width
+gdk_screen_get_width_mm
+gdk_screen_get_window_stack
+gdk_screen_height
+gdk_screen_height_mm
+gdk_screen_is_composited
+gdk_screen_list_visuals
+gdk_screen_make_display_name
+gdk_screen_set_font_options
+gdk_screen_set_resolution
+gdk_screen_width
+gdk_screen_width_mm
+gdk_scroll_direction_get_type
+gdk_selection_convert
+gdk_selection_owner_get
+gdk_selection_owner_get_for_display
+gdk_selection_owner_set
+gdk_selection_owner_set_for_display
+gdk_selection_property_get
+gdk_selection_send_notify
+gdk_selection_send_notify_for_display
+gdk_set_double_click_time
+gdk_set_program_class
+gdk_set_show_events
+gdk_setting_action_get_type
+gdk_setting_get
+gdk_set_allowed_backends
+gdk_status_get_type
+gdk_synthesize_window_state
+gdk_test_render_sync
+gdk_test_simulate_button
+gdk_test_simulate_key
+gdk_text_property_to_utf8_list_for_display
+gdk_threads_add_idle
+gdk_threads_add_idle_full
+gdk_threads_add_timeout
+gdk_threads_add_timeout_full
+gdk_threads_add_timeout_seconds
+gdk_threads_add_timeout_seconds_full
+gdk_threads_enter
+gdk_threads_init
+gdk_threads_leave
+gdk_threads_set_lock_functions
+gdk_unicode_to_keyval
+gdk_utf8_to_string_target
+gdk_visibility_state_get_type
+gdk_visual_get_best
+gdk_visual_get_best_depth
+gdk_visual_get_best_type
+gdk_visual_get_best_with_both
+gdk_visual_get_best_with_depth
+gdk_visual_get_best_with_type
+gdk_visual_get_bits_per_rgb
+gdk_visual_get_blue_pixel_details
+gdk_visual_get_byte_order
+gdk_visual_get_colormap_size
+gdk_visual_get_depth
+gdk_visual_get_green_pixel_details
+gdk_visual_get_red_pixel_details
+gdk_visual_get_screen
+gdk_visual_get_system
+gdk_visual_get_type
+gdk_visual_get_visual_type
+gdk_visual_type_get_type
+#ifdef GDK_WINDOWING_WIN32
+gdk_win32_handle_table_lookup
+gdk_win32_icon_to_pixbuf_libgtk_only
+gdk_win32_pixbuf_to_hicon_libgtk_only
+gdk_win32_selection_add_targets
+gdk_win32_set_modal_dialog_libgtk_only
+gdk_win32_window_is_win32
+gdk_win32_window_get_impl_hwnd
+gdk_win32_window_get_handle
+gdk_win32_window_get_type
+gdk_win32_display_get_type
+gdk_win32_window_foreign_new_for_display
+gdk_win32_window_lookup_for_display
+#endif
+gdk_window_add_filter
+gdk_window_at_pointer
+gdk_window_attributes_type_get_type
+gdk_window_beep
+gdk_window_begin_move_drag
+gdk_window_begin_move_drag_for_device
+gdk_window_begin_paint_rect
+gdk_window_begin_paint_region
+gdk_window_begin_resize_drag
+gdk_window_begin_resize_drag_for_device
+gdk_window_window_class_get_type
+gdk_window_configure_finished
+gdk_window_constrain_size
+gdk_window_coords_from_parent
+gdk_window_coords_to_parent
+gdk_window_create_similar_surface
+gdk_window_deiconify
+gdk_window_destroy
+gdk_window_destroy_notify
+gdk_window_edge_get_type
+gdk_window_enable_synchronized_configure
+gdk_window_end_paint
+gdk_window_ensure_native
+gdk_window_flush
+gdk_window_focus
+gdk_window_freeze_toplevel_updates_libgtk_only
+gdk_window_freeze_updates
+gdk_window_fullscreen
+gdk_window_geometry_changed
+gdk_window_get_accept_focus
+gdk_window_get_background_pattern
+gdk_window_get_children
+gdk_window_get_clip_region
+gdk_window_get_composited
+gdk_window_get_cursor
+gdk_window_get_decorations
+gdk_window_get_device_cursor
+gdk_window_get_device_events
+gdk_window_get_device_position
+gdk_window_get_display
+gdk_window_get_drag_protocol
+gdk_window_get_effective_parent
+gdk_window_get_effective_toplevel
+gdk_window_get_events
+gdk_window_get_focus_on_map
+gdk_window_get_frame_clock
+gdk_window_get_frame_extents
+gdk_window_get_fullscreen_mode
+gdk_window_get_geometry
+gdk_window_get_group
+gdk_window_get_height
+gdk_window_get_modal_hint
+gdk_window_get_origin
+gdk_window_get_parent
+gdk_window_get_pointer
+gdk_window_get_position
+gdk_window_get_root_coords
+gdk_window_get_root_origin
+gdk_window_get_screen
+gdk_window_get_source_events
+gdk_window_get_state
+gdk_window_get_support_multidevice
+gdk_window_get_toplevel
+gdk_window_get_type
+gdk_window_get_type_hint
+gdk_window_get_update_area
+gdk_window_get_user_data
+gdk_window_get_visible_region
+gdk_window_get_visual
+gdk_window_get_width
+gdk_window_get_window_type
+gdk_window_has_native
+gdk_window_hide
+gdk_window_hints_get_type
+gdk_window_iconify
+gdk_window_impl_get_type
+#ifdef GDK_WINDOWING_X11
+gdk_window_impl_x11_get_type
+#endif
+gdk_window_input_shape_combine_region
+gdk_window_invalidate_maybe_recurse
+gdk_window_invalidate_rect
+gdk_window_invalidate_region
+gdk_window_is_destroyed
+gdk_window_is_input_only
+gdk_window_is_shaped
+gdk_window_is_viewable
+gdk_window_is_visible
+gdk_window_lower
+gdk_window_maximize
+gdk_window_merge_child_input_shapes
+gdk_window_merge_child_shapes
+gdk_window_move
+gdk_window_move_region
+gdk_window_move_resize
+gdk_window_new
+gdk_window_peek_children
+gdk_window_process_all_updates
+gdk_window_process_updates
+gdk_window_raise
+gdk_window_register_dnd
+gdk_window_remove_filter
+gdk_window_reparent
+gdk_window_resize
+gdk_window_restack
+gdk_window_scroll
+gdk_window_set_accept_focus
+gdk_window_set_background
+gdk_window_set_background_pattern
+gdk_window_set_background_rgba
+gdk_window_set_child_input_shapes
+gdk_window_set_child_shapes
+gdk_window_set_composited
+gdk_window_set_cursor
+gdk_window_set_debug_updates
+gdk_window_set_decorations
+gdk_window_set_device_cursor
+gdk_window_set_device_events
+gdk_window_set_events
+gdk_window_set_focus_on_map
+gdk_window_set_fullscreen_mode
+gdk_window_set_functions
+gdk_window_set_geometry_hints
+gdk_window_set_group
+gdk_window_set_icon_list
+gdk_window_set_icon_name
+gdk_window_set_keep_above
+gdk_window_set_keep_below
+gdk_window_set_modal_hint
+gdk_window_set_opacity
+gdk_window_set_override_redirect
+gdk_window_set_role
+gdk_window_set_skip_pager_hint
+gdk_window_set_skip_taskbar_hint
+gdk_window_set_source_events
+gdk_window_set_startup_id
+gdk_window_set_static_gravities
+gdk_window_set_support_multidevice
+gdk_window_set_title
+gdk_window_set_transient_for
+gdk_window_set_type_hint
+gdk_window_set_urgency_hint
+gdk_window_set_user_data
+gdk_window_shape_combine_region
+gdk_window_show
+gdk_window_show_unraised
+gdk_window_state_get_type
+gdk_window_stick
+gdk_window_thaw_toplevel_updates_libgtk_only
+gdk_window_thaw_updates
+gdk_window_type_get_type
+gdk_window_type_hint_get_type
+gdk_window_unfullscreen
+gdk_window_unmaximize
+gdk_window_unstick
+gdk_window_withdraw
+gdk_wm_decoration_get_type
+gdk_wm_function_get_type
+#ifdef GDK_WINDOWING_X11
+gdk_x11_app_launch_context_get_type
+gdk_x11_atom_to_xatom
+gdk_x11_atom_to_xatom_for_display
+gdk_x11_cursor_get_type
+gdk_x11_cursor_get_xcursor
+gdk_x11_cursor_get_xdisplay
+gdk_x11_device_core_get_type
+gdk_x11_device_get_id
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_lookup
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_display_broadcast_startup_message
+gdk_x11_display_error_trap_pop
+gdk_x11_display_error_trap_pop_ignored
+gdk_x11_display_error_trap_push
+gdk_x11_display_get_startup_notification_id
+gdk_x11_display_get_type
+gdk_x11_display_get_user_time
+gdk_x11_display_get_xdisplay
+gdk_x11_display_grab
+gdk_x11_display_manager_get_type
+gdk_x11_display_set_cursor_theme
+gdk_x11_display_set_startup_notification_id
+gdk_x11_display_string_to_compound_text
+gdk_x11_display_text_property_to_text_list
+gdk_x11_display_ungrab
+gdk_x11_display_utf8_to_compound_text
+gdk_x11_drag_context_get_type
+gdk_x11_free_compound_text
+gdk_x11_free_text_list
+gdk_x11_get_default_root_xwindow
+gdk_x11_get_default_screen
+gdk_x11_get_default_xdisplay
+gdk_x11_get_server_time
+gdk_x11_get_xatom_by_name
+gdk_x11_get_xatom_by_name_for_display
+gdk_x11_get_xatom_name
+gdk_x11_get_xatom_name_for_display
+gdk_x11_grab_server
+gdk_x11_keymap_get_type
+gdk_x11_keymap_get_group_for_state
+gdk_x11_keymap_key_is_modifier
+gdk_x11_lookup_xdisplay
+gdk_x11_register_standard_event_type
+gdk_x11_screen_get_monitor_output
+gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_type
+gdk_x11_screen_get_window_manager_name
+gdk_x11_screen_get_xscreen
+gdk_x11_screen_lookup_visual
+gdk_x11_screen_supports_net_wm_hint
+gdk_x11_set_sm_client_id
+gdk_x11_ungrab_server
+gdk_x11_visual_get_type
+gdk_x11_visual_get_xvisual
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_type
+gdk_x11_window_get_xid
+gdk_x11_window_move_to_current_desktop
+gdk_x11_window_set_theme_variant
+gdk_x11_window_set_hide_titlebar_when_maximized
+gdk_x11_window_set_user_time
+gdk_x11_window_set_utf8_property
+gdk_x11_xatom_to_atom
+gdk_x11_xatom_to_atom_for_display
+#endif

gdk/gdkapplaunchcontext.h

@@ -37,7 +37,6 @@ G_BEGIN_DECLS
         #define GDK_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
 
 
-GDK_AVAILABLE_IN_ALL
 GType                gdk_app_launch_context_get_type      (void);
 
 GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context)
@@ -45,19 +44,14 @@ GdkAppLaunchContext *gdk_app_launch_context_new           (void);
 GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context)
 void                 gdk_app_launch_context_set_display   (GdkAppLaunchContext *context,
                                                            GdkDisplay          *display);
-GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_screen    (GdkAppLaunchContext *context,
                                                            GdkScreen           *screen);
-GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_desktop   (GdkAppLaunchContext *context,
                                                            gint                 desktop);
-GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
                                                            guint32              timestamp);
-GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_icon      (GdkAppLaunchContext *context,
                                                            GIcon               *icon);
-GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
                                                            const char          *icon_name);
 

gdk/gdkcairo.h

@@ -30,34 +30,26 @@
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_ALL
 cairo_t  * gdk_cairo_create             (GdkWindow          *window);
-GDK_AVAILABLE_IN_ALL
 gboolean   gdk_cairo_get_clip_rectangle (cairo_t            *cr,
                                          GdkRectangle       *rect);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_set_source_rgba    (cairo_t              *cr,
                                          const GdkRGBA        *rgba);
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_set_source_pixbuf  (cairo_t              *cr,
                                          const GdkPixbuf      *pixbuf,
                                          gdouble               pixbuf_x,
                                          gdouble               pixbuf_y);
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_set_source_window  (cairo_t              *cr,
                                          GdkWindow            *window,
                                          gdouble               x,
                                          gdouble               y);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_rectangle          (cairo_t              *cr,
                                          const GdkRectangle   *rectangle);
-GDK_AVAILABLE_IN_ALL
 void       gdk_cairo_region             (cairo_t              *cr,
                                          const cairo_region_t *region);
 
-GDK_AVAILABLE_IN_ALL
 cairo_region_t *
            gdk_cairo_region_create_from_surface
                                         (cairo_surface_t      *surface);

gdk/gdkcolor.h

@@ -31,7 +31,6 @@
 
 #include <cairo.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
@@ -59,24 +58,17 @@ struct _GdkColor
 
 #define GDK_TYPE_COLOR (gdk_color_get_type ())
 
-GDK_AVAILABLE_IN_ALL
 GType     gdk_color_get_type (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkColor *gdk_color_copy      (const GdkColor *color);
-GDK_AVAILABLE_IN_ALL
 void      gdk_color_free      (GdkColor       *color);
 
-GDK_AVAILABLE_IN_ALL
 guint     gdk_color_hash      (const GdkColor *color);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_color_equal     (const GdkColor *colora,
                                const GdkColor *colorb);
 
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_color_parse     (const gchar    *spec,
                                GdkColor       *color);
-GDK_AVAILABLE_IN_ALL
 gchar *   gdk_color_to_string (const GdkColor *color);
 
 

gdk/gdkcursor.h

@@ -213,33 +213,25 @@ typedef enum
 /* Cursors
  */
 
-GDK_AVAILABLE_IN_ALL
 GType      gdk_cursor_get_type           (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_for_display	 (GdkDisplay      *display,
 					  GdkCursorType    cursor_type);
 #ifndef GDK_MULTIHEAD_SAFE
-GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new		 (GdkCursorType	   cursor_type);
 #endif
-GDK_AVAILABLE_IN_ALL
 GdkCursor* gdk_cursor_new_from_pixbuf	 (GdkDisplay      *display,
 					  GdkPixbuf       *pixbuf,
 					  gint             x,
 					  gint             y);
-GDK_AVAILABLE_IN_ALL
 GdkCursor*  gdk_cursor_new_from_name	 (GdkDisplay      *display,
 					  const gchar     *name);
-GDK_AVAILABLE_IN_ALL
 GdkDisplay* gdk_cursor_get_display	 (GdkCursor	  *cursor);
 GDK_DEPRECATED_IN_3_0_FOR(g_object_ref)
 GdkCursor * gdk_cursor_ref               (GdkCursor       *cursor);
 GDK_DEPRECATED_IN_3_0_FOR(g_object_unref)
 void        gdk_cursor_unref             (GdkCursor       *cursor);
-GDK_AVAILABLE_IN_ALL
 GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
-GDK_AVAILABLE_IN_ALL
 GdkCursorType gdk_cursor_get_cursor_type (GdkCursor       *cursor);
 
 

gdk/gdkdevice.h

@@ -22,7 +22,6 @@
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 
@@ -142,100 +141,75 @@ struct _GdkTimeCoord
   gdouble axes[GDK_MAX_TIMECOORD_AXES];
 };
 
-GDK_AVAILABLE_IN_ALL
 GType                 gdk_device_get_type       (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_device_get_name       (GdkDevice *device);
-GDK_AVAILABLE_IN_ALL
 gboolean              gdk_device_get_has_cursor (GdkDevice *device);
 
 /* Functions to configure a device */
-GDK_AVAILABLE_IN_ALL
 GdkInputSource gdk_device_get_source    (GdkDevice      *device);
 
-GDK_AVAILABLE_IN_ALL
 GdkInputMode   gdk_device_get_mode      (GdkDevice      *device);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_device_set_mode      (GdkDevice      *device,
                                          GdkInputMode    mode);
 
-GDK_AVAILABLE_IN_ALL
 gint           gdk_device_get_n_keys    (GdkDevice       *device);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_device_get_key       (GdkDevice       *device,
                                          guint            index_,
                                          guint           *keyval,
                                          GdkModifierType *modifiers);
-GDK_AVAILABLE_IN_ALL
 void           gdk_device_set_key       (GdkDevice      *device,
                                          guint           index_,
                                          guint           keyval,
                                          GdkModifierType modifiers);
 
-GDK_AVAILABLE_IN_ALL
 GdkAxisUse     gdk_device_get_axis_use  (GdkDevice         *device,
                                          guint              index_);
-GDK_AVAILABLE_IN_ALL
 void           gdk_device_set_axis_use  (GdkDevice         *device,
                                          guint              index_,
                                          GdkAxisUse         use);
 
 
-GDK_AVAILABLE_IN_ALL
 void     gdk_device_get_state    (GdkDevice         *device,
                                   GdkWindow         *window,
                                   gdouble           *axes,
                                   GdkModifierType   *mask);
-GDK_AVAILABLE_IN_ALL
 void     gdk_device_get_position (GdkDevice         *device,
                                   GdkScreen        **screen,
                                   gint              *x,
                                   gint              *y);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *
          gdk_device_get_window_at_position
                                  (GdkDevice         *device,
                                   gint              *win_x,
                                   gint              *win_y);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_history  (GdkDevice         *device,
                                   GdkWindow         *window,
                                   guint32            start,
                                   guint32            stop,
                                   GdkTimeCoord    ***events,
                                   gint              *n_events);
-GDK_AVAILABLE_IN_ALL
 void     gdk_device_free_history (GdkTimeCoord     **events,
                                   gint               n_events);
 
-GDK_AVAILABLE_IN_ALL
 gint     gdk_device_get_n_axes     (GdkDevice       *device);
-GDK_AVAILABLE_IN_ALL
 GList *  gdk_device_list_axes      (GdkDevice       *device);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_axis_value (GdkDevice       *device,
                                     gdouble         *axes,
                                     GdkAtom          axis_label,
                                     gdouble         *value);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_axis     (GdkDevice         *device,
                                   gdouble           *axes,
                                   GdkAxisUse         use,
                                   gdouble           *value);
-GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_device_get_display (GdkDevice      *device);
 
-GDK_AVAILABLE_IN_ALL
 GdkDevice  * gdk_device_get_associated_device (GdkDevice     *device);
-GDK_AVAILABLE_IN_ALL
 GList *      gdk_device_list_slave_devices    (GdkDevice     *device);
 
-GDK_AVAILABLE_IN_ALL
 GdkDeviceType gdk_device_get_device_type (GdkDevice *device);
 
-GDK_AVAILABLE_IN_ALL
 GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkWindow        *window,
                                       GdkGrabOwnership  grab_ownership,
@@ -244,17 +218,14 @@ GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkCursor        *cursor,
                                       guint32           time_);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_device_ungrab      (GdkDevice        *device,
                                       guint32           time_);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_device_warp        (GdkDevice        *device,
                                       GdkScreen        *screen,
                                       gint              x,
                                       gint              y);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_grab_info_libgtk_only (GdkDisplay  *display,
                                            GdkDevice   *device,
                                            GdkWindow  **grab_window,

gdk/gdkdevicemanager.c

@@ -330,7 +330,7 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
  * for this application. In X11, window managers may change this depending on the interaction
  * pattern under the presence of several pointers.
  *
- * You should use this function seldomly, only in code that isn't triggered by a #GdkEvent
+ * You should use this function sheldomly, only in code that isn't triggered by a #GdkEvent
  * and there aren't other means to get a meaningful #GdkDevice to operate on.
  *
  * Returns: (transfer none): The client pointer. This memory is

gdk/gdkdevicemanager.h

@@ -32,15 +32,11 @@ G_BEGIN_DECLS
 #define GDK_IS_DEVICE_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER))
 
 
-GDK_AVAILABLE_IN_ALL
 GType        gdk_device_manager_get_type           (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_device_manager_get_display        (GdkDeviceManager *device_manager);
-GDK_AVAILABLE_IN_ALL
 GList *      gdk_device_manager_list_devices       (GdkDeviceManager *device_manager,
                                                     GdkDeviceType     type);
-GDK_AVAILABLE_IN_ALL
 GdkDevice *  gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);
 
 G_END_DECLS

gdk/gdkdisplay.h

@@ -40,20 +40,15 @@ G_BEGIN_DECLS
 #define GDK_DISPLAY_OBJECT(object)    GDK_DISPLAY(object)
 #endif
 
-GDK_AVAILABLE_IN_ALL
 GType       gdk_display_get_type (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 GdkDisplay *gdk_display_open                (const gchar *display_name);
 
-GDK_AVAILABLE_IN_ALL
 const gchar * gdk_display_get_name         (GdkDisplay *display);
 
 GDK_DEPRECATED_IN_3_10
 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
-GDK_AVAILABLE_IN_ALL
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
                                             gint         screen_num);
-GDK_AVAILABLE_IN_ALL
 GdkScreen * gdk_display_get_default_screen (GdkDisplay  *display);
 
 #ifndef GDK_MULTIDEVICE_SAFE
@@ -67,42 +62,29 @@ GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed)
 gboolean    gdk_display_pointer_is_grabbed (GdkDisplay  *display);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
-GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_device_is_grabbed  (GdkDisplay  *display,
                                             GdkDevice   *device);
-GDK_AVAILABLE_IN_ALL
 void        gdk_display_beep               (GdkDisplay  *display);
-GDK_AVAILABLE_IN_ALL
 void        gdk_display_sync               (GdkDisplay  *display);
-GDK_AVAILABLE_IN_ALL
 void        gdk_display_flush              (GdkDisplay  *display);
 
-GDK_AVAILABLE_IN_ALL
 void        gdk_display_close                  (GdkDisplay  *display);
-GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_is_closed          (GdkDisplay  *display);
 
 GDK_DEPRECATED_IN_3_0_FOR(gdk_device_manager_list_devices)
 GList *     gdk_display_list_devices       (GdkDisplay  *display);
 
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_display_get_event  (GdkDisplay     *display);
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_display_peek_event (GdkDisplay     *display);
-GDK_AVAILABLE_IN_ALL
 void      gdk_display_put_event  (GdkDisplay     *display,
                                   const GdkEvent *event);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_display_has_pending (GdkDisplay  *display);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_display_set_double_click_time     (GdkDisplay   *display,
                                             guint         msec);
-GDK_AVAILABLE_IN_ALL
 void gdk_display_set_double_click_distance (GdkDisplay   *display,
                                             guint         distance);
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplay *gdk_display_get_default (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
@@ -123,52 +105,36 @@ void             gdk_display_warp_pointer          (GdkDisplay             *disp
                                                     gint                   y);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplay *gdk_display_open_default_libgtk_only (void);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_cursor_alpha     (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_cursor_color     (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_display_get_default_cursor_size   (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 void     gdk_display_get_maximal_cursor_size   (GdkDisplay    *display,
                                                 guint         *width,
                                                 guint         *height);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow *gdk_display_get_default_group       (GdkDisplay *display); 
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
                                                       GdkAtom     selection);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_clipboard_persistence (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 void     gdk_display_store_clipboard                (GdkDisplay    *display,
                                                      GdkWindow     *clipboard_window,
                                                      guint32        time_,
                                                      const GdkAtom *targets,
                                                      gint           n_targets);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_shapes           (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_input_shapes     (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_display_supports_composite        (GdkDisplay    *display);
-GDK_AVAILABLE_IN_ALL
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const gchar   *startup_id);
 
-GDK_AVAILABLE_IN_ALL
 GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_ALL
 GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);
 
 G_END_DECLS

gdk/gdkdisplaymanager.c

@@ -48,6 +48,7 @@
 #endif
 
 #ifdef GDK_WINDOWING_BROADWAY
+#include "broadway/gdkbroadwaydisplaymanager.h"
 #include "broadway/gdkprivate-broadway.h"
 #endif
 
@@ -57,6 +58,7 @@
 #endif
 
 #ifdef GDK_WINDOWING_WAYLAND
+#include "wayland/gdkwayland.h"
 #include "wayland/gdkprivate-wayland.h"
 #endif
 
@@ -130,7 +132,24 @@ static void gdk_display_manager_get_property (GObject                *object,
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)
+static void g_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, g_initable_iface_init))
+
+static gboolean
+gdk_display_manager_initable_init (GInitable     *initable,
+                                   GCancellable  *cancellable,
+                                   GError       **error)
+{
+  return TRUE;
+}
+
+static void
+g_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = gdk_display_manager_initable_init;
+}
 
 static void
 gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
@@ -232,7 +251,7 @@ static const gchar *allowed_backends;
  * followed by the Quartz backend, and then all
  * others.
  *
- * If the <envar>GDK_BACKEND</envar> environment variable
+ * If the <envvar>GDK_BACKEND</envvar> environment variable
  * is set, it determines what backends are tried in what
  * order, while still respecting the set of allowed backends
  * that are specified by this function.
@@ -253,32 +272,7 @@ gdk_set_allowed_backends (const gchar *backends)
   allowed_backends = g_strdup (backends);
 }
 
-typedef struct _GdkBackend GdkBackend;
-
-struct _GdkBackend {
-  const char *name;
-  GdkDisplay * (* open_display) (const char *name);
-};
-
-static GdkBackend gdk_backends[] = {
-#ifdef GDK_WINDOWING_QUARTZ
-  { "quartz",   _gdk_quartz_display_open },
-#endif
-#ifdef GDK_WINDOWING_WIN32
-  { "win32",    _gdk_win32_display_open },
-#endif
-#ifdef GDK_WINDOWING_X11
-  { "x11",      _gdk_x11_display_open },
-#endif
-#ifdef GDK_WINDOWING_WAYLAND
-  { "wayland",  _gdk_wayland_display_open },
-#endif
-#ifdef GDK_WINDOWING_BROADWAY
-  { "broadway", _gdk_broadway_display_open },
-#endif
-  /* NULL-terminating this array so we can use commas above */
-  { NULL, NULL }
-};
+static GdkDisplayManager *manager = NULL;
 
 /**
  * gdk_display_manager_get:
@@ -300,11 +294,97 @@ static GdkBackend gdk_backends[] = {
 GdkDisplayManager*
 gdk_display_manager_get (void)
 {
-  static GdkDisplayManager *manager = NULL;
+  gdk_display_manager_peek ();
 
   if (manager == NULL)
-    manager = g_object_new (GDK_TYPE_DISPLAY_MANAGER, NULL);
-  
+    g_error ("No GDK backend found (%s)", allowed_backends);
+
+  return manager;
+}
+
+typedef struct _GdkBackend GdkBackend;
+
+struct _GdkBackend {
+  const char *name;
+  GType (* get_backend_type) (void);
+  GdkDisplay * (* open_display) (const char *name);
+};
+
+GdkBackend gdk_backends[] = {
+#ifdef GDK_WINDOWING_QUARTZ
+  { "quartz",   gdk_quartz_display_manager_get_type,    _gdk_quartz_display_open },
+#endif
+#ifdef GDK_WINDOWING_WIN32
+  { "win32",    gdk_win32_display_manager_get_type,     _gdk_win32_display_open },
+#endif
+#ifdef GDK_WINDOWING_X11
+  { "x11",      gdk_x11_display_manager_get_type,       _gdk_x11_display_open },
+#endif
+#ifdef GDK_WINDOWING_WAYLAND
+  { "wayland",  gdk_wayland_display_manager_get_type,   _gdk_wayland_display_open },
+#endif
+#ifdef GDK_WINDOWING_BROADWAY
+  { "broadway", gdk_broadway_display_manager_get_type,  _gdk_broadway_display_open },
+#endif
+  /* NULL-terminating this array so we can use commas above */
+  { NULL, NULL }
+};
+
+/**
+ * gdk_display_manager_peek:
+ *
+ * Gets the singleton #GdkDisplayManager object. If GDK could
+ * not be initialized, %NULL is returned.
+ *
+ * Returns: (transfer none): The global #GdkDisplayManager singleton,
+ *     or %NULL if GDK could not be initialized. gdk_parse_args(),
+ *     gdk_init(), or gdk_init_check() must have been called first
+ *
+ * Since: 3.10
+ */
+GdkDisplayManager *
+gdk_display_manager_peek (void)
+{
+  if (manager == NULL)
+    {
+      const gchar *backend_list;
+      gchar **backends;
+      gint i, j;
+      gboolean allow_any;
+
+      if (allowed_backends == NULL)
+        allowed_backends = "*";
+      allow_any = strstr (allowed_backends, "*") != NULL;
+
+      backend_list = g_getenv ("GDK_BACKEND");
+      if (backend_list == NULL)
+        backend_list = allowed_backends;
+      backends = g_strsplit (backend_list, ",", 0);
+
+      for (i = 0; manager == NULL && backends[i] != NULL; i++)
+        {
+          const gchar *backend = backends[i];
+          gboolean any = g_str_equal (backend, "*");
+
+          if (!allow_any && !any && !strstr (allowed_backends, backend))
+            continue;
+
+          for (j = 0; gdk_backends[j].name != NULL; j++)
+            {
+              if ((any && allow_any) ||
+                  (any && strstr (allowed_backends, gdk_backends[j].name)) ||
+                  g_str_equal (backend, gdk_backends[j].name))
+                {
+                  GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
+                  manager = g_initable_new (gdk_backends[j].get_backend_type (), NULL, NULL, NULL);
+                  if (manager)
+                    break;
+                }
+            }
+        }
+      g_strfreev (backends);
+    }
+
   return manager;
 }
 
@@ -421,48 +501,19 @@ GdkDisplay *
 gdk_display_manager_open_display (GdkDisplayManager *manager,
                                   const gchar       *name)
 {
-  const gchar *backend_list;
-  GdkDisplay *display;
-  gchar **backends;
-  gint i, j;
-  gboolean allow_any;
+  guint i;
 
-  if (allowed_backends == NULL)
-    allowed_backends = "*";
-  allow_any = strstr (allowed_backends, "*") != NULL;
-
-  backend_list = g_getenv ("GDK_BACKEND");
-  if (backend_list == NULL)
-    backend_list = allowed_backends;
-  backends = g_strsplit (backend_list, ",", 0);
-
-  display = NULL;
-
-  for (i = 0; display == NULL && backends[i] != NULL; i++)
+  for (i = 0; gdk_backends[i].name != NULL; i++)
     {
-      const gchar *backend = backends[i];
-      gboolean any = g_str_equal (backend, "*");
-
-      if (!allow_any && !any && !strstr (allowed_backends, backend))
-        continue;
-
-      for (j = 0; gdk_backends[j].name != NULL; j++)
+      if (G_OBJECT_TYPE (manager) == gdk_backends[i].get_backend_type ())
         {
-          if ((any && allow_any) ||
-              (any && strstr (allowed_backends, gdk_backends[j].name)) ||
-              g_str_equal (backend, gdk_backends[j].name))
-            {
-              GDK_NOTE (MISC, g_message ("Trying %s backend", gdk_backends[j].name));
-              display = gdk_backends[j].open_display (name);
-              if (display)
-                break;
-            }
+          return gdk_backends[i].open_display (name);
         }
     }
 
-  g_strfreev (backends);
+  g_assert_not_reached ();
 
-  return display;
+  return NULL;
 }
 
 void

gdk/gdkdisplaymanager.h

@@ -40,19 +40,15 @@ G_BEGIN_DECLS
 #define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
 
 
-GDK_AVAILABLE_IN_ALL
 GType              gdk_display_manager_get_type            (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkDisplayManager *gdk_display_manager_get                 (void);
-GDK_AVAILABLE_IN_ALL
+GDK_AVAILABLE_IN_3_10
+GdkDisplayManager *gdk_display_manager_peek                (void);
 GdkDisplay *       gdk_display_manager_get_default_display (GdkDisplayManager *manager);
-GDK_AVAILABLE_IN_ALL
 void               gdk_display_manager_set_default_display (GdkDisplayManager *manager,
                                                             GdkDisplay        *display);
-GDK_AVAILABLE_IN_ALL
 GSList *           gdk_display_manager_list_displays       (GdkDisplayManager *manager);
-GDK_AVAILABLE_IN_ALL
 GdkDisplay *       gdk_display_manager_open_display        (GdkDisplayManager *manager,
                                                             const gchar       *name);
 

gdk/gdkdnd.h

@@ -89,60 +89,43 @@ typedef enum
 } GdkDragProtocol;
 
 
-GDK_AVAILABLE_IN_ALL
 GType            gdk_drag_context_get_type             (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 void             gdk_drag_context_set_device           (GdkDragContext *context,
                                                         GdkDevice      *device);
-GDK_AVAILABLE_IN_ALL
 GdkDevice *      gdk_drag_context_get_device           (GdkDragContext *context);
 
-GDK_AVAILABLE_IN_ALL
 GList           *gdk_drag_context_list_targets         (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
 GdkDragAction    gdk_drag_context_get_actions          (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
 GdkDragAction    gdk_drag_context_get_suggested_action (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
 GdkDragAction    gdk_drag_context_get_selected_action  (GdkDragContext *context);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow       *gdk_drag_context_get_source_window    (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
 GdkWindow       *gdk_drag_context_get_dest_window      (GdkDragContext *context);
-GDK_AVAILABLE_IN_ALL
 GdkDragProtocol  gdk_drag_context_get_protocol         (GdkDragContext *context);
 
 /* Destination side */
 
-GDK_AVAILABLE_IN_ALL
 void             gdk_drag_status        (GdkDragContext   *context,
                                          GdkDragAction     action,
                                          guint32           time_);
-GDK_AVAILABLE_IN_ALL
 void             gdk_drop_reply         (GdkDragContext   *context,
                                          gboolean          accepted,
                                          guint32           time_);
-GDK_AVAILABLE_IN_ALL
 void             gdk_drop_finish        (GdkDragContext   *context,
                                          gboolean          success,
                                          guint32           time_);
-GDK_AVAILABLE_IN_ALL
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
 
 /* Source side */
 
-GDK_AVAILABLE_IN_ALL
 GdkDragContext * gdk_drag_begin            (GdkWindow      *window,
                                             GList          *targets);
 
-GDK_AVAILABLE_IN_ALL
 GdkDragContext * gdk_drag_begin_for_device (GdkWindow      *window,
                                             GdkDevice      *device,
                                             GList          *targets);
 
-GDK_AVAILABLE_IN_ALL
 void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
                                            GdkWindow        *drag_window,
                                            GdkScreen        *screen,
@@ -151,7 +134,6 @@ void    gdk_drag_find_window_for_screen   (GdkDragContext   *context,
                                            GdkWindow       **dest_window,
                                            GdkDragProtocol  *protocol);
 
-GDK_AVAILABLE_IN_ALL
 gboolean        gdk_drag_motion      (GdkDragContext *context,
                                       GdkWindow      *dest_window,
                                       GdkDragProtocol protocol,
@@ -160,13 +142,10 @@ gboolean        gdk_drag_motion      (GdkDragContext *context,
                                       GdkDragAction   suggested_action,
                                       GdkDragAction   possible_actions,
                                       guint32         time_);
-GDK_AVAILABLE_IN_ALL
 void            gdk_drag_drop        (GdkDragContext *context,
                                       guint32         time_);
-GDK_AVAILABLE_IN_ALL
 void            gdk_drag_abort       (GdkDragContext *context,
                                       guint32         time_);
-GDK_AVAILABLE_IN_ALL
 gboolean        gdk_drag_drop_succeeded (GdkDragContext *context);
 
 G_END_DECLS

gdk/gdkenumtypes.h.template

@@ -7,7 +7,6 @@
 #define __GDK_ENUM_TYPES_H__
 
 #include <glib-object.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 /*** END file-header ***/
@@ -18,7 +17,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GDK_AVAILABLE_IN_ALL GType @enum_name@_get_type (void) G_GNUC_CONST;
+GType @enum_name@_get_type (void) G_GNUC_CONST;
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 

gdk/gdkevents.h

@@ -460,8 +460,6 @@ typedef enum
  * @GDK_WINDOW_STATE_ABOVE: the window is kept above other windows.
  * @GDK_WINDOW_STATE_BELOW: the window is kept below other windows.
  * @GDK_WINDOW_STATE_FOCUSED: the window is presented as focused (with active decorations).
- * @GDK_WINDOW_TILED: the window is in a tiled state, see
- *   gdk_window_get_tiled_edges() for more details. Since 3.10
  *
  * Specifies the state of a toplevel window.
  */
@@ -474,8 +472,7 @@ typedef enum
   GDK_WINDOW_STATE_FULLSCREEN = 1 << 4,
   GDK_WINDOW_STATE_ABOVE      = 1 << 5,
   GDK_WINDOW_STATE_BELOW      = 1 << 6,
-  GDK_WINDOW_STATE_FOCUSED    = 1 << 7,
-  GDK_WINDOW_STATE_TILED      = 1 << 8
+  GDK_WINDOW_STATE_FOCUSED    = 1 << 7
 } GdkWindowState;
 
 /**
@@ -1189,36 +1186,24 @@ union _GdkEvent
   GdkEventGrabBroken        grab_broken;
 };
 
-GDK_AVAILABLE_IN_ALL
 GType     gdk_event_get_type            (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_events_pending	 	(void);
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_event_get			(void);
 
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_event_peek                (void);
-GDK_AVAILABLE_IN_ALL
 void      gdk_event_put	 		(const GdkEvent *event);
 
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_event_new                 (GdkEventType    type);
-GDK_AVAILABLE_IN_ALL
 GdkEvent* gdk_event_copy     		(const GdkEvent *event);
-GDK_AVAILABLE_IN_ALL
 void	  gdk_event_free     		(GdkEvent 	*event);
 
-GDK_AVAILABLE_IN_ALL
 guint32   gdk_event_get_time            (const GdkEvent  *event);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_event_get_state           (const GdkEvent  *event,
                                          GdkModifierType *state);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_event_get_coords		(const GdkEvent  *event,
 					 gdouble	 *x_win,
 					 gdouble	 *y_win);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_event_get_root_coords	(const GdkEvent *event,
 					 gdouble	*x_root,
 					 gdouble	*y_root);
@@ -1242,61 +1227,46 @@ gboolean  gdk_event_get_scroll_deltas   (const GdkEvent *event,
                                          gdouble         *delta_x,
                                          gdouble         *delta_y);
 
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_event_get_axis            (const GdkEvent  *event,
                                          GdkAxisUse       axis_use,
                                          gdouble         *value);
-GDK_AVAILABLE_IN_ALL
 void       gdk_event_set_device         (GdkEvent        *event,
                                          GdkDevice       *device);
-GDK_AVAILABLE_IN_ALL
 GdkDevice* gdk_event_get_device         (const GdkEvent  *event);
-GDK_AVAILABLE_IN_ALL
 void       gdk_event_set_source_device  (GdkEvent        *event,
                                          GdkDevice       *device);
-GDK_AVAILABLE_IN_ALL
 GdkDevice* gdk_event_get_source_device  (const GdkEvent  *event);
-GDK_AVAILABLE_IN_ALL
 void       gdk_event_request_motions    (const GdkEventMotion *event);
 GDK_AVAILABLE_IN_3_4
 gboolean   gdk_event_triggers_context_menu (const GdkEvent *event);
 
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_events_get_distance       (GdkEvent        *event1,
                                          GdkEvent        *event2,
                                          gdouble         *distance);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_events_get_angle          (GdkEvent        *event1,
                                          GdkEvent        *event2,
                                          gdouble         *angle);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_events_get_center         (GdkEvent        *event1,
                                          GdkEvent        *event2,
                                          gdouble         *x,
                                          gdouble         *y);
 
-GDK_AVAILABLE_IN_ALL
 void	  gdk_event_handler_set 	(GdkEventFunc    func,
 					 gpointer        data,
 					 GDestroyNotify  notify);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_event_set_screen         (GdkEvent        *event,
                                          GdkScreen       *screen);
-GDK_AVAILABLE_IN_ALL
 GdkScreen *gdk_event_get_screen         (const GdkEvent  *event);
 
 GDK_AVAILABLE_IN_3_4
 GdkEventSequence *gdk_event_get_event_sequence (const GdkEvent *event);
 
-GDK_AVAILABLE_IN_ALL
 void	  gdk_set_show_events		(gboolean	 show_events);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_get_show_events		(void);
 
 #ifndef GDK_MULTIHEAD_SAFE
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_setting_get                           (const gchar *name,
                                                     GValue          *value);
 

gdk/gdkframeclock.h

@@ -74,7 +74,6 @@ typedef enum {
   GDK_FRAME_CLOCK_PHASE_AFTER_PAINT   = 1 << 6
 } GdkFrameClockPhase;
 
-GDK_AVAILABLE_IN_3_8
 GType    gdk_frame_clock_get_type             (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_3_8

gdk/gdkframeclockidle.c

@@ -384,7 +384,6 @@ gdk_frame_clock_paint_idle (void *data)
         case GDK_FRAME_CLOCK_PHASE_LAYOUT:
           if (priv->freeze_count == 0)
             {
-	      int iter;
 #ifdef G_ENABLE_DEBUG
               if ((_gdk_debug_flags & GDK_DEBUG_FRAMES) != 0)
                 {
@@ -395,20 +394,11 @@ gdk_frame_clock_paint_idle (void *data)
 #endif /* G_ENABLE_DEBUG */
 
               priv->phase = GDK_FRAME_CLOCK_PHASE_LAYOUT;
-	      /* We loop in the layout phase, because we don't want to progress
-	       * into the paint phase with invalid size allocations. This may
-	       * happen in some situation like races between user window
-	       * resizes and natural size changes.
-	       */
-	      iter = 0;
-              while ((priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT) &&
-		     priv->freeze_count == 0 && iter++ < 4)
+              if (priv->requested & GDK_FRAME_CLOCK_PHASE_LAYOUT)
                 {
                   priv->requested &= ~GDK_FRAME_CLOCK_PHASE_LAYOUT;
                   g_signal_emit_by_name (G_OBJECT (clock), "layout");
                 }
-	      if (iter == 5)
-		g_warning ("gdk-frame-clock: layout continuously requested, giving up after 4 tries");
             }
         case GDK_FRAME_CLOCK_PHASE_PAINT:
           if (priv->freeze_count == 0)

gdk/gdkinternals.h

@@ -189,7 +189,6 @@ struct _GdkWindow
 
   GList *filters;
   GList *children;
-  GList *native_children;
 
   cairo_pattern_t *background;
 
@@ -225,8 +224,6 @@ struct _GdkWindow
   guint native_visibility : 2; /* the native visibility of a impl windows */
   guint viewable : 1; /* mapped and all parents mapped */
   guint applied_shape : 1;
-  guint in_update : 1;
-  guint geometry_dirty : 1;
   GdkFullscreenMode fullscreen_mode;
 
   /* The GdkWindow that has the impl, ref:ed if another window.
@@ -253,6 +250,10 @@ struct _GdkWindow
   GdkCursor *cursor;
   GHashTable *device_cursor;
 
+  GSList *implicit_paint;
+
+  GList *outstanding_moves;
+
   cairo_region_t *shape;
   cairo_region_t *input_shape;
 
@@ -268,11 +269,10 @@ struct _GdkWindow
   guint num_offscreen_children;
 
   GdkFrameClock *frame_clock; /* NULL to use from parent or default */
-  GdkWindowInvalidateHandlerFunc invalidate_handler;
 };
 
-#define GDK_WINDOW_TYPE(d) ((((GdkWindow *)(d)))->window_type)
-#define GDK_WINDOW_DESTROYED(d) (((GdkWindow *)(d))->destroyed)
+#define GDK_WINDOW_TYPE(d) (((GDK_WINDOW (d)))->window_type)
+#define GDK_WINDOW_DESTROYED(d) (GDK_WINDOW (d)->destroyed)
 
 extern gchar     *_gdk_display_name;
 extern gint       _gdk_screen_number;
@@ -354,6 +354,26 @@ void _gdk_windowing_got_event                (GdkDisplay       *display,
 
 #define GDK_WINDOW_IS_MAPPED(window) (((window)->state & GDK_WINDOW_STATE_WITHDRAWN) == 0)
 
+#define GDK_TYPE_PAINTABLE            (_gdk_paintable_get_type ())
+#define GDK_PAINTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_PAINTABLE, GdkPaintable))
+#define GDK_IS_PAINTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_PAINTABLE))
+#define GDK_PAINTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GDK_TYPE_PAINTABLE, GdkPaintableIface))
+
+typedef struct _GdkPaintable        GdkPaintable;
+typedef struct _GdkPaintableIface   GdkPaintableIface;
+
+struct _GdkPaintableIface
+{
+  GTypeInterface g_iface;
+  
+  void (* begin_paint_region)       (GdkPaintable    *paintable,
+                                     GdkWindow       *window,
+                                     const cairo_region_t *region);
+  void (* end_paint)                (GdkPaintable    *paintable);
+};
+
+GType _gdk_paintable_get_type (void) G_GNUC_CONST;
+
 void _gdk_window_invalidate_for_expose (GdkWindow       *window,
                                         cairo_region_t       *region);
 

gdk/gdkkeys.h

@@ -77,20 +77,16 @@ struct _GdkKeymapKey
  * in the keymap and see what keyval it corresponds to.
  */
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_keymap_get_type (void) G_GNUC_CONST;
 
 #ifndef GDK_MULTIHEAD_SAFE
-GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_default     (void);
 #endif
-GDK_AVAILABLE_IN_ALL
 GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_ALL
+
 guint          gdk_keymap_lookup_key               (GdkKeymap           *keymap,
 						    const GdkKeymapKey  *key);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,
 						    guint                hardware_keycode,
 						    GdkModifierType      state,
@@ -99,32 +95,24 @@ gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,
 						    gint                *effective_group,
 						    gint                *level,
 						    GdkModifierType     *consumed_modifiers);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_get_entries_for_keyval   (GdkKeymap           *keymap,
 						    guint                keyval,
 						    GdkKeymapKey       **keys,
 						    gint                *n_keys);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_get_entries_for_keycode  (GdkKeymap           *keymap,
 						    guint                hardware_keycode,
 						    GdkKeymapKey       **keys,
 						    guint              **keyvals,
 						    gint                *n_entries);
 
-GDK_AVAILABLE_IN_ALL
 PangoDirection gdk_keymap_get_direction            (GdkKeymap           *keymap);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_have_bidi_layouts        (GdkKeymap           *keymap);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_get_caps_lock_state      (GdkKeymap           *keymap);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_get_num_lock_state       (GdkKeymap           *keymap);
 GDK_AVAILABLE_IN_3_4
 guint          gdk_keymap_get_modifier_state       (GdkKeymap           *keymap);
-GDK_AVAILABLE_IN_ALL
 void           gdk_keymap_add_virtual_modifiers    (GdkKeymap           *keymap,
                                                     GdkModifierType     *state);
-GDK_AVAILABLE_IN_ALL
 gboolean       gdk_keymap_map_virtual_modifiers    (GdkKeymap           *keymap,
                                                     GdkModifierType     *state);
 GDK_AVAILABLE_IN_3_4
@@ -134,27 +122,18 @@ GdkModifierType gdk_keymap_get_modifier_mask       (GdkKeymap           *keymap,
 
 /* Key values
  */
-GDK_AVAILABLE_IN_ALL
 gchar*   gdk_keyval_name         (guint        keyval) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 guint    gdk_keyval_from_name    (const gchar *keyval_name);
-GDK_AVAILABLE_IN_ALL
 void     gdk_keyval_convert_case (guint        symbol,
 				  guint       *lower,
 				  guint       *upper);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_keyval_to_upper     (guint        keyval) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 guint    gdk_keyval_to_lower     (guint        keyval) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_keyval_is_upper     (guint        keyval) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_keyval_is_lower     (guint        keyval) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 guint32  gdk_keyval_to_unicode   (guint        keyval) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 guint    gdk_unicode_to_keyval   (guint32      wc) G_GNUC_CONST;
 
 

gdk/gdkmain.h

@@ -40,42 +40,29 @@ G_BEGIN_DECLS
 
 #define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT)
 
-GDK_AVAILABLE_IN_ALL
 void                  gdk_parse_args                      (gint           *argc,
                                                            gchar        ***argv);
-GDK_AVAILABLE_IN_ALL
 void                  gdk_init                            (gint           *argc,
                                                            gchar        ***argv);
-GDK_AVAILABLE_IN_ALL
 gboolean              gdk_init_check                      (gint           *argc,
                                                            gchar        ***argv);
-GDK_AVAILABLE_IN_ALL
 void                  gdk_add_option_entries_libgtk_only  (GOptionGroup   *group);
-GDK_AVAILABLE_IN_ALL
 void                  gdk_pre_parse_libgtk_only           (void);
 
-GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_get_program_class               (void);
-GDK_AVAILABLE_IN_ALL
 void                  gdk_set_program_class               (const gchar    *program_class);
 
-GDK_AVAILABLE_IN_ALL
 void                  gdk_notify_startup_complete         (void);
-GDK_AVAILABLE_IN_ALL
 void                  gdk_notify_startup_complete_with_id (const gchar* startup_id);
 
 /* Push and pop error handlers for X errors
  */
-GDK_AVAILABLE_IN_ALL
 void                           gdk_error_trap_push        (void);
 /* warn unused because you could use pop_ignored otherwise */
-GDK_AVAILABLE_IN_ALL
 G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop         (void);
-GDK_AVAILABLE_IN_ALL
 void                           gdk_error_trap_pop_ignored (void);
 
 
-GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_get_display_arg_name (void);
 
 GDK_DEPRECATED_IN_3_8_FOR(gdk_display_get_name (gdk_display_get_default ()))
@@ -106,28 +93,20 @@ GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed)
 gboolean      gdk_pointer_is_grabbed (void);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
-GDK_AVAILABLE_IN_ALL
 gint gdk_screen_width  (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 gint gdk_screen_height (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 gint gdk_screen_width_mm  (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 gint gdk_screen_height_mm (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 void gdk_set_double_click_time (guint msec);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_beep (void);
 
 #endif /* GDK_MULTIHEAD_SAFE */
 
-GDK_AVAILABLE_IN_ALL
 void gdk_flush (void);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_disable_multidevice (void);
 
 GDK_AVAILABLE_IN_3_10

gdk/gdkoffscreenwindow.c

@@ -555,6 +555,42 @@ gdk_offscreen_window_queue_antiexpose (GdkWindow *window,
   return FALSE;
 }
 
+static void
+gdk_offscreen_window_translate (GdkWindow      *window,
+                                cairo_region_t *area,
+                                gint            dx,
+                                gint            dy)
+{
+  GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (window->impl);
+
+  if (offscreen->surface)
+    {
+      cairo_t *cr;
+
+      cr = cairo_create (offscreen->surface);
+
+      area = cairo_region_copy (area);
+
+      gdk_cairo_region (cr, area);
+      cairo_clip (cr);
+
+      /* NB: This is a self-copy and Cairo doesn't support that yet.
+       * So we do a litle trick.
+       */
+      cairo_push_group (cr);
+
+      cairo_set_source_surface (cr, offscreen->surface, dx, dy);
+      cairo_paint (cr);
+
+      cairo_pop_group_to_source (cr);
+      cairo_paint (cr);
+
+      cairo_destroy (cr);
+    }
+
+  _gdk_window_add_damage (window, area);
+}
+
 static cairo_surface_t *
 gdk_offscreen_window_resize_cairo_surface (GdkWindow       *window,
                                            cairo_surface_t *surface,
@@ -716,6 +752,7 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
   impl_class->input_shape_combine_region = gdk_offscreen_window_input_shape_combine_region;
   impl_class->set_static_gravities = gdk_offscreen_window_set_static_gravities;
   impl_class->queue_antiexpose = gdk_offscreen_window_queue_antiexpose;
+  impl_class->translate = gdk_offscreen_window_translate;
   impl_class->destroy = gdk_offscreen_window_destroy;
   impl_class->destroy_foreign = NULL;
   impl_class->resize_cairo_surface = gdk_offscreen_window_resize_cairo_surface;

gdk/gdkpango.h

@@ -23,16 +23,13 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
 /************************************************************************/
 
-GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get_for_screen (GdkScreen    *screen);
 #ifndef GDK_MULTIHEAD_SAFE
-GDK_AVAILABLE_IN_ALL
 PangoContext *gdk_pango_context_get            (void);
 #endif
 
@@ -43,13 +40,11 @@ PangoContext *gdk_pango_context_get            (void);
  * draw with the region as clip, only the given ranges are drawn.
  */
 
-GDK_AVAILABLE_IN_ALL
 cairo_region_t    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
                                                      gint             x_origin,
                                                      gint             y_origin,
                                                      const gint      *index_ranges,
                                                      gint             n_ranges);
-GDK_AVAILABLE_IN_ALL
 cairo_region_t    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
                                                      gint             x_origin,
                                                      gint             y_origin,

gdk/gdkpixbuf.h

@@ -30,20 +30,17 @@
 #endif
 
 #include <cairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_window  (GdkWindow       *window,
                                         gint             src_x,
                                         gint             src_y,
                                         gint             width,
                                         gint             height);
 
-GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
                                         gint             src_x,
                                         gint             src_y,

gdk/gdkprivate.h

@@ -31,10 +31,8 @@ G_BEGIN_DECLS
 
 const char * _gdk_atom_name_const (GdkAtom atom);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_window_destroy_notify	     (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_synthesize_window_state (GdkWindow     *window,
                                   GdkWindowState unset_flags,
                                   GdkWindowState set_flags);

gdk/gdkproperty.h

@@ -30,7 +30,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
@@ -52,16 +51,12 @@ typedef enum
 } GdkPropMode;
 
 
-GDK_AVAILABLE_IN_ALL
 GdkAtom gdk_atom_intern (const gchar *atom_name,
                          gboolean     only_if_exists);
-GDK_AVAILABLE_IN_ALL
 GdkAtom gdk_atom_intern_static_string (const gchar *atom_name);
-GDK_AVAILABLE_IN_ALL
 gchar*  gdk_atom_name   (GdkAtom      atom);
 
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_property_get    (GdkWindow     *window,
                               GdkAtom        property,
                               GdkAtom        type,
@@ -72,7 +67,6 @@ gboolean gdk_property_get    (GdkWindow     *window,
                               gint          *actual_format,
                               gint          *actual_length,
                               guchar       **data);
-GDK_AVAILABLE_IN_ALL
 void     gdk_property_change (GdkWindow     *window,
                               GdkAtom        property,
                               GdkAtom        type,
@@ -80,11 +74,9 @@ void     gdk_property_change (GdkWindow     *window,
                               GdkPropMode    mode,
                               const guchar  *data,
                               gint           nelements);
-GDK_AVAILABLE_IN_ALL
 void     gdk_property_delete (GdkWindow     *window,
                               GdkAtom        property);
 
-GDK_AVAILABLE_IN_ALL
 gint   gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
                                                    GdkAtom         encoding,
                                                    gint            format,
@@ -92,7 +84,6 @@ gint   gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
                                                    gint            length,
                                                    gchar        ***list);
 
-GDK_AVAILABLE_IN_ALL
 gchar *gdk_utf8_to_string_target                  (const gchar    *str);
 
 G_END_DECLS

gdk/gdkrectangle.h

@@ -30,22 +30,18 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
 /* Rectangle utilities
  */
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_rectangle_intersect (const GdkRectangle *src1,
                                   const GdkRectangle *src2,
                                   GdkRectangle       *dest);
-GDK_AVAILABLE_IN_ALL
 void     gdk_rectangle_union     (const GdkRectangle *src1,
                                   const GdkRectangle *src2,
                                   GdkRectangle       *dest);
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_rectangle_get_type (void) G_GNUC_CONST;
 
 #define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())

gdk/gdkrgba.c

@@ -352,7 +352,7 @@ gdk_rgba_equal (gconstpointer p1,
  * These string forms are string forms those supported by
  * the CSS3 colors module, and can be parsed by gdk_rgba_parse().
  *
- * Note that this string representation may lose some
+ * Note that this string representation may loose some
  * precision, since r, g and b are represented as 8-bit
  * integers. If this is a concern, you should use a
  * different representation.

gdk/gdkrgba.h

@@ -30,7 +30,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
@@ -44,24 +43,17 @@ struct _GdkRGBA
 
 #define GDK_TYPE_RGBA (gdk_rgba_get_type ())
 
-GDK_AVAILABLE_IN_ALL
 GType     gdk_rgba_get_type  (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkRGBA * gdk_rgba_copy      (const GdkRGBA *rgba);
-GDK_AVAILABLE_IN_ALL
 void      gdk_rgba_free      (GdkRGBA       *rgba);
 
-GDK_AVAILABLE_IN_ALL
 guint     gdk_rgba_hash      (gconstpointer  p);
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_rgba_equal     (gconstpointer  p1,
                               gconstpointer  p2);
 
-GDK_AVAILABLE_IN_ALL
 gboolean  gdk_rgba_parse     (GdkRGBA       *rgba,
                               const gchar   *spec);
-GDK_AVAILABLE_IN_ALL
 gchar *   gdk_rgba_to_string (const GdkRGBA *rgba);
 
 

gdk/gdkscreen.h

@@ -38,43 +38,26 @@ G_BEGIN_DECLS
 #define GDK_IS_SCREEN(object)      (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_SCREEN))
 
 
-GDK_AVAILABLE_IN_ALL
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 
-GDK_AVAILABLE_IN_ALL
 GdkVisual *  gdk_screen_get_system_visual     (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gboolean     gdk_screen_is_composited         (GdkScreen   *screen);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow *  gdk_screen_get_root_window       (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_screen_get_display           (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_number            (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_width             (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_height            (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_width_mm          (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_height_mm         (GdkScreen   *screen);
 
-GDK_AVAILABLE_IN_ALL
 GList *      gdk_screen_list_visuals          (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 GList *      gdk_screen_get_toplevel_windows  (GdkScreen   *screen);
-GDK_AVAILABLE_IN_ALL
 gchar *      gdk_screen_make_display_name     (GdkScreen   *screen);
 
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_n_monitors        (GdkScreen    *screen);
-GDK_AVAILABLE_IN_ALL
 gint         gdk_screen_get_primary_monitor   (GdkScreen    *screen);
-GDK_AVAILABLE_IN_ALL
 void         gdk_screen_get_monitor_geometry  (GdkScreen    *screen,
                                                gint          monitor_num,
                                                GdkRectangle *dest);
@@ -83,46 +66,33 @@ void         gdk_screen_get_monitor_workarea  (GdkScreen    *screen,
                                                gint          monitor_num,
                                                GdkRectangle *dest);
 
-GDK_AVAILABLE_IN_ALL
 gint          gdk_screen_get_monitor_at_point  (GdkScreen *screen,
                                                 gint       x,
                                                 gint       y);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_screen_get_monitor_at_window (GdkScreen *screen,
                                                 GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_screen_get_monitor_width_mm  (GdkScreen *screen,
                                                 gint       monitor_num);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_screen_get_monitor_height_mm (GdkScreen *screen,
                                                 gint       monitor_num);
-GDK_AVAILABLE_IN_ALL
 gchar *       gdk_screen_get_monitor_plug_name (GdkScreen *screen,
                                                 gint       monitor_num);
 
-GDK_AVAILABLE_IN_ALL
 GdkScreen *gdk_screen_get_default (void);
 
-GDK_AVAILABLE_IN_ALL
 gboolean   gdk_screen_get_setting (GdkScreen   *screen,
                                    const gchar *name,
                                    GValue      *value);
 
-GDK_AVAILABLE_IN_ALL
 void                        gdk_screen_set_font_options (GdkScreen                  *screen,
                                                          const cairo_font_options_t *options);
-GDK_AVAILABLE_IN_ALL
 const cairo_font_options_t *gdk_screen_get_font_options (GdkScreen                  *screen);
 
-GDK_AVAILABLE_IN_ALL
 void    gdk_screen_set_resolution (GdkScreen *screen,
                                    gdouble    dpi);
-GDK_AVAILABLE_IN_ALL
 gdouble gdk_screen_get_resolution (GdkScreen *screen);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow *gdk_screen_get_active_window (GdkScreen *screen);
-GDK_AVAILABLE_IN_ALL
 GList     *gdk_screen_get_window_stack  (GdkScreen *screen);
 
 G_END_DECLS

gdk/gdkselection.h

@@ -30,7 +30,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
@@ -153,22 +152,18 @@ G_BEGIN_DECLS
  */
 
 #ifndef GDK_MULTIHEAD_SAFE
-GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set (GdkWindow	 *owner,
 				    GdkAtom	  selection,
 				    guint32	  time_,
 				    gboolean      send_event);
-GDK_AVAILABLE_IN_ALL
 GdkWindow* gdk_selection_owner_get (GdkAtom	  selection);
 #endif/* GDK_MULTIHEAD_SAFE */
 
-GDK_AVAILABLE_IN_ALL
 gboolean   gdk_selection_owner_set_for_display (GdkDisplay *display,
 						GdkWindow  *owner,
 						GdkAtom     selection,
 						guint32     time_,
 						gboolean    send_event);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display,
 						GdkAtom     selection);
 
@@ -186,25 +181,21 @@ GdkWindow *gdk_selection_owner_get_for_display (GdkDisplay *display,
  * Retrieves the contents of a selection in a given
  * form.
  */
-GDK_AVAILABLE_IN_ALL
 void	   gdk_selection_convert   (GdkWindow	 *requestor,
 				    GdkAtom	  selection,
 				    GdkAtom	  target,
 				    guint32	  time_);
-GDK_AVAILABLE_IN_ALL
 gint       gdk_selection_property_get (GdkWindow  *requestor,
 				       guchar	 **data,
 				       GdkAtom	  *prop_type,
 				       gint	  *prop_format);
 
-GDK_AVAILABLE_IN_ALL
 void	   gdk_selection_send_notify (GdkWindow      *requestor,
 				      GdkAtom	      selection,
 				      GdkAtom	      target,
 				      GdkAtom	      property,
 				      guint32	      time_);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_selection_send_notify_for_display (GdkDisplay      *display,
 						  GdkWindow       *requestor,
 						  GdkAtom     	   selection,

gdk/gdktestutils.h

@@ -39,16 +39,13 @@ G_BEGIN_DECLS
 
 
 /* --- Gdk Test Utility API --- */
-GDK_AVAILABLE_IN_ALL
 void            gdk_test_render_sync            (GdkWindow      *window);
-GDK_AVAILABLE_IN_ALL
 gboolean        gdk_test_simulate_key           (GdkWindow      *window,
                                                  gint            x,
                                                  gint            y,
                                                  guint           keyval,
                                                  GdkModifierType modifiers,
                                                  GdkEventType    key_pressrelease);
-GDK_AVAILABLE_IN_ALL
 gboolean        gdk_test_simulate_button        (GdkWindow      *window,
                                                  gint            x,
                                                  gint            y,

gdk/gdkthreads.h

@@ -30,12 +30,11 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
 #if defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
-#define GDK_THREADS_DEPRECATED _GDK_EXTERN
+#define GDK_THREADS_DEPRECATED
 #else
 #define GDK_THREADS_DEPRECATED GDK_DEPRECATED_IN_3_6
 #endif
@@ -50,31 +49,25 @@ GDK_THREADS_DEPRECATED
 void     gdk_threads_set_lock_functions       (GCallback enter_fn,
                                                GCallback leave_fn);
 
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_idle_full            (gint           priority,
                                                GSourceFunc    function,
                                                gpointer       data,
                                                GDestroyNotify notify);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_idle                 (GSourceFunc    function,
                                                gpointer       data);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_timeout_full         (gint           priority,
                                                guint          interval,
                                                GSourceFunc    function,
                                                gpointer       data,
                                                GDestroyNotify notify);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_timeout              (guint          interval,
                                                GSourceFunc    function,
                                                gpointer       data);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_timeout_seconds_full (gint           priority,
                                                guint          interval,
                                                GSourceFunc    function,
                                                gpointer       data,
                                                GDestroyNotify notify);
-GDK_AVAILABLE_IN_ALL
 guint    gdk_threads_add_timeout_seconds      (guint          interval,
                                                GSourceFunc    function,
                                                gpointer       data);

gdk/gdkversionmacros.h.in

@@ -30,10 +30,6 @@
 #define GDK_MINOR_VERSION (@GTK_MINOR_VERSION@)
 #define GDK_MICRO_VERSION (@GTK_MICRO_VERSION@)
 
-#ifndef _GDK_EXTERN
-#define _GDK_EXTERN extern
-#endif
-
 /**
  * GDK_DISABLE_DEPRECATION_WARNINGS:
  *
@@ -43,13 +39,13 @@
  */
 
 #ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-#define GDK_DEPRECATED _GDK_EXTERN
-#define GDK_DEPRECATED_FOR(f) _GDK_EXTERN
-#define GDK_UNAVAILABLE(maj,min) _GDK_EXTERN
+#define GDK_DEPRECATED
+#define GDK_DEPRECATED_FOR(f)
+#define GDK_UNAVAILABLE(maj,min)
 #else
-#define GDK_DEPRECATED G_DEPRECATED _GDK_EXTERN
-#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _GDK_EXTERN
-#define GDK_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GDK_EXTERN
+#define GDK_DEPRECATED G_DEPRECATED
+#define GDK_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
+#define GDK_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min)
 #endif
 
 /* XXX: Every new stable minor release bump should add a macro here */
@@ -183,92 +179,90 @@
 #error "GDK_VERSION_MIN_REQUIRED must be >= GDK_VERSION_3_0"
 #endif
 
-#define GDK_AVAILABLE_IN_ALL                  _GDK_EXTERN
-
 /* XXX: Every new stable minor release should add a set of macros here */
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_0
 # define GDK_DEPRECATED_IN_3_0                GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_0_FOR(f)         GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_0                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_0_FOR(f)         _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_0
+# define GDK_DEPRECATED_IN_3_0_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_0
 # define GDK_AVAILABLE_IN_3_0                 GDK_UNAVAILABLE(3, 0)
 #else
-# define GDK_AVAILABLE_IN_3_0                 _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_0
 #endif
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_2
 # define GDK_DEPRECATED_IN_3_2                GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_2_FOR(f)         GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_2                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_2_FOR(f)         _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_2
+# define GDK_DEPRECATED_IN_3_2_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_2
 # define GDK_AVAILABLE_IN_3_2                 GDK_UNAVAILABLE(3, 2)
 #else
-# define GDK_AVAILABLE_IN_3_2                 _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_2
 #endif
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_4
 # define GDK_DEPRECATED_IN_3_4                GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_4_FOR(f)         GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_4                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_4_FOR(f)         _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_4
+# define GDK_DEPRECATED_IN_3_4_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_4
 # define GDK_AVAILABLE_IN_3_4                 GDK_UNAVAILABLE(3, 4)
 #else
-# define GDK_AVAILABLE_IN_3_4                 _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_4
 #endif
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_6
 # define GDK_DEPRECATED_IN_3_6                GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_6_FOR(f)         GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_6                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_6_FOR(f)         _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_6
+# define GDK_DEPRECATED_IN_3_6_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_6
 # define GDK_AVAILABLE_IN_3_6                 GDK_UNAVAILABLE(3, 6)
 #else
-# define GDK_AVAILABLE_IN_3_6                 _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_6
 #endif
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_8
 # define GDK_DEPRECATED_IN_3_8                GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_8_FOR(f)         GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_8                _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_8_FOR(f)         _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_8
+# define GDK_DEPRECATED_IN_3_8_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_8
 # define GDK_AVAILABLE_IN_3_8                 GDK_UNAVAILABLE(3, 8)
 #else
-# define GDK_AVAILABLE_IN_3_8                 _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_8
 #endif
 
 #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_3_10
 # define GDK_DEPRECATED_IN_3_10               GDK_DEPRECATED
 # define GDK_DEPRECATED_IN_3_10_FOR(f)        GDK_DEPRECATED_FOR(f)
 #else
-# define GDK_DEPRECATED_IN_3_10               _GDK_EXTERN
-# define GDK_DEPRECATED_IN_3_10_FOR(f)        _GDK_EXTERN
+# define GDK_DEPRECATED_IN_3_10
+# define GDK_DEPRECATED_IN_3_10_FOR(f)
 #endif
 
 #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_3_10
 # define GDK_AVAILABLE_IN_3_10                GDK_UNAVAILABLE(3, 10)
 #else
-# define GDK_AVAILABLE_IN_3_10                _GDK_EXTERN
+# define GDK_AVAILABLE_IN_3_10
 #endif
 
 #endif  /* __GDK_VERSION_MACROS_H__ */

gdk/gdkvisual.h

@@ -30,7 +30,6 @@
 #endif
 
 #include <gdk/gdktypes.h>
-#include <gdk/gdkversionmacros.h>
 
 G_BEGIN_DECLS
 
@@ -79,61 +78,41 @@ typedef enum
  * a particular visual.
  */
 
-GDK_AVAILABLE_IN_ALL
 GType         gdk_visual_get_type            (void) G_GNUC_CONST;
 
 #ifndef GDK_MULTIHEAD_SAFE
-GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_best_depth      (void);
-GDK_AVAILABLE_IN_ALL
 GdkVisualType gdk_visual_get_best_type       (void);
-GDK_AVAILABLE_IN_ALL
 GdkVisual*    gdk_visual_get_system          (void);
-GDK_AVAILABLE_IN_ALL
 GdkVisual*    gdk_visual_get_best            (void);
-GDK_AVAILABLE_IN_ALL
 GdkVisual*    gdk_visual_get_best_with_depth (gint           depth);
-GDK_AVAILABLE_IN_ALL
 GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
-GDK_AVAILABLE_IN_ALL
 GdkVisual*    gdk_visual_get_best_with_both  (gint           depth,
                                               GdkVisualType  visual_type);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_query_depths       (gint           **depths,
                              gint            *count);
-GDK_AVAILABLE_IN_ALL
 void gdk_query_visual_types (GdkVisualType  **visual_types,
                              gint            *count);
 
-GDK_AVAILABLE_IN_ALL
 GList* gdk_list_visuals (void);
 #endif
 
-GDK_AVAILABLE_IN_ALL
 GdkScreen    *gdk_visual_get_screen (GdkVisual *visual);
 
-GDK_AVAILABLE_IN_ALL
 GdkVisualType gdk_visual_get_visual_type         (GdkVisual *visual);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_depth               (GdkVisual *visual);
-GDK_AVAILABLE_IN_ALL
 GdkByteOrder  gdk_visual_get_byte_order          (GdkVisual *visual);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_colormap_size       (GdkVisual *visual);
-GDK_AVAILABLE_IN_ALL
 gint          gdk_visual_get_bits_per_rgb        (GdkVisual *visual);
-GDK_AVAILABLE_IN_ALL
 void          gdk_visual_get_red_pixel_details   (GdkVisual *visual,
                                                   guint32   *mask,
                                                   gint      *shift,
                                                   gint      *precision);
-GDK_AVAILABLE_IN_ALL
 void          gdk_visual_get_green_pixel_details (GdkVisual *visual,
                                                   guint32   *mask,
                                                   gint      *shift,
                                                   gint      *precision);
-GDK_AVAILABLE_IN_ALL
 void          gdk_visual_get_blue_pixel_details  (GdkVisual *visual,
                                                   guint32   *mask,
                                                   gint      *shift,

gdk/gdkwindow.h

@@ -507,109 +507,77 @@ struct _GdkWindowClass
 
 /* Windows
  */
-GDK_AVAILABLE_IN_ALL
 GType         gdk_window_get_type              (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
 GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
                                                 GdkWindowAttr *attributes,
                                                 gint           attributes_mask);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_destroy               (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 GdkWindowType gdk_window_get_window_type       (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_is_destroyed          (GdkWindow     *window);
 
-GDK_AVAILABLE_IN_ALL
 GdkVisual *   gdk_window_get_visual            (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 GdkScreen *   gdk_window_get_screen            (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 GdkDisplay *  gdk_window_get_display           (GdkWindow     *window);
 #ifndef GDK_MULTIDEVICE_SAFE
 GDK_DEPRECATED_IN_3_0_FOR(gdk_device_get_window_at_position)
 GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
                                                 gint          *win_y);
 #endif /* GDK_MULTIDEVICE_SAFE */
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_show                  (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_hide                  (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_withdraw              (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_show_unraised         (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_move                  (GdkWindow     *window,
                                                 gint           x,
                                                 gint           y);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_resize                (GdkWindow     *window,
                                                 gint           width,
                                                 gint           height);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_move_resize           (GdkWindow     *window,
                                                 gint           x,
                                                 gint           y,
                                                 gint           width,
                                                 gint           height);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_reparent              (GdkWindow     *window,
                                                 GdkWindow     *new_parent,
                                                 gint           x,
                                                 gint           y);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_raise                 (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_lower                 (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_restack               (GdkWindow     *window,
 						GdkWindow     *sibling,
 						gboolean       above);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_focus                 (GdkWindow     *window,
                                                 guint32        timestamp);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_user_data         (GdkWindow     *window,
                                                 gpointer       user_data);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_override_redirect (GdkWindow     *window,
                                                 gboolean       override_redirect);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_get_accept_focus      (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_accept_focus      (GdkWindow     *window,
 					        gboolean       accept_focus);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_get_focus_on_map      (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_focus_on_map      (GdkWindow     *window,
 					        gboolean       focus_on_map);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_add_filter            (GdkWindow     *window,
                                                 GdkFilterFunc  function,
                                                 gpointer       data);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_remove_filter         (GdkWindow     *window,
                                                 GdkFilterFunc  function,
                                                 gpointer       data);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_scroll                (GdkWindow     *window,
                                                 gint           dx,
                                                 gint           dy);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_move_region           (GdkWindow       *window,
 						const cairo_region_t *region,
 						gint             dx,
 						gint             dy);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_ensure_native        (GdkWindow       *window);
 
 /* 
  * This allows for making shaped (partially transparent) windows
  * - cool feature, needed for Drag and Drag for example.
  */
-GDK_AVAILABLE_IN_ALL
 void gdk_window_shape_combine_region (GdkWindow	      *window,
                                       const cairo_region_t *shape_region,
                                       gint	       offset_x,
@@ -622,12 +590,9 @@ void gdk_window_shape_combine_region (GdkWindow	      *window,
  * 
  * - Raster
  */
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_child_shapes (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_get_composited (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_composited   (GdkWindow *window,
                                   gboolean   composited);
 
@@ -638,17 +603,13 @@ void gdk_window_set_composited   (GdkWindow *window,
  * 
  * - Raster
  */
-GDK_AVAILABLE_IN_ALL
 void gdk_window_merge_child_shapes         (GdkWindow       *window);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_window_input_shape_combine_region (GdkWindow       *window,
                                             const cairo_region_t *shape_region,
                                             gint             offset_x,
                                             gint             offset_y);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_child_input_shapes     (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_merge_child_input_shapes   (GdkWindow       *window);
 
 
@@ -658,174 +619,111 @@ void gdk_window_merge_child_input_shapes   (GdkWindow       *window);
  * Note that a window that is_viewable below is not necessarily
  * viewable in the X sense.
  */
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_is_visible     (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_is_viewable    (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_is_input_only  (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_is_shaped      (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindowState gdk_window_get_state (GdkWindow *window);
 
 /* Set static bit gravity on the parent, and static
  * window gravity on all children.
  */
-GDK_AVAILABLE_IN_ALL
 gboolean gdk_window_set_static_gravities (GdkWindow *window,
                                           gboolean   use_static);
 
 /* GdkWindow */
 
-/**
- * GdkWindowInvalidateHandlerFunc:
- * @window: a #GdkWindow
- * @region: a #cairo_region_t
- *
- * Whenever some area of the window is invalidated (directly in the
- * window or in a child window) this gets called with @region in
- * the coordinate space of @window. You can use @region to just
- * keep track of the dirty region, or you can actually change
- * @region in case you are doing display tricks like showing
- * a child in multiple places.
- *
- * Since: 3.10
- */
-typedef void (*GdkWindowInvalidateHandlerFunc)  (GdkWindow      *window,
-						 cairo_region_t *region);
-GDK_AVAILABLE_IN_3_10
-void gdk_window_set_invalidate_handler (GdkWindow                      *window,
-					GdkWindowInvalidateHandlerFunc  handler);
-
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_has_native         (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void              gdk_window_set_type_hint (GdkWindow        *window,
                                             GdkWindowTypeHint hint);
-GDK_AVAILABLE_IN_ALL
 GdkWindowTypeHint gdk_window_get_type_hint (GdkWindow        *window);
 
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_get_modal_hint   (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_modal_hint   (GdkWindow       *window,
                                            gboolean         modal);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_skip_taskbar_hint (GdkWindow *window,
                                        gboolean   skips_taskbar);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_skip_pager_hint   (GdkWindow *window,
                                        gboolean   skips_pager);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_set_urgency_hint      (GdkWindow *window,
 				       gboolean   urgent);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_geometry_hints (GdkWindow          *window,
 					     const GdkGeometry  *geometry,
 					     GdkWindowHints      geom_mask);
 
-GDK_AVAILABLE_IN_ALL
 cairo_region_t *gdk_window_get_clip_region  (GdkWindow          *window);
-GDK_AVAILABLE_IN_ALL
 cairo_region_t *gdk_window_get_visible_region(GdkWindow         *window);
 
 
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_begin_paint_rect   (GdkWindow          *window,
 					     const GdkRectangle *rectangle);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_begin_paint_region (GdkWindow          *window,
 					     const cairo_region_t    *region);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_end_paint          (GdkWindow          *window);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_flush             (GdkWindow          *window);
 
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_title	   (GdkWindow	  *window,
 					    const gchar	  *title);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_role          (GdkWindow     *window,
 					    const gchar   *role);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_startup_id    (GdkWindow     *window,
 					    const gchar   *startup_id);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_transient_for (GdkWindow     *window,
 					    GdkWindow     *parent);
 GDK_DEPRECATED_IN_3_4_FOR(gdk_window_set_background_rgba)
 void	      gdk_window_set_background	 (GdkWindow	  *window,
 					  const GdkColor  *color);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_background_rgba (GdkWindow     *window,
                                               const GdkRGBA *rgba);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_background_pattern (GdkWindow	 *window,
                                                  cairo_pattern_t *pattern);
-GDK_AVAILABLE_IN_ALL
 cairo_pattern_t *gdk_window_get_background_pattern (GdkWindow     *window);
 
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_cursor	 (GdkWindow	  *window,
 					  GdkCursor	  *cursor);
-GDK_AVAILABLE_IN_ALL
 GdkCursor    *gdk_window_get_cursor      (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_device_cursor (GdkWindow	  *window,
                                             GdkDevice     *device,
                                             GdkCursor	  *cursor);
-GDK_AVAILABLE_IN_ALL
 GdkCursor    *gdk_window_get_device_cursor (GdkWindow     *window,
                                             GdkDevice     *device);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_get_user_data	 (GdkWindow	  *window,
 					  gpointer	  *data);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_get_geometry	 (GdkWindow	  *window,
 					  gint		  *x,
 					  gint		  *y,
 					  gint		  *width,
 					  gint		  *height);
-GDK_AVAILABLE_IN_ALL
 int           gdk_window_get_width       (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 int           gdk_window_get_height      (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_get_position	 (GdkWindow	  *window,
 					  gint		  *x,
 					  gint		  *y);
-GDK_AVAILABLE_IN_ALL
 gint	      gdk_window_get_origin	 (GdkWindow	  *window,
 					  gint		  *x,
 					  gint		  *y);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_get_root_coords (GdkWindow	  *window,
 					  gint             x,
 					  gint             y,
 					  gint		  *root_x,
 					  gint		  *root_y);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_coords_to_parent   (GdkWindow       *window,
                                           gdouble          x,
                                           gdouble          y,
                                           gdouble         *parent_x,
                                           gdouble         *parent_y);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_coords_from_parent (GdkWindow       *window,
                                           gdouble          parent_x,
                                           gdouble          parent_y,
                                           gdouble         *x,
                                           gdouble         *y);
 
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_get_root_origin (GdkWindow	  *window,
 					  gint		  *x,
 					  gint		  *y);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_get_frame_extents (GdkWindow     *window,
                                             GdkRectangle  *rect);
 
@@ -836,94 +734,61 @@ GdkWindow *   gdk_window_get_pointer     (GdkWindow       *window,
                                           gint            *y,
                                           GdkModifierType *mask);
 #endif /* GDK_MULTIDEVICE_SAFE */
-GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_device_position (GdkWindow       *window,
                                               GdkDevice       *device,
                                               gint            *x,
                                               gint            *y,
                                               GdkModifierType *mask);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_parent      (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_toplevel    (GdkWindow       *window);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_effective_parent   (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *   gdk_window_get_effective_toplevel (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 GList *	      gdk_window_get_children	 (GdkWindow	  *window);
-GDK_AVAILABLE_IN_ALL
 GList *       gdk_window_peek_children   (GdkWindow       *window);
-GDK_AVAILABLE_IN_3_10
-GList *       gdk_window_get_children_with_user_data (GdkWindow *window,
-						      gpointer   user_data);
-
-GDK_AVAILABLE_IN_ALL
 GdkEventMask  gdk_window_get_events	 (GdkWindow	  *window);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_events	 (GdkWindow	  *window,
 					  GdkEventMask	   event_mask);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_device_events (GdkWindow    *window,
                                             GdkDevice    *device,
                                             GdkEventMask  event_mask);
-GDK_AVAILABLE_IN_ALL
 GdkEventMask  gdk_window_get_device_events (GdkWindow    *window,
                                             GdkDevice    *device);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_source_events (GdkWindow      *window,
                                             GdkInputSource  source,
                                             GdkEventMask    event_mask);
-GDK_AVAILABLE_IN_ALL
 GdkEventMask  gdk_window_get_source_events (GdkWindow      *window,
                                             GdkInputSource  source);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_icon_list   (GdkWindow       *window,
 					  GList           *pixbufs);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_icon_name	 (GdkWindow	  *window, 
 					  const gchar	  *name);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_group	 (GdkWindow	  *window, 
 					  GdkWindow	  *leader);
-GDK_AVAILABLE_IN_ALL
 GdkWindow*    gdk_window_get_group	 (GdkWindow	  *window);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_decorations (GdkWindow	  *window,
 					  GdkWMDecoration  decorations);
-GDK_AVAILABLE_IN_ALL
 gboolean      gdk_window_get_decorations (GdkWindow       *window,
 					  GdkWMDecoration *decorations);
-GDK_AVAILABLE_IN_ALL
 void	      gdk_window_set_functions	 (GdkWindow	  *window,
 					  GdkWMFunction	   functions);
 
-GDK_AVAILABLE_IN_ALL
 cairo_surface_t *
               gdk_window_create_similar_surface (GdkWindow *window,
                                           cairo_content_t  content,
                                           int              width,
                                           int              height);
 
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_beep            (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_iconify         (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_deiconify       (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_stick           (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_unstick         (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_maximize        (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_unmaximize      (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_fullscreen      (GdkWindow       *window);
 GDK_AVAILABLE_IN_3_8
 void          gdk_window_set_fullscreen_mode (GdkWindow   *window,
@@ -931,26 +796,19 @@ void          gdk_window_set_fullscreen_mode (GdkWindow   *window,
 GDK_AVAILABLE_IN_3_8
 GdkFullscreenMode
               gdk_window_get_fullscreen_mode (GdkWindow   *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_unfullscreen    (GdkWindow       *window);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_keep_above  (GdkWindow       *window,
                                           gboolean         setting);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_keep_below  (GdkWindow       *window,
                                           gboolean         setting);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_set_opacity     (GdkWindow       *window,
                                           gdouble          opacity);
-GDK_AVAILABLE_IN_ALL
 void          gdk_window_register_dnd    (GdkWindow       *window);
 
-GDK_AVAILABLE_IN_ALL
 GdkDragProtocol
               gdk_window_get_drag_protocol(GdkWindow      *window,
                                            GdkWindow     **target);
 
-GDK_AVAILABLE_IN_ALL
 void gdk_window_begin_resize_drag            (GdkWindow     *window,
                                               GdkWindowEdge  edge,
                                               gint           button,
@@ -965,7 +823,6 @@ void gdk_window_begin_resize_drag_for_device (GdkWindow     *window,
                                               gint           root_x,
                                               gint           root_y,
                                               guint32        timestamp);
-GDK_AVAILABLE_IN_ALL
 void gdk_window_begin_move_drag              (GdkWindow     *window,
                                               gint           button,
                                               gint           root_x,
@@ -980,11 +837,9 @@ void gdk_window_begin_move_drag_for_device   (GdkWindow     *window,
                                               guint32        timestamp);
 
 /* Interface for dirty-region queueing */
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_invalidate_rect           (GdkWindow          *window,
 					         const GdkRectangle *rect,
 					         gboolean            invalidate_children);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_invalidate_region         (GdkWindow          *window,
 					         const cairo_region_t    *region,
 					         gboolean            invalidate_children);
@@ -1003,35 +858,25 @@ void       gdk_window_invalidate_region         (GdkWindow          *window,
 typedef gboolean (*GdkWindowChildFunc)          (GdkWindow *window,
                                                  gpointer   user_data);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_invalidate_maybe_recurse  (GdkWindow            *window,
 						 const cairo_region_t *region,
 						 GdkWindowChildFunc    child_func,
 						 gpointer              user_data);
-GDK_AVAILABLE_IN_ALL
 cairo_region_t *gdk_window_get_update_area      (GdkWindow            *window);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_freeze_updates      (GdkWindow    *window);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_thaw_updates        (GdkWindow    *window);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_freeze_toplevel_updates_libgtk_only (GdkWindow *window);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_thaw_toplevel_updates_libgtk_only   (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_process_all_updates (void);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_process_updates     (GdkWindow    *window,
 					   gboolean      update_children);
 
 /* Enable/disable flicker, so you can tell if your code is inefficient. */
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_set_debug_updates   (gboolean      setting);
 
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_constrain_size      (GdkGeometry  *geometry,
                                            guint         flags,
                                            gint          width,
@@ -1044,26 +889,19 @@ void gdk_window_enable_synchronized_configure (GdkWindow *window);
 GDK_DEPRECATED_IN_3_8
 void gdk_window_configure_finished            (GdkWindow *window);
 
-GDK_AVAILABLE_IN_ALL
 GdkWindow *gdk_get_default_root_window (void);
 
 /* Offscreen redirection */
-GDK_AVAILABLE_IN_ALL
 cairo_surface_t *
            gdk_offscreen_window_get_surface    (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void       gdk_offscreen_window_set_embedder   (GdkWindow     *window,
 						GdkWindow     *embedder);
-GDK_AVAILABLE_IN_ALL
 GdkWindow *gdk_offscreen_window_get_embedder   (GdkWindow     *window);
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_geometry_changed         (GdkWindow     *window);
 
 /* Multidevice support */
-GDK_AVAILABLE_IN_ALL
 void       gdk_window_set_support_multidevice (GdkWindow *window,
                                                gboolean   support_multidevice);
-GDK_AVAILABLE_IN_ALL
 gboolean   gdk_window_get_support_multidevice (GdkWindow *window);
 
 /* Frame clock */

gdk/gdkwindowimpl.h

@@ -101,9 +101,6 @@ struct _GdkWindowImplClass
                                          gint            *x,
                                          gint            *y,
                                          GdkModifierType *mask);
-  gboolean    (* begin_paint_region)    (GdkWindow       *window,
-					 const cairo_region_t *region);
-  void        (* end_paint)             (GdkWindow       *window);
 
   cairo_region_t * (* get_shape)        (GdkWindow       *window);
   cairo_region_t * (* get_input_shape)  (GdkWindow       *window);
@@ -128,6 +125,16 @@ struct _GdkWindowImplClass
   gboolean     (* queue_antiexpose)     (GdkWindow       *window,
 					 cairo_region_t  *update_area);
 
+  /* Called to move @area inside @window by @dx x @dy pixels. @area is 
+   * guaranteed to be inside @window. If part of @area is not invisible or
+   * invalid, it is this function's job to queue expose events in those 
+   * areas.
+   */
+  void         (* translate)            (GdkWindow       *window,
+					 cairo_region_t  *area,
+					 gint            dx,
+					 gint            dy);
+
 /* Called to do the windowing system specific part of gdk_window_destroy(),
  *
  * window: The window being destroyed

gdk/quartz/GdkQuartzView.c

@@ -1,7 +1,6 @@
 /* GdkQuartzView.m
  *
  * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2011 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,507 +23,18 @@
 
 @implementation GdkQuartzView
 
--(id)initWithFrame: (NSRect)frameRect
-{
-  if ((self = [super initWithFrame: frameRect]))
-    {
-      markedRange = NSMakeRange (NSNotFound, 0);
-      selectedRange = NSMakeRange (NSNotFound, 0);
-    }
-
-  return self;
-}
-
--(BOOL)acceptsFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("acceptsFirstResponder\n"));
-  return YES;
-}
-
--(BOOL)becomeFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("becomeFirstResponder\n"));
-  return YES;
-}
-
--(BOOL)resignFirstResponder
-{
-  GDK_NOTE (EVENTS, g_print ("resignFirstResponder\n"));
-  return YES;
-}
-
--(void) keyDown: (NSEvent *) theEvent
-{
-  GDK_NOTE (EVENTS, g_print ("keyDown\n"));
-  [self interpretKeyEvents: [NSArray arrayWithObject: theEvent]];
-}
-
--(void)flagsChanged: (NSEvent *) theEvent
-{
-}
-
--(NSUInteger)characterIndexForPoint: (NSPoint)aPoint
-{
-  GDK_NOTE (EVENTS, g_print ("characterIndexForPoint\n"));
-  return 0;
-}
-
--(NSRect)firstRectForCharacterRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("firstRectForCharacterRange\n"));
-  gint ns_x, ns_y;
-  GdkRectangle *rect;
-
-  rect = g_object_get_data (G_OBJECT (gdk_window), GIC_CURSOR_RECT);
-  if (rect)
-    {
-      _gdk_quartz_window_gdk_xy_to_xy (rect->x, rect->y + rect->height,
-				       &ns_x, &ns_y);
-
-      return NSMakeRect (ns_x, ns_y, rect->width, rect->height);
-    }
-  else
-    {
-      return NSMakeRect (0, 0, 0, 0);
-    }
-}
-
--(NSArray *)validAttributesForMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("validAttributesForMarkedText\n"));
-  return [NSArray arrayWithObjects: NSUnderlineStyleAttributeName, nil];
-}
-
--(NSAttributedString *)attributedSubstringForProposedRange: (NSRange)aRange actualRange: (NSRangePointer)actualRange
-{
-  GDK_NOTE (EVENTS, g_print ("attributedSubstringForProposedRange\n"));
-  return nil;
-}
-
--(BOOL)hasMarkedText
-{
-  GDK_NOTE (EVENTS, g_print ("hasMarkedText\n"));
-  return markedRange.location != NSNotFound && markedRange.length != 0;
-}
-
--(NSRange)markedRange
-{
-  GDK_NOTE (EVENTS, g_print ("markedRange\n"));
-  return markedRange;
-}
-
--(NSRange)selectedRange
-{
-  GDK_NOTE (EVENTS, g_print ("selectedRange\n"));
-  return selectedRange;
-}
-
--(void)unmarkText
-{
-  GDK_NOTE (EVENTS, g_print ("unmarkText\n"));
-  markedRange = selectedRange = NSMakeRange (NSNotFound, 0);
-}
-
--(void)setMarkedText: (id)aString selectedRange: (NSRange)newSelection replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("setMarkedText\n"));
-  const char *str;
-  char *prev_str;
-
-  if (replacementRange.location == NSNotFound)
-    {
-      markedRange = NSMakeRange (newSelection.location, [aString length]);
-      selectedRange = NSMakeRange (newSelection.location, newSelection.length);
-    }
-  else {
-      markedRange = NSMakeRange (replacementRange.location, [aString length]);
-      selectedRange = NSMakeRange (replacementRange.location + newSelection.location, newSelection.length);
-    }
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-    {
-      str = [[aString string] UTF8String];
-    }
-  else {
-      str = [aString UTF8String];
-    }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_MARKED_TEXT, g_strdup (str));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_POS,
-		     GUINT_TO_POINTER (selectedRange.location));
-  g_object_set_data (G_OBJECT (gdk_window), TIC_SELECTED_LEN,
-		     GUINT_TO_POINTER (selectedRange.length));
-
-  GDK_NOTE (EVENTS, g_print ("setMarkedText: set %s (%p, nsview %p): %s\n",
-			     TIC_MARKED_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-}
-
--(void)doCommandBySelector: (SEL)aSelector
-{
-  GDK_NOTE (EVENTS, g_print ("doCommandBySelector\n"));
-  [super doCommandBySelector: aSelector];
-}
-
--(void)insertText: (id)aString replacementRange: (NSRange)replacementRange
-{
-  GDK_NOTE (EVENTS, g_print ("insertText\n"));
-  const char *str;
-  char *prev_str;
-
-  if ([self hasMarkedText])
-    [self unmarkText];
-
-  if ([aString isKindOfClass: [NSAttributedString class]])
-    {
-      str = [[aString string] UTF8String];
-    }
-  else
-    {
-      str = [aString UTF8String];
-    }
-
-  prev_str = g_object_get_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT);
-  if (prev_str)
-    g_free (prev_str);
-  g_object_set_data (G_OBJECT (gdk_window), TIC_INSERT_TEXT, g_strdup (str));
-  GDK_NOTE (EVENTS, g_print ("insertText: set %s (%p, nsview %p): %s\n",
-			     TIC_INSERT_TEXT, gdk_window, self,
-			     str ? str : "(empty)"));
-
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_FILTERED));
-}
-
--(void)deleteBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)deleteForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)deleteToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)deleteToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)deleteWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)deleteWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("deleteWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)insertBacktab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertBacktab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)insertNewline: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertNewline\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY, GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)insertTab: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("insertTab\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToBeginningOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToBeginningOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToBeginningOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToBeginningOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToBeginningOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToEndOfDocument: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocument\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToEndOfDocumentAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfDocumentAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToEndOfLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveToEndOfLineAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveToEndOfLineAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordBackward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordBackwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordBackwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordForward: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForward\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordForwardAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordForwardAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordLeft: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeft\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordLeftAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordLeftAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordRight: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRight\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)moveWordRightAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("moveWordRightAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)pageDown: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDown\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)pageDownAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageDownAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)pageUp: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUp\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)pageUpAndModifySelection: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("pageUpAndModifySelection\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)selectAll: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectAll\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)selectLine: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectLine\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)selectWord: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("selectWord\n"));
-  g_object_set_data (G_OBJECT (gdk_window), GIC_FILTER_KEY,
-		     GUINT_TO_POINTER (GIC_FILTER_PASSTHRU));
-}
-
--(void)noop: (id)sender
-{
-  GDK_NOTE (EVENTS, g_print ("noop\n"));
-}
-
-/* --------------------------------------------------------------- */
-
 -(void)dealloc
 {
   if (trackingRect)
     {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
       trackingRect = 0;
     }
 
   [super dealloc];
 }
 
--(void)setGdkWindow: (GdkWindow *)window
+-(void)setGdkWindow:(GdkWindow *)window
 {
   gdk_window = window;
 }
@@ -550,11 +60,10 @@
     return YES;
 
   /* A view is opaque if its GdkWindow doesn't have the RGBA visual */
-  return gdk_window_get_visual (gdk_window) !=
-    gdk_screen_get_rgba_visual (_gdk_screen);
+  return gdk_window_get_visual (gdk_window) != gdk_screen_get_rgba_visual (_gdk_screen);
 }
 
--(void)drawRect: (NSRect)rect
+-(void)drawRect:(NSRect)rect 
 {
   GdkRectangle gdk_rect;
   GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (gdk_window->impl);
@@ -566,7 +75,7 @@
   if (GDK_WINDOW_DESTROYED (gdk_window))
     return;
 
-  if (! (gdk_window->event_mask & GDK_EXPOSURE_MASK))
+  if (!(gdk_window->event_mask & GDK_EXPOSURE_MASK))
     return;
 
   if (NSEqualRects (rect, NSZeroRect))
@@ -584,7 +93,7 @@
       [NSGraphicsContext saveGraphicsState];
 
       [[NSColor windowBackgroundColor] setFill];
-      [NSBezierPath fillRect: rect];
+      [NSBezierPath fillRect:rect];
 
       [NSGraphicsContext restoreGraphicsState];
 
@@ -598,9 +107,9 @@
       impl->needs_display_region = NULL;
     }
 
-  [self getRectsBeingDrawn: &drawn_rects count: &count];
+  [self getRectsBeingDrawn:&drawn_rects count:&count];
   region = cairo_region_create ();
-
+  
   for (i = 0; i < count; i++)
     {
       gdk_rect.x = drawn_rects[i].origin.x;
@@ -624,7 +133,7 @@
     }
 }
 
--(void)setNeedsInvalidateShadow: (BOOL)invalidate
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate
 {
   needsInvalidateShadow = invalidate;
 }
@@ -642,7 +151,7 @@
 
   if (trackingRect)
     {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
       trackingRect = 0;
     }
 
@@ -654,32 +163,32 @@
    */
 
   rect = [self bounds];
-  trackingRect = [self addTrackingRect: rect
-		  owner: self
-		  userData: nil
-		  assumeInside: NO];
+  trackingRect = [self addTrackingRect:rect
+                                 owner:self
+                              userData:nil
+                          assumeInside:NO];
 }
 
 -(void)viewDidMoveToWindow
 {
   if (![self window]) /* We are destroyed already */
-    return;
+      return;
 
   [self updateTrackingRect];
 }
 
--(void)viewWillMoveToWindow: (NSWindow *)newWindow
+-(void)viewWillMoveToWindow:(NSWindow *)newWindow
 {
   if (newWindow == nil && trackingRect)
     {
-      [self removeTrackingRect: trackingRect];
+      [self removeTrackingRect:trackingRect];
       trackingRect = 0;
     }
 }
 
--(void)setFrame: (NSRect)frame
+-(void)setFrame:(NSRect)frame
 {
-  [super setFrame: frame];
+  [super setFrame:frame];
 
   if ([self window])
     [self updateTrackingRect];

gdk/quartz/GdkQuartzView.h

@@ -17,32 +17,17 @@
  */
 
 #import <AppKit/AppKit.h>
-#include "gdk/gdk.h"
+#include "gdkwindow.h"
 
-/* Text Input Client */
-#define TIC_MARKED_TEXT "tic-marked-text"
-#define TIC_SELECTED_POS  "tic-selected-pos"
-#define TIC_SELECTED_LEN  "tic-selected-len"
-#define TIC_INSERT_TEXT "tic-insert-text"
-
-/* GtkIMContext */
-#define GIC_CURSOR_RECT  "gic-cursor-rect"
-#define GIC_FILTER_KEY   "gic-filter-key"
-#define GIC_FILTER_PASSTHRU	0
-#define GIC_FILTER_FILTERED	1
-
-@interface GdkQuartzView : NSView <NSTextInputClient>
-{
+@interface GdkQuartzView : NSView {
   GdkWindow *gdk_window;
   NSTrackingRectTag trackingRect;
   BOOL needsInvalidateShadow;
-  NSRange markedRange;
-  NSRange selectedRange;
 }
 
-- (void)setGdkWindow: (GdkWindow *)window;
-- (GdkWindow *)gdkWindow;
-- (NSTrackingRectTag)trackingRect;
-- (void)setNeedsInvalidateShadow: (BOOL)invalidate;
+-(void)setGdkWindow:(GdkWindow *)window;
+-(GdkWindow *)gdkWindow;
+-(NSTrackingRectTag)trackingRect;
+-(void)setNeedsInvalidateShadow:(BOOL)invalidate;
 
 @end

gdk/quartz/Makefile.am

@@ -9,7 +9,6 @@ AM_CPPFLAGS = 				\
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/gdk		\
 	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
 	$(GTK_DEBUG_FLAGS) 		\
 	$(GDK_DEP_CFLAGS)		\
 	"-xobjective-c"

gdk/quartz/gdkdisplay-quartz.c

@@ -336,11 +336,4 @@ gdk_quartz_display_class_init (GdkQuartzDisplayClass *class)
   display_class->convert_selection = _gdk_quartz_display_convert_selection;
   display_class->text_property_to_utf8_list = _gdk_quartz_display_text_property_to_utf8_list;
   display_class->utf8_to_string_target = _gdk_quartz_display_utf8_to_string_target;
-
-  ProcessSerialNumber psn = { 0, kCurrentProcess };
-
-  /* Make the current process a foreground application, i.e. an app
-   * with a user interface, in case we're not running from a .app bundle
-   */
-  TransformProcessType (&psn, kProcessTransformToForegroundApplication);
 }

gdk/quartz/gdkdisplaymanager-quartz.c

@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <dlfcn.h>
 #include <ApplicationServices/ApplicationServices.h>
 
 #include "gdkquartzdisplay.h"
@@ -42,6 +43,18 @@ G_DEFINE_TYPE (GdkQuartzDisplayManager, gdk_quartz_display_manager, GDK_TYPE_DIS
 static void
 gdk_quartz_display_manager_init (GdkQuartzDisplayManager *manager)
 {
+  ProcessSerialNumber psn = { 0, kCurrentProcess };
+  void (*_gtk_quartz_framework_init_ptr) (void);
+
+  /* Make the current process a foreground application, i.e. an app
+   * with a user interface, in case we're not running from a .app bundle
+   */
+  TransformProcessType (&psn, kProcessTransformToForegroundApplication);
+
+  /* Initialize GTK+ framework if there is one. */
+  _gtk_quartz_framework_init_ptr = dlsym (RTLD_DEFAULT, "_gtk_quartz_framework_init");
+  if (_gtk_quartz_framework_init_ptr)
+    _gtk_quartz_framework_init_ptr ();
 }
 
 static void

gdk/quartz/gdkquartz.h

@@ -53,7 +53,6 @@ typedef enum
   GDK_OSX_NEW = 99
 } GdkOSXVersion;
 
-GDK_AVAILABLE_IN_ALL
 GdkOSXVersion gdk_quartz_osx_version (void);
 
 GdkAtom   gdk_quartz_pasteboard_type_to_atom_libgtk_only        (NSString       *type);

gdk/quartz/gdkquartzcursor.h

@@ -42,7 +42,6 @@ typedef GdkCursor GdkQuartzCursor;
 #endif
 typedef struct _GdkQuartzCursorClass GdkQuartzCursorClass;
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_cursor_get_type (void);
 
 G_END_DECLS

gdk/quartz/gdkquartzdevice-core.h

@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 typedef struct _GdkQuartzDeviceCore GdkQuartzDeviceCore;
 typedef struct _GdkQuartzDeviceCoreClass GdkQuartzDeviceCoreClass;
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_device_core_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS

gdk/quartz/gdkquartzdevicemanager-core.h

@@ -37,7 +37,6 @@ typedef struct _GdkQuartzDeviceManagerCore GdkQuartzDeviceManagerCore;
 typedef struct _GdkQuartzDeviceManagerCoreClass GdkQuartzDeviceManagerCoreClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_device_manager_core_get_type (void) G_GNUC_CONST;
 
 

gdk/quartz/gdkquartzdisplay.h

@@ -43,7 +43,6 @@ typedef GdkDisplay GdkQuartzDisplay;
 typedef struct _GdkQuartzDisplayClass GdkQuartzDisplayClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_display_get_type (void);
 
 G_END_DECLS

gdk/quartz/gdkquartzdisplaymanager.h

@@ -39,7 +39,6 @@ typedef GdkDisplayManager _GdkQuartzDisplayManager;
 typedef struct _GdkDisplayManagerClass GdkQuartzDisplayManagerClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_display_manager_get_type (void);
 
 G_END_DECLS

gdk/quartz/gdkquartzdnd.h

@@ -42,10 +42,8 @@ typedef GdkDragContext GdkQuartzDragContext;
 typedef struct _GdkQuartzDragContextClass GdkQuartzDragContextClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType     gdk_quartz_drag_context_get_type (void);
 
-GDK_AVAILABLE_IN_ALL
 id        gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context);
 
 G_END_DECLS

gdk/quartz/gdkquartzkeys.h

@@ -42,7 +42,6 @@ typedef GdkKeymap GdkQuartzKeymap;
 #endif
 typedef struct _GdkQuartzKeymapClass GdkQuartzKeymapClass;
 
-GDK_AVAILABLE_IN_ALL
 GType gdk_quartz_keymap_get_type (void);
 
 G_END_DECLS

gdk/quartz/gdkquartzscreen.h

@@ -42,7 +42,6 @@ typedef GdkScreen GdkQuartzScreen;
 typedef struct _GdkQuartzScreenClass GdkQuartzScreenClass;
 
 
-GDK_AVAILABLE_IN_ALL
 GType      gdk_quartz_screen_get_type (void);
 
 G_END_DECLS

gdk/quartz/gdkquartzutils.h

@@ -28,9 +28,7 @@
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_ALL
 NSImage  *gdk_quartz_pixbuf_to_ns_image_libgtk_only             (GdkPixbuf      *pixbuf);
-GDK_AVAILABLE_IN_ALL
 NSEvent  *gdk_quartz_event_get_nsevent                          (GdkEvent       *event);
 
 G_END_DECLS