beginings of an xcb gdk backend

This is just a private convenience function, and exporting _-prefixed
functions doesn't work with our libtool setup. Just do the 3 line
calculation in gail.

NEWS

@@ -1,3 +1,54 @@
+Overview of Changes from GTK+ 2.91.3 to 2.91.4
+==============================================
+
+* Bugs fixed:
+ 609622 disappearing statusicon
+ 631331 window icons don't work anymore
+ 632894 Only show Desktop in file chooser button if there is one
+ 633670 Child minimum/natural size is not respected by GtkScrolledWindow
+ 633762 Correctly convert colors to CSS and deal with librsvg limitations
+ 633915 gtk_button_box_child_requisition() mishandles size allocations
+ 634060 Support for GIcon pixbufs
+ 634338 Move GtkPaned documentation to inline comments
+ 634339 Move GtkProgressBar documentation to inline comments
+ 634340 Move GtkPageSetup documentation to inline comments
+
+* Translation updates
+ Japanese
+ Estonian
+
+
+Overview of Changes from GTK+ 2.91.2 to 2.91.3
+==============================================
+
+* The scrollable interface has gained some extra properties
+  to influence scrolling behaviour: [hv]scroll-policy
+
+* The size_request vfunc and signal have been deprecated and
+  are no longer used inside GTK+ itself
+
+* GtkAssistant has added a custom page type that gives full
+  control of button visibility
+
+* The homogeneous parameter has been removed from gtk_box_new
+
+* Bugs fixed:
+  61852 GtkTextBuffer needs a case insensitive search
+ 576498 GtkAssistant seals members without adding accessors
+ 612611 auto-mnemonics breaks menu scrolling
+ 633050 need gtk_combo_box_new_with_model_and_entry
+ 633216 Make gdk_rgba_to_string() take a const GdkRGBA
+ 633274 Add error trap around call to XFixesChangeSaveSet()
+ 633374 Port tests to GtkScrollable API...
+ 633500 statusbar labels behind resize grip on startup
+
+* Updated translations:
+ Catalan (Valencian)
+ Estonian
+ Galician
+ Hebrew
+
+
 Overview of Changes from GTK+ 2.91.1 to 2.91.2
 ==============================================
 

build/win32/vs9/gdk.vcprojin

@@ -72,7 +72,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -107,7 +107,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
 				LinkIncremental="2"
 				ModuleDefinitionFile="$(IntDir)\gdk.def"
@@ -208,6 +208,7 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
 		</Filter>
 		<Filter
 			Name="Source Files"

build/win32/vs9/gtk+.vsprops

@@ -8,13 +8,13 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\GdkPixbuf-2.0"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
+		AdditionalDependencies="gdk_pixbuf-2.0.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
 		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
 	/>
 	<Tool
@@ -31,7 +31,7 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GtkApiVersion"
-		Value="3.0"
+		Value="2.0"
 	/>
 	<UserMacro
 		Name="GtkBinaryVersion"
@@ -45,18 +45,6 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 		Name="GtkPrefixDefine"
 		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
 	/>
-	<UserMacro
-		Name="GdkPixbufIncludedLoaderDefines"
-		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus"
-	/>
-	<UserMacro
-		Name="GdkPixbufDefines"
-		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibdirDefine"
-		Value="PIXBUF_LIBDIR=\&quot;$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\&quot;"
-	/>
 	<UserMacro
 		Name="GdkDefines"
 		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
@@ -75,24 +63,20 @@ copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
 echo on&#x0D;&#x0A;
 mkdir $(OutDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(OutDir)\bin&#x0D;&#x0A;
+
+mkdir $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy $(ConfigurationName)\$(PlatformName)\bin\gtk-demo.exe $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.c $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.h $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.gif $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.jpg $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.png $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
+copy ..\..\..\demos\gtk-demo\*.ui $(OutDir)\bin\gtk-demo&#x0D;&#x0A;
 
 mkdir $(OutDir)\lib&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-
 mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -108,9 +92,11 @@ copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#
 copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
+copy ..\..\..\gdk\gdkkeysyms-compat.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
@@ -158,6 +144,7 @@ copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\
 copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkcellrendererspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -239,6 +226,7 @@ copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&
 copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkoffscreenwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -282,6 +270,7 @@ copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0
 copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtkspinner.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -308,6 +297,8 @@ copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\g
 copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolitemgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
+copy ..\..\..\gtk\gtktoolpalette.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
 copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
@@ -344,10 +335,6 @@ copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
 "
 	/>
-	<UserMacro
-		Name="GtkGenerateGdkPixbufDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;$(IntDir)\gdk-pixbuf.def&quot;"
-	/>
 	<UserMacro
 		Name="GtkGenerateGdkDef"
 		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"

build/win32/vs9/gtk-demo.vcproj

@@ -76,9 +76,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
@@ -106,9 +107,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
@@ -138,9 +140,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				SubSystem="2"
+				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"

configure.ac

@@ -20,7 +20,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [2])
+m4_define([gtk_micro_version], [4])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -39,7 +39,7 @@ m4_define([gtk_api_version], [3.0])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.27.1])
+m4_define([glib_required_version], [2.27.3])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
 m4_define([cairo_required_version], [1.10.0])

demos/gtk-demo/assistant.c

@@ -94,7 +94,7 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
   GdkPixbuf *pixbuf;
 
-  box = gtk_hbox_new (FALSE, 12);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
@@ -121,7 +121,7 @@ create_page2 (GtkWidget *assistant)
   GtkWidget *box, *checkbutton;
   GdkPixbuf *pixbuf;
 
-  box = gtk_vbox_new (12, FALSE);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "

demos/gtk-demo/button_box.c

@@ -18,9 +18,9 @@ create_bbox (gint  horizontal,
   frame = gtk_frame_new (title);
 
   if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 
   gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), bbox);
@@ -63,13 +63,13 @@ do_button_box (GtkWidget *do_widget)
     
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    main_vbox = gtk_vbox_new (FALSE, 0);
+    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add (GTK_CONTAINER (window), main_vbox);
     
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
     
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
@@ -92,7 +92,7 @@ do_button_box (GtkWidget *do_widget)
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
     
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 

demos/gtk-demo/changedisplay.c

