buffer

The code in GDK is incredibly broken and nobody is quite sure what's
right-side-up and what's upside down, but this breaks mutter-wayland
now, so let's remove it. It might leak, but we should probably do a
full restructuring of GDK drawing to fix it.

NEWS

@@ -1,3 +1,158 @@
+Overview of Changes in GTK+ 3.11.6 to 3.11.7
+============================================
+
+* GtkActionBar:
+ - Fix theming
+
+* GtkBox:
+ - Allow setting center widget to NULL
+ - Fix a size-allocation error
+
+* GtkPopover:
+ - Fix a crash with text handles (#724392)
+ - Allow resetting relative-to  (#724407)
+
+* Wayland:
+ - Use new xdg-shell ping
+ - Use new xdg-shell focus methods
+
+* Printing:
+ - Fix a small memory leak (#724631)
+
+
+Overview of Changes in GTK+ 3.11.5 to 3.11.6
+============================================
+
+* GtkActionBar is a new widget that is meant to be used
+  for actions at the bottom of a window.
+
+* GtkPopover:
+ - A ::closed signal has been added
+ - Style propagation to popovers has been fixed
+ - Popovers can now be populated from a menu model
+ - GtkMenuButton can use popovers instead of menus
+
+* GtkAppChooserDialog has been redesigned
+
+* GtkBox can now place a widget centered, regardless of
+  the sizes of children on either side, similar to GtkHeaderBar.
+
+* The API documentation has been converted to markdown, and
+  many cleanups and improvements have been made at the same time.
+
+* Bug fixes:
+ 706515 HeaderBars are sometimes too tall
+ 707999 HeaderBar height increases when the subtitle label is set...
+ 721309 Links inside dimmed labels get different colors depending...
+ 723014 wip: Make popover from menu model
+ 723394 const parameter to GtkPopover gtk_popover_set_pointing_to
+ 723627 The padding aroung the timelabel is wrong
+ 723637 GtkTreeViewColumn: fix critical warning
+ 723672 Dialogs with header bars - buttons should have an equal w...
+ 723716 GtkFlowBox::child-activated match slot signature
+ 723771 gtkwindow: remove delete-event idle function on finalize
+ 723863 Implementation for component->get_size not needed
+ 723929 Add a generic center box
+ 724008 void function should not return void expression
+ 724094 Add GtkEntry:max-width-chars
+ 724218 App chooser dialog looks rough
+ 724411 GtkAboutDialog: License visible even if not set and prede...
+ 724503 Make gtk_popover_bind_model() public
+ 724539 Can't drag primary toolbars with a GtkSeparatorToolItem i...
+ 724541 Labels with links can't be activated in a GtkListBox 
+
+* Translation updates:
+ French
+ Galician
+ Hebrew
+ Indonesian
+ Norwegian bokmål
+ Russian
+ Scottish Gaelic
+ Slovenian
+ Spanish
+ Tajik
+ Thai
+
+
+Overview of Changes in GTK+ 3.11.4 to 3.11.5
+============================================
+
+* GtkPopover: A new widget that is can be used for transient
+  views, as an alternative to menus or dialogs.
+
+* Dialogs:
+ - Dialogs have been modernized, can use a header bar now
+ - Built-in dialogs react to a setting, gtk-dialogs-use-header
+   for this, dialogs derived from GtkDialog: default to no headerbar
+ - GtkAssistant also respects the setting
+
+* OS X:
+ - Better menu integration. Items such as 'Hide', 'Hide Others'
+   and 'Show All' are now handled specially
+ - GTK+ provides a default application menu now
+
+* Theming:
+ - GTK+ now uses RGBA visuals by default
+ - Notebook tabs now support a prelight state
+ - Reorderable notebook tabs can be themed differently
+
+* Documentation:
+ - The API documentation has seen numerous fixes and improvements
+ - Docbook markup is being phased out in favor of markdown
+
+* Bugs fixed:
+ 350190 Need specific icon for GTK_ICON_SIZE_SMALL_TOOLBAR for...
+ 566945 gtk_widget_override_color() documentation should menti...
+ 630217 RGBA visual by default
+ 634793 Use g_object_notify_by_pspec() / g_object_class_instal...
+ 636594 The default value of the property 'logo' in GtkAboutDi...
+ 665928 GtkWindow: Add comment about floating reference
+ 692931 The list of printers should be searchable/sortable
+ 699224 file chooser does not respect 12/24-hour clock setting
+ 704456 Synthesized crossing events don't have correct device ...
+ 711298 "Edit Scheduled Transaction" window way too modal
+ 720059 use headerbars in dialogs
+ 720552 Provide a more "native" Mac OS application menu
+ 721895 Remove GtkIconCache
+ 722429 docs/comments: Fix spelling of 'explicitly'
+ 722515 csd menu icon should use default window icon if per-wi...
+ 722574 GtkAboutDialog doesn't get headerbars when used from JS
+ 722588 GtkStack: add gtk_stack_get_child_by_name()
+ 722638 Version the gio-2.0 and wayland-client requirements (g...
+ 722642 Use symbolic icon for file chooser
+ 722722 Fix vertical alignment of labels in "Paper" section of...
+ 722919 Setting custom titlebar on realized window looks weird
+ 723119 docs: use |[ ]| instead of <programlisting></programli...
+ 723121 GtkPlacesSidebar: pressing "eject" icon does not power...
+ 723157 Merge GtkFileChooserWidget and GtkFileChooserDefault
+ 723159 CSD shadows are clipped
+ 723181 Use GtkPopover for GtkScaleButton
+ 723183 GtkStyleContext: don't use disconnect_by_func()
+ 723212 Use headerbar in GtkAssistant
+ 723366 GtkFileChooser crashes due to a signal connection left...
+ 723390 gdkwindow: Use an InputOnly window for focus_window
+ 723402 widget: Fix set_focus_child handling during focus changes
+ 723555 Decode extension names in X11 error handler
+
+* Translation updates:
+ Aragonese
+ Brazilian Portuguese
+ Estonian
+ Galician
+ Greek
+ Hebrew
+ Indonesian
+ Kazakh
+ Lithuanian
+ Scottish Gaelic
+ Simplified Chinese
+ Spanish
+ Tajik
+ Traditional Chinese
+ Ukrainian
+
+
 Overview of Changes in GTK+ 3.11.3 to 3.11.4
 ============================================
 

README.in

@@ -92,6 +92,16 @@ Release notes for 3.12
   it used to inconsistently scroll with the buffer but then go
   reposition to a window-relative position on redraw.
 
+* A number of container widgets have been made more compliant with
+  the uniform CSS rendering model by making them render backgrounds
+  and borders. This may require some adjustments in applications that
+  were making assumptions about containers never rendering backgrounds.
+
+* GTK+ is now choosing an RGBA visual for its windows by default if
+  one is available. This can cause problems for applications which make
+  assumptions about the default visual. You can set GDK_RGBA=0 in the
+  environment to force GTK+ to use the default X11 visual, as before.
+
 Release notes for 3.10
 ======================
 

build/win32/vs10/README.txt

@@ -20,10 +20,14 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs10/README.txt file in glib for details where to unpack them.
 
-You will also need a Python 2.x/3.x interpretor installed on your system,
+You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-needs to be in your PATH before attempting the build of GTK+.
+either needs to be in your PATH before attempting the build of GTK+, or it
+can be found in the path specified by PythonPath in gtk-version-paths.props.
+If you happen to change the PythonPath setting in gtk-version-paths.props after
+opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
+delete all the *.sdf, *.suo and *.user files before re-attempting the build.
 
 It is recommended that one builds the dependencies with VS10 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,

build/win32/vs10/gtk-gen-srcs.props

@@ -58,6 +58,8 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)
 :DONE_GDKCONFIG_H
     </GenGdkConfigHBroadway>
     <GenerateGtkDbusBuiltSources>
+set PATH=$(PATH);$(PythonPath)
+
 cd ..\..\..\gtk
 
 python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml

build/win32/vs10/gtk-install.props

@@ -494,6 +494,8 @@ copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
+
 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
 
 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
@@ -732,6 +734,36 @@ copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libg
 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 
 
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
+
+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
+
+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
+
+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
+
+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
+
+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\
+
+
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
+
+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\
+
+
 mkdir $(CopyDir)\share\glib-2.0\schemas
 
 copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas

build/win32/vs10/gtk-version-paths.props

@@ -12,6 +12,7 @@
     <GtkSeparateVSDllSuffix>-3-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
+    <PythonPath>c:\python27</PythonPath>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtkversionpathsprops</_PropertySheetDisplayName>
@@ -50,5 +51,8 @@
     <BuildMacro Include="GtkDllSuffix">
       <Value>$(GtkDllSuffix)</Value>
     </BuildMacro>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>

build/win32/vs10/gtk3-demo.vcxproj

@@ -182,15 +182,13 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_buffer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />	
+    <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c" />
@@ -199,8 +197,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c" />
@@ -208,6 +206,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -216,12 +215,14 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c" />
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c" />
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c" />
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk.vcxproj">
@@ -236,4 +237,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

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

@@ -24,7 +24,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\css_multiplebgs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_pixbufs.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\css_shadows.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\dialog.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\drawingarea.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\editable_cells.c"><Filter>Source Files</Filter></ClCompile>
@@ -32,7 +31,6 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\entry_completion.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\event_axes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\expander.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\headerbar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\hypertext.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\iconview.c"><Filter>Source Files</Filter></ClCompile>
@@ -41,8 +39,8 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\infobar.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\links.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\listbox.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\flowbox.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\list_store.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\menus.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\offscreen_window2.c"><Filter>Source Files</Filter></ClCompile>
@@ -50,6 +48,7 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\panes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pickers.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\pixbufs.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\popover.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\printing.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\revealer.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\rotated_text.c"><Filter>Source Files</Filter></ClCompile>
@@ -58,11 +57,13 @@
     <ClCompile Include="..\..\..\demos\gtk-demo\sizegroup.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\spinner.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\stack.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\textview.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\textscroll.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\theming_style_classes.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\toolpalette.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\transparent.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\demos\gtk-demo\tree_store.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
+    <ClCompile Include="..\..\..\demos\gtk-demo\main.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>

build/win32/vs9/README.txt

@@ -19,10 +19,14 @@ ATK and GLib.  External dependencies are at least Cairo
 gettext-runtime, fontconfig*, freetype*, expat*.  See the 
 build/win32/vs9/README.txt file in glib for details where to unpack them.
 
-You will also need a Python 2.x/3.x interpretor installed on your system,
+You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
-needs to be in your PATH before attempting the build of GTK+.
+either needs to be in your PATH before attempting the build of GTK+, or it
+can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
+If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
+opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
+delete all the *.ncb, *.suo and *.user files before re-attempting the build.
 
 It is recommended that one builds the dependencies with VS9 as far as
 possible, especially those from and using the GTK+ stack (i.e. GLib,

build/win32/vs9/gtk-gen-srcs.vsprops

@@ -57,6 +57,8 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)

 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
 		Value="
+set PATH=$(PATH);$(PythonPath)&#x0D;&#x0A;
+
 cd ..\..\..\gtk&#x0D;&#x0A;
 python $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml&#x0D;&#x0A;
 cd $(SolutionDir)&#x0D;&#x0A;

build/win32/vs9/gtk-install.vsprops

@@ -261,6 +261,7 @@ copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk
&#x0A
 copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

+copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

 copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk

@@ -381,6 +382,24 @@ copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-$(ApiVersion)\lib
 copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

 copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\libgail-util

 
+mkdir $(CopyDir)\share\icons\hicolor\16x16\apps

+copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\22x22\apps

+copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\24x24\apps

+copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\32x32\apps

+copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\48x48\apps

+copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\

+
+mkdir $(CopyDir)\share\icons\hicolor\256x256\apps

+copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\

+
 mkdir $(CopyDir)\share\glib-2.0\schemas

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

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


build/win32/vs9/gtk-version-paths.vsprops

@@ -50,4 +50,8 @@
 		Name="GtkDllSuffix"
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
+	<UserMacro
+		Name="PythonPath"
+		Value="c:\python27"
+	/>
 </VisualStudioPropertySheet>

build/win32/vs9/gtk3-demo.vcproj

@@ -170,10 +170,9 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_accordion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_basics.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_pixbufs.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\css_shadows.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\css_multiplebgs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
@@ -181,7 +180,6 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\event_axes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\headerbar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
@@ -190,15 +188,16 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\listbox.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\flowbox.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\overlay.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\popover.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\revealer.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
@@ -207,12 +206,14 @@
 			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\stack.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\theming_style_classes.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\transparent.c" />
 			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\demo_resources.c" />
+			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
 		</Filter>
 		<Filter
 			Name="Header Files"

configure.ac

@@ -10,7 +10,7 @@
 
 m4_define([gtk_major_version], [3])
 m4_define([gtk_minor_version], [11])
-m4_define([gtk_micro_version], [5])
+m4_define([gtk_micro_version], [8])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -41,12 +41,13 @@ AC_CANONICAL_HOST
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.39.0])
+m4_define([glib_required_version], [2.39.5])
 m4_define([pango_required_version], [1.32.4])
 m4_define([atk_required_version], [2.7.5])
 m4_define([cairo_required_version], [1.12.0])
 m4_define([gdk_pixbuf_required_version], [2.27.1])
 m4_define([introspection_required_version], [1.39.0])
+m4_define([wayland_required_version], [1.3.90])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -413,7 +414,7 @@ fi
 
 PKG_PROG_PKG_CONFIG
 
-WAYLAND_DEPENDENCIES="wayland-client >= 1.2.0 xkbcommon >= 0.2.0 wayland-cursor"
+WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version"
 if test "$enable_wayland_backend" = "maybe" ; then
   AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
   PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
@@ -1265,11 +1266,11 @@ fi
 
 # Check for gio-unix
 if test "$have_gio_unix" = "yes"; then
-  GDK_GIO_PACKAGE=gio-unix-2.0
+  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
   AC_DEFINE([HAVE_GIO_UNIX], [1],
             [Define if gio-unix is available])
 else
-  GDK_GIO_PACKAGE=gio-2.0
+  GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version"
 fi
 
 # Check for Pango flags
@@ -1314,7 +1315,7 @@ LIBS="$gtk_save_LIBS"
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"
 
-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo cairo-gobject"
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
 GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends"
 if test "x$enable_x11_backend" = xyes; then
   GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
@@ -1351,13 +1352,13 @@ fi
 
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
 
-GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
+GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
 GTK_PRIVATE_PACKAGES="$ATK_PACKAGES"
 if test "x$enable_x11_backend" = xyes; then
   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
 if test "$have_gio_unix" = "yes"; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0"
+  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
 fi
 GTK_EXTRA_LIBS=
 
@@ -1632,7 +1633,7 @@ AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
 # Checks for gtk-doc and docbook-tools
 ##################################################
 
-GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.20],[--flavour no-tmpl])
 
 AC_ARG_ENABLE(man,
               [AS_HELP_STRING([--enable-man],

demos/gtk-demo/Makefile.am

@@ -41,6 +41,7 @@ demos =						\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
+	popover.c				\
 	printing.c				\
 	revealer.c				\
 	rotated_text.c				\

demos/gtk-demo/builder.c

@@ -37,6 +37,7 @@ do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GError *err = NULL;
+  GtkWidget *toolbar;
 
   if (!window)
     {
@@ -53,6 +54,9 @@ do_builder (GtkWidget *do_widget)
                              gtk_widget_get_screen (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
+      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
+      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+                                   "primary-toolbar");
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/button_box.c

@@ -90,6 +90,14 @@ do_button_box (GtkWidget *do_widget)
                         create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
                         TRUE, TRUE, 5);
 
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
+                        TRUE, TRUE, 5);
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Expand", 40, GTK_BUTTONBOX_EXPAND),
+                        TRUE, TRUE, 5);
+
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
 
@@ -98,19 +106,25 @@ do_button_box (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 30, GTK_BUTTONBOX_SPREAD),
+                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
                         TRUE, TRUE, 0);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 30, GTK_BUTTONBOX_EDGE),