@@ -357,7 +357,7 @@ create_frame (ChangeDisplayInfo *info,
 
   *frame = gtk_frame_new (title);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
   gtk_container_add (GTK_CONTAINER (*frame), hbox);
 
@@ -375,7 +375,7 @@ create_frame (ChangeDisplayInfo *info,
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 
-  *button_vbox = gtk_vbox_new (FALSE, 5);
+  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE, 0);
 
   if (!info->size_group)
@@ -624,7 +624,7 @@ do_changedisplay (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 

demos/gtk-demo/clipboard.c

@@ -210,7 +210,7 @@ do_clipboard (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -219,7 +219,7 @@ do_clipboard (GtkWidget *do_widget)
 
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
@@ -236,7 +236,7 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
@@ -253,7 +253,7 @@ do_clipboard (GtkWidget *do_widget)
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 

demos/gtk-demo/colorsel.c

@@ -85,7 +85,7 @@ do_colorsel (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

demos/gtk-demo/combobox.c

@@ -345,7 +345,7 @@ do_combobox (GtkWidget *do_widget)
     
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    vbox = gtk_vbox_new (FALSE, 2);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
@@ -354,7 +354,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Some stock icons");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Where are we ?");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     
@@ -424,7 +424,7 @@ do_combobox (GtkWidget *do_widget)
     frame = gtk_frame_new ("Editable");
     gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
     
-    box = gtk_vbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 5);
     gtk_container_add (GTK_CONTAINER (frame), box);
     

demos/gtk-demo/dialog.c

@@ -54,7 +54,7 @@ interactive_dialog_clicked (GtkButton *button,
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
 
@@ -120,24 +120,25 @@ do_dialog (GtkWidget *do_widget)
       frame = gtk_frame_new ("Dialogs");
       gtk_container_add (GTK_CONTAINER (window), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       /* Standard message dialog */
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
 			G_CALLBACK (message_dialog_clicked), NULL);
       gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
-      gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
+                          FALSE, FALSE, 0);
 
       /* Interactive dialog*/
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-      vbox2 = gtk_vbox_new (FALSE, 0);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",

demos/gtk-demo/drawingarea.c

@@ -216,7 +216,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

demos/gtk-demo/editable_cells.c

@@ -332,7 +332,7 @@ do_editable_cells (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
@@ -365,7 +365,8 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
       /* some buttons */
-      hbox = gtk_hbox_new (TRUE, 4);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       button = gtk_button_new_with_label ("Add item");

demos/gtk-demo/entry_buffer.c

@@ -34,7 +34,7 @@ do_entry_buffer (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

demos/gtk-demo/entry_completion.c

@@ -61,7 +61,7 @@ do_entry_completion (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

demos/gtk-demo/expander.c

@@ -35,7 +35,7 @@ do_expander (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

demos/gtk-demo/iconview.c

@@ -300,7 +300,7 @@ do_iconview (GtkWidget *do_widget)
 	  GtkWidget *tool_bar;
 	  GtkToolItem *home_button;
 
-	  vbox = gtk_vbox_new (FALSE, 0);
+	  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	  gtk_container_add (GTK_CONTAINER (window), vbox);
 
 	  tool_bar = gtk_toolbar_new ();

demos/gtk-demo/images.c

@@ -335,7 +335,7 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

demos/gtk-demo/infobar.c

@@ -44,7 +44,7 @@ do_infobar (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       bar = gtk_info_bar_new ();
@@ -81,7 +81,7 @@ do_infobar (GtkWidget *do_widget)
       frame = gtk_frame_new ("Info bars");
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8);
 
-      vbox2 = gtk_vbox_new (FALSE, 8);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 

demos/gtk-demo/list_store.c

@@ -266,7 +266,7 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");

demos/gtk-demo/main.c

@@ -954,7 +954,7 @@ main (int argc, char **argv)
   g_signal_connect_after (window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   tree = create_tree ();

demos/gtk-demo/makefile.msc.in

@@ -14,15 +14,15 @@ PERL = perl
 ################################################################
 
 # Possibly override versions from build/win32/module.defs
-GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
-GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
+GTK_VER = 2.0
+GDK_PIXBUF_VER = 2.0
 
 GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
 GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
 GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
 
 INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
-DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
+DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS) $(CAIRO_CFLAGS)
 LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
 DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
 	-DDEMOCODEDIR=\".\"
@@ -90,5 +90,6 @@ OBJECTS = \
 	main.obj \
 
 gtk-demo.exe : demos.h $(OBJECTS)
-	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
+	$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+	$(CAIRO_LIBS) $(PANGOCAIRO_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
 

demos/gtk-demo/menus.c

@@ -146,11 +146,11 @@ do_menus (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      box = gtk_hbox_new (FALSE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (window), box);
       gtk_widget_show (box);
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (box), box1);
       gtk_widget_show (box1);
 
@@ -176,7 +176,7 @@ do_menus (GtkWidget *do_widget)
       gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
       gtk_widget_show (menuitem);
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
       gtk_widget_show (box2);

demos/gtk-demo/offscreen_window.c

@@ -560,8 +560,9 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_widget_modify_bg (window, GTK_STATE_NORMAL, &black);
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (0, FALSE);
-      scale = gtk_hscale_new_with_range (0, G_PI/2, 0.01);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                        0, G_PI/2, 0.01);
       gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
 
       button = gtk_button_new_with_label ("A Button");

demos/gtk-demo/offscreen_window2.c

@@ -461,13 +461,13 @@ do_offscreen_window2 (GtkWidget *do_widget)
 
       gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-      vbox = gtk_vbox_new (0, FALSE);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       bin = gtk_mirror_bin_new ();
 
       group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       backbutton = gtk_button_new ();
       gtk_container_add (GTK_CONTAINER (backbutton),
                          gtk_image_new_from_stock (GTK_STOCK_GO_BACK, 4));

demos/gtk-demo/panes.c

@@ -153,14 +153,14 @@ do_panes (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Panes");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
-      
-      vpaned = gtk_vpaned_new ();
+
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
 
-      hpaned = gtk_hpaned_new ();
+      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
 
       frame = gtk_frame_new (NULL);

demos/gtk-demo/rotated_text.c

@@ -190,7 +190,8 @@ do_rotated_text (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
-      box = gtk_hbox_new (TRUE, 0);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       /* Add a drawing area */

demos/gtk-demo/search_entry.c

@@ -266,7 +266,7 @@ do_search_entry (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
@@ -274,7 +274,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 10);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 

demos/gtk-demo/sizegroup.c

@@ -118,7 +118,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_vbox_new (FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 

demos/gtk-demo/spinner.c

@@ -50,12 +50,12 @@ do_spinner (GtkWidget *do_widget)
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     /* Sensitive */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
     spinner = gtk_spinner_new ();
     gtk_container_add (GTK_CONTAINER (hbox), spinner);
     gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
@@ -63,7 +63,7 @@ do_spinner (GtkWidget *do_widget)
     spinner_sensitive = spinner;
 
     /* Disabled */
-    hbox = gtk_hbox_new (FALSE, 5);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
     spinner = gtk_spinner_new ();
     gtk_container_add (GTK_CONTAINER (hbox), spinner);
     gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());

demos/gtk-demo/stock_browser.c

@@ -417,7 +417,7 @@ do_stock_browser (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-      hbox = gtk_hbox_new (FALSE, 8);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -486,7 +486,7 @@ do_stock_browser (GtkWidget *do_widget)
       frame = gtk_frame_new ("Selected Item");
       gtk_container_add (GTK_CONTAINER (align), frame);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 

demos/gtk-demo/textscroll.c

@@ -184,7 +184,8 @@ do_textscroll (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
       
-      hbox = gtk_hbox_new (TRUE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
       gtk_container_add (GTK_CONTAINER (window), hbox);
 
       create_text_view (hbox, TRUE);

demos/gtk-demo/textview.c

@@ -379,7 +379,7 @@ attach_widgets (GtkTextView *text_view)
         }
       else if (i == 2)
         {
-          widget = gtk_hscale_new (NULL);
+          widget = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, NULL);
           gtk_range_set_range (GTK_RANGE (widget), 0, 100);
           gtk_widget_set_size_request (widget, 70, -1);
         }
@@ -434,7 +434,7 @@ do_textview (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "TextView");
       gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-      vpaned = gtk_vpaned_new ();
+      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
       gtk_container_add (GTK_CONTAINER (window), vpaned);
 

demos/gtk-demo/toolpalette.c

@@ -438,7 +438,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       /* Add widgets to control the ToolPalette appearance: */
-      box = gtk_vbox_new (FALSE, 6);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       /* Orientation combo box: */
@@ -507,7 +507,7 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);
 
       /* Add hbox */
-      hbox = gtk_hbox_new (FALSE, 5);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
       gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
 
       /* Add and fill the ToolPalette: */

demos/gtk-demo/tree_store.c

@@ -402,7 +402,7 @@ do_tree_store (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 

demos/gtk-demo/ui_manager.c

@@ -196,7 +196,7 @@ do_ui_manager (GtkWidget *do_widget)
 	  g_error_free (error);
 	}
 
-      box1 = gtk_vbox_new (FALSE, 0);
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
       
       gtk_box_pack_start (GTK_BOX (box1),
@@ -209,11 +209,11 @@ do_ui_manager (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
 
 
-      separator = gtk_hseparator_new ();
+      separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
 
 
-      box2 = gtk_vbox_new (FALSE, 10);
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
       gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
 

demos/testanimation.c

@@ -323,7 +323,7 @@ do_image (const char *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -384,7 +384,7 @@ do_nonprogressive (const gchar *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 

demos/testgtk/main.c

@@ -350,7 +350,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "destroy",
                     G_CALLBACK (gtk_main_quit), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   tree = create_tree ();

demos/testpixbuf-save.c

@@ -365,7 +365,7 @@ main (int argc, char **argv)
         g_signal_connect (window, "destroy",   
 			  G_CALLBACK (close_app), NULL);
    
-        vbox = gtk_vbox_new (FALSE, 0);
+        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (window), vbox);  
    
         drawing_area = gtk_drawing_area_new ();

demos/testpixbuf-scale.c

@@ -98,7 +98,7 @@ main(int argc, char **argv)
 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (gtk_main_quit), NULL);
 	
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
         combo_box = gtk_combo_box_text_new ();
@@ -117,7 +117,7 @@ main(int argc, char **argv)
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new ("Overall Alpha:");
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 	g_signal_connect (adjustment, "value_changed",
 			  G_CALLBACK (overall_changed_cb), NULL);
 	
-	hscale = gtk_hscale_new (adjustment);
+	hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
 	gtk_scale_set_digits (GTK_SCALE (hscale), 0);
 	gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
 

docs/reference/gtk/gtk3-sections.txt

@@ -779,6 +779,7 @@ GtkComboBox
 gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
+gtk_combo_box_new_with_model_and_entry
 gtk_combo_box_get_wrap_width
 gtk_combo_box_set_wrap_width
 gtk_combo_box_get_row_span_column
@@ -6383,7 +6384,6 @@ gtk_grid_set_column_spacing
 gtk_grid_get_column_spacing
 
 <SUBSECTION Standard>
-GtkGrid
 GtkGridClass
 GTK_TYPE_GRID
 GTK_GRID

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

@@ -343,6 +343,189 @@ cairo_destroy (cr);
     have been either impossible or impractical.
   </para>
 
+  <section>
+    <title>Replace size_request by get_preferred_width/height</title>
+
+    <para>
+      The request-phase of the traditional GTK+ geometry management
+      has been replaced by a more flexible height-for-width system,
+      which is described in detail in the API documentation
+      (see <xref linkend="geometry-management"/>). As a consequence,
+      the ::size-request signal and vfunc has been removed from
+      #GtkWidgetClass. The replacement for size_request() can
+      take several levels of sophistication:
+      <itemizedlist>
+        <listitem>As a minimal replacement to keep current functionality,
+        you can simply implement the get_preferred_width() and
+        get_preferred_height() vfuncs by calling your existing
+        size_request() function. So you go from
+        <informalexample><programlisting>
+static void
+my_widget_class_init (MyWidgetClass *class)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  /* ... */
+
+  widget_class->size_request = my_widget_size_request;
+
+  /* ... */
+}
+        </programlisting></informalexample>
+        to something that looks more like this:
+        <informalexample><programlisting>
+static void
+my_widget_get_preferred_width (GtkWidget *widget,
+                               gint      *minimal_width,
+                               gint      *natural_width)
+{
+  GtkRequisition requisition;
+
+  my_widget_size_request (widget, &amp;requisition);
+
+  *minimal_width = *natural_width = requisition.width;
+}
+
+static void
+my_widget_get_preferred_height (GtkWidget *widget,
+                                gint      *minimal_height,
+                                gint      *natural_height)
+{
+  GtkRequisition requisition;
+
+  my_widget_size_request (widget, &amp;requisition);
+
+  *minimal_height = *natural_height = requisition.height;
+}
+
+ /* ... */
+
+static void
+my_widget_class_init (MyWidgetClass *class)
+{
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  /* ... */
+
+  widget_class->get_preferred_width = my_widget_get_preferred_width;
+  widget_class->get_preferred_height = my_widget_get_preferred_height;
+
+  /* ... */
+
+}
+        </programlisting></informalexample>
+          Sometimes you can make things a little more streamlined
+          by replacing your existing size_request() implementation by
+          one that takes an orientation parameter:
+          <informalexample><programlisting>
+static void
+my_widget_get_preferred_size (GtkWidget      *widget,
+                              GtkOrientation  orientation,
+                               gint          *minimal_size,
+                               gint          *natural_size)
+{
+
+  /* do things that are common for both orientations ... */
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      /* do stuff that only applies to width... */
+
+      *minimal_size = *natural_size = ...
+    }
+  else
+   {
+      /* do stuff that only applies to height... */
+
+      *minimal_size = *natural_size = ...
+   }
+}
+
+static void
+my_widget_get_preferred_width (GtkWidget *widget,
+                               gint      *minimal_width,
+                               gint      *natural_width)
+{
+  my_widget_get_preferred_size (widget,
+                                GTK_ORIENTATION_HORIZONTAL,
+                                minimal_width,
+                                natural_width);
+}
+
+static void
+my_widget_get_preferred_height (GtkWidget *widget,
+                                gint      *minimal_height,
+                                gint      *natural_height)
+{
+  my_widget_get_preferred_size (widget,
+                                GTK_ORIENTATION_VERTICAL,
+                                minimal_height,
+                                natural_height);
+}
+
+ /* ... */
+          </programlisting></informalexample>
+        </listitem>
+        <listitem>If your widget can cope with a small size,
+          but would appreciate getting some more space (a common
+          example would be that it contains ellipsizable labels),
+          you can do that by making your get_preferred_width()/height()
+          functions return a smaller value for @minimal than for @natural.
+          For @minimal, you probably want to return the same value
+          that your size_request() function returned before (since
+          size_request() was defined as returning the minimal size
+          a widget can work with). A simple way to obtain good
+          values for @natural, in the case of containers, is to use
+          gtk_widget_get_preferred_width() and
+          gtk_widget_get_preferred_height() on the children of the
+          container, as in the following example:
+          <informalexample><programlisting>
+static void
+gtk_fixed_get_preferred_height (GtkWidget *widget,
+                                gint      *minimum,
+                                gint      *natural)
+{
+  GtkFixed *fixed = GTK_FIXED (widget);
+  GtkFixedPrivate *priv = fixed->priv;
+  GtkFixedChild *child;
+  GList *children;
+  gint child_min, child_nat;
+
+  *minimum = 0;
+  *natural = 0;
+
+  for (children = priv->children; children; children = children->next)
+    {
+      child = children->data;
+
+      if (!gtk_widget_get_visible (child->widget))
+        continue;
+
+      gtk_widget_get_preferred_height (child->widget, &amp;child_min, &amp;child_nat);
+
+      *minimum = MAX (*minimum, child->y + child_min);
+      *natural = MAX (*natural, child->y + child_nat);
+    }
+}
+          </programlisting></informalexample>
+        </listitem>
+        <listitem>Note that the get_preferred_width()/height() functions
+          only allow you to deal with one dimension at a time. If your
+          size_request() handler is doing things that involve both
+          width and height at the same time (e.g. limiting the aspect
+          ratio), you will have to implement get_preferred_height_for_width()
+          and get_preferred_width_for_height().
+        </listitem>
+        <listitem>To make full use of the new capabilities of the
+          height-for-width geometry management, you need to additionally
+          implement the get_preferred_height_for_width() and
+          get_preferred_width_for_height(). For details on these functions,
+          see <xref linkend="geometry-management"/>.
+        </listitem>
+      </itemizedlist>
+    </para>
+  </section>
+
   <section>
     <title>Replace GdkRegion by cairo_region_t</title>
 
@@ -624,7 +807,21 @@ gtk_arrow_draw (GtkWidget *widget,
   </section>
 
   <section>
-    <title>GtkScrolledWindow policy</title>
+    <title>Check your expand flags</title>
+
+    <para>
+      The behaviour of expanding widgets has changed slightly in GTK+ 3,
+      compared to GTK+ 2.x. It is now 'inherited', i.e. a container that
+      has an expanding child is considered expanding itself. This is often
+      the desired behaviour. In places where you don't want this to happen,
+      setting the container explicity as not expanding will stop the
+      expand flag of the child from being inherited. See
+      gtk_widget_set_hexpand() and gtk_widget_set_vexpand().
+    </para>
+  </section>
+
+  <section>
+    <title>Scrolling changes</title>
 
     <para>
       The default values for the #GtkScrolledWindow:hscrollbar-policy and
@@ -632,6 +829,14 @@ gtk_arrow_draw (GtkWidget *widget,
       'never' to 'automatic'. If your application was relying on the default
       value, you will have explicitly set it explicitly.
     </para>
+
+    <para>
+      The ::set-scroll-adjustments signal on GtkWidget has been replaced
+      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.
+    </para>
   </section>
 
   <section>

docs/reference/gtk/migrating-GtkApplication.xml

@@ -106,22 +106,28 @@ 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(). GApplication does not
-      have a direct equivalent for this feature at this time, but
-      some of the predefined libunique commands have equivalents in
-      GApplication. Instead of sending the %UNIQUE_ACTIVATE command,
-      call g_application_activate(), instead of sending the
+      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
+      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
       have direct replacement at this time.
     </para>
 
     <para>
-      On the other hand, GApplication supports passing entire
-      commandlines to the running instance, which reduces the need
-      for user-defined commands. And GDBus makes it very easy to
-      implement D-Bus interfaces for communication between
-      application instances, see e.g. g_dbus_connection_register_object().
+      As a replacement for custom commands, GApplication implements the
+      #GActionGroup interface and lets you add a group of actions with
+      g_application_set_action_group(). The actions can then be invoked,
+      either by using the D-Bus interface for #GAction directly, or by
+      calling g_action_group_activate_action() from another instance of
+      the GApplication. The #GApplication documentation contains an
+      example for using GApplication with actions.
+    </para>
+
+    <para>
+      For more complex needs, GApplication supports passing entire
+      commandlines to the running instance.
     </para>
   </section>
 </chapter>

docs/reference/gtk/tmpl/.gitignore

@@ -8,24 +8,34 @@ gtkbuilder.sgml
 gtkbutton.sgml
 gtkcalendar.sgml
 gtkcelleditable.sgml
+gtkcellrenderer.sgml
+gtkcellrenderertext.sgml
+gtkcellview.sgml
+gtkcolorbutton.sgml
+gtkcolorsel.sgml
 gtkcombobox.sgml
 gtkcomboboxentry.sgml
 gtkcontainer.sgml
 gtkeditable.sgml
+gtkentry.sgml
 gtkentrybuffer.sgml
 gtkhbox.sgml
 gtkiconview.sgml
 gtkimcontextsimple.sgml
 gtkimmulticontext.sgml
 gtkitemfactory.sgml
+gtklayout.sgml
 gtklinkbutton.sgml
 gtkmessagedialog.sgml
 gtknotebook.sgml
 gtkobject.sgml
 gtkorientable.sgml
+gtkpagesetup.sgml
 gtkpagesetupunixdialog.sgml
+gtkpaned.sgml
 gtkpapersize.sgml
 gtkprinter.sgml
+gtkprogressbar.sgml
 gtkradioaction.sgml
 gtkradiobutton.sgml
 gtkrange.sgml
@@ -42,11 +52,13 @@ gtkscrolledwindow.sgml
 gtkseparator.sgml
 gtkseparatormenuitem.sgml
 gtkseparatortoolitem.sgml
+gtksettings.sgml
 gtkstatusbar.sgml
 gtkstyle.sgml
 gtktesting.sgml
 gtktextiter.sgml
 gtktexttagtable.sgml
+gtktextview.sgml
 gtktoggleaction.sgml
 gtktoolbar.sgml
 gtktoolitem.sgml
@@ -56,6 +68,7 @@ gtktreemodelfilter.sgml
 gtktreeselection.sgml
 gtktreesortable.sgml
 gtktreestore.sgml
+gtktreeview.sgml
 gtktreeviewcolumn.sgml
 gtktypeutils.sgml
 gtkwindow.sgml

docs/reference/gtk/tmpl/gtkcellrenderer.sgml

@@ -1,448 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRenderer
-
-<!-- ##### SECTION Short_Description ##### -->
-An object for rendering a single cell on a GdkDrawable
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkCellRenderer is a base class of a set of objects used for
-rendering a cell to a #GdkDrawable.  These objects are used primarily by
-the #GtkTreeView widget, though they aren't tied to them in any
-specific way.  It is worth noting that #GtkCellRenderer is not a
-#GtkWidget and cannot be treated as such.
-</para>
-
-<para>
-The primary use of a #GtkCellRenderer is for drawing a certain graphical
-elements on a #GdkDrawable.  Typically, one cell renderer is used to
-draw many cells on the screen.  To this extent, it isn't expected that a
-CellRenderer keep any permanent state around.  Instead, any state is set
-just prior to use using #GObject<!-- -->s property system.  Then, the
-cell is measured using gtk_cell_renderer_get_size().  Finally, the cell
-is rendered in the correct location using gtk_cell_renderer_render().
-</para>
-
-<para>
-There are a number of rules that must be followed when writing a new
-#GtkCellRenderer.  First and formost, it's important that a certain set
-of properties will always yield a cell renderer of the same size,
-barring a #GtkStyle change.  The #GtkCellRenderer also has a number of
-generic properties that are expected to be honored by all children.
-</para>
-
-<para>
-Beyond merely rendering a cell, cell renderers can optionally 
-provide active user interface elements. A cell renderer can be 
-<firstterm>activatable</firstterm> like #GtkCellRendererToggle, 
-which toggles when it gets activated by a mouse click, or it can be 
-<firstterm>editable</firstterm> like #GtkCellRendererText, which 
-allows the user to edit the text using a #GtkEntry.
-To make a cell renderer activatable or editable, you have to 
-implement the @activate or @start_editing virtual functions, 
-respectively.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkCellRendererText,#GtkCellRendererPixbuf,#GtkCellRendererToggle
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### ENUM GtkCellRendererState ##### -->
-<para>
-Tells how a cell is to be rendererd.
-</para>
-
-@GTK_CELL_RENDERER_SELECTED: The cell is currently selected, and
-probably has a selection colored background to render to.
-@GTK_CELL_RENDERER_PRELIT: The mouse is hovering over the cell.
-@GTK_CELL_RENDERER_INSENSITIVE: The cell is drawn in an insensitive manner
-@GTK_CELL_RENDERER_SORTED: The cell is in a sorted row
-@GTK_CELL_RENDERER_FOCUSED: The cell is in the focus row.
-
-<!-- ##### ENUM GtkCellRendererMode ##### -->
-<para>
-Identifies how the user can interact with a particular cell.
-</para>
-
-@GTK_CELL_RENDERER_MODE_INERT: The cell is just for display
-and cannot be interacted with.  Note that this doesn't mean that eg. the
-row being drawn can't be selected -- just that a particular element of
-it cannot be individually modified.
-@GTK_CELL_RENDERER_MODE_ACTIVATABLE: The cell can be clicked.
-@GTK_CELL_RENDERER_MODE_EDITABLE: The cell can be edited or otherwise modified.
-
-<!-- ##### STRUCT GtkCellRenderer ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRenderer::editing-canceled ##### -->
-<para>
-
-</para>
-
-@cellrenderer: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCellRenderer::editing-started ##### -->
-<para>
-
-</para>
-
-@cellrenderer: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkCellRenderer:cell-background ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:cell-background-gdk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:cell-background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:editing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expanded ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:is-expander ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:xpad ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRenderer:ypad ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkCellRendererClass ##### -->
-<para>
-
-</para>
-
-@parent_class: 
-@get_request_mode: 
-@get_preferred_width: 
-@get_preferred_height_for_width: 
-@get_preferred_height: 
-@get_preferred_width_for_height: 
-@get_size: 
-@render: 
-@activate: 
-@start_editing: 
-@editing_canceled: 
-@editing_started: 
-@_gtk_reserved1: 
-@_gtk_reserved2: 
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_size ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@cell_area: 
-@x_offset: 
-@y_offset: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_render ##### -->
-<para>
-
-</para>
-
-@cell: 
-@cr: 
-@widget: 
-@background_area: 
-@cell_area: 
-@flags: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_activate ##### -->
-<para>
-
-</para>
-
-@cell: 
-@event: 
-@widget: 
-@path: 
-@background_area: 
-@cell_area: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_start_editing ##### -->
-<para>
-
-</para>
-
-@cell: 
-@event: 
-@widget: 
-@path: 
-@background_area: 
-@cell_area: 
-@flags: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_stop_editing ##### -->
-<para>
-
-</para>
-
-@cell: 
-@canceled: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_fixed_size ##### -->
-<para>
-
-</para>
-
-@cell: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_set_fixed_size ##### -->
-<para>
-
-</para>
-
-@cell: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_visible ##### -->
-<para>
-
-</para>
-
-@cell: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_set_visible ##### -->
-<para>
-
-</para>
-
-@cell: 
-@visible: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_sensitive ##### -->
-<para>
-
-</para>
-
-@cell: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_set_sensitive ##### -->
-<para>
-
-</para>
-
-@cell: 
-@sensitive: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_alignment ##### -->
-<para>
-
-</para>
-
-@cell: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_set_alignment ##### -->
-<para>
-
-</para>
-
-@cell: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_padding ##### -->
-<para>
-
-</para>
-
-@cell: 
-@xpad: 
-@ypad: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_set_padding ##### -->
-<para>
-
-</para>
-
-@cell: 
-@xpad: 
-@ypad: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_height ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@minimum_size: 
-@natural_size: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_height_for_width ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@width: 
-@minimum_height: 
-@natural_height: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_size ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@minimum_size: 
-@natural_size: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_width ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@minimum_size: 
-@natural_size: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_preferred_width_for_height ##### -->
-<para>
-
-</para>
-
-@cell: 
-@widget: 
-@height: 
-@minimum_width: 
-@natural_width: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_get_request_mode ##### -->
-<para>
-
-</para>
-
-@cell: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_get_desired_height_for_width_of_row ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@path: 
-@avail_size: 
-@minimum_size: 
-@natural_size: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_get_desired_width_of_row ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@path: 
-@minimum_size: 
-@natural_size: 
-
-

docs/reference/gtk/tmpl/gtkcellrenderertext.sgml

@@ -1,288 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellRendererText
-
-<!-- ##### SECTION Short_Description ##### -->
-Renders text in a cell
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkCellRendererText renders a given text in its cell, using the font, color and 
-style information provided by its properties. The text will be ellipsized if it is 
-too long and the <link linkend="GtkCellRendererText--ellipsize">ellipsize</link> 
-property allows it.
-</para>
-
-<para>
-If the <link linkend="GtkCellRenderer--mode">mode</link> is %GTK_CELL_RENDERER_MODE_EDITABLE,
-the #GtkCellRendererText allows to edit its text using an entry.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellRendererText ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellRendererText::edited ##### -->
-<para>
-
-</para>
-
-@cellrenderertext: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkCellRendererText:align-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:alignment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:attributes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:background ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:background-gdk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:editable-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:ellipsize ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:ellipsize-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:family ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:family-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:font ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:font-desc ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:foreground ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:foreground-gdk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:foreground-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:language ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:language-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:markup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:max-width-chars ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:rise ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:rise-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:scale ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:scale-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:single-paragraph-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:size-points ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:size-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:stretch ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:stretch-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:strikethrough ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:strikethrough-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:style-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:underline-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:variant ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:variant-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:weight ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:weight-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:width-chars ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:wrap-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellRendererText:wrap-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_renderer_text_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_renderer_text_set_fixed_height_from_font ##### -->
-<para>
-
-</para>
-
-@renderer: 
-@number_of_rows: 
-
-

docs/reference/gtk/tmpl/gtkcellview.sgml

@@ -1,143 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellView
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget displaying a single row of a GtkTreeModel
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A #GtkCellView displays a single row of a #GtkTreeModel, using
-cell renderers just like #GtkTreeView. #GtkCellView doesn't support
-some of the more complex features of #GtkTreeView, like cell editing
-and drag and drop.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellView ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkCellView:background ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellView:background-gdk ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellView:background-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCellView:model ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_cell_view_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_new_with_text ##### -->
-<para>
-
-</para>
-
-@text: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_new_with_markup ##### -->
-<para>
-
-</para>
-
-@markup: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_new_with_pixbuf ##### -->
-<para>
-
-</para>
-
-@pixbuf: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_set_model ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@model: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_get_model ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_set_displayed_row ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@path: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_get_displayed_row ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_get_size_of_row ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@path: 
-@requisition: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_cell_view_set_background_color ##### -->
-<para>
-
-</para>
-
-@cell_view: 
-@color: 
-
-

docs/reference/gtk/tmpl/gtkcolorbutton.sgml

@@ -1,148 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkColorButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A button to launch a color selection dialog
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkColorButton is a button which displays the currently selected color 
-an allows to open a color selection dialog to change the color. It is suitable 
-widget for selecting a color in a preference dialog.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkColorSelectionDialog, #GtkFontButton
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkColorButton ##### -->
-<para>
-The GtkColorButton struct has only private fields and 
-should not be used directly.
-</para>
-
-
-<!-- ##### SIGNAL GtkColorButton::color-set ##### -->
-<para>
-
-</para>
-
-@colorbutton: the object which received the signal.
-
-<!-- ##### ARG GtkColorButton:alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:title ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorButton:use-alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_color_button_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_new_with_color ##### -->
-<para>
-
-</para>
-
-@color: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_color ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_color ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_use_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@use_alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_use_alpha ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_button_set_title ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@title: 
-
-
-<!-- ##### FUNCTION gtk_color_button_get_title ##### -->
-<para>
-
-</para>
-
-@color_button: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcolorsel.sgml

@@ -1,237 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkColorSelection
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget used to select a color
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkColorSelection is a widget that is used to select 
-a color.  It consists of a color wheel and number of sliders
-and entry boxes for color parameters such as hue, saturation,
-value, red, green, blue, and opacity.  It is found on the standard 
-color selection dialog box #GtkColorSelectionDialog.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkColorSelection ##### -->
-<para>
-The #GtkColorSelection-struct struct contains private data only, 
-and should be accessed using the functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkColorSelection::color-changed ##### -->
-<para>
-This signal is emitted when the color changes in the #GtkColorSelection
-according to its update policy.
-</para>
-
-@colorselection: the object which received the signal.
-
-<!-- ##### ARG GtkColorSelection:current-alpha ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:current-color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:has-opacity-control ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkColorSelection:has-palette ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_color_selection_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_has_opacity_control ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@has_opacity: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_has_opacity_control ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_has_palette ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@has_palette: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_has_palette ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_current_alpha ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_current_alpha ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_current_color ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_current_color ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_previous_alpha ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_previous_alpha ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@alpha: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_get_previous_color ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_previous_color ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@color: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_is_adjusting ##### -->
-<para>
-
-</para>
-
-@colorsel: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_palette_from_string ##### -->
-<para>
-
-</para>
-
-@str: 
-@colors: 
-@n_colors: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_palette_to_string ##### -->
-<para>
-
-</para>
-
-@colors: 
-@n_colors: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkColorSelectionChangePaletteFunc ##### -->
-<para>
-
-</para>
-
-@colors: 
-@n_colors: 
-
-
-<!-- ##### FUNCTION gtk_color_selection_set_change_palette_with_screen_hook ##### -->
-<para>
-
-</para>
-
-@func: 
-@Returns: 
-
-
-<!-- ##### USER_FUNCTION GtkColorSelectionChangePaletteWithScreenFunc ##### -->
-<para>
-
-</para>
-
-@screen: 
-@colors: 
-@n_colors: 
-@Since: 2.2
-
-

docs/reference/gtk/tmpl/gtkcombo.sgml

@@ -1,222 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCombo
-
-<!-- ##### SECTION Short_Description ##### -->
-A text entry field with a dropdown list
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkCombo widget consists of a single-line text entry field and a drop-down
-list. The drop-down list is displayed when the user clicks on a small arrow
-button to the right of the entry field.
-</para>
-<para>
-The drop-down list is a #GtkList widget and can be accessed using the
-<structfield>list</structfield> member of the #GtkCombo-struct.
-List elements can contain arbitrary widgets, but if an element is not a
-plain label, then you must use the gtk_list_set_item_string() function.
-This sets the string which will be placed in the text entry field when the
-item is selected.
-</para>
-<para>
-By default, the user can step through the items in the list using the
-arrow (cursor) keys, though this behaviour can be turned off with
-gtk_combo_set_use_arrows().
-</para>
-<para>
-As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBoxEntry.
-</para>
-
-<example id="gtkcombo-simple-example">
-<title>Creating a <structname>GtkCombo</structname> widget with simple text 
-items.</title>
-<programlisting>
-  GtkWidget *combo;
-  GList *items = NULL;
-
-  items = g_list_append (items, "First Item");
-  items = g_list_append (items, "Second Item");
-  items = g_list_append (items, "Third Item");
-  items = g_list_append (items, "Fourth Item");
-  items = g_list_append (items, "Fifth Item");
-
-  combo = gtk_combo_new (<!-- -->);
-  gtk_combo_set_popdown_strings (GTK_COMBO (combo), items);
-</programlisting>
-</example>
-
-<example>
-<title>Creating a <structname>GtkCombo</structname> widget with a complex item.</title>
-<programlisting>
-  GtkWidget *combo, *item, *hbox, *arrow, *label;
-
-  combo = gtk_combo_new (<!-- -->);
-
-  item = gtk_list_item_new (<!-- -->);
-  gtk_widget_show (item);
-
-  /* You can put almost anything into the GtkListItem widget. Here we will use
-     a horizontal box with an arrow and a label in it. */
-  hbox = gtk_hbox_new (FALSE, 3);
-  gtk_container_add (GTK_CONTAINER (item), hbox);
-  gtk_widget_show (hbox);
-
-  arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_OUT);
-  gtk_widget_show (arrow);
-  gtk_box_pack_start (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
-
-  label = gtk_label_new ("First Item");
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-  /* You must set the string to display in the entry field when the item is
-     selected. */
-  gtk_combo_set_item_string (GTK_COMBO (combo), GTK_ITEM (item), "1st Item");
-
-  /* Now we simply add the item to the combo's list. */
-  gtk_container_add (GTK_CONTAINER (GTK_COMBO (combo)->list), item);
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT GtkCombo ##### -->
-<para>
-The #GtkCombo-struct struct contains the following fields.
-(These fields should be considered read-only. They should never be set by
-an application.)
-</para>
-
-@entry: the text entry field.
-@list: the list shown in the drop-down window.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-<!-- ##### ARG GtkCombo:allow-empty ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:case-sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:enable-arrow-keys ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:enable-arrows-always ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCombo:value-in-list ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_combo_new ##### -->
-<para>
-Creates a new #GtkCombo.
-</para>
-
-@Returns: a new #GtkCombo.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### -->
-<para>
-Convenience function to set all of the items in the popup list.
-(See the <link linkend="gtkcombo-simple-example">example</link> above.)
-</para>
-
-@combo: a #GtkCombo.
-@strings: a list of strings, or %NULL to clear the popup list
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->
-<para>
-Specifies whether the value entered in the text entry field must match one of
-the values in the list. If this is set then the user will not be able to
-perform any other action until a valid value has been entered.
-</para>
-<para>
-If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE.
-</para>
-
-@combo: a #GtkCombo.
-@val: %TRUE if the value entered must match one of the values in the list.
-@ok_if_empty: %TRUE if an empty value is considered valid.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_use_arrows ##### -->
-<para>
-Specifies if the arrow (cursor) keys can be used to step through the items in
-the list. This is on by default.
-</para>
-
-@combo: a #GtkCombo.
-@val: %TRUE if the arrow keys can be used to step through the items in 
-     the list.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### -->
-<para>
-Obsolete function, does nothing.
-</para>
-
-@combo: a #GtkCombo.
-@val: unused
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### -->
-<para>
-Specifies whether the text entered into the #GtkEntry field and the text in
-the list items is case sensitive.
-</para>
-<para>
-This may be useful, for example, when you have called
-gtk_combo_set_value_in_list() to limit the values entered, but you are not
-worried about differences in case.
-</para>
-
-@combo: a #GtkCombo.
-@val: %TRUE if the text in the list items is case sensitive.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_set_item_string ##### -->
-<para>
-Sets the string to place in the #GtkEntry field when a particular list item is
-selected. This is needed if the list item is not a simple label.
-</para>
-
-@combo: a #GtkCombo.
-@item: a #GtkItem.
-@item_value: the string to place in the #GtkEntry when @item is selected.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-
-<!-- ##### FUNCTION gtk_combo_disable_activate ##### -->
-<para>
-Stops the #GtkCombo widget from showing the popup list when the #GtkEntry
-emits the "activate" signal, i.e. when the Return key is pressed.
-This may be useful if, for example, you want the Return key to close a dialog
-instead.
-</para>
-
-@combo: a #GtkCombo.
-@Deprecated: 2.4: Use #GtkComboBox instead.
-
-

docs/reference/gtk/tmpl/gtklayout.sgml

@@ -1,177 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkLayout
-
-<!-- ##### SECTION Short_Description ##### -->
-
-Infinite scrollable area containing child widgets and/or custom drawing
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkLayout is similar to #GtkDrawingArea in that it's a "blank slate"
-and doesn't do anything but paint a blank background by default. It's
-different in that it supports scrolling natively (you can add it to a
-#GtkScrolledWindow), and it can contain child widgets, since it's a
-#GtkContainer. However if you're just going to draw, a #GtkDrawingArea
-is a better choice since it has lower overhead.
-</para>
-
-<para>
-When handling expose events on a #GtkLayout, you must draw to 
-GTK_LAYOUT (layout)-&gt;bin_window, rather than to 
-GTK_WIDGET (layout)-&gt;window, as you would for a drawing
-area.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkDrawingArea, #GtkScrolledWindow
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkLayout ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkLayout::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
-@layout: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### ARG GtkLayout:hadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:vadjustment ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkLayout:y ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_layout_new ##### -->
-<para>
-
-</para>
-
-@hadjustment: 
-@vadjustment: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_layout_put ##### -->
-<para>
-
-</para>
-
-@layout: 
-@child_widget: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_layout_move ##### -->
-<para>
-
-</para>
-
-@layout: 
-@child_widget: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_layout_set_size ##### -->
-<para>
-
-</para>
-
-@layout: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_layout_get_size ##### -->
-<para>
-
-</para>
-
-@layout: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_layout_get_hadjustment ##### -->
-<para>
-
-</para>
-
-@layout: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_layout_get_vadjustment ##### -->
-<para>
-
-</para>
-
-@layout: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_layout_set_hadjustment ##### -->
-<para>
-
-</para>
-
-@layout: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_layout_set_vadjustment ##### -->
-<para>
-
-</para>
-
-@layout: 
-@adjustment: 
-
-
-<!-- ##### FUNCTION gtk_layout_get_bin_window ##### -->
-<para>
-
-</para>
-
-@layout: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkpagesetup.sgml

@@ -1,320 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPageSetup
-
-<!-- ##### SECTION Short_Description ##### -->
-Stores page setup information
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-A GtkPageSetup object stores the page size, orientation and margins. 
-The idea is that you can get one of these from the page setup dialog 
-and then pass it to the #GtkPrintOperation when printing. 
-The benefit of splitting this out of the #GtkPrintSettings is that 
-these affect the actual layout of the page, and thus need to be set 
-long before user prints. 
-</para>
-<para id="print-margins">
-The margins specified in this object are the "print margins", i.e. the 
-parts of the page that the printer cannot print on. These are different
-from the layout margins that a word processor uses; they are typically
-used to determine the <emphasis>minimal</emphasis> size for the layout 
-margins.
-</para>
-<para>
-To obtain a #GtkPageSetup use gtk_page_setup_new()
-to get the defaults, or use gtk_print_run_page_setup_dialog() to show 
-the page setup dialog and receive the resulting page setup.
-</para>
-<example>
-<title>A page setup dialog</title>
-<programlisting>
-static GtkPrintSettings *settings = NULL;
-static GtkPageSetup *page_setup = NULL;
-
-static void
-do_page_setup (void)
-{
-  GtkPageSetup *new_page_setup;
-
-  if (settings == NULL)
-    settings = gtk_print_settings_new (<!-- -->);
-
-  new_page_setup = gtk_print_run_page_setup_dialog (GTK_WINDOW (main_window),
-                                                    page_setup, settings);
-
-  if (page_setup)
-    g_object_unref (page_setup);
-
-  page_setup = new_page_setup;
-}
-</programlisting>
-</example>
-<para>
-Printing support was added in GTK+ 2.10.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkPageSetup ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION gtk_page_setup_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_copy ##### -->
-<para>
-
-</para>
-
-@other: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_orientation ##### -->
-<para>
-
-</para>
-
-@setup: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_orientation ##### -->
-<para>
-
-</para>
-
-@setup: 
-@orientation: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_paper_size ##### -->
-<para>
-
-</para>
-
-@setup: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_paper_size ##### -->
-<para>
-
-</para>
-
-@setup: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_top_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_top_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@margin: 
-@unit: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_bottom_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_bottom_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@margin: 
-@unit: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_left_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_left_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@margin: 
-@unit: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_right_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_right_margin ##### -->
-<para>
-
-</para>
-
-@setup: 
-@margin: 
-@unit: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_set_paper_size_and_default_margins ##### -->
-<para>
-
-</para>
-
-@setup: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_paper_width ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_paper_height ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_page_width ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_get_page_height ##### -->
-<para>
-
-</para>
-
-@setup: 
-@unit: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_new_from_file ##### -->
-<para>
-
-</para>
-
-@file_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_new_from_key_file ##### -->
-<para>
-
-</para>
-
-@key_file: 
-@group_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_load_file ##### -->
-<para>
-
-</para>
-
-@setup: 
-@file_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_load_key_file ##### -->
-<para>
-
-</para>
-
-@setup: 
-@key_file: 
-@group_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_to_file ##### -->
-<para>
-
-</para>
-
-@setup: 
-@file_name: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_page_setup_to_key_file ##### -->
-<para>
-
-</para>
-
-@setup: 
-@key_file: 
-@group_name: 
-
-

docs/reference/gtk/tmpl/gtkpaned.sgml

@@ -1,272 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkPaned
-
-<!-- ##### SECTION Short_Description ##### -->
-Base class for widgets with two adjustable panes
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkPaned is the base class for widgets with two panes,
-arranged either horizontally (#GtkHPaned) or
-vertically (#GtkVPaned). Child widgets are 
-added to the panes of the widget with
-gtk_paned_pack1() and gtk_paned_pack2(). The division
-beween the two children is set by default from the
-size requests of the children, but it can be adjusted
-by the user.
-</para>
-<para>
-A paned widget draws a separator between the two
-child widgets and a small handle that the user
-can drag to adjust the division. It does not
-draw any relief around the children or around
-the separator. (The space in which the separator
-is called the gutter.) Often, it is useful
-to put each child inside a #GtkFrame with the
-shadow type set to %GTK_SHADOW_IN so that the
-gutter appears as a ridge. No separator is drawn
-if one of the children is missing.
-</para>
-<para>
-Each child has two options that can be set, 
-@resize and @shrink. If @resize is true, then when the
-#GtkPaned is resized, that child will expand
-or shrink along with the paned widget. If @shrink
-is true, then when that child can be made smaller
-than its requisition by the user. Setting @shrink
-to %FALSE allows the application to set a minimum
-size. If @resize is false for both children, then
-this is treated as if @resize is true for both
-children.
-</para>
-<para>
-The application can set the position of the slider
-as if it were set by the user, by calling
-gtk_paned_set_position().
-</para>
-
-<example>
-<title>Creating a paned widget with minimum sizes.</title>
-<programlisting>
-GtkWidget *hpaned = gtk_hpaned_new (<!-- -->);
-GtkWidget *frame1 = gtk_frame_new (NULL);
-GtkWidget *frame2 = gtk_frame_new (NULL);
-gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_IN);
-gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_IN);
-
-gtk_widget_set_size_request (hpaned, 200, -1);
-
-gtk_paned_pack1 (GTK_PANED (hpaned), frame1, TRUE, FALSE);
-gtk_widget_set_size_request (frame1, 50, -1);
-
-gtk_paned_pack2 (GTK_PANED (hpaned), frame2, FALSE, FALSE);
-gtk_widget_set_size_request (frame2, 50, -1);
-</programlisting>
-</example>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkPaned ##### -->
-<para>
-</para>
-
-
-<!-- ##### SIGNAL GtkPaned::accept-position ##### -->
-<para>
-
-</para>
-
-@paned: the object which received the signal.
-@Returns: 
-
-<!-- ##### SIGNAL GtkPaned::cancel-position ##### -->
-<para>
-
-</para>
-
-@paned: the object which received the signal.
-@Returns: 
-
-<!-- ##### SIGNAL GtkPaned::cycle-child-focus ##### -->
-<para>
-
-</para>
-
-@Returns: 
-@Param4: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@paned: the object which received the signal.
-
-<!-- ##### SIGNAL GtkPaned::cycle-handle-focus ##### -->
-<para>
-
-</para>
-
-@Returns: 
-@Param4: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@paned: the object which received the signal.
-
-<!-- ##### SIGNAL GtkPaned::move-handle ##### -->
-<para>
-
-</para>
-
-@Returns: 
-@Param4: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@paned: the object which received the signal.
-
-<!-- ##### SIGNAL GtkPaned::toggle-handle-focus ##### -->
-<para>
-
-</para>
-
-@paned: the object which received the signal.
-@Returns: 
-
-<!-- ##### ARG GtkPaned:max-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:min-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:position-set ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:resize ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:shrink ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkPaned:handle-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_paned_new ##### -->
-<para>
-
-</para>
-
-@orientation: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paned_add1 ##### -->
-<para>
-Adds a child to the top or left pane with
-default parameters. This is equivalent
-to <literal>gtk_paned_pack1 (paned, child, FALSE, TRUE)</literal>.
-</para>
-
-@paned: a paned widget
-@child: the child to add
-
-
-<!-- ##### FUNCTION gtk_paned_add2 ##### -->
-<para>
-Adds a child to the bottom or right pane with default
-parameters. This is equivalent to 
-<literal>gtk_paned_pack2 (paned, child, TRUE, TRUE)</literal>.
-</para>
-
-@paned: a paned widget
-@child: the child to add
-
-
-<!-- ##### FUNCTION gtk_paned_pack1 ##### -->
-<para>
-Adds a child to the top or left pane.
-</para>
-
-@paned: a paned widget
-@child: the child to add
-@resize: should this child expand when the paned widget is resized.
-@shrink: can this child be made smaller than its requisition.
-
-
-<!-- ##### FUNCTION gtk_paned_pack2 ##### -->
-<para>
-Adds a child to the bottom or right pane.
-</para>
-
-@paned: a paned widget
-@child: the child to add
-@resize: should this child expand when the paned widget is resized.
-@shrink: can this child be made smaller than its requisition.
-
-
-<!-- ##### FUNCTION gtk_paned_get_child1 ##### -->
-<para>
-
-</para>
-
-@paned: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paned_get_child2 ##### -->
-<para>
-
-</para>
-
-@paned: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paned_set_position ##### -->
-<para>
-
-</para>
-
-@paned: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_paned_get_position ##### -->
-<para>
-
-</para>
-
-@paned: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_paned_get_handle_window ##### -->
-<para>
-
-</para>
-
-@paned: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkprogressbar.sgml

@@ -1,241 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkProgressBar
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget which indicates progress visually
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkProgressBar is typically used to display the progress of a long
-running operation.  It provides a visual clue that processing
-is underway.  The #GtkProgressBar can be used in two different
-modes: percentage mode and activity mode.
-</para>
-
-<para>
-When an application can determine how much work needs to take place 
-(e.g. read a fixed number of bytes from a file) and can monitor its
-progress, it can use the #GtkProgressBar in percentage mode and the user
-sees a growing bar indicating the percentage of the work that has
-been completed.  In this mode, the application is required to call
-gtk_progress_bar_set_fraction() periodically to update the progress bar.
-</para>
-
-<para>
-When an application has no accurate way of knowing the amount of work
-to do, it can use the #GtkProgressBar in activity mode, which shows activity 
-by a block moving back and forth within the progress area. In this mode,
-the application is required to call gtk_progress_bar_pulse() perodically
-to update the progress bar.
-</para>
-
-<para>
-There is quite a bit of flexibility provided to control the appearance
-of the #GtkProgressBar.  Functions are provided to control the 
-orientation of the bar, optional text can be displayed along with
-the bar, and the step size used in activity mode can be set.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkProgressBar ##### -->
-<para>
-The #GtkProgressBar-struct struct contains private data only, 
-and should be accessed using the functions below.
-</para>
-
-
-<!-- ##### ARG GtkProgressBar:ellipsize ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:fraction ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:inverted ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:pulse-step ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:show-text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:text ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:min-horizontal-bar-height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:min-horizontal-bar-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:min-vertical-bar-height ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:min-vertical-bar-width ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:xspacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkProgressBar:yspacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_progress_bar_new ##### -->
-<para>
-Creates a new #GtkProgressBar.
-</para>
-
-@void: 
-@Returns: a #GtkProgressBar.
-
-
-<!-- ##### FUNCTION gtk_progress_bar_pulse ##### -->
-<para>
-
-</para>
-
-@pbar: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_fraction ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@fraction: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_fraction ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_inverted ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@inverted: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_inverted ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_show_text ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@show_text: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_show_text ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_text ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@text: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_text ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_ellipsize ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@mode: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_ellipsize ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_pulse_step ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@fraction: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_pulse_step ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtksettings.sgml

@@ -1,532 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Settings
-
-<!-- ##### SECTION Short_Description ##### -->
-Sharing settings between applications
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-GtkSettings provide a mechanism to share global settings between applications.
-On the X window system, this sharing is realized by an <ulink href="http://www.freedesktop.org/wiki/Specifications/xsettings-spec">XSettings</ulink>
-manager that is usually part of the desktop environment, along with utilities
-that let the user change these settings. In the absence of an Xsettings manager,
-settings can also be specified in RC files.
-</para>
-
-<para>
-Applications can override system-wide settings with gtk_settings_set_string_property(),
-gtk_settings_set_long_property(), etc. This should be restricted to special
-cases though; GtkSettings are not meant as an application configuration
-facility. When doing so, you need to be aware that settings that are specific
-to individual widgets may not be available before the widget type has been
-realized at least once. The following example demonstrates a way to do this:
-<informalexample><programlisting>
-  gtk_init (&amp;argc, &amp;argv);
-
-  /&ast; make sure the type is realized &ast;/
-  g_type_class_unref (g_type_class_ref (GTK_TYPE_IMAGE_MENU_ITEM));
-
-  g_object_set (gtk_settings_get_default (), "gtk-menu-images", FALSE, NULL);
-</programlisting></informalexample>
-</para>
-
-<para>
-There is one GtkSettings instance per screen. It can be obtained with
-gtk_settings_get_for_screen(), but in many cases, it is more convenient
-to use gtk_widget_get_settings(). gtk_settings_get_default() returns the
-GtkSettings instance for the default screen.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkSettings ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### ARG GtkSettings:color-hash ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-alternative-button-order ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-alternative-sort-arrows ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-application-prefer-dark-theme ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-auto-mnemonics ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-button-images ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-can-change-accels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-color-palette ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-color-scheme ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-cursor-blink ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-cursor-blink-time ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-cursor-blink-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-cursor-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-cursor-theme-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-dnd-drag-threshold ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-double-click-distance ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-double-click-time ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-accels ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-animations ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-event-sounds ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-input-feedback-sounds ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-mnemonics ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-enable-tooltips ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-entry-password-hint-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-entry-select-on-focus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-error-bell ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-fallback-icon-theme ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-file-chooser-backend ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-font-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-fontconfig-timestamp ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-icon-sizes ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-icon-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-im-module ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-keynav-cursor-only ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-keynav-wrap-around ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-label-select-on-focus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-bar-accel ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-bar-popup-delay ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-images ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-popdown-delay ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-menu-popup-delay ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-modules ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-print-backends ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-print-preview-command ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-recent-files-limit ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-recent-files-max-age ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-scrolled-window-placement ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-show-input-method-menu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-show-unicode-menu ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-sound-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-split-cursor ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-theme-name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-timeout-expand ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-timeout-initial ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-timeout-repeat ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-toolbar-icon-size ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-toolbar-style ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-tooltip-browse-mode-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-tooltip-browse-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-tooltip-timeout ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-touchscreen-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-xft-antialias ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-xft-dpi ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-xft-hinting ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-xft-hintstyle ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkSettings:gtk-xft-rgba ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkSettingsValue ##### -->
-<para>
-
-</para>
-
-@origin: 
-@value: 
-
-<!-- ##### FUNCTION gtk_settings_get_default ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_settings_get_for_screen ##### -->
-<para>
-
-</para>
-
-@screen: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_settings_install_property ##### -->
-<para>
-
-</para>
-
-@pspec: 
-
-
-<!-- ##### FUNCTION gtk_settings_install_property_parser ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@parser: 
-
-
-<!-- ##### FUNCTION gtk_rc_property_parse_color ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@gstring: 
-@property_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_rc_property_parse_enum ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@gstring: 
-@property_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_rc_property_parse_flags ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@gstring: 
-@property_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_rc_property_parse_requisition ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@gstring: 
-@property_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_rc_property_parse_border ##### -->
-<para>
-
-</para>
-
-@pspec: 
-@gstring: 
-@property_value: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_settings_set_property_value ##### -->
-<para>
-
-</para>
-
-@settings: 
-@name: 
-@svalue: 
-
-
-<!-- ##### FUNCTION gtk_settings_set_string_property ##### -->
-<para>
-
-</para>
-
-@settings: 
-@name: 
-@v_string: 
-@origin: 
-
-
-<!-- ##### FUNCTION gtk_settings_set_long_property ##### -->
-<para>
-
-</para>
-
-@settings: 
-@name: 
-@v_long: 
-@origin: 
-
-
-<!-- ##### FUNCTION gtk_settings_set_double_property ##### -->
-<para>
-
-</para>
-
-@settings: 
-@name: 
-@v_double: 
-@origin: 
-
-

docs/reference/gtk/tmpl/gtktable.sgml

@@ -32,11 +32,13 @@ either side</emphasis> of the widget it belongs to.
 gtk_table_set_homogeneous(), can be used to set whether all cells in the
 table will resize themselves to the size of the largest widget in the table.
 </para>
+<note>
 <para>
 Note that #GtkGrid provides the same capabilities as GtkTable for arranging
 widgets in a rectangular grid, and additionally supports height-for-width
 geometry management.
 </para>
+</note>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>

docs/reference/gtk/tmpl/gtktextview.sgml

@@ -1,883 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkTextView
-
-<!-- ##### SECTION Short_Description ##### -->
-Widget that displays a GtkTextBuffer
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-You may wish to begin by reading the <link linkend="TextWidget">text widget
-conceptual overview</link> which gives an overview of all the objects and data
-types related to the text widget and how they work together.
-</para>
-
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkTextBuffer, #GtkTextIter
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkTextView ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkTextView::backspace ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::copy-clipboard ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::cut-clipboard ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::delete-from-cursor ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkTextView::insert-at-cursor ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkTextView::move-cursor ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-<!-- ##### SIGNAL GtkTextView::move-viewport ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkTextView::paste-clipboard ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::populate-popup ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkTextView::preedit-changed ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkTextView::select-all ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkTextView::set-anchor ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::set-scroll-adjustments ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-@arg1: 
-@arg2: 
-
-<!-- ##### SIGNAL GtkTextView::toggle-cursor-visible ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### SIGNAL GtkTextView::toggle-overwrite ##### -->
-<para>
-
-</para>
-
-@textview: the object which received the signal.
-
-<!-- ##### ARG GtkTextView:accepts-tab ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:buffer ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:cursor-visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:editable ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:im-module ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:indent ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:justification ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:left-margin ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:overwrite ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:pixels-above-lines ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:pixels-below-lines ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:pixels-inside-wrap ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:right-margin ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:tabs ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:wrap-mode ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkTextView:error-underline-color ##### -->
-<para>
-
-</para>
-
-<!-- ##### ENUM GtkTextWindowType ##### -->
-<para>
-
-</para>
-
-@GTK_TEXT_WINDOW_PRIVATE: 
-@GTK_TEXT_WINDOW_WIDGET: 
-@GTK_TEXT_WINDOW_TEXT: 
-@GTK_TEXT_WINDOW_LEFT: 
-@GTK_TEXT_WINDOW_RIGHT: 
-@GTK_TEXT_WINDOW_TOP: 
-@GTK_TEXT_WINDOW_BOTTOM: 
-
-<!-- ##### FUNCTION gtk_text_view_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_new_with_buffer ##### -->
-<para>
-
-</para>
-
-@buffer: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_buffer ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@buffer: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_buffer ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_hadjustment ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_vadjustment ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_scroll_to_mark ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@mark: 
-@within_margin: 
-@use_align: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_text_view_scroll_to_iter ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@within_margin: 
-@use_align: 
-@xalign: 
-@yalign: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_scroll_mark_onscreen ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@mark: 
-
-
-<!-- ##### FUNCTION gtk_text_view_move_mark_onscreen ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@mark: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_place_cursor_onscreen ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_visible_rect ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@visible_rect: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_iter_location ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@location: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_line_at_y ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@target_iter: 
-@y: 
-@line_top: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_line_yrange ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@y: 
-@height: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_iter_at_location ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_iter_at_position ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@trailing: 
-@x: 
-@y: 
-
-
-<!-- ##### FUNCTION gtk_text_view_buffer_to_window_coords ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@win: 
-@buffer_x: 
-@buffer_y: 
-@window_x: 
-@window_y: 
-
-
-<!-- ##### FUNCTION gtk_text_view_window_to_buffer_coords ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@win: 
-@window_x: 
-@window_y: 
-@buffer_x: 
-@buffer_y: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_window ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@win: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_window_type ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_border_window_size ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@type: 
-@size: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_border_window_size ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@type: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_forward_display_line ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_backward_display_line ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_forward_display_line_end ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_backward_display_line_start ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_starts_display_line ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_move_visually ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@iter: 
-@count: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_add_child_at_anchor ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@child: 
-@anchor: 
-
-
-<!-- ##### STRUCT GtkTextChildAnchor ##### -->
-<para>
-A <structname>GtkTextChildAnchor</structname> is a spot in the buffer 
-where child widgets can be "anchored" (inserted inline, as if they were 
-characters). The anchor can have multiple widgets anchored, to allow for 
-multiple views.
-</para>
-
-
-<!-- ##### FUNCTION gtk_text_child_anchor_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_child_anchor_get_widgets ##### -->
-<para>
-
-</para>
-
-@anchor: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_child_anchor_get_deleted ##### -->
-<para>
-
-</para>
-
-@anchor: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_add_child_in_window ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@child: 
-@which_window: 
-@xpos: 
-@ypos: 
-
-
-<!-- ##### FUNCTION gtk_text_view_move_child ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@child: 
-@xpos: 
-@ypos: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_wrap_mode ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@wrap_mode: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_wrap_mode ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_editable ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@setting: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_editable ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_cursor_visible ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@setting: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_cursor_visible ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_overwrite ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@overwrite: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_overwrite ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_pixels_above_lines ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@pixels_above_lines: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_pixels_above_lines ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_pixels_below_lines ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@pixels_below_lines: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_pixels_below_lines ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_pixels_inside_wrap ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@pixels_inside_wrap: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_pixels_inside_wrap ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_justification ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@justification: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_justification ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_left_margin ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@left_margin: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_left_margin ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_right_margin ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@right_margin: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_right_margin ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_indent ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@indent: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_indent ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_tabs ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@tabs: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_tabs ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_set_accepts_tab ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@accepts_tab: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_accepts_tab ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_get_default_attributes ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_im_context_filter_keypress ##### -->
-<para>
-
-</para>
-
-@text_view: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_text_view_reset_im_context ##### -->
-<para>
-
-</para>
-
-@text_view: 
-
-
-<!-- ##### MACRO GTK_TEXT_VIEW_PRIORITY_VALIDATE ##### -->
-<para>
-The priority at which the text view validates onscreen lines
-in an idle job in the background.
-</para>
-
-
-

docs/tools/widgets.c

@@ -222,7 +222,7 @@ create_radio (void)
   GtkWidget *radio;
   GtkWidget *align;
 
-  widget = gtk_vbox_new (FALSE, 3);
+  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
   gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE, 0);
   radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
@@ -261,7 +261,7 @@ create_accel_label (void)
   gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (widget), button);
   gtk_widget_set_no_show_all (button, TRUE);
 
-  box = gtk_vbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (box), widget);
   gtk_container_add (GTK_CONTAINER (box), button);
 
@@ -424,7 +424,7 @@ create_icon_view (void)
 
   gtk_container_add (GTK_CONTAINER (widget), icon_view);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
@@ -446,7 +446,7 @@ create_color_button (void)
   GtkWidget *align;
   GdkColor color;
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   color.red = 0x1e<<8;  /* Go Gagne! */
   color.green = 0x90<<8;
@@ -468,7 +468,7 @@ create_font_button (void)
   GtkWidget *picker;
   GtkWidget *align;
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_font_button_new_with_font ("Sans Serif 10");
   gtk_container_add (GTK_CONTAINER (align), picker);
@@ -488,8 +488,8 @@ create_file_button (void)
   GtkWidget *picker;
   GtkWidget *align;
 
-  vbox = gtk_vbox_new (FALSE, 12);
-  vbox2 = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
 		  			GTK_FILE_CHOOSER_ACTION_OPEN);
@@ -504,10 +504,10 @@ create_file_button (void)
   gtk_box_pack_start (GTK_BOX (vbox),
 		      vbox2, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_hseparator_new (),
+		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
 		      FALSE, FALSE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 3);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
 		  			GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@@ -530,13 +530,14 @@ create_separator (void)
   GtkWidget *hbox;
   GtkWidget *vbox;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_hseparator_new (),
+		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
 		      TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_vseparator_new (),
+		      gtk_separator_new (GTK_ORIENTATION_VERTICAL),
 		      TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -555,9 +556,10 @@ create_panes (void)
   GtkWidget *vbox;
   GtkWidget *pane;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 12);
-  pane = gtk_hpaned_new ();
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+  pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
 				 "shadow", GTK_SHADOW_IN,
@@ -571,7 +573,7 @@ create_panes (void)
   gtk_box_pack_start (GTK_BOX (hbox),
 		      pane,
 		      TRUE, TRUE, 0);
-  pane = gtk_vpaned_new ();
+  pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
 				 "shadow", GTK_SHADOW_IN,
@@ -788,7 +790,7 @@ create_menubar (void)
   item = gtk_menu_item_new_with_mnemonic ("_Help");
   gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -868,7 +870,7 @@ create_progressbar (void)
   widget = gtk_progress_bar_new ();
   gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -901,7 +903,7 @@ create_spinbutton (void)
 
   widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -919,7 +921,7 @@ create_statusbar (void)
   GtkWidget *widget;
   GtkWidget *vbox, *align;
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), gtk_label_new ("Status Bar"));
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -944,13 +946,16 @@ create_scales (void)
   GtkWidget *hbox;
   GtkWidget *vbox;
 
-  vbox = gtk_vbox_new (FALSE, 3);
-  hbox = gtk_hbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_hscale_new_with_range (0.0, 100.0, 1.0),
+		      gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
+                                                0.0, 100.0, 1.0),
 		      TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_vscale_new_with_range (0.0, 100.0, 1.0),
+		      gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
+                                                0.0, 100.0, 1.0),
 		      TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -970,7 +975,7 @@ create_image (void)
   widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
 				     GTK_ICON_SIZE_DND);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
@@ -990,7 +995,7 @@ create_spinner (void)
   widget = gtk_spinner_new ();
   gtk_widget_set_size_request (widget, 24, 24);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
   gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);

examples/arrow/arrow.c

@@ -44,7 +44,7 @@ int main( int   argc,
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
   /* Create a box to hold the arrows/buttons */
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (box), 2);
   gtk_container_add (GTK_CONTAINER (window), box);
 

examples/buttonbox/buttonbox.c

@@ -16,9 +16,9 @@ static GtkWidget *create_bbox( gint  horizontal,
   frame = gtk_frame_new (title);
 
   if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 
   gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), bbox);
@@ -61,13 +61,13 @@ int main( int   argc,
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-  main_vbox = gtk_vbox_new (FALSE, 0);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
   frame_horz = gtk_frame_new ("Horizontal Button Boxes");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
   gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
@@ -90,7 +90,7 @@ int main( int   argc,
   frame_vert = gtk_frame_new ("Vertical Button Boxes");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
   gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 

examples/buttons/buttons.c

@@ -13,7 +13,7 @@ static GtkWidget *xpm_label_box( gchar     *xpm_filename,
     GtkWidget *image;
 
     /* Create box for image and label */
-    box = gtk_hbox_new (FALSE, 0);
+    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (box), 2);
 
     /* Now on to the image stuff */

examples/calendar/calendar.c

@@ -277,16 +277,16 @@ static void create_calendar( void )
 		    NULL);
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
-  vbox = gtk_vbox_new (FALSE, DEF_PAD);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   /*
    * The top part of the window, Calendar, flags and fontsel.
    */
 
-  hbox = gtk_hbox_new (FALSE, DEF_PAD);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
-  hbbox = gtk_hbutton_box_new ();
+  hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_set_spacing (GTK_BOX (hbbox), 5);
@@ -322,17 +322,17 @@ static void create_calendar( void )
 		    &calendar_data);
 
 