+                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 30, GTK_BUTTONBOX_START),
+                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
                         TRUE, TRUE, 5);
 
     gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 30, GTK_BUTTONBOX_END),
+                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
+                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
+                        TRUE, TRUE, 5);
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Expand", 10, GTK_BUTTONBOX_EXPAND),
                         TRUE, TRUE, 5);
   }
 

demos/gtk-demo/demo.gresource.xml

@@ -110,6 +110,7 @@
     <file>panes.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
+    <file>popover.c</file>
     <file>printing.c</file>
     <file>revealer.c</file>
     <file>rotated_text.c</file>
@@ -133,4 +134,7 @@
     <file>messages.txt</file>
     <file>apple-red.png</file>
   </gresource>
+  <gresource prefix="/popover">
+    <file>popover.ui</file>
+  </gresource>
 </gresources>

demos/gtk-demo/demo.ui

@@ -151,6 +151,7 @@
     </object>
     <object class="GtkAboutDialog" id="aboutdialog1">
         <property name="program-name" translatable="yes">GtkBuilder demo</property>
+        <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
          <accessibility>
 	     <relation target="window1" type="subwindow-of"/>
 	 </accessibility>
@@ -243,9 +244,6 @@
                           </child>
                         </object>
                       </child>
-		    <accessibility>
-		      	<action action_name="move-cursor" description="Move the cursor to select another person."/>
-		    </accessibility>
                     </object>
                     <packing>
                         <property name="position">2</property>

demos/gtk-demo/dialog.c

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

demos/gtk-demo/offscreen_window.c

@@ -279,7 +279,7 @@ gtk_rotated_bin_realize (GtkWidget *widget)
       attributes.width = child_allocation.width;
       attributes.height = child_allocation.height;
     }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
+  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)

demos/gtk-demo/offscreen_window2.c

@@ -218,7 +218,7 @@ gtk_mirror_bin_realize (GtkWidget *widget)
       attributes.width = child_allocation.width;
       attributes.height = child_allocation.height;
     }
-  bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
+  bin->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen (widget)),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)

demos/gtk-demo/popover.c