-  separator = gtk_vseparator_new ();
+  separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (hbox), separator, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, DEF_PAD);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, DEF_PAD);
 
   /* Build the Right frame with the flags in */
 
   frame = gtk_frame_new ("Flags");
   gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, DEF_PAD);
-  vbox3 = gtk_vbox_new (TRUE, DEF_PAD_SMALL);
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
   gtk_container_add (GTK_CONTAINER (frame), vbox3);
 
   for (i = 0; i < 5; i++)
@@ -360,31 +360,31 @@ static void create_calendar( void )
   frame = gtk_frame_new ("Signal events");
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, DEF_PAD);
 
-  vbox2 = gtk_vbox_new (TRUE, DEF_PAD_SMALL);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, TRUE, DEF_PAD_SMALL);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.last_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.prev_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 3);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 3);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
   label = gtk_label_new ("Second previous signal:");
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   calendar_data.prev2_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 

examples/entry/entry.c

@@ -48,7 +48,7 @@ int main( int   argc,
                               G_CALLBACK (gtk_widget_destroy),
                               window);
 
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 
@@ -65,7 +65,7 @@ int main( int   argc,
     gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);
     gtk_widget_show (entry);
 
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (vbox), hbox);
     gtk_widget_show (hbox);
 

examples/gtkdial/dial_test.c

@@ -34,7 +34,7 @@ int main( int   argc,
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

examples/helloworld2/helloworld2.c

@@ -48,7 +48,7 @@ int main (int   argc,
     /* We create a box to pack widgets into.  This is described in detail
      * in the "packing" section. The box is not really visible, it
      * is just used as a tool to arrange widgets. */
-    box1 = gtk_hbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
     /* Put the box into the main window. */
     gtk_container_add (GTK_CONTAINER (window), box1);

examples/label/label.c

@@ -19,8 +19,8 @@ int main( int   argc,
 		    NULL);
 
   gtk_window_set_title (GTK_WINDOW (window), "Label");
-  vbox = gtk_vbox_new (FALSE, 5);
-  hbox = gtk_hbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), hbox);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
@@ -50,7 +50,7 @@ int main( int   argc,
   gtk_container_add (GTK_CONTAINER (frame), label);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   frame = gtk_frame_new ("Line wrapped label");
   label = gtk_label_new ("This is an example of a line-wrapped label.  It " \

examples/menu/itemfactory.c

@@ -150,7 +150,7 @@ int main( int argc,
   gtk_widget_set_size_request (GTK_WIDGET(window), 300, 200);
  
   /* Make a vbox to put the three menus in */
-  main_vbox = gtk_vbox_new (FALSE, 1);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 1);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
  

examples/menu/menu.c

@@ -72,7 +72,7 @@ int main( int   argc,
     gtk_menu_item_set_submenu (GTK_MENU_ITEM (root_menu), menu);
 
     /* A vbox to put a menu and a button in: */
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 

examples/packbox/packbox.c

@@ -26,7 +26,7 @@ static GtkWidget *make_box( gboolean homogeneous,
 
     /* Create a new hbox with the appropriate homogeneous
      * and spacing settings */
-    box = gtk_hbox_new (homogeneous, spacing);
+    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, homogeneous, spacing);
 
     /* Create a series of buttons with the appropriate settings */
     button = gtk_button_new_with_label ("gtk_box_pack");
@@ -102,13 +102,13 @@ int main( int   argc,
     /* We create a vertical box (vbox) to pack the horizontal boxes into.
      * This allows us to stack the horizontal boxes filled with buttons one
      * on top of the other in this vbox. */
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
 
     /* which example to show. These correspond to the pictures above. */
     switch (which) {
     case 1:
 	/* create a new label. */
-	label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
+	label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);");
 
 	/* Align the label to the left side.  We'll discuss this function and
 	 * others in the section on Widget Attributes. */
@@ -141,7 +141,7 @@ int main( int   argc,
 
 	/* Creates a separator, we'll learn more about these later,
 	 * but they are quite simple. */
-	separator = gtk_hseparator_new ();
+	separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 
         /* Pack the separator into the vbox. Remember each of these
          * widgets is being packed into a vbox, so they'll be stacked
@@ -150,7 +150,7 @@ int main( int   argc,
 	gtk_widget_show (separator);
 
 	/* Create another new label, and show it. */
-	label = gtk_label_new ("gtk_hbox_new (TRUE, 0);");
+	label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
@@ -166,7 +166,7 @@ int main( int   argc,
 	gtk_widget_show (box2);
 
 	/* Another new separator. */
-	separator = gtk_hseparator_new ();
+	separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 	/* The last 3 arguments to gtk_box_pack_start are:
 	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
@@ -178,7 +178,7 @@ int main( int   argc,
 
 	/* Create a new label, remember box1 is a vbox as created
 	 * near the beginning of main() */
-	label = gtk_label_new ("gtk_hbox_new (FALSE, 10);");
+	label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
@@ -193,13 +193,13 @@ int main( int   argc,
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
 
-	separator = gtk_hseparator_new ();
+	separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 	/* The last 3 arguments to gtk_box_pack_start are:
 	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
 
-	label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
+	label = gtk_label_new ("gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
@@ -214,7 +214,7 @@ int main( int   argc,
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
 
-	separator = gtk_hseparator_new ();
+	separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 	/* The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
@@ -239,7 +239,7 @@ int main( int   argc,
 	gtk_widget_show (box2);
 
 	/* A separator for the bottom. */
-	separator = gtk_hseparator_new ();
+	separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 	/* This explicitly sets the separator to 400 pixels wide by 5 pixels
 	 * high. This is so the hbox we created will also be 400 pixels wide,
 	 * and the "end" label will be separated from the other labels in the
@@ -253,7 +253,7 @@ int main( int   argc,
     }
 
     /* Create another new hbox.. remember we can use as many as we need! */
-    quitbox = gtk_hbox_new (FALSE, 0);
+    quitbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
     /* Our quit button. */
     button = gtk_button_new_with_label ("Quit");

examples/paned/paned.c

@@ -116,7 +116,7 @@ int main( int   argc,
 
     /* create a vpaned widget and add it to our toplevel window */
    
-    vpaned = gtk_vpaned_new ();
+    vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
     gtk_container_add (GTK_CONTAINER (window), vpaned);
     gtk_widget_show (vpaned);
    

examples/progressbar/progressbar.c

@@ -116,7 +116,7 @@ int main( int   argc,
     gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar");
     gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0);
 
-    vbox = gtk_vbox_new (FALSE, 5);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
     gtk_container_add (GTK_CONTAINER (pdata->window), vbox);
     gtk_widget_show (vbox);
@@ -136,7 +136,7 @@ int main( int   argc,
     /* Add a timer callback to update the value of the progress bar */
     pdata->timer = gdk_threads_add_timeout (100, progress_timeout, pdata);
 
-    separator = gtk_hseparator_new ();
+    separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
     gtk_widget_show (separator);
 

examples/radiobuttons/radiobuttons.c

@@ -31,11 +31,11 @@ int main( int   argc,
     gtk_window_set_title (GTK_WINDOW (window), "radio buttons");
     gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), box1);
     gtk_widget_show (box1);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -55,11 +55,11 @@ int main( int   argc,
     gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
     gtk_widget_show (button);
 
-    separator = gtk_hseparator_new ();
+    separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
     gtk_widget_show (separator);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
     gtk_widget_show (box2);

examples/rangewidgets/rangewidgets.c

@@ -96,11 +96,11 @@ static void create_range_controls( void )
                       NULL);
     gtk_window_set_title (GTK_WINDOW (window), "range controls");
 
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), box1);
     gtk_widget_show (box1);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -111,24 +111,24 @@ static void create_range_controls( void )
      * (upper - page_size). */
     adj1 = gtk_adjustment_new (0.0, 0.0, 101.0, 0.1, 1.0, 1.0);
 
-    vscale = gtk_vscale_new (GTK_ADJUSTMENT (adj1));
+    vscale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adj1));
     scale_set_default_values (GTK_SCALE (vscale));
     gtk_box_pack_start (GTK_BOX (box2), vscale, TRUE, TRUE, 0);
     gtk_widget_show (vscale);
 
-    box3 = gtk_vbox_new (FALSE, 10);
+    box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_box_pack_start (GTK_BOX (box2), box3, TRUE, TRUE, 0);
     gtk_widget_show (box3);
 
     /* Reuse the same adjustment */
-    hscale = gtk_hscale_new (GTK_ADJUSTMENT (adj1));
+    hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj1));
     gtk_widget_set_size_request (GTK_WIDGET (hscale), 200, -1);
     scale_set_default_values (GTK_SCALE (hscale));
     gtk_box_pack_start (GTK_BOX (box3), hscale, TRUE, TRUE, 0);
     gtk_widget_show (hscale);
 
     /* Reuse the same adjustment again */
-    scrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (adj1));
+    scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj1));
     /* Notice how this causes the scales to always be updated
      * continuously when the scrollbar is moved */
     gtk_range_set_update_policy (GTK_RANGE (scrollbar),
@@ -136,7 +136,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box3), scrollbar, TRUE, TRUE, 0);
     gtk_widget_show (scrollbar);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -149,7 +149,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
     gtk_widget_show (button);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* An option menu to change the position of the value */