@@ -0,0 +1,185 @@
+/* Popovers
+ *
+ * A bubble-like window containing contextual information or options.
+ * GtkPopovers can be attached to any widget, and will be displayed
+ * within the same window, but on top of all its content.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+toggle_changed_cb (GtkToggleButton *button,
+                   GtkWidget       *popover)
+{
+  gtk_widget_set_visible (popover,
+                          gtk_toggle_button_get_active (button));
+}
+
+static GtkWidget *
+create_popover (GtkWidget       *parent,
+                GtkWidget       *child,
+                GtkPositionType  pos)
+{
+  GtkWidget *popover;
+
+  popover = gtk_popover_new (parent);
+  gtk_popover_set_position (GTK_POPOVER (popover), pos);
+  gtk_container_add (GTK_CONTAINER (popover), child);
+  gtk_container_set_border_width (GTK_CONTAINER (popover), 6);
+  gtk_widget_show (child);
+
+  return popover;
+}
+
+static GtkWidget *
+create_complex_popover (GtkWidget       *parent,
+                        GtkPositionType  pos)
+{
+  GtkWidget *popover, *window, *content;
+  GtkBuilder *builder;
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/popover/popover.ui", NULL);
+  window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+  content = gtk_bin_get_child (GTK_BIN (window));
+  g_object_ref (content);
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (content)),
+                        content);
+  gtk_widget_destroy (window);
+  g_object_unref (builder);
+
+  popover = create_popover (parent, content, GTK_POS_BOTTOM);
+  g_object_unref (content);
+
+  gtk_widget_set_size_request (popover, 200, -1);
+  gtk_widget_set_vexpand (popover, TRUE);
+
+  gtk_widget_set_margin_start (popover, 10);
+  gtk_widget_set_margin_end (popover, 10);
+  gtk_widget_set_margin_bottom (popover, 10);
+
+  return popover;
+}
+
+static void
+entry_size_allocate_cb (GtkEntry      *entry,
+                        GtkAllocation *allocation,
+                        gpointer       user_data)
+{
+  GtkEntryIconPosition popover_pos;
+  GtkPopover *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  if (gtk_widget_is_visible (GTK_WIDGET (popover)))
+    {
+      popover_pos =
+        GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry),
+                                             "popover-icon-pos"));
+      gtk_entry_get_icon_area (entry, popover_pos, &rect);
+      gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+    }
+}
+
+static void
+entry_icon_press_cb (GtkEntry             *entry,
+                     GtkEntryIconPosition  icon_pos,
+                     GdkEvent             *event,
+                     gpointer              user_data)
+{
+  GtkWidget *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  gtk_entry_get_icon_area (entry, icon_pos, &rect);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+  gtk_widget_show (popover);
+
+  g_object_set_data (G_OBJECT (entry), "popover-icon-pos",
+                     GUINT_TO_POINTER (icon_pos));
+}
+
+static void
+day_selected_cb (GtkCalendar *calendar,
+                 gpointer     user_data)
+{
+  cairo_rectangle_int_t rect;
+  GtkAllocation allocation;
+  GtkWidget *popover;
+  GdkEvent *event;
+
+  event = gtk_get_current_event ();
+
+  if (event->type != GDK_BUTTON_PRESS)
+    return;
+
+  gdk_window_coords_to_parent (event->button.window,
+                               event->button.x, event->button.y,
+                               &event->button.x, &event->button.y);
+  gtk_widget_get_allocation (GTK_WIDGET (calendar), &allocation);
+  rect.x = event->button.x - allocation.x;
+  rect.y = event->button.y - allocation.y;
+  rect.width = rect.height = 1;
+
+  popover = create_popover (GTK_WIDGET (calendar),
+                            gtk_entry_new (),
+                            GTK_POS_BOTTOM);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+
+  gtk_widget_show (popover);
+
+  gdk_event_free (event);
+}
+
+GtkWidget *
+do_popover (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *popover, *box, *widget;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
+      gtk_container_set_border_width (GTK_CONTAINER (box), 24);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      widget = gtk_toggle_button_new_with_label ("Button");
+      popover = create_popover (widget,
+                                gtk_label_new ("This popover does not grab input"),
+                                GTK_POS_TOP);
+      gtk_popover_set_modal (GTK_POPOVER (popover), FALSE);
+      g_signal_connect (widget, "toggled",
+                        G_CALLBACK (toggle_changed_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_entry_new ();
+      popover = create_complex_popover (widget, GTK_POS_TOP);
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_PRIMARY, "edit-find");
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_SECONDARY, "edit-clear");
+
+      g_signal_connect (widget, "icon-press",
+                        G_CALLBACK (entry_icon_press_cb), popover);
+      g_signal_connect (widget, "size-allocate",
+                        G_CALLBACK (entry_size_allocate_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_calendar_new ();
+      g_signal_connect (widget, "day-selected",
+                        G_CALLBACK (day_selected_cb), NULL);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show_all (window);
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}

demos/gtk-demo/popover.ui

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Nov 13 16:45:55 2013 -->
+<interface>
+  <!-- interface-requires gtk+ 3.10 -->
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Item 1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 7</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 8</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 9</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 10</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkBox" id="box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="entry1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="primary_icon_name">edit-find</property>
+            <property name="secondary_icon_name">edit-clear</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <property name="model">liststore1</property>
+                <property name="headers_visible">False</property>
+                <property name="enable_search">False</property>
+                <property name="search_column">2</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="column1">
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/textscroll.c

@@ -116,7 +116,7 @@ setup_scroll (GtkTextView *textview,
     {
       /* If we want to scroll to the end, including horizontal scrolling,
        * then we just create a mark with right gravity at the end of the
-       * buffer. It will stay at the end unless explicitely moved with
+       * buffer. It will stay at the end unless explicitly moved with
        * gtk_text_buffer_move_mark.
        */
       gtk_text_buffer_create_mark (buffer, "end", &iter, FALSE);
@@ -129,7 +129,7 @@ setup_scroll (GtkTextView *textview,
       /* If we want to scroll to the bottom, but not scroll horizontally,
        * then an end mark won't do the job. Just create a mark so we can
        * use it with gtk_text_view_scroll_mark_onscreen, we'll position it
-       * explicitely when needed. Use left gravity so the mark stays where
+       * explicitly when needed. Use left gravity so the mark stays where
        * we put it after inserting new text.
        */
       gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE);

demos/widget-factory/widget-factory.ui

@@ -139,7 +139,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="border-width">10</property>
         <child>
           <object class="GtkStack" id="toplevel_stack">
             <property name="visible">True</property>
@@ -147,6 +146,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
               <object class="GtkBox" id="page1">
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
+                <property name="border-width">10</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkBox" id="box2">
@@ -1750,7 +1750,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <child>
                       <object class="GtkFrame" id="page2frame">
                         <property name="visible">True</property>
-                        <property name="margin-top">2</property>
+                        <style>
+                          <class name="app-notification"/>
+                        </style>
                         <child>
                           <object class="GtkBox" id="page2box">
                             <property name="visible">True</property>
@@ -1770,6 +1772,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                             <child>
                               <object class="GtkButton" id="page2dismiss">
                                 <property name="visible">True</property>
+                                <property name="relief">none</property>
                                 <child>
                                   <object class="GtkImage" id="page2dismissi">
                                     <property name="visible">True</property>
@@ -1791,7 +1794,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </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="border-width">16</property>
                     <child>
                       <object class="GtkBox" id="page2box1">
                         <property name="visible">True</property>
@@ -1812,6 +1815,23 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                             <property name="adjustment">adjustment1</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkVolumeButton">
+                            <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
+                            <property name="valign">center</property>
+                            <property name="use-symbolic">True</property>
+                            <property name="value">.5</property>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkVolumeButton">
+                            <property name="orientation">horizontal</property>
+                            <property name="valign">center</property>
+                            <property name="use-symbolic">True</property>
+                            <property name="value">.5</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left-attach">0</property>

docs/reference/gdk/Makefile.am

@@ -48,7 +48,7 @@ AM_CPPFLAGS = 			\
 GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
+MKDB_OPTIONS=--output-format=xml --name-space=gdk
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files = 		\

docs/reference/gdk/gdk3-overrides.txt

@@ -13,3 +13,18 @@
 <NAME>GDK_WINDOWING_WIN32</NAME>
 #define GDK_WINDOWING_WIN32
 </MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_QUARTZ</NAME>
+#define GDK_WINDOWING_QUARTZ
+</MACRO>
+
+<MACRO>
+<NAME>GDK_WINDOWING_WAYLAND</NAME>
+#define GDK_WINDOWING_WAYLAND
+</MACRO>
+
+<MACRO>
+<NAME>GDK_DISABLE_DEPRECATION_WARNINGS</NAME>
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+</MACRO>

docs/reference/gdk/gdk3-sections.txt

@@ -463,6 +463,7 @@ gdk_window_get_pointer
 gdk_window_get_device_position
 gdk_window_get_device_position_double
 GdkModifierType
+GdkModifierIntent
 gdk_window_get_parent
 gdk_window_get_toplevel
 gdk_window_get_children
@@ -1162,8 +1163,7 @@ gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
+gdk_wayland_display_get_xdg_shell
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
 

docs/reference/gdk/gdk3.types

@@ -7,6 +7,7 @@ gdk_device_manager_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
 gdk_drag_context_get_type
+gdk_frame_clock_get_type
 gdk_keymap_get_type
 gdk_screen_get_type
 gdk_visual_get_type

docs/reference/gtk/Makefile.am

@@ -112,6 +112,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir) 	\
 	-I$(top_builddir)/gdk	\
 	-DGTK_ENABLE_BROKEN	\
+	-Wno-deprecated-declarations \
 	$(GTK_DEBUG_FLAGS)	\
 	$(GTK_DEP_CFLAGS)
 
@@ -125,7 +126,7 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gtk
+MKDB_OPTIONS=--output-format=xml --name-space=gtk
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\

docs/reference/gtk/getting_started.xml

@@ -419,7 +419,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
         <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application2/exampleappwin.c">full source</ulink>)</para>
       </informalexample>
 
-      <para>You may have noticed that we used the _from_resource() variant
+      <para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
       of the function that sets a template. Now we need to use GLib's resource
       functionality to include the ui file in the binary. This is commonly
       done by listing all resources in a .gresource.xml file, such as this:
@@ -456,10 +456,10 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 
       <para>To this end, we add a private struct to our application
       window subclass and keep a reference to the #GtkStack there.