@@ -184,7 +184,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* Yet another option menu, this time for the update policy of the
@@ -218,7 +218,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* An HScale widget for adjusting the number of digits on the
@@ -230,7 +230,7 @@ static void create_range_controls( void )
     adj2 = gtk_adjustment_new (1.0, 0.0, 5.0, 1.0, 1.0, 0.0);
     g_signal_connect (adj2, "value_changed",
                       G_CALLBACK (cb_digits_scale), NULL);
-    scale = gtk_hscale_new (GTK_ADJUSTMENT (adj2));
+    scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj2));
     gtk_scale_set_digits (GTK_SCALE (scale), 0);
     gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
     gtk_widget_show (scale);
@@ -238,7 +238,7 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    box2 = gtk_hbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
 
     /* And, one last HScale widget for adjusting the page size of the
@@ -250,7 +250,7 @@ static void create_range_controls( void )
     adj2 = gtk_adjustment_new (1.0, 1.0, 101.0, 1.0, 1.0, 0.0);
     g_signal_connect (adj2, "value-changed",
                       G_CALLBACK (cb_page_size), (gpointer) adj1);
-    scale = gtk_hscale_new (GTK_ADJUSTMENT (adj2));
+    scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj2));
     gtk_scale_set_digits (GTK_SCALE (scale), 0);
     gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
     gtk_widget_show (scale);
@@ -258,11 +258,11 @@ static void create_range_controls( void )
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
 
-    separator = gtk_hseparator_new ();
+    separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
     gtk_widget_show (separator);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
     gtk_widget_show (box2);

examples/rulers/rulers.c

@@ -42,7 +42,7 @@ int main( int   argc,
     /* The horizontal ruler goes on top. As the mouse moves across the
      * drawing area, a motion_notify_event is passed to the
      * appropriate event handler for the ruler. */