-      The gtk_widget_class_bind_child() function arranges things so
-      that after instantiating the template, the @stack member of
-      the private struct will point to the widget of the same name
-      from the template.</para>
+      The gtk_widget_class_bind_template_child_private() function
+      arranges things so that after instantiating the template, the
+      @stack member of the private struct will point to the widget of
+      the same name from the template.</para>
 
       <informalexample>
         <programlisting><![CDATA[
@@ -720,7 +720,7 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>Now we revisit the preferences_activated() function in our
+      <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
       application class, and make it open a new preference dialog.</para>
 
       <informalexample>
@@ -863,8 +863,8 @@ example_app_window_init (ExampleAppWindow *win)
         <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
-      <para>To connect the menuitem to the show-words setting,
-      we use a #GSettingsAction.</para>
+      <para>To connect the menuitem to the show-words setting, we use
+      a #GAction corresponding to the given #GSettings key.</para>
 
       <informalexample>
         <programlisting><![CDATA[

docs/reference/gtk/glossary.xml

@@ -196,9 +196,7 @@
 	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
 	linkend="parent">parent's</glossterm>.  This can be tested with
-	the gtk_widget_get_has_window() function.  See
-	<xref linkend="window-no-window-widgets"/> for a detailed
-	description of this flag.
+	the gtk_widget_get_has_window() function.
       </para>
     </glossdef>
   </glossentry>
@@ -237,8 +235,7 @@
       </para>
 
       <para>
-	Note that when a widget creates a window in its <link
-	linkend="gtkwidget-realize"><methodname>::realize()</methodname></link>
+	Note that when a #GtkWidget creates a window in its #GtkWidget::realize
 	handler, it does not actually show the window.  That is, the
 	window's structure is just created in memory.  The widget
 	actually shows the window when it gets <glossterm
@@ -286,7 +283,7 @@
       <para>
         A style encapsulates what GTK+ needs to know in order to draw
         a widget. Styles can be modified with 
-        <link linkend="gtk-Resource-Files">resource files</link>.
+        <link linkend="gtk3-Resource-Files">resource files</link>.
       </para>
     </glossdef>
   </glossentry>

docs/reference/gtk/gtk-docs.sgml

@@ -56,14 +56,14 @@
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
+      <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
-      <xi:include href="xml/gtkwindow.xml" />
-      <xi:include href="xml/gtkwindowgroup.xml" />
       <xi:include href="xml/gtkinvisible.xml" />
       <xi:include href="xml/gtkoffscreenwindow.xml" />
+      <xi:include href="xml/gtkwindowgroup.xml" />
     </chapter>
 
     <chapter id="LayoutContainers">
@@ -117,7 +117,7 @@
     </chapter>
 
     <chapter id="NumericEntry">
-      <title>Numeric/Text Data Entry</title>
+      <title>Numeric and Text Data Entry</title>
       <xi:include href="xml/gtkentry.xml" />
       <xi:include href="xml/gtkentrybuffer.xml" />
       <xi:include href="xml/gtkentrycompletion.xml" />
@@ -190,10 +190,11 @@
       <xi:include href="xml/gtkmenutoolbutton.xml" />
       <xi:include href="xml/gtktoggletoolbutton.xml" />
       <xi:include href="xml/gtkradiotoolbutton.xml" />
+      <xi:include href="xml/gtkpopover.xml" />
     </chapter>
 
     <chapter id="SelectorWidgets">
-      <title>Selectors (Color/File/Font)</title>
+      <title>Selector Widgets and Dialogs</title>
       <xi:include href="xml/gtkcolorchooser.xml" />
       <xi:include href="xml/gtkcolorbutton.xml" />
       <xi:include href="xml/gtkcolorchooserwidget.xml" />

docs/reference/gtk/gtk3-sections.txt

@@ -55,6 +55,7 @@ gtk_about_dialog_get_type
 <FILE>gtkaccelgroup</FILE>
 <TITLE>Keyboard Accelerators</TITLE>
 GtkAccelGroup
+GtkAccelGroupClass
 gtk_accel_group_new
 gtk_accel_group_connect
 gtk_accel_group_connect_by_path
@@ -83,7 +84,6 @@ gtk_accelerator_set_default_mod_mask
 gtk_accelerator_get_default_mod_mask
 
 <SUBSECTION Standard>
-GtkAccelGroupClass
 GTK_TYPE_ACCEL_GROUP
 GTK_ACCEL_GROUP
 GTK_IS_ACCEL_GROUP
@@ -178,6 +178,7 @@ gtk_accessible_get_type
 <FILE>gtkaction</FILE>
 <TITLE>GtkAction</TITLE>
 GtkAction
+GtkActionClass
 gtk_action_new
 gtk_action_get_name
 gtk_action_is_sensitive
@@ -228,7 +229,6 @@ GTK_ACTION_CLASS
 GTK_IS_ACTION
 GTK_IS_ACTION_CLASS
 GTK_ACTION_GET_CLASS
-GtkActionClass
 <SUBSECTION Private>
 gtk_action_get_type
 GtkActionPrivate
@@ -259,6 +259,7 @@ gtk_activatable_get_type
 <FILE>gtkactiongroup</FILE>
 <TITLE>GtkActionGroup</TITLE>
 GtkActionGroup
+GtkActionGroupClass
 gtk_action_group_new
 gtk_action_group_get_name
 gtk_action_group_get_sensitive
@@ -292,7 +293,6 @@ GTK_ACTION_GROUP_CLASS
 GTK_IS_ACTION_GROUP
 GTK_IS_ACTION_GROUP_CLASS
 GTK_ACTION_GROUP_GET_CLASS
-GtkActionGroupClass
 <SUBSECTION Private>
 gtk_action_group_get_type
 GtkActionGroupPrivate
@@ -335,6 +335,7 @@ gtk_adjustment_get_type
 <FILE>gtkalignment</FILE>
 <TITLE>GtkAlignment</TITLE>
 GtkAlignment
+GtkAlignmentClass
 gtk_alignment_new
 gtk_alignment_set
 gtk_alignment_get_padding
@@ -355,6 +356,7 @@ GtkAlignmentPrivate
 <FILE>gtkassistant</FILE>
 <TITLE>GtkAssistant</TITLE>
 GtkAssistant
+GtkAssistantClass
 gtk_assistant_new
 gtk_assistant_get_current_page
 gtk_assistant_set_current_page
@@ -385,7 +387,6 @@ gtk_assistant_next_page
 gtk_assistant_previous_page
 
 <SUBSECTION Standard>
-GtkAssistantClass
 GTK_TYPE_ASSISTANT
 GTK_ASSISTANT
 GTK_ASSISTANT_CLASS
@@ -419,6 +420,7 @@ gtk_arrow_get_type
 <FILE>gtkaspectframe</FILE>
 <TITLE>GtkAspectFrame</TITLE>
 GtkAspectFrame
+GtkAspectFrameClass
 gtk_aspect_frame_new
 gtk_aspect_frame_set
 <SUBSECTION Standard>
@@ -437,6 +439,7 @@ gtk_aspect_frame_get_type
 <FILE>gtkbbox</FILE>
 <TITLE>GtkButtonBox</TITLE>
 GtkButtonBox
+GtkButtonBoxClass
 gtk_button_box_new
 gtk_button_box_get_layout
 gtk_button_box_get_child_secondary
@@ -460,6 +463,7 @@ gtk_button_box_get_type
 <FILE>gtkbin</FILE>
 <TITLE>GtkBin</TITLE>
 GtkBin
+GtkBinClass
 gtk_bin_get_child
 <SUBSECTION Standard>
 GTK_BIN
@@ -477,6 +481,7 @@ gtk_bin_get_type
 <FILE>gtkbox</FILE>
 <TITLE>GtkBox</TITLE>
 GtkBox
+GtkBoxClass
 gtk_box_new
 gtk_box_pack_start
 gtk_box_pack_end
@@ -489,6 +494,8 @@ gtk_box_query_child_packing
 gtk_box_set_child_packing
 gtk_box_get_baseline_position
 gtk_box_set_baseline_position
+gtk_box_get_center_widget
+gtk_box_set_center_widget
 <SUBSECTION Standard>
 GTK_BOX
 GTK_IS_BOX
@@ -505,7 +512,9 @@ gtk_box_get_type
 <FILE>gtklistbox</FILE>
 <TITLE>GtkListBox</TITLE>
 GtkListBox
+GtkListBoxClass
 GtkListBoxRow
+GtkListBoxRowClass
 GtkListBoxFilterFunc
 GtkListBoxSortFunc
 GtkListBoxUpdateHeaderFunc
@@ -551,6 +560,7 @@ GTK_TYPE_LIST_BOX_ROW
 
 <SUBSECTION Private>
 gtk_list_box_get_type
+gtk_list_box_row_get_type
 </SECTION>
 
 <SECTION>
@@ -600,9 +610,6 @@ gtk_builder_get_objects
 gtk_builder_expose_object
 gtk_builder_connect_signals
 gtk_builder_connect_signals_full
-gtk_builder_add_callback_symbol
-gtk_builder_add_callback_symbols
-gtk_builder_lookup_callback_symbol
 gtk_builder_set_translation_domain
 gtk_builder_get_translation_domain
 gtk_builder_set_application
@@ -612,13 +619,7 @@ gtk_builder_value_from_string
 gtk_builder_value_from_string_type
 GTK_BUILDER_WARN_INVALID_CHILD_TYPE
 GTK_BUILDER_ERROR
-<SUBSECTION>
-gtk_builder_new
-gtk_builder_add_from_file
-gtk_builder_add_from_resource
-gtk_builder_add_from_string
-gtk_builder_add_objects_from_file
-gtk_builder_add_objects_from_string
+
 <SUBSECTION Standard>
 GTK_BUILDER
 GTK_IS_BUILDER
@@ -636,6 +637,7 @@ GtkBuilderPrivate
 <FILE>gtkbutton</FILE>
 <TITLE>GtkButton</TITLE>
 GtkButton
+GtkButtonClass
 gtk_button_new
 gtk_button_new_with_label
 gtk_button_new_with_mnemonic
@@ -739,6 +741,7 @@ gtk_check_button_get_type
 <SECTION>
 <FILE>gtkcheckmenuitem</FILE>
 GtkCheckMenuItem
+GtkCheckMenuItemClass
 <TITLE>GtkCheckMenuItem</TITLE>
 gtk_check_menu_item_new
 gtk_check_menu_item_new_with_label
@@ -820,6 +823,7 @@ gtk_hsv_get_type
 <FILE>gtkcolorsel</FILE>
 <TITLE>GtkColorSelection</TITLE>
 GtkColorSelection
+GtkColorSelectionClass
 gtk_color_selection_new
 gtk_color_selection_set_has_opacity_control
 gtk_color_selection_get_has_opacity_control
@@ -877,6 +881,7 @@ gtk_color_selection_dialog_get_type
 <FILE>gtkcombobox</FILE>
 <TITLE>GtkComboBox</TITLE>
 GtkComboBox
+GtkComboBoxClass
 gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
@@ -963,6 +968,7 @@ gtk_combo_box_text_get_type
 <FILE>gtkcontainer</FILE>
 <TITLE>GtkContainer</TITLE>
 GtkContainer
+GtkContainerClass
 GTK_IS_RESIZE_CONTAINER
 GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID
 gtk_container_add
@@ -1018,6 +1024,7 @@ gtk_container_get_type
 <FILE>gtkdialog</FILE>
 <TITLE>GtkDialog</TITLE>
 GtkDialog
+GtkDialogClass
 GtkDialogFlags
 GtkResponseType
 gtk_dialog_new
@@ -1033,6 +1040,7 @@ gtk_dialog_get_response_for_widget
 gtk_dialog_get_widget_for_response
 gtk_dialog_get_action_area
 gtk_dialog_get_content_area
+gtk_dialog_get_header_bar
 <SUBSECTION>
 gtk_alternative_dialog_button_order
 gtk_dialog_set_alternative_button_order
@@ -1112,10 +1120,12 @@ gtk_entry_get_activates_default
 gtk_entry_get_has_frame
 gtk_entry_get_inner_border
 gtk_entry_get_width_chars
+gtk_entry_get_max_width_chars
 gtk_entry_set_activates_default
 gtk_entry_set_has_frame
 gtk_entry_set_inner_border
 gtk_entry_set_width_chars
+gtk_entry_set_max_width_chars
 gtk_entry_get_invisible_char
 gtk_entry_set_alignment
 gtk_entry_get_alignment
@@ -1263,6 +1273,7 @@ gtk_entry_completion_get_type
 <FILE>gtkeventbox</FILE>
 <TITLE>GtkEventBox</TITLE>
 GtkEventBox
+GtkEventBoxClass
 gtk_event_box_new
 gtk_event_box_set_above_child
 gtk_event_box_get_above_child
@@ -1283,6 +1294,7 @@ gtk_event_box_get_type
 <FILE>gtkexpander</FILE>
 <TITLE>GtkExpander</TITLE>
 GtkExpander
+GtkExpanderClass
 gtk_expander_new
 gtk_expander_new_with_mnemonic
 gtk_expander_set_expanded
@@ -1410,6 +1422,7 @@ GtkFileChooserDialogPrivate
 <FILE>gtkfilechooserwidget</FILE>
 <TITLE>GtkFileChooserWidget</TITLE>
 GtkFileChooserWidget
+GtkFileChooserWidgetClass
 gtk_file_chooser_widget_new
 <SUBSECTION Standard>
 GTK_FILE_CHOOSER_WIDGET
@@ -1427,6 +1440,7 @@ GtkFileChooserWidgetPrivate
 <FILE>gtkfilechooserbutton</FILE>
 <TITLE>GtkFileChooserButton</TITLE>
 GtkFileChooserButton
+GtkFileChooserButtonClass
 gtk_file_chooser_button_new
 gtk_file_chooser_button_new_with_dialog
 gtk_file_chooser_button_get_title
@@ -1611,10 +1625,10 @@ gtk_font_chooser_get_type
 <FILE>gtkfontchooserwidget</FILE>
 <TITLE>GtkFontChooserWidget</TITLE>
 GtkFontChooserWidget
+GtkFontChooserWidgetClass
 gtk_font_chooser_widget_new
 
 <SUBSECTION Standard>
-GtkFontChooserWidgetClass
 GTK_TYPE_FONT_CHOOSER_WIDGET
 GTK_FONT_CHOOSER_WIDGET
 GTK_FONT_CHOOSER_WIDGET_CLASS
@@ -1631,10 +1645,10 @@ gtk_font_chooser_widget_get_type
 <FILE>gtkfontchooserdialog</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
+GtkFontChooserDialogClass
 gtk_font_chooser_dialog_new
 
 <SUBSECTION Standard>
-GtkFontChooserDialogClass
 GTK_TYPE_FONT_CHOOSER_DIALOG
 GTK_FONT_CHOOSER_DIALOG
 GTK_FONT_CHOOSER_DIALOG_CLASS
@@ -1651,6 +1665,7 @@ gtk_font_chooser_dialog_get_type
 <FILE>gtkframe</FILE>
 <TITLE>GtkFrame</TITLE>
 GtkFrame
+GtkFrameClass
 gtk_frame_new
 gtk_frame_set_label
 gtk_frame_set_label_widget
@@ -1676,6 +1691,7 @@ gtk_frame_get_type
 <FILE>gtkhandlebox</FILE>
 <TITLE>GtkHandleBox</TITLE>
 GtkHandleBox
+GtkHandleBoxClass
 gtk_handle_box_new
 gtk_handle_box_set_shadow_type
 gtk_handle_box_set_handle_position
@@ -1931,6 +1947,7 @@ GtkImageGIconData
 <FILE>gtkimagemenuitem</FILE>
 <TITLE>GtkImageMenuItem</TITLE>
 GtkImageMenuItem
+GtkImageMenuItemClass
 gtk_image_menu_item_set_image
 gtk_image_menu_item_get_image
 gtk_image_menu_item_new
@@ -1943,7 +1960,6 @@ gtk_image_menu_item_get_always_show_image
 gtk_image_menu_item_set_always_show_image
 gtk_image_menu_item_set_accel_group
 <SUBSECTION Standard>
-GtkImageMenuItemClass
 GTK_IMAGE_MENU_ITEM
 GTK_IMAGE_MENU_ITEM_CLASS
 GTK_IMAGE_MENU_ITEM_GET_CLASS
@@ -2135,6 +2151,7 @@ gtk_layout_get_type
 <FILE>gtklinkbutton</FILE>
 <TITLE>GtkLinkButton</TITLE>
 GtkLinkButton
+GtkLinkButtonClass
 gtk_link_button_new
 gtk_link_button_new_with_label
 gtk_link_button_get_uri
@@ -2149,7 +2166,6 @@ GTK_IS_LINK_BUTTON
 GTK_LINK_BUTTON_CLASS
 GTK_IS_LINK_BUTTON_CLASS
 GTK_LINK_BUTTON_GET_CLASS
-GtkLinkButtonClass
 <SUBSECTION Private>
 GtkLinkButtonPrivate
 gtk_link_button_get_type
@@ -2230,8 +2246,12 @@ GtkMenuButton
 gtk_menu_button_new
 gtk_menu_button_set_popup
 gtk_menu_button_get_popup
+gtk_menu_button_set_popover
+gtk_menu_button_get_popover
 gtk_menu_button_set_menu_model
 gtk_menu_button_get_menu_model
+gtk_menu_button_set_use_popover
+gtk_menu_button_get_use_popover
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
 gtk_menu_button_set_align_widget
@@ -2252,6 +2272,7 @@ gtk_menu_button_get_type
 <FILE>gtkmenuitem</FILE>
 <TITLE>GtkMenuItem</TITLE>
 GtkMenuItem
+GtkMenuItemClass
 gtk_menu_item_new
 gtk_menu_item_new_with_label
 gtk_menu_item_new_with_mnemonic
@@ -2520,6 +2541,7 @@ gtk_numerable_icon_get_type
 <FILE>gtkoffscreenwindow</FILE>
 <TITLE>GtkOffscreenWindow</TITLE>
 GtkOffscreenWindow
+GtkOffscreenWindowClass
 gtk_offscreen_window_new
 gtk_offscreen_window_get_surface
 gtk_offscreen_window_get_pixbuf
@@ -2579,6 +2601,8 @@ gtk_places_sidebar_list_shortcuts
 gtk_places_sidebar_get_nth_bookmark
 gtk_places_sidebar_get_show_connect_to_server
 gtk_places_sidebar_set_show_connect_to_server
+gtk_places_sidebar_get_local_only
+gtk_places_sidebar_set_local_only
 <SUBSECTION Standard>
 GTK_PLACES_SIDEBAR
 GTK_IS_PLACES_SIDEBAR
@@ -3078,6 +3102,7 @@ gtk_scrollbar_get_type
 <FILE>gtkscrolledwindow</FILE>
 <TITLE>GtkScrolledWindow</TITLE>
 GtkScrolledWindow
+GtkScrolledWindowClass
 gtk_scrolled_window_new
 gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_get_vadjustment
@@ -3118,6 +3143,7 @@ GtkScrolledWindowPrivate
 <FILE>gtksearchbar</FILE>
 <TITLE>GtkSearchBar</TITLE>
 GtkSearchBar
+GtkSearchBarClass
 gtk_search_bar_new
 gtk_search_bar_connect_entry
 gtk_search_bar_get_search_mode
@@ -3173,9 +3199,9 @@ GtkSeparatorPrivate
 <FILE>gtkseparatormenuitem</FILE>
 <TITLE>GtkSeparatorMenuItem</TITLE>
 GtkSeparatorMenuItem
+GtkSeparatorMenuItemClass
 gtk_separator_menu_item_new
 <SUBSECTION Standard>
-GtkSeparatorMenuItemClass
 GTK_SEPARATOR_MENU_ITEM
 GTK_SEPARATOR_MENU_ITEM_CLASS
 GTK_SEPARATOR_MENU_ITEM_GET_CLASS
@@ -3470,6 +3496,7 @@ gtk_table_get_type
 <FILE>gtktearoffmenuitem</FILE>
 <TITLE>GtkTearoffMenuItem</TITLE>
 GtkTearoffMenuItem
+GtkTearoffMenuItemClass
 gtk_tearoff_menu_item_new
 <SUBSECTION Standard>
 GTK_TEAROFF_MENU_ITEM
@@ -3967,6 +3994,7 @@ GtkToolbarPrivate
 <FILE>gtktoolitem</FILE>
 <TITLE>GtkToolItem</TITLE>
 GtkToolItem
+GtkToolItemClass
 gtk_tool_item_new
 gtk_tool_item_set_homogeneous
 gtk_tool_item_get_homogeneous
@@ -4013,6 +4041,7 @@ GtkToolItemPrivate
 <FILE>gtkseparatortoolitem</FILE>
 <TITLE>GtkSeparatorToolItem</TITLE>
 GtkSeparatorToolItem
+GtkSeparatorToolItemClass
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
 gtk_separator_tool_item_get_draw
@@ -4034,6 +4063,7 @@ GtkSeparatorToolItemPrivate
 <FILE>gtktoolbutton</FILE>
 <TITLE>GtkToolButton</TITLE>
 GtkToolButton
+GtkToolButtonClass
 gtk_tool_button_new
 gtk_tool_button_new_from_stock
 gtk_tool_button_set_label
@@ -4066,6 +4096,7 @@ GtkToolButtonPrivate
 <FILE>gtkmenutoolbutton</FILE>
 <TITLE>GtkMenuToolButton</TITLE>
 GtkMenuToolButton
+GtkMenuToolButtonClass
 gtk_menu_tool_button_new
 gtk_menu_tool_button_new_from_stock
 gtk_menu_tool_button_set_menu
@@ -4074,7 +4105,6 @@ gtk_menu_tool_button_set_arrow_tooltip_text
 gtk_menu_tool_button_set_arrow_tooltip_markup
 
 <SUBSECTION Standard>
-GtkMenuToolButtonClass
 GTK_TYPE_MENU_TOOL_BUTTON
 GTK_MENU_TOOL_BUTTON
 GTK_MENU_TOOL_BUTTON_CLASS
@@ -4114,13 +4144,13 @@ gtk_radio_tool_button_get_type
 <FILE>gtktoggletoolbutton</FILE>
 <TITLE>GtkToggleToolButton</TITLE>
 GtkToggleToolButton
+GtkToggleToolButtonClass
 gtk_toggle_tool_button_new
 gtk_toggle_tool_button_new_from_stock
 gtk_toggle_tool_button_set_active
 gtk_toggle_tool_button_get_active
 
 <SUBSECTION Standard>
-GtkToggleToolButtonClass
 GTK_TYPE_TOGGLE_TOOL_BUTTON
 GTK_TOGGLE_TOOL_BUTTON
 GTK_TOGGLE_TOOL_BUTTON_CLASS
@@ -4137,6 +4167,7 @@ GtkToggleToolButtonPrivate
 <FILE>gtktoolitemgroup</FILE>
 <TITLE>GtkToolItemGroup</TITLE>
 GtkToolItemGroup
+GtkToolItemGroupClass
 gtk_tool_item_group_get_collapsed
 gtk_tool_item_group_get_drop_item
 gtk_tool_item_group_get_ellipsize
@@ -4156,7 +4187,6 @@ gtk_tool_item_group_set_label_widget
 gtk_tool_item_group_set_header_relief
 
 <SUBSECTION Standard>
-GtkToolItemGroupClass
 GTK_TOOL_ITEM_GROUP
 GTK_IS_TOOL_ITEM_GROUP
 GTK_TYPE_TOOL_ITEM_GROUP
@@ -4173,6 +4203,7 @@ gtk_tool_item_group_get_type
 <FILE>gtktoolpalette</FILE>
 <TITLE>GtkToolPalette</TITLE>
 GtkToolPalette
+GtkToolPaletteClass
 gtk_tool_palette_new
 gtk_tool_palette_get_exclusive
 gtk_tool_palette_set_exclusive
@@ -4198,7 +4229,6 @@ gtk_tool_palette_get_hadjustment
 gtk_tool_palette_get_vadjustment
 
 <SUBSECTION Standard>
-GtkToolPaletteClass
 GTK_TOOL_PALETTE
 GTK_IS_TOOL_PALETTE
 GTK_TYPE_TOOL_PALETTE
@@ -4371,6 +4401,7 @@ gtk_tree_model_filter_get_type
 <FILE>gtktreeselection</FILE>
 <TITLE>GtkTreeSelection</TITLE>
 GtkTreeSelection
+GtkTreeSelectionClass
 GtkTreeSelectionFunc
 GtkTreeSelectionForeachFunc
 gtk_tree_selection_set_mode
@@ -4410,6 +4441,8 @@ gtk_tree_selection_get_type
 GtkTreeSortable
 GtkTreeSortableIface
 GtkTreeIterCompareFunc
+GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID
+GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID
 gtk_tree_sortable_sort_column_changed
 gtk_tree_sortable_get_sort_column_id
 gtk_tree_sortable_set_sort_column_id
@@ -4678,7 +4711,6 @@ gtk_tree_view_get_tooltip_column
 gtk_tree_view_set_tooltip_column
 
 <SUBSECTION Standard>
-GtkTreeSelectionClass
 GTK_TREE_VIEW
 GTK_IS_TREE_VIEW
 GTK_TYPE_TREE_VIEW
@@ -4693,6 +4725,7 @@ gtk_tree_view_get_type
 <FILE>gtkcellview</FILE>
 <TITLE>GtkCellView</TITLE>
 GtkCellView
+GtkCellViewClass
 gtk_cell_view_new
 gtk_cell_view_new_with_context
 gtk_cell_view_new_with_text
@@ -4710,7 +4743,6 @@ gtk_cell_view_get_draw_sensitive
 gtk_cell_view_set_fit_model
 gtk_cell_view_get_fit_model
 <SUBSECTION Standard>
-GtkCellViewClass
 GTK_TYPE_CELL_VIEW
 GTK_CELL_VIEW
 GTK_CELL_VIEW_CLASS
@@ -5155,6 +5187,7 @@ gtk_vbox_get_type
 <FILE>gtkviewport</FILE>
 <TITLE>GtkViewport</TITLE>
 GtkViewport
+GtkViewportClass
 gtk_viewport_new
 gtk_viewport_get_hadjustment
 gtk_viewport_get_vadjustment
@@ -5396,7 +5429,6 @@ gtk_widget_get_display
 gtk_widget_get_root_window
 gtk_widget_get_screen
 gtk_widget_has_screen
-gtk_widget_get_scale_factor
 gtk_widget_get_size_request
 gtk_widget_set_child_visible
 gtk_widget_set_size_request
@@ -5465,9 +5497,6 @@ gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
 gtk_widget_get_modifier_mask
 gtk_widget_insert_action_group
-gtk_widget_add_tick_callback
-gtk_widget_remove_tick_callback
-gtk_widget_get_frame_clock
 gtk_widget_get_opacity
 gtk_widget_set_opacity
 
@@ -5557,6 +5586,7 @@ gtk_requisition_get_type
 <FILE>gtkwindow</FILE>
 <TITLE>GtkWindow</TITLE>
 GtkWindow
+GtkWindowClass
 gtk_window_new
 gtk_window_set_title
 gtk_window_set_wmclass
@@ -6188,6 +6218,7 @@ gtk_gradient_get_type
 <TITLE>GtkStyle</TITLE>
 GTK_STYLE_ATTACHED
 GtkStyle
+GtkStyleClass
 gtk_style_new
 gtk_style_copy
 gtk_style_attach
@@ -6228,7 +6259,6 @@ GtkRcProperty
 GtkRcPropertyParser
 
 <SUBSECTION Standard>
-GtkStyleClass
 GTK_STYLE
 GTK_IS_STYLE
 GTK_TYPE_STYLE
@@ -6244,6 +6274,7 @@ GtkThemeEngine
 <FILE>gtkrc</FILE>
 <TITLE>Resource Files</TITLE>
 GtkRcStyle
+GtkRcStyleClass
 GtkRcFlags
 GtkRcTokenType
 gtk_rc_scanner_new
@@ -6271,7 +6302,6 @@ gtk_rc_style_new
 gtk_rc_style_copy
 
 <SUBSECTION Standard>
-GtkRcStyleClass
 GTK_RC_STYLE
 GTK_IS_RC_STYLE
 GTK_TYPE_RC_STYLE
@@ -6470,6 +6500,7 @@ GtkAccelFlags
 GtkArrowPlacement
 GtkArrowType
 GtkAttachOptions
+GtkBaselinePosition
 GtkButtonBoxStyle
 GtkCornerType
 GtkDeleteType
@@ -6630,6 +6661,7 @@ GTK_STOCK_ZOOM_OUT
 <TITLE>GtkIconTheme</TITLE>
 GtkIconInfo
 GtkIconTheme
+GtkIconThemeClass
 GtkIconLookupFlags
 GTK_ICON_THEME_ERROR
 GtkIconThemeError
@@ -6682,7 +6714,6 @@ gtk_icon_info_get_attach_points
 gtk_icon_info_get_display_name
 gtk_icon_info_is_symbolic
 <SUBSECTION Standard>
-GtkIconThemeClass
 GTK_ICON_THEME
 GTK_IS_ICON_THEME
 GTK_TYPE_ICON_THEME
@@ -6702,6 +6733,7 @@ gtk_icon_theme_error_quark
 <TITLE>Themeable Stock Images</TITLE>
 GtkIconSource
 GtkIconFactory
+GtkIconFactoryClass
 GtkIconSet
 GtkIconSize
 gtk_icon_source_copy
@@ -6748,7 +6780,6 @@ gtk_icon_source_set_size_wildcarded
 gtk_icon_source_set_state
 gtk_icon_source_set_state_wildcarded
 <SUBSECTION Standard>
-GtkIconFactoryClass
 GTK_TYPE_ICON_FACTORY
 GTK_ICON_FACTORY
 GTK_IS_ICON_FACTORY
@@ -6769,6 +6800,7 @@ gtk_icon_source_get_type
 <FILE>gtkprintoperation</FILE>
 <TITLE>High-level Printing API</TITLE>
 GtkPrintOperation
+GtkPrintOperationClass
 GtkPrintStatus
 GtkPrintOperationAction
 GtkPrintOperationResult
@@ -6825,7 +6857,6 @@ GTK_IS_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW
 GTK_PRINT_OPERATION_PREVIEW_GET_IFACE
 GTK_TYPE_PRINT_OPERATION_PREVIEW
-GtkPrintOperationClass
 GtkPrintOperationPreviewIface
 
 <SUBSECTION Private>
@@ -7229,6 +7260,7 @@ gtk_print_job_get_type
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
+GtkPageSetupUnixDialogClass
 gtk_page_setup_unix_dialog_new
 gtk_page_setup_unix_dialog_set_page_setup
 gtk_page_setup_unix_dialog_get_page_setup
@@ -7236,7 +7268,6 @@ gtk_page_setup_unix_dialog_set_print_settings
 gtk_page_setup_unix_dialog_get_print_settings
 
 <SUBSECTION Standard>
-GtkPageSetupUnixDialogClass
 GTK_TYPE_PAGE_SETUP_UNIX_DIALOG
 GTK_PAGE_SETUP_UNIX_DIALOG
 GTK_PAGE_SETUP_UNIX_DIALOG_CLASS
@@ -7275,6 +7306,7 @@ gtk_test_widget_wait_for_draw
 <FILE>filesystem</FILE>
 <TITLE>Filesystem utilities</TITLE>
 GtkMountOperation
+GtkMountOperationClass
 gtk_mount_operation_new
 gtk_mount_operation_is_showing
 gtk_mount_operation_set_parent
@@ -7283,7 +7315,6 @@ gtk_mount_operation_set_screen
 gtk_mount_operation_get_screen
 gtk_show_uri
 <SUBSECTION Standard>
-GtkMountOperationClass
 GTK_IS_MOUNT_OPERATION
 GTK_IS_MOUNT_OPERATION_CLASS
 GTK_MOUNT_OPERATION
@@ -7320,6 +7351,7 @@ gtk_orientable_get_type
 <FILE>gtkapplication</FILE>
 <TITLE>GtkApplication</TITLE>
 GtkApplication
+GtkApplicationClass
 
 gtk_application_new
 gtk_application_add_window
@@ -7348,7 +7380,6 @@ gtk_application_get_accels_for_action
 gtk_application_set_accels_for_action
 
 <SUBSECTION Standard>
-GtkApplicationClass
 GTK_TYPE_APPLICATION
 GTK_APPLICATION
 GTK_APPLICATION_CLASS
@@ -7364,13 +7395,13 @@ GtkApplicationPrivate
 <FILE>gtkapplicationwindow</FILE>
 <TITLE>GtkApplicationWindow</TITLE>
 GtkApplicationWindow
+GtkApplicationWindowClass
 gtk_application_window_new
 gtk_application_window_set_show_menubar
 gtk_application_window_get_show_menubar
 gtk_application_window_get_id
 
 <SUBSECTION Standard>
-GtkApplicationWindowClass
 GTK_TYPE_APPLICATION_WINDOW
 GTK_APPLICATION_WINDOW
 GTK_APPLICATION_WINDOW_CLASS
@@ -7413,6 +7444,7 @@ GTK_TYPE_ACTIONABLE
 <FILE>gtkgrid</FILE>
 <TITLE>GtkGrid</TITLE>
 GtkGrid
+GtkGridClass
 gtk_grid_new
 gtk_grid_attach
 gtk_grid_attach_next_to
@@ -7436,7 +7468,6 @@ gtk_grid_get_row_baseline_position
 gtk_grid_set_row_baseline_position
 
 <SUBSECTION Standard>
-GtkGridClass
 GTK_TYPE_GRID
 GTK_GRID
 GTK_GRID_CLASS
@@ -7452,12 +7483,12 @@ gtk_grid_get_type
 <SECTION>
 <FILE>gtkswitch</FILE>
 GtkSwitch
+GtkSwitchClass
 gtk_switch_new
 gtk_switch_set_active
 gtk_switch_get_active
 
 <SUBSECTION Standard>
-GtkSwitchClass
 GTK_TYPE_SWITCH
 GTK_SWITCH
 GTK_SWITCH_CLASS
@@ -7500,6 +7531,7 @@ GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS
 <FILE>gtkappchooserbutton</FILE>
 <TITLE>GtkAppChooserButton</TITLE>
 GtkAppChooserButton
+GtkAppChooserButtonClass
 gtk_app_chooser_button_new
 gtk_app_chooser_button_append_custom_item
 gtk_app_chooser_button_append_separator
@@ -7512,7 +7544,6 @@ gtk_app_chooser_button_get_heading
 gtk_app_chooser_button_set_heading
 
 <SUBSECTION Standard>
-GtkAppChooserButtonClass
 GTK_TYPE_APP_CHOOSER_BUTTON
 GTK_APP_CHOOSER_BUTTON
 GTK_APP_CHOOSER_BUTTON_CLASS
@@ -7529,6 +7560,7 @@ gtk_app_chooser_button_get_type
 <FILE>gtkappchooserdialog</FILE>
 <TITLE>GtkAppChooserDialog</TITLE>
 GtkAppChooserDialog
+GtkAppChooserDialogClass
 gtk_app_chooser_dialog_new
 gtk_app_chooser_dialog_new_for_content_type
 gtk_app_chooser_dialog_get_widget
@@ -7536,7 +7568,6 @@ gtk_app_chooser_dialog_set_heading
 gtk_app_chooser_dialog_get_heading
 
 <SUBSECTION Standard>
-GtkAppChooserDialogClass
 GTK_TYPE_APP_CHOOSER_DIALOG
 GTK_APP_CHOOSER_DIALOG
 GTK_APP_CHOOSER_DIALOG_CLASS
@@ -7553,6 +7584,7 @@ gtk_app_chooser_dialog_get_type
 <FILE>gtkappchooserwidget</FILE>
 <TITLE>GtkAppChooserWidget</TITLE>
 GtkAppChooserWidget
+GtkAppChooserWidgetClass
 gtk_app_chooser_widget_new
 gtk_app_chooser_widget_set_show_default
 gtk_app_chooser_widget_get_show_default
@@ -7568,7 +7600,6 @@ gtk_app_chooser_widget_set_default_text
 gtk_app_chooser_widget_get_default_text
 
 <SUBSECTION Standard>
-GtkAppChooserWidgetClass
 GTK_TYPE_APP_CHOOSER_WIDGET
 GTK_APP_CHOOSER_WIDGET
 GTK_APP_CHOOSER_WIDGET_CLASS
@@ -7585,13 +7616,13 @@ gtk_app_chooser_widget_get_type
 <FILE>gtklockbutton</FILE>
 <TITLE>GtkLockButton</TITLE>
 GtkLockButton
+GtkLockButtonClass
 
 gtk_lock_button_new
 gtk_lock_button_get_permission
 gtk_lock_button_set_permission
 
 <SUBSECTION Standard>
-GtkLockButtonClass
 GTK_TYPE_LOCK_BUTTON
 GTK_LOCK_BUTTON
 GTK_IS_LOCK_BUTTON
@@ -7607,6 +7638,7 @@ GtkLockButtonPrivate
 <FILE>gtkoverlay</FILE>
 <TITLE>GtkOverlay</TITLE>
 GtkOverlay
+GtkOverlayClass
 
 gtk_overlay_new
 gtk_overlay_add_overlay
@@ -7618,7 +7650,6 @@ GTK_OVERLAY_CLASS
 GTK_IS_OVERLAY
 GTK_IS_OVERLAY_CLASS
 GTK_OVERLAY_GET_CLASS
-GtkOverlayClass
 
 <SUBSECTION Private>
 gtk_overlay_get_type
@@ -7649,6 +7680,7 @@ gtk_color_chooser_get_type
 <FILE>gtkcolorchooserwidget</FILE>
 <TITLE>GtkColorChooserWidget</TITLE>
 GtkColorChooserWidget
+GtkColorChooserWidgetClass
 gtk_color_chooser_widget_new
 
 <SUBSECTION Standard>
@@ -7744,6 +7776,7 @@ GtkStack
 gtk_stack_new
 gtk_stack_add_named
 gtk_stack_add_titled
+gtk_stack_get_child_by_name
 gtk_stack_set_visible_child
 gtk_stack_get_visible_child
 gtk_stack_set_visible_child_name
@@ -7772,6 +7805,7 @@ gtk_stack_switcher_get_stack
 <FILE>gtkrevealer</FILE>
 <TITLE>GtkRevealer</TITLE>
 GtkRevealer
+GtkRevealerClass
 gtk_revealer_new
 gtk_revealer_get_reveal_child
 gtk_revealer_set_reveal_child
@@ -7831,3 +7865,20 @@ gtk_flow_box_child_get_index
 gtk_flow_box_child_is_selected
 gtk_flow_box_child_changed
 </SECTION>
+
+<SECTION>
+<FILE>gtkpopover</FILE>
+<TITLE>GtkPopover</TITLE>
+GtkPopover
+gtk_popover_new
+gtk_popover_new_from_model
+gtk_popover_bind_model
+gtk_popover_set_relative_to
+gtk_popover_get_relative_to
+gtk_popover_set_pointing_to
+gtk_popover_get_pointing_to
+gtk_popover_set_position
+gtk_popover_get_position
+gtk_popover_set_modal
+gtk_popover_get_modal
+</SECTION>

docs/reference/gtk/gtk3.types.in

@@ -126,6 +126,7 @@ gtk_paned_get_type
 gtk_paper_size_get_type
 gtk_places_sidebar_get_type
 @ENABLE_ON_X11@gtk_plug_get_type
+gtk_popover_get_type
 @DISABLE_ON_W32@gtk_printer_get_type
 gtk_print_context_get_type
 @DISABLE_ON_W32@gtk_print_job_get_type

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

@@ -935,7 +935,7 @@ gdk_window_add_filter (NULL, message_filter, NULL);
       In GTK+ 3, GDK can be built with multiple backends, and currently
       used backend has to be determined at runtime, typically using
       type-check macros on a #GdkDisplay or #GdkWindow. You still need
-      to use the #GDK_WINDOWING macros to only compile code referring
+      to use the GDK_WINDOWING macros to only compile code referring
       to supported backends:
       <informalexample><programlisting>
 #ifdef GDK_WINDOWING_X11
@@ -1001,7 +1001,7 @@ AM_CONDITIONAL(BUILD_x11, [test "x$have_x11" = "xyes"])
       The widget is expected to draw itself with its allocated size, which
       is available via the new gtk_widget_get_allocated_width() and
       gtk_widget_get_allocated_height() functions. It is not necessary to
-      check for GTK_WIDGET_IS_DRAWABLE(), since GTK+ already does this check
+      check for gtk_widget_is_drawable(), since GTK+ already does this check
       before emitting the #GtkWidget::draw signal.
     </para>
     <para>
@@ -1121,7 +1121,7 @@ gtk_arrow_draw (GtkWidget *widget,
     </para>
     <para>
       If you experience sizing problems with widgets in ported code,
-      carefully check the #GtkBox::expand and #GtkBox::fill flags of your
+      carefully check the #GtkBox expand and #GtkBox fill child properties of your
       boxes.
     </para>
   </section>
@@ -1141,7 +1141,7 @@ gtk_arrow_draw (GtkWidget *widget,
       by the #GtkScrollable interface which must be implemented by a widget
       that wants to be placed in a #GtkScrolledWindow. Instead of emitting
       ::set-scroll-adjustments, the scrolled window simply sets the
-      #GtkScrollable::hadjustment and #GtkScrollable::vadjustment properties.
+      #GtkScrollable:hadjustment and #GtkScrollable:vadjustment properties.
     </para>
   </section>
 

docs/reference/gtk/migrating-GtkGrid.xml

@@ -184,7 +184,7 @@
       you construct it. This property specifies the space that
       separates the children from each other. Additionally, you
       can specify extra space to put around each child individually,
-      using the #GtkBox:padding child property.
+      using the #GtkBox padding child property.
     </para>
 
     <para>

docs/reference/gtk/migrating-GtkStyleContext.xml

@@ -143,7 +143,7 @@
     </para>
 
     <para>
-      The detail string available in #GtkStyle-based engines has been
+      The detail string available in #GtkStyle<!-- -->-based engines has been
       replaced by widget regions and style classes. Regions are a way for
       complex widgets to associate different styles with different areas,
       such as even and odd rows in a treeview. Style classes allow sharing
@@ -162,7 +162,7 @@
     <title>Extending the CSS parser</title>
 
     <para>
-      In #GtkStyle-based engines, #GtkRCStyle provided ways to extend the
+      In #GtkStyle<!-- -->-based engines, GtkRCStyle provided ways to extend the
       gtkrc parser with engine-specific extensions. This has been replaced
       by gtk_theming_engine_register_property(), which lets a theme engine
       register new properties with an arbitrary type. While there is built-in
@@ -186,7 +186,7 @@
 
     <para>
       Widget style properties also follow a similar syntax, with the widget
-      type name used as a prefix. For example, the #GtkWidget:focus-line-width
+      type name used as a prefix. For example, the #GtkWidget focus-line-width
       style property can be modified in CSS as
       <literal>-GtkWidget-focus-line-width</literal>.
     </para>
@@ -633,7 +633,7 @@
       <listitem>
         <para>
           If your container renders child widgets within different regions,
-          make it implement GtkContainer::get_path_for_child(). This function
+          make it implement #GtkContainer get_path_for_child(<!-- -->). This function
           lets containers assign a special #GtkWidgetPath to child widgets
           depending on their role/region. This is necessary to extend the
           concept above throughout the widget hierarchy.

docs/reference/gtk/migrating-checklist.sgml

@@ -28,7 +28,7 @@
     <para>
       The #GtkWidget::popup-menu signal instructs the widget for which
       it is emitted to create a context-sensitive popup menu. By default,
-      the <link linkend="gtk-bindings">key binding mechanism</link> is set to
+      the <link linkend="gtk-bindings-install">key binding mechanism</link> is set to
       emit this signal when the
       <keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo>
       or <keycap>Menu</keycap> keys are pressed while a widget has the
@@ -142,7 +142,7 @@ my_widget_popup_menu_handler (GtkWidget *widget)
         able to take the keyboard focus.  In general, widgets should
         be fully usable through the keyboard and not just the mouse.
         The very first step of this is to ensure that your widget
-        turns on the %GTK_CAN_FOCUS <link linkend="gtkwidgetflags">flag</link>.
+        can receive focus, using gtk_widget_set_can_focus().
       </para>
     </note>
   </section>

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

@@ -96,7 +96,7 @@ main (int argc, char *argv[])
 </example>
   <section><title>Uniqueness</title>
     <para>
-      Instead of creating a #UniqueApp with unique_app_new(), create
+      Instead of creating a UniqueApp with unique_app_new(<!-- -->), create
       a #GApplication with g_application_new() or a #GtkApplication
       with gtk_application_new(). The @name that was used with
       unique_app_new() is very likely usable as the @application_id for
@@ -116,12 +116,12 @@ main (int argc, char *argv[])
   <section><title>Commands and Messages</title>
     <para>
       libunique lets you send messages with commands to a running
-      instance using unique_app_send_message(). The commands can be either
+      instance using unique_app_send_message(<!-- -->). The commands can be either
       predefined or custom. Some of the predefined libunique commands have
-      equivalents in GApplication. Instead of sending the %UNIQUE_ACTIVATE
+      equivalents in GApplication. Instead of sending the UNIQUE_ACTIVATE
       command, call g_application_activate(), instead of sending the
-      %UNIQUE_OPEN command, call g_application_open(). The
-      %UNIQUE_NEW and %UNIQUE_CLOSE and user-defined commands don't
+      UNIQUE_OPEN command, call g_application_open(). The
+      UNIQUE_NEW and UNIQUE_CLOSE and user-defined commands don't
       have direct replacement at this time.
     </para>
 

docs/reference/gtk/question_index.sgml

@@ -186,9 +186,9 @@ or Linux system with gettext installed, type <literal>info gettext</literal>
 to read the documentation.
 </para>
 <para>
-The short checklist on how to use gettext is: call bindtextdomain() so
+The short checklist on how to use gettext is: call <literal>bindtextdomain(<!-- -->)</literal> so
 gettext can find the files containing your translations, call textdomain()
-to set the default translation domain, call bind_textdomain_codeset() to
+to set the default translation domain, call <literal>bind_textdomain_codeset(<!-- -->)</literal> to
 request that all translated strings are returned in UTF-8, then call
 gettext() to look up each string to be translated in the default domain.
 </para>
@@ -360,7 +360,7 @@ g_free (text);
 </para>
 <para>
 If you are using gettext() to localize your application, you need to
-call bind_textdomain_codeset() to ensure that translated strings are
+call <literal>bind_textdomain_codeset(<!-- -->)</literal> to ensure that translated strings are
 returned in UTF-8 encoding.
 </para>
 </answer>
@@ -522,7 +522,7 @@ macro ?
 <answer>
 <para>
 The <literal>GTK_TYPE_BLAH</literal> macros are defined as calls to
-<literal>gtk_blah_get_type()</literal>, and the <literal>_get_type()</literal> i
+<literal>gtk_blah_get_type(<!-- -->)</literal>, and the <literal>_get_type(<!-- -->)</literal>
 functions are declared as %G_GNUC_CONST which allows the compiler to optimize
 the call away if it appears that the value is not being used.
 </para>

docs/tools/shooter.c

@@ -25,6 +25,8 @@
 #define _(x) (x)
 #endif
 
+static void queue_show (void);
+
 static Window
 find_toplevel_window (Window xid)
 {
@@ -52,8 +54,12 @@ static GdkPixbuf *
 add_border_to_shot (GdkPixbuf *pixbuf)
 {
   GdkPixbuf *retval;
+  GdkColorspace colorspace;
+  int bits;
 
-  retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+  colorspace = gdk_pixbuf_get_colorspace (pixbuf);
+  bits = gdk_pixbuf_get_bits_per_sample (pixbuf);
+  retval = gdk_pixbuf_new (colorspace, TRUE, bits,
 			   gdk_pixbuf_get_width (pixbuf) + 2,
 			   gdk_pixbuf_get_height (pixbuf) + 2);
 
@@ -76,8 +82,12 @@ remove_shaped_area (GdkPixbuf *pixbuf,
   XRectangle *rectangles;
   int rectangle_count, rectangle_order;
   int i;
+  GdkColorspace colorspace;
+  int bits;
 
-  retval = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+  colorspace = gdk_pixbuf_get_colorspace (pixbuf);
+  bits = gdk_pixbuf_get_bits_per_sample (pixbuf);
+  retval = gdk_pixbuf_new (colorspace, TRUE, bits,
 			   gdk_pixbuf_get_width (pixbuf),
 			   gdk_pixbuf_get_height (pixbuf));
   
@@ -116,9 +126,15 @@ remove_shaped_area (GdkPixbuf *pixbuf,
   return retval;
 }
 
+typedef enum {
+  DECOR_NONE,
+  DECOR_FRAME,
+  DECOR_WINDOW_FRAME
+} DecorationType;
+
 static GdkPixbuf *
-take_window_shot (Window   child,
-		  gboolean include_decoration)
+take_window_shot (Window         child,
+                  DecorationType decor)
 {
   GdkWindow *window;
   Window xid;
@@ -127,9 +143,9 @@ take_window_shot (Window   child,
   gint width, height;
 
   GdkPixbuf *tmp, *tmp2;
-  GdkPixbuf *retval;
+  GdkPixbuf *retval = NULL;
 
-  if (include_decoration)
+  if (decor == DECOR_WINDOW_FRAME)
     xid = find_toplevel_window (child);
   else
     xid = child;
@@ -163,24 +179,120 @@ take_window_shot (Window   child,
   tmp = gdk_pixbuf_get_from_window (window,
 				    x, y, width, height);
 
-  if (include_decoration)
-    tmp2 = remove_shaped_area (tmp, xid);
-  else
-    tmp2 = add_border_to_shot (tmp);
+  if (tmp != NULL)
+    {
+      if (decor == DECOR_WINDOW_FRAME)
+        tmp2 = remove_shaped_area (tmp, xid);
+      else if (decor == DECOR_FRAME)
+        tmp2 = add_border_to_shot (tmp);
+      else
+        tmp2 = g_object_ref (tmp);
 
-  retval = create_shadowed_pixbuf (tmp2);
-  g_object_unref (tmp);
-  g_object_unref (tmp2);
+      g_object_unref (tmp);
+
+      if (tmp2 != NULL)
+        {
+          retval = create_shadowed_pixbuf (tmp2);
+          g_object_unref (tmp2);
+        }
+    }
 
   return retval;
 }
 
+static GList *toplevels;
+static guint shot_id;
+static gboolean
+
+window_is_csd (GdkWindow *window)
+{
+  gboolean set;
+  GdkWMDecoration decorations = 0;
+
+  /* FIXME: is this accurate? */
+  set = gdk_window_get_decorations (window, &decorations);
+  return (set && (decorations == 0));
+}
+
+static gboolean
+shoot_one (WidgetInfo *info)
+{
+  GdkWindow *window;
+  XID id;
+  GdkPixbuf *screenshot = NULL;
+  DecorationType decor = DECOR_FRAME;
+
+  if (g_list_find (toplevels, info) == NULL)
+    {
+      g_warning ("Widget not found in queue");
+      gtk_main_quit ();
+    }
+
+  window = gtk_widget_get_window (info->window);
+  id = gdk_x11_window_get_xid (window);
+  if (window_is_csd (window))
+    decor = (info->include_decorations) ? DECOR_NONE : DECOR_WINDOW_FRAME;
+  screenshot = take_window_shot (id, decor);
+  if (screenshot != NULL)
+    {
+      char *filename;
+      filename = g_strdup_printf ("./%s.png", info->name);
+      gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
+      g_free (filename);
+      g_object_unref (screenshot);
+    }
+  else
+    {
+      g_warning ("unable to save shot of %s", info->name);
+    }
+  gtk_widget_destroy (info->window);
+
+  shot_id = 0;
+
+  /* remove from the queue and try to load up another */
+  toplevels = g_list_remove (toplevels, info);
+  if (toplevels == NULL)
+    gtk_main_quit ();
+  else
+    queue_show ();
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+on_show (WidgetInfo *info)
+{
+  if (shot_id != 0)
+    return;
+
+  shot_id = g_timeout_add (500, (GSourceFunc) shoot_one, info);
+}
+
+static gboolean
+show_one (void)
+{
+  WidgetInfo *info = toplevels->data;
+
+  g_message ("shooting %s", info->name);
+
+  g_signal_connect_swapped (info->window,
+                            "show",
+                            G_CALLBACK (on_show),
+                            info);
+
+  gtk_widget_show (info->window);
+
+  return G_SOURCE_REMOVE;
+}
+
+static void
+queue_show (void)
+{
+  g_idle_add ((GSourceFunc) show_one, NULL);
+}
+
 int main (int argc, char **argv)
 {
-  GList *toplevels;
-  GdkPixbuf *screenshot = NULL;
-  GList *node;
-
   /* If there's no DISPLAY, we silently error out.  We don't want to break
    * headless builds. */
   if (! gtk_init_check (&argc, &argv))
@@ -188,45 +300,8 @@ int main (int argc, char **argv)
 
   toplevels = get_all_widgets ();
 
-  for (node = toplevels; node; node = g_list_next (node))
-    {
-      GtkAllocation allocation;
-      GdkWindow *window;
-      WidgetInfo *info;
-      XID id;
-      char *filename;
-
-      info = node->data;
-
-      gtk_widget_show (info->window);
-
-      window = gtk_widget_get_window (info->window);
-      gtk_widget_get_allocation (info->window, &allocation);
-
-      gtk_widget_show_now (info->window);
-      gtk_widget_queue_draw_area (info->window,
-                                  allocation.x, allocation.y,
-                                  allocation.width, allocation.height);
-      gdk_window_process_updates (window, TRUE);
-
-      while (gtk_events_pending ())
-	{
-	  gtk_main_iteration ();
-	}
-      sleep (1);
-
-      while (gtk_events_pending ())
-	{
-	  gtk_main_iteration ();
-	}
-
-      id = gdk_x11_window_get_xid (window);
-      screenshot = take_window_shot (id, info->include_decorations);
-      filename = g_strdup_printf ("./%s.png", info->name);
-      gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
-      g_free(filename);
-      gtk_widget_hide (info->window);
-    }
+  queue_show ();
+  gtk_main ();
 
   return 0;
 }