-    hrule = gtk_hruler_new ();
+    hrule = gtk_ruler_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_ruler_set_metric (GTK_RULER (hrule), GTK_PIXELS);
     gtk_ruler_set_range (GTK_RULER (hrule), 7, 13, 0, 20);
     g_signal_connect_swapped (area, "motion-notify-event",
@@ -55,7 +55,7 @@ int main( int   argc,
     /* The vertical ruler goes on the left. As the mouse moves across
      * the drawing area, a motion_notify_event is passed to the
      * appropriate event handler for the ruler. */
-    vrule = gtk_vruler_new ();
+    vrule = gtk_ruler_new (GTK_ORIENTATION_VERTICAL);
     gtk_ruler_set_metric (GTK_RULER (vrule), GTK_PIXELS);
     gtk_ruler_set_range (GTK_RULER (vrule), 0, YSIZE, 10, YSIZE );
     g_signal_connect_swapped (area, "motion-notify-event",

examples/scribble-simple/scribble-simple.c

@@ -129,7 +129,7 @@ int main( int   argc,
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "Test Input");
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

examples/scribble-xinput/scribble-xinput.c

@@ -190,7 +190,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_name (window, "Test Input");
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 

examples/spinbutton/spinbutton.c

@@ -69,23 +69,23 @@ int main( int   argc,
 
   gtk_window_set_title (GTK_WINDOW (window), "Spin Button");
 
-  main_vbox = gtk_vbox_new (FALSE, 5);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
   frame = gtk_frame_new ("Not accelerated");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   /* Day, month, year spinners */
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Day :");
@@ -97,7 +97,7 @@ int main( int   argc,
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Month :");
@@ -109,7 +109,7 @@ int main( int   argc,
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Year :");
@@ -125,14 +125,14 @@ int main( int   argc,
   frame = gtk_frame_new ("Accelerated");
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Value :");
@@ -145,7 +145,7 @@ int main( int   argc,
   gtk_widget_set_size_request (spinner1, 100, -1);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
 
   label = gtk_label_new ("Digits :");
@@ -160,7 +160,7 @@ int main( int   argc,
 		    spinner2);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
 
   button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
@@ -179,7 +179,7 @@ int main( int   argc,
 
   val_label = gtk_label_new ("");
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
   button = gtk_button_new_with_label ("Value as Int");
   g_object_set_data (G_OBJECT (button), "user_data", val_label);
@@ -198,7 +198,7 @@ int main( int   argc,
   gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE, 0);
   gtk_label_set_text (GTK_LABEL (val_label), "0");
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
 
   button = gtk_button_new_with_label ("Close");

examples/statusbar/statusbar.c

@@ -41,7 +41,7 @@ int main( int   argc,
     g_signal_connect (window, "delete-event",
                       G_CALLBACK (exit), NULL);
 
-    vbox = gtk_vbox_new (FALSE, 1);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
     gtk_container_add (GTK_CONTAINER (window), vbox);
     gtk_widget_show (vbox);
 

gdk/gdkevents.c

@@ -1032,8 +1032,8 @@ gdk_event_get_device (const GdkEvent *event)
     case GDK_KEY_RELEASE:
       {
         GdkDisplay *display;
-        GdkDevice *core_pointer;
         GdkDeviceManager *device_manager;
+        GdkDevice *client_pointer;
 
         g_warning ("Event with type %d not holding a GdkDevice. "
                    "It is most likely synthesized outside Gdk/GTK+\n",
@@ -1041,13 +1041,13 @@ gdk_event_get_device (const GdkEvent *event)
 
         display = gdk_window_get_display (event->any.window);
         device_manager = gdk_display_get_device_manager (display);
-        core_pointer = gdk_display_get_core_pointer (display);
+        client_pointer = gdk_device_manager_get_client_pointer (device_manager);
 
         if (event->type == GDK_KEY_PRESS ||
             event->type == GDK_KEY_RELEASE)
-          return gdk_device_get_associated_device (core_pointer);
+          return gdk_device_get_associated_device (client_pointer);
         else
-          return core_pointer;
+          return client_pointer;
       }
       break;
     default:

gdk/gdkrgba.c

@@ -72,6 +72,43 @@ gdk_rgba_free (GdkRGBA *rgba)
   g_slice_free (GdkRGBA, rgba);
 }
 
+#define SKIP_WHITESPACES(s) while (*(s) == ' ') (s)++;
+
+/* Parses a single color component from a rgb() or rgba() specification
+ * according to CSS3 rules. Compared to exact CSS3 parsing we are liberal
+ * in what we accept as follows:
+ *
+ *  - For non-percentage values, we accept floats in the range 0-255
+ *    not just [0-9]+ integers
+ *  - For percentage values we accept any float, not just
+ *     [ 0-9]+ | [0-9]* '.' [0-9]+
+ *  - We accept mixed percentages and non-percentages in a single
+ *    rgb() or rgba() specification.
+ */
+static double
+parse_rgb_value (const char  *str,
+		 char       **endp)
+{
+  double number;
+  const char *p;
+
+  number = g_ascii_strtod (str, endp);
+
+  p = *endp;
+
+  SKIP_WHITESPACES (p);
+
+  if (*p == '%')
+    {
+      *endp = (char *)(p + 1);
+      return CLAMP(number / 100., 0., 1.);
+    }
+  else
+    {
+      return CLAMP(number / 255., 0., 1.);
+    }
+}
+
 /**
  * gdk_rgba_parse:
  * @spec: the string specifying the color
@@ -100,8 +137,9 @@ gdk_rgba_free (GdkRGBA *rgba)
  * </itemizedlist>
  *
  * Where 'r', 'g', 'b' and 'a' are respectively the red, green, blue and
- * alpha color values, parsed in the last 2 cases as double numbers in
- * the range [0..1], any other value out of that range will be clamped.
+ * alpha color values. In the last two cases, r g and b are either integers
+ * in the range 0 to 255 or precentage values in the range 0% to 100%, and
+ * a is a floating point value in the range 0 to 1.
  *
  * Returns: %TRUE if the parsing succeeded
  **/
@@ -113,8 +151,6 @@ gdk_rgba_parse (const gchar *spec,
   gdouble r, g, b, a;
   gchar *str = (gchar *) spec;
 
-#define SKIP_WHITESPACES(s) while (*(s) == ' ') (s)++;
-
   if (strncmp (str, "rgba", 4) == 0)
     {
       has_alpha = TRUE;
@@ -157,7 +193,7 @@ gdk_rgba_parse (const gchar *spec,
 
   /* Parse red */
   SKIP_WHITESPACES (str);
-  r = g_ascii_strtod (str, &str);
+  r = parse_rgb_value (str, &str);
   SKIP_WHITESPACES (str);
 
   if (*str != ',')
@@ -167,7 +203,7 @@ gdk_rgba_parse (const gchar *spec,
 
   /* Parse green */
   SKIP_WHITESPACES (str);
-  g = g_ascii_strtod (str, &str);
+  g = parse_rgb_value (str, &str);
   SKIP_WHITESPACES (str);
 
   if (*str != ',')
@@ -177,7 +213,7 @@ gdk_rgba_parse (const gchar *spec,
 
   /* Parse blue */
   SKIP_WHITESPACES (str);
-  b = g_ascii_strtod (str, &str);
+  b = parse_rgb_value (str, &str);
   SKIP_WHITESPACES (str);
 
   if (has_alpha)
@@ -195,8 +231,6 @@ gdk_rgba_parse (const gchar *spec,
   if (*str != ')')
     return FALSE;
 
-#undef SKIP_WHITESPACES
-
   if (rgba)
     {
       rgba->red = CLAMP (r, 0, 1);
@@ -208,6 +242,8 @@ gdk_rgba_parse (const gchar *spec,
   return TRUE;
 }
 
+#undef SKIP_WHITESPACES
+
 /**
  * gdk_rgba_hash:
  * @p: a #GdkRGBA pointer.
@@ -259,25 +295,36 @@ gdk_rgba_equal (gconstpointer p1,
  * gdk_rgba_to_string:
  * @rgba: a #GdkRGBA
  *
- * Returns a textual specification of @rgba in the form
- * <literal>rgba (r, g, b, a)</literal>, where 'r', 'g',
- * 'b' and 'a' represent the red, green, blue and alpha
- * values respectively.
+ * Returns a textual specification of @rgba in the form <literal>rgb
+ * (r, g, b)</literal> or <literal>rgba (r, g, b, a)</literal>,
+ * where 'r', 'g', 'b' and 'a' represent the red, green, blue and alpha values
+ * respectively. r, g, and b are integers in the range 0 to 255, and a
+ * is a floating point value in the range 0 to 1.
+ *
+ * (These string forms are string forms those supported by the CSS3 colors module)
  *
  * Returns: A newly allocated text string
  **/
 gchar *
-gdk_rgba_to_string (GdkRGBA *rgba)
+gdk_rgba_to_string (const GdkRGBA *rgba)
 {
-  gchar red[G_ASCII_DTOSTR_BUF_SIZE];
-  gchar green[G_ASCII_DTOSTR_BUF_SIZE];
-  gchar blue[G_ASCII_DTOSTR_BUF_SIZE];
-  gchar alpha[G_ASCII_DTOSTR_BUF_SIZE];
+  if (rgba->alpha > 0.999)
+    {
+      return g_strdup_printf ("rgb(%d,%d,%d)",
+			      (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
+			      (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
+			      (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.));
+    }
+  else
+    {
+      gchar alpha[G_ASCII_DTOSTR_BUF_SIZE];
 
-  g_ascii_dtostr (red, G_ASCII_DTOSTR_BUF_SIZE, CLAMP (rgba->red, 0, 1));
-  g_ascii_dtostr (green, G_ASCII_DTOSTR_BUF_SIZE, CLAMP (rgba->green, 0, 1));
-  g_ascii_dtostr (blue, G_ASCII_DTOSTR_BUF_SIZE, CLAMP (rgba->blue, 0, 1));
-  g_ascii_dtostr (alpha, G_ASCII_DTOSTR_BUF_SIZE, CLAMP (rgba->alpha, 0, 1));
+      g_ascii_dtostr (alpha, G_ASCII_DTOSTR_BUF_SIZE, CLAMP (rgba->alpha, 0, 1));
 
-  return g_strdup_printf ("rgba(%s,%s,%s,%s)", red, green, blue, alpha);
+      return g_strdup_printf ("rgba(%d,%d,%d,%s)",
+			      (int)(0.5 + CLAMP (rgba->red, 0., 1.) * 255.),
+			      (int)(0.5 + CLAMP (rgba->green, 0., 1.) * 255.),
+			      (int)(0.5 + CLAMP (rgba->blue, 0., 1.) * 255.),
+			      alpha);
+    }
 }

gdk/gdkrgba.h

@@ -55,7 +55,7 @@ guint     gdk_rgba_hash  (gconstpointer p);
 gboolean  gdk_rgba_equal (gconstpointer p1,
                           gconstpointer p2);
 
-gchar *   gdk_rgba_to_string (GdkRGBA *rgba);
+gchar *   gdk_rgba_to_string (const GdkRGBA *rgba);
 
 GType     gdk_rgba_get_type (void) G_GNUC_CONST;
 

gdk/tests/gdk-color.c

@@ -14,23 +14,23 @@ test_color_parse (void)
   res = gdk_rgba_parse ("", &color);
   g_assert (!res);
 
+  expected.red = 100/255.;
+  expected.green = 90/255.;
+  expected.blue = 80/255.;
+  expected.alpha = 0.1;
+  res = gdk_rgba_parse ("rgba(100,90,80,0.1)", &color);
+  g_assert (res);
+  g_assert (gdk_rgba_equal (&color, &expected));
+
   expected.red = 0.4;
   expected.green = 0.3;
   expected.blue = 0.2;
   expected.alpha = 0.1;
-  res = gdk_rgba_parse ("rgba(0.4,0.3,0.2,0.1)", &color);
+  res = gdk_rgba_parse ("rgba(40%,30%,20%,0.1)", &color);
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
-  res = gdk_rgba_parse ("rgba ( 0.4 ,  0.3  ,   0.2 ,  0.1     )", &color);
-  g_assert (res);
-  g_assert (gdk_rgba_equal (&color, &expected));
-
-  expected.red = 0.4;
-  expected.green = 0.3;
-  expected.blue = 0.2;
-  expected.alpha = 1.0;
-  res = gdk_rgba_parse ("rgb(0.4,0.3,0.2)", &color);
+  res = gdk_rgba_parse ("rgba(  40 % ,  30 %  ,   20 % ,  0.1    )", &color);
   g_assert (res);
   g_assert (gdk_rgba_equal (&color, &expected));
 
@@ -61,10 +61,13 @@ test_color_to_string (void)
   gchar *res_en;
   gchar *orig;
 
+  /* Using /255. values for the r, g, b components should
+   * make sure they round-trip exactly without rounding
+   * from the double => integer => double conversions */
   rgba.red = 1.0;
-  rgba.green = 0.5;
-  rgba.blue = 0.1;
-  rgba.alpha = 1.0;
+  rgba.green = 128/255.;
+  rgba.blue = 64/255.;
+  rgba.alpha = 0.5;
 
   orig = g_strdup (setlocale (LC_ALL, NULL));
   res = gdk_rgba_to_string (&rgba);

gdk/win32/gdkcursor-win32.c

@@ -170,14 +170,6 @@ gdk_cursor_new_for_display (GdkDisplay   *display,
   return cursor_new_from_hcursor (hcursor, cursor_type);
 }
 
-static gboolean
-color_is_white (const GdkColor *color)
-{
-  return (color->red == 0xFFFF
-	  && color->green == 0xFFFF
-	  && color->blue == 0xFFFF);
-}
-
 /* FIXME: The named cursors below are presumably not really useful, as
  * the names are Win32-specific. No GTK+ application developed on Unix
  * (and most cross-platform GTK+ apps are developed on Unix) is going

gdk/win32/gdkdevice-wintab.c

@@ -145,7 +145,7 @@ gdk_device_wintab_get_state (GdkDevice       *device,
     }
 
   if (device_wintab->last_axis_data)
-    _gdk_device_wintab_translate_axes (device, window, axes, NULL, NULL);
+    _gdk_device_wintab_translate_axes (device_wintab, window, axes, NULL, NULL);
 }
 
 static void

gdk/xcb/Makefile.am

@@ -0,0 +1,27 @@
+include $(top_srcdir)/Makefile.decl
+
+libgdkincludedir = $(includedir)/gtk-3.0/gdk
+
+INCLUDES = 				\
+	-DG_LOG_DOMAIN=\"Gdk\"		\
+	-DGDK_COMPILATION		\
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdk		\
+	-I$(top_builddir)/gdk		\
+	$(GTK_DEBUG_FLAGS) 		\
+	$(GDK_DEP_CFLAGS)
+
+LDADDS = $(GDK_DEP_LIBS)
+
+noinst_LTLIBRARIES = libgdk-xcb.la
+
+libgdk_xcb_la_SOURCES =    	\
+	dragcontext.c		\
+	visual.c		\
+	screen.c		\
+	display.c		\
+	init.c			\
+	window.c		\
+	nothing.c
+
+-include $(top_srcdir)/git.mk

gdk/xcb/display.c

@@ -0,0 +1,62 @@
+#include "gdk.h"
+
+#include "screen.h"
+
+#include <xcb/xcb.h>
+
+typedef GdkDisplayClass GdkDisplayXcbClass;
+
+typedef struct
+{
+  GdkDisplay parent_instance;
+
+  GdkScreen *default_screen;
+  xcb_connection_t *cn;
+} GdkDisplayXcb;
+
+GType gdk_screen_xcb_get_type (void);
+static GType gdk_display_xcb_get_type (void);
+G_DEFINE_TYPE (GdkDisplayXcb, gdk_display_xcb, GDK_TYPE_DISPLAY)
+
+static void
+gdk_display_xcb_init (GdkDisplayXcb *dispxcb)
+{
+}
+
+static void
+gdk_display_xcb_class_init (GdkDisplayXcbClass *class)
+{
+}
+
+GdkDisplay *
+gdk_display_open (const gchar *display_name)
+{
+  GdkDisplayXcb *dispxcb;
+  xcb_connection_t *cn;
+  xcb_screen_t *scr;
+
+  /* XXX how does this work? */
+  g_assert (display_name == NULL);
+
+  cn = xcb_connect (NULL, NULL);
+  const xcb_setup_t *setup = xcb_get_setup (cn);
+  xcb_screen_iterator_t iter = xcb_setup_roots_iterator (setup);
+  scr = iter.data;
+
+  if (cn == NULL)
+    return NULL;
+
+  dispxcb = g_object_new (gdk_display_xcb_get_type (), NULL);
+  dispxcb->default_screen = gdk_screen_xcb_new ((GdkDisplay *) dispxcb, 0, scr);
+  dispxcb->cn = cn;
+
+  return (GdkDisplay *) dispxcb;
+}
+
+GdkScreen *
+gdk_display_get_default_screen (GdkDisplay *display)
+{
+  GdkDisplayXcb *dispxcb = (GdkDisplayXcb *) display;
+
+  return dispxcb->default_screen;
+}

gdk/xcb/dragcontext.c

@@ -0,0 +1,13 @@
+#include "gdk.h"
+
+G_DEFINE_TYPE (GdkDragContext, gdk_drag_context, G_TYPE_OBJECT)
+
+static void
+gdk_drag_context_init (GdkDragContext *context)
+{
+}
+
+static void
+gdk_drag_context_class_init (GdkDragContextClass *class)
+{
+}

gdk/xcb/init.c

@@ -0,0 +1,11 @@
+#include "gdk.h"
+
+void
+_gdk_windowing_init (void)
+{
+}
+
+void
+_gdk_windowing_set_default_display (GdkDisplay *disp)
+{
+}

gdk/xcb/nothing.c

@@ -0,0 +1,154 @@
+#include <glib.h>
+
+/* from gdk */
+void _gdk_windowing_after_process_all_updates (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_get_input_shape (void) { g_assert_not_reached (); }
+void gdk_keymap_get_for_display (void) { g_assert_not_reached (); }
+void gdk_device_ungrab (void) { g_assert_not_reached (); }
+void gdk_display_get_name (void) { g_assert_not_reached (); }
+void _gdk_windowing_launch_failed (void) { g_assert_not_reached (); }
+void gdk_screen_get_height_mm (void) { g_assert_not_reached (); }
+void gdk_window_foreign_new_for_display (void) { g_assert_not_reached (); }
+void _gdk_windowing_substitute_screen_number (void) { g_assert_not_reached (); }
+void gdk_screen_get_n_monitors (void) { g_assert_not_reached (); }
+void gdk_screen_get_width_mm (void) { g_assert_not_reached (); }
+void gdk_cursor_new_for_display (void) { g_assert_not_reached (); }
+void _gdk_windowing_get_device_state (void) { g_assert_not_reached (); }
+void gdk_string_to_compound_text_for_display (void) { g_assert_not_reached (); }
+void gdk_text_property_to_text_list_for_display (void) { g_assert_not_reached (); }
+void gdk_drag_find_window_for_screen (void) { g_assert_not_reached (); }
+void gdk_display_supports_composite (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_destroy_foreign (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_get_next_serial (void) { g_assert_not_reached (); }
+void _gdk_events_queue (void) { g_assert_not_reached (); }
+void gdk_utf8_to_compound_text_for_display (void) { g_assert_not_reached (); }
+void gdk_display_beep (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_at_device_position (void) { g_assert_not_reached (); }
+void gdk_drag_get_protocol_for_display (void) { g_assert_not_reached (); }
+void gdk_input_set_extension_events (void) { g_assert_not_reached (); }
+void gdk_selection_send_notify_for_display (void) { g_assert_not_reached (); }
+void gdk_display_sync (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_process_updates_recurse (void) { g_assert_not_reached (); }
+void _gdk_cursor_destroy (void) { g_assert_not_reached (); }
+void gdk_screen_get_monitor_geometry (void) { g_assert_not_reached (); }
+void gdk_display_flush (void) { g_assert_not_reached (); }
+void gdk_screen_list_visuals (void) { g_assert_not_reached (); }
+void _gdk_windowing_get_startup_notify_id (void) { g_assert_not_reached (); }
+void _gdk_windowing_before_process_all_updates (void) { g_assert_not_reached (); }
+void gdk_screen_get_width (void) { g_assert_not_reached (); }
+void _gdk_windowing_event_data_free (void) { g_assert_not_reached (); }
+void gdk_selection_owner_set_for_display (void) { g_assert_not_reached (); }
+void _gdk_input_check_extension_events (void) { g_assert_not_reached (); }
+void _gdk_windowing_event_data_copy (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_set_composited (void) { g_assert_not_reached (); }
+void gdk_screen_make_display_name (void) { g_assert_not_reached (); }
+void _gdk_windowing_device_grab (void) { g_assert_not_reached (); }
+void *_gdk_windowing_args = NULL;
+void _gdk_windowing_window_beep (void) { g_assert_not_reached (); }
+void _gdk_windowing_display_set_sm_client_id (void) { g_assert_not_reached (); }
+void gdk_screen_get_height (void) { g_assert_not_reached (); }
+void gdk_screen_broadcast_client_message (void) { g_assert_not_reached (); }
+void gdk_selection_owner_get_for_display (void) { g_assert_not_reached (); }
+void gdk_screen_get_rgba_visual (void) { g_assert_not_reached (); }
+void _gdk_windowing_window_get_shape (void) { g_assert_not_reached (); }
+void gdk_event_send_client_message_for_display (void) { g_assert_not_reached (); }
+void gdk_text_property_to_utf8_list_for_display (void) { g_assert_not_reached (); }
+
+/* from gtk */
+void gdk_display_supports_selection_notification (void) { g_assert_not_reached (); }
+void gdk_keymap_get_entries_for_keycode (void) { g_assert_not_reached (); }
+void gdk_spawn_on_screen (void) { g_assert_not_reached (); }
+void gdk_keyval_name (void) { g_assert_not_reached (); }
+void gdk_drop_reply (void) { g_assert_not_reached (); }
+void gdk_window_lookup_for_display (void) { g_assert_not_reached (); }
+void gdk_keymap_get_entries_for_keyval (void) { g_assert_not_reached (); }
+void gdk_display_get_n_screens (void) { g_assert_not_reached (); }
+void gdk_display_request_selection_notification (void) { g_assert_not_reached (); }
+void gdk_keymap_get_caps_lock_state (void) { g_assert_not_reached (); }
+void gdk_window_begin_move_drag (void) { g_assert_not_reached (); }
+void gdk_drag_status (void) { g_assert_not_reached (); }
+void gdk_window_set_icon_list (void) { g_assert_not_reached (); }
+void gdk_window_set_keep_above (void) { g_assert_not_reached (); }
+void gdk_window_set_type_hint (void) { g_assert_not_reached (); }
+void gdk_keymap_get_num_lock_state (void) { g_assert_not_reached (); }
+void gdk_display_get_maximal_cursor_size (void) { g_assert_not_reached (); }
+void gdk_drag_context_get_device (void) { g_assert_not_reached (); }
+void gdk_notify_startup_complete (void) { g_assert_not_reached (); }
+void gdk_window_set_title (void) { g_assert_not_reached (); }
+void gdk_keymap_get_direction (void) { g_assert_not_reached (); }
+void gdk_flush (void) { g_assert_not_reached (); }
+void gdk_selection_property_get (void) { g_assert_not_reached (); }
+void gdk_drag_context_set_device (void) { g_assert_not_reached (); }
+void gdk_window_set_skip_taskbar_hint (void) { g_assert_not_reached (); }
+void gdk_window_unfullscreen (void) { g_assert_not_reached (); }
+void gdk_window_set_focus_on_map (void) { g_assert_not_reached (); }
+void gdk_window_enable_synchronized_configure (void) { g_assert_not_reached (); }
+void gdk_window_begin_resize_drag (void) { g_assert_not_reached (); }
+void gdk_property_change (void) { g_assert_not_reached (); }
+void gdk_window_set_decorations (void) { g_assert_not_reached (); }
+void gdk_window_set_role (void) { g_assert_not_reached (); }
+void gdk_cursor_get_display (void) { g_assert_not_reached (); }
+void gdk_window_set_transient_for (void) { g_assert_not_reached (); }
+void gdk_window_get_frame_extents (void) { g_assert_not_reached (); }
+void gdk_test_simulate_button (void) { g_assert_not_reached (); }
+void gdk_keyval_from_name (void) { g_assert_not_reached (); }
+void gdk_window_set_modal_hint (void) { g_assert_not_reached (); }
+void gdk_error_trap_pop_ignored (void) { g_assert_not_reached (); }
+void gdk_error_trap_pop (void) { g_assert_not_reached (); }
+void gdk_display_get_screen (void) { g_assert_not_reached (); }
+void gdk_display_store_clipboard (void) { g_assert_not_reached (); }
+void gdk_cursor_get_image (void) { g_assert_not_reached (); }
+void gdk_drag_motion (void) { g_assert_not_reached (); }
+void gdk_window_set_geometry_hints (void) { g_assert_not_reached (); }
+void gdk_atom_intern_static_string (void) { g_assert_not_reached (); }
+void gdk_error_trap_push (void) { g_assert_not_reached (); }
+void gdk_window_iconify (void) { g_assert_not_reached (); }
+void gdk_screen_is_composited (void) { g_assert_not_reached (); }
+void gdk_display_supports_cursor_color (void) { g_assert_not_reached (); }
+void gdk_window_unstick (void) { g_assert_not_reached (); }
+void gdk_window_set_opacity (void) { g_assert_not_reached (); }
+void gdk_window_fullscreen (void) { g_assert_not_reached (); }
+void gdk_window_set_startup_id (void) { g_assert_not_reached (); }
+void gdk_selection_convert (void) { g_assert_not_reached (); }
+void gdk_window_set_keep_below (void) { g_assert_not_reached (); }
+void gdk_window_register_dnd (void) { g_assert_not_reached (); }
+void gdk_window_deiconify (void) { g_assert_not_reached (); }
+void gdk_property_delete (void) { g_assert_not_reached (); }
+void gdk_window_set_accept_focus (void) { g_assert_not_reached (); }
+void gdk_window_set_urgency_hint (void) { g_assert_not_reached (); }
+void gdk_free_compound_text (void) { g_assert_not_reached (); }
+void gdk_window_maximize (void) { g_assert_not_reached (); }
+void gdk_drag_begin (void) { g_assert_not_reached (); }
+void gdk_drag_get_selection (void) { g_assert_not_reached (); }
+void gdk_window_set_functions (void) { g_assert_not_reached (); }
+void gdk_drag_drop (void) { g_assert_not_reached (); }
+void gdk_cursor_new_from_pixbuf (void) { g_assert_not_reached (); }
+void gdk_test_simulate_key (void) { g_assert_not_reached (); }
+void gdk_utf8_to_string_target (void) { g_assert_not_reached (); }
+void gdk_display_supports_clipboard_persistence (void) { g_assert_not_reached (); }
+void gdk_keymap_map_virtual_modifiers (void) { g_assert_not_reached (); }
+void gdk_window_stick (void) { g_assert_not_reached (); }
+void gdk_display_warp_device (void) { g_assert_not_reached (); }
+void gdk_drag_abort (void) { g_assert_not_reached (); }
+void gdk_window_unmaximize (void) { g_assert_not_reached (); }
+void gdk_cursor_new_from_name (void) { g_assert_not_reached (); }
+void gdk_display_get_default_cursor_size (void) { g_assert_not_reached (); }
+void gdk_set_locale (void) { g_assert_not_reached (); }
+void gdk_window_set_skip_pager_hint (void) { g_assert_not_reached (); }
+void gdk_keymap_add_virtual_modifiers (void) { g_assert_not_reached (); }
+void gdk_window_configure_finished (void) { g_assert_not_reached (); }
+void gdk_atom_name (void) { g_assert_not_reached (); }
+void gdk_property_get (void) { g_assert_not_reached (); }
+void gdk_window_focus (void) { g_assert_not_reached (); }
+void gdk_keymap_translate_keyboard_state (void) { g_assert_not_reached (); }
+void gdk_drop_finish (void) { g_assert_not_reached (); }
+void gdk_atom_intern (void) { g_assert_not_reached (); }
+void gdk_display_supports_cursor_alpha (void) { g_assert_not_reached (); }
+void gdk_notify_startup_complete_with_id (void) { g_assert_not_reached (); }
+
+/* other stuff */
+void gdk_test_render_sync (void) { g_assert_not_reached (); }
+void gdk_display_add_client_message_filter (void) { g_assert_not_reached (); }
+void gdk_screen_get_primary_monitor (void) { g_assert_not_reached (); }
+void gdk_window_get_root_origin (void) { g_assert_not_reached (); }
+void gdk_window_set_icon_name (void) { g_assert_not_reached (); }

gdk/xcb/screen.c

@@ -0,0 +1,93 @@
+#include "gdk.h"
+#include "gdkinternals.h"
+#include "visual.h"
+
+#include <xcb/xcb.h>
+
+typedef GdkScreenClass GdkScreenXcbClass;
+
+typedef struct
+{
+  GdkScreen parent_instance;
+
+  GdkVisual *system_visual;
+  GdkWindow *root_window;
+  GdkDisplay *display;
+
+  xcb_screen_t *scr;
+  gint number;
+} GdkScreenXcb;
+
+static GType gdk_screen_xcb_get_type (void);
+G_DEFINE_TYPE (GdkScreenXcb, gdk_screen_xcb, GDK_TYPE_SCREEN)
+
+static void
+gdk_screen_xcb_init (GdkScreenXcb *scrxcb)
+{
+}
+
+static void
+gdk_screen_xcb_class_init (GdkScreenXcbClass *class)
+{
+}
+
+gboolean
+gdk_screen_get_setting (GdkScreen   *screen,
+                        const gchar *name,
+                        GValue      *value)
+{
+  return FALSE;
+}
+
+GdkDisplay *
+gdk_screen_get_display (GdkScreen *screen)
+{
+  GdkScreenXcb *scrxcb = (GdkScreenXcb *) screen;
+
+  return scrxcb->display;
+}
+
+int
+gdk_screen_get_number (GdkScreen *screen)
+{
+  GdkScreenXcb *scrxcb = (GdkScreenXcb *) screen;
+
+  return scrxcb->number;
+}
+
+GdkVisual *
+gdk_screen_get_system_visual (GdkScreen *screen)
+{
+  GdkScreenXcb *scrxcb = (GdkScreenXcb *) screen;
+
+  return scrxcb->system_visual;
+}
+
+GdkWindow *
+gdk_screen_get_root_window (GdkScreen *screen)
+{
+  GdkScreenXcb *scrxcb = (GdkScreenXcb *) screen;
+
+  return scrxcb->root_window;
+}
+
+GdkScreenXcb *
+gdk_screen_xcb_new (GdkDisplay   *display,
+                    gint          number,
+                    xcb_screen_t *scr)
+{
+  GdkWindowObject *private;
+  GdkScreenXcb *scrxcb;
+
+  scrxcb = g_object_new (gdk_screen_xcb_get_type (), NULL);
+  scrxcb->system_visual = gdk_visual_xcb_new (GDK_SCREEN (scrxcb));
+  scrxcb->root_window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  private = (GdkWindowObject *) scrxcb->root_window;
+  private->visual = scrxcb->system_visual;
+  private->window_type = GDK_WINDOW_ROOT;
+  scrxcb->display = display;
+  scrxcb->number = number;
+  scrxcb->scr = scr;
+
+  return scrxcb;
+}

gdk/xcb/screen.h

@@ -0,0 +1,6 @@
+#include <xcb/xcb.h>
+
+GdkScreen *
+gdk_screen_xcb_new (GdkDisplay   *display,
+                    gint          number,
+                    xcb_screen_t *scr);

gdk/xcb/visual.c

@@ -0,0 +1,43 @@
+#include "visual.h"
+#include "gdk.h"
+
+struct _GdkVisualClass {
+  GObjectClass parent_class;
+};
+
+struct _GdkVisualPrivate {
+  GdkScreen *screen;
+};
+
+G_DEFINE_TYPE (GdkVisual, gdk_visual, G_TYPE_OBJECT)
+
+static void
+gdk_visual_init (GdkVisual *visual)
+{
+  visual->priv = G_TYPE_INSTANCE_GET_PRIVATE (visual,
+                                              GDK_TYPE_VISUAL,
+                                              GdkVisualPrivate);
+}
+
+static void
+gdk_visual_class_init (GdkVisualClass *class)
+{
+  g_type_class_add_private (class, sizeof (GdkVisualPrivate));
+}
+
+GdkScreen *
+gdk_visual_get_screen (GdkVisual *visual)
+{
+  return visual->priv->screen;
+}
+
+GdkVisual *
+gdk_visual_xcb_new (GdkScreen *screen)
+{
+  GdkVisual *visual;
+
+  visual = g_object_new (gdk_visual_get_type (), NULL);
+  visual->priv->screen = screen;
+
+  return visual;
+}

gdk/xcb/visual.h

@@ -0,0 +1,4 @@
+#include "gdk.h"
+
+GdkVisual *
+gdk_visual_xcb_new (GdkScreen *screen);

gdk/xcb/window.c

@@ -0,0 +1,48 @@
+#include "gdkwindowimpl.h"
+#include "gdkinternals.h"
+
+typedef struct
+{
+  GObject parent_instance;
+} GdkWindowImplXcb;
+
+typedef struct
+{
+  GObjectClass parent_class;
+} GdkWindowImplXcbClass;
+
+static void gdk_window_impl_iface_init (GdkWindowImplIface *iface);
+static GType gdk_window_impl_xcb_get_type (void);
+G_DEFINE_TYPE_WITH_CODE (GdkWindowImplXcb,
+                         gdk_window_impl_xcb,
+                         G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL,
+                                                gdk_window_impl_iface_init))
+
+static void
+gdk_window_impl_xcb_init (GdkWindowImplXcb *implxcb)
+{
+}
+
+static void
+gdk_window_impl_xcb_class_init (GdkWindowImplXcbClass *class)
+{
+}
+
+static void
+gdk_window_impl_iface_init (GdkWindowImplIface *iface)
+{
+}
+
+void
+_gdk_window_impl_new (GdkWindow *window,
+                      GdkWindow *real_parent,
+                      GdkScreen *screen,
+                      GdkEventMask event_mask,
+                      GdkWindowAttr *attributes,
+                      gint attributes_mask)
+{
+  GdkWindowObject *private = (GdkWindowObject *) window;
+
+  private->impl = g_object_new (gdk_window_impl_xcb_get_type (), NULL);
+}

gtk/gtk.symbols

@@ -262,6 +262,8 @@ gtk_application_remove_window
 #if IN_FILE(__GTK_ASSISTANT_C__)
 gtk_assistant_get_type G_GNUC_CONST
 gtk_assistant_new
+gtk_assistant_next_page
+gtk_assistant_previous_page
 gtk_assistant_get_current_page
 gtk_assistant_set_current_page
 gtk_assistant_get_n_pages
@@ -821,6 +823,7 @@ gtk_combo_box_get_wrap_width
 gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
+gtk_combo_box_new_with_model_and_entry
 gtk_combo_box_popdown
 gtk_combo_box_popup
 gtk_combo_box_popup_for_device
@@ -2903,9 +2906,14 @@ gtk_scale_button_get_popup
 #if IN_FILE(__GTK_SCROLLABLE_C__)
 gtk_scrollable_get_type G_GNUC_CONST
 gtk_scrollable_get_hadjustment
+gtk_scrollable_get_hscroll_policy
 gtk_scrollable_get_vadjustment
+gtk_scrollable_get_vscroll_policy
+gtk_scrollable_policy_get_type G_GNUC_CONST
 gtk_scrollable_set_hadjustment
+gtk_scrollable_set_hscroll_policy
 gtk_scrollable_set_vadjustment
+gtk_scrollable_set_vscroll_policy
 #endif
 #endif
 

gtk/gtkaboutdialog.c

@@ -574,7 +574,7 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   /* Widgets */
   gtk_widget_push_composite_child ();
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
   gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
@@ -597,7 +597,8 @@ gtk_about_dialog_init (GtkAboutDialog *about)
   gtk_label_set_justify (GTK_LABEL (priv->copyright_label), GTK_JUSTIFY_CENTER);
   gtk_box_pack_start (GTK_BOX (vbox), priv->copyright_label, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (TRUE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, FALSE, 0);
 
   priv->website_label = button = gtk_label_new ("");

gtk/gtkalignment.h

@@ -53,7 +53,7 @@ struct _GtkAlignment
 {
   GtkBin bin;
 
-  /* <private> */
+  /*< private >*/
   GtkAlignmentPrivate *priv;
 };