GtkApplication rewrite

It's needed in gtktestutils.c

NEWS

@@ -1,3 +1,55 @@
+Overview of Changes from GTK+ 2.90.4 to 2.90.5
+==============================================
+
+* Support NOCONFIGURE in autogen.sh to avoid running configure
+
+* The cairo dependency has been bumped to 1.9.10
+
+* Drop aliasing hacks instead use -Bsymbolic-funtions.
+
+* Bugs:
+ 589904 Certain drawing in some widgets does not pass on...
+ 610346 Confusion between GtkWindow:allow-grow and GtkWindow:resizable
+ 613284 Replace GdkRegion with cairo_region_t
+ 617386 Migrate API docs from templates to source files (GtkButton)
+ 617389 Migrate API docs from templates to source files (GtkCalendar)
+ 617392 Migrate API docs from templates to source files (GtkCellEditable)
+ 621414 Can't select file on file browser popup after choosing to sort...
+ 622677 Remove GdkWindowObject public structure
+ 623239 also show num-lock warning
+ 623307 Annotate gdk_display_manager_list_displays return value
+ 623389 [iconview] Fix segfault when using rubberband selection
+ 623476 [windows] gdk fails to compile
+ 623520 gtk+ 3 fails to build from outside git source tree
+ 623845 Use -Bsymbolic
+ 461618 use GSlice for gtkrequisition
+
+* Deprecations and cleanups:
+ - GdkRegion has been removed, and region-using code has been ported
+   to cairo_region_t and cairo_rectangle_int_t.
+ - The deprecated GdkFont has been removed, together with vestigial
+   uses in GTK+, including the GdkFontSel::font property and a GdkFont
+   member in GtkStyle.
+ - The GdkWindowObject structure has been removed from public headers.
+ - The GdkWindow::allow-grow and ::allow-shrink properties have been removed.
+
+* Quartz:
+ - Misc fixed to clipping and color handling
+ - Update the DND code for GdkDevice changes
+
+* Translation updates:
+ Breton
+ Czech
+ Estonian
+ Galician
+ Hebrew
+ Kazakh
+ Norwegian bokmål
+ Slovenian
+ Simplified Chinese
+ Spanish
+
+
 Overview of Changes from GTK+ 2.90.3 to 2.90.4
 ==============================================
 

autogen.sh

@@ -72,7 +72,12 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+# NOCONFIGURE is used by gnome-common; support both
+if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
+    NOCONFIGURE=1
+fi
+
+if test -z "$NOCONFIGURE"; then
         if test -z "$*"; then
                 echo "I am going to run ./configure with no arguments - if you wish "
                 echo "to pass any to it, please specify them on the $0 command line."
@@ -116,7 +121,7 @@ $AUTOMAKE --add-missing || exit $?
 autoconf || exit $?
 cd $ORIGDIR || exit $?
 
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
+if test -z "$NOCONFIGURE"; then
         $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo 

configure.ac

@@ -12,7 +12,7 @@ AC_PREREQ([2.62])
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [90])
-m4_define([gtk_micro_version], [4])
+m4_define([gtk_micro_version], [6])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -31,10 +31,10 @@ 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.25.9])
+m4_define([glib_required_version], [2.25.12])
 m4_define([pango_required_version], [1.20])
 m4_define([atk_required_version], [1.29.2])
-m4_define([cairo_required_version], [1.6])
+m4_define([cairo_required_version], [1.9.10])
 m4_define([gdk_pixbuf_required_version], [2.21.0])
 
 
@@ -740,6 +740,8 @@ AC_MSG_RESULT($gtk_uxtheme_h)
 AC_CHECK_HEADERS(crt_externs.h)
 AC_CHECK_FUNCS(_NSGetEnviron)
 
+AC_MSG_CHECKING(whether to build dynamic modules)
+
 AC_ARG_ENABLE(modules,
               [AC_HELP_STRING([--disable-modules],
                               [disable dynamic module loading])])
@@ -1300,7 +1302,7 @@ LDFLAGS="$saved_ldflags"
 if test "x$gdktarget" = "xx11"; then
   GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
 else
-  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
+  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
 fi
 
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
@@ -1310,7 +1312,7 @@ GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFL
 # into the pkg-config files
 #
 if test $enable_explicit_deps != yes ; then
-  GDK_PACKAGES="$PANGO_PACKAGES"
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
   GDK_EXTRA_LIBS=
 fi
 
@@ -1554,7 +1556,7 @@ fi
 # GObject introspection
 ##################################################
 
-GOBJECT_INTROSPECTION_CHECK([0.6.14])
+GOBJECT_INTROSPECTION_CHECK([0.9.0])
 
 ##################################################
 # Checks for gtk-doc and docbook-tools
@@ -1669,10 +1671,30 @@ if test x$gdk_working_wctype = xno; then
   gdk_wc="\$gdk_wc
 #define GDK_HAVE_BROKEN_WCTYPE 1"
 fi
-
-
 ])
 
+dnl
+dnl Check for -Bsymbolic-functions linker flag used to avoid
+dnl intra-library PLT jumps, if available.
+dnl
+AC_ARG_ENABLE(Bsymbolic,
+              [AC_HELP_STRING([--disable-Bsymbolic],
+                              [avoid linking with -Bsymbolic])],,
+              [SAVED_LDFLAGS="${LDFLAGS}"
+               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
+               LDFLAGS=-Wl,-Bsymbolic-functions
+               AC_TRY_LINK([], [int main (void) { return 0; }],
+                           AC_MSG_RESULT(yes)
+                           enable_Bsymbolic=yes,
+                           AC_MSG_RESULT(no)
+                           enable_Bsymbolic=no)
+               LDFLAGS="${SAVED_LDFLAGS}"])
+
+if test "x${enable_Bsymbolic}" == "xyes"; then
+  GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
+fi
+AC_SUBST(GTK_LINK_FLAGS)
+
 AC_CONFIG_FILES([
 config.h.win32
 gtk-zip.sh

demos/gtk-demo/changedisplay.c

@@ -229,6 +229,7 @@ static void
 open_display_cb (GtkWidget         *button,
 		 ChangeDisplayInfo *info)
 {
+  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *display_entry;
   GtkWidget *dialog_label;
@@ -248,11 +249,13 @@ open_display_cb (GtkWidget         *button,
   dialog_label =
     gtk_label_new ("Please enter the name of\nthe new display\n");
 
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
-  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
+  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
 
   gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (GTK_BIN (dialog)->child);
+  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));
 
   while (!result)
     {
@@ -599,6 +602,7 @@ do_changedisplay (GtkWidget *do_widget)
 
   if (!info)
     {
+      GtkWidget *content_area;
       GtkWidget *vbox;
       GtkWidget *frame;
 
@@ -618,11 +622,11 @@ do_changedisplay (GtkWidget *do_widget)
       g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);
 
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
+
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
-			  TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 
       frame = create_display_frame (info);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

demos/gtk-demo/colorsel.c

@@ -41,13 +41,15 @@ change_color_callback (GtkWidget *button,
 {
   GtkWidget *dialog;
   GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
   gint response;
   
   dialog = gtk_color_selection_dialog_new ("Changing color");
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-  
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
+
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
 
   gtk_color_selection_set_previous_color (colorsel, &color);
   gtk_color_selection_set_current_color (colorsel, &color);

demos/gtk-demo/combobox.c

@@ -435,7 +435,7 @@ do_combobox (GtkWidget *do_widget)
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
      
-    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
+    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
     gtk_container_add (GTK_CONTAINER (combo), entry);
   
   }

demos/gtk-demo/dialog.c

@@ -33,6 +33,7 @@ static void
 interactive_dialog_clicked (GtkButton *button,
 			    gpointer   user_data)
 {
+  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *hbox;
   GtkWidget *stock;
@@ -51,9 +52,11 @@ interactive_dialog_clicked (GtkButton *button,
                                         GTK_RESPONSE_CANCEL,
 					NULL);
 
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
   hbox = gtk_hbox_new (FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
 
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);

demos/gtk-demo/entry_buffer.c

@@ -11,6 +11,7 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_entry_buffer (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -31,8 +32,10 @@ do_entry_buffer (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/entry_completion.c

@@ -37,6 +37,7 @@ create_completion_model (void)
 GtkWidget *
 do_entry_completion (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -58,8 +59,10 @@ do_entry_completion (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);

demos/gtk-demo/expander.c

@@ -13,6 +13,7 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *expander;
@@ -32,8 +33,10 @@ do_expander (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new ("Expander demo. Click on the triangle for details.");

demos/gtk-demo/offscreen_window.c

@@ -226,12 +226,12 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  gint border_width;
+  guint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;
@@ -378,6 +378,7 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   GtkRequisition child_requisition;
   double s, c;
   double w, h;
+  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -390,8 +391,9 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   w = c * child_requisition.width + s * child_requisition.height;
   h = s * child_requisition.width + c * child_requisition.height;
 
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  requisition->width = border_width * 2 + w;
+  requisition->height = border_width * 2 + h;
 }
 
 static void
@@ -399,13 +401,13 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  gint border_width;
+  guint border_width;
   gint w, h;
   gdouble s, c;
 
   widget->allocation = *allocation;
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;

demos/gtk-demo/offscreen_window2.c

@@ -164,12 +164,12 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  gint border_width;
+  guint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   attributes.x = widget->allocation.x + border_width;
   attributes.y = widget->allocation.y + border_width;
@@ -302,6 +302,7 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkRequisition child_requisition;
+  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -309,8 +310,9 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
   if (bin->child && gtk_widget_get_visible (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
-  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
-  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  requisition->width = border_width * 2 + child_requisition.width + 10;
+  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
 }
 
 static void
@@ -318,11 +320,12 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  gint border_width;
   gint w, h;
+  guint border_width;
+
   widget->allocation = *allocation;
 
-  border_width = GTK_CONTAINER (widget)->border_width;
+  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;

demos/gtk-demo/panes.c

@@ -18,11 +18,13 @@ toggle_resize (GtkWidget *widget,
 	       GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
   gboolean resize, shrink;
 
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);
 
   g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
@@ -38,11 +40,13 @@ toggle_shrink (GtkWidget *widget,
 	       GtkWidget *child)
 {
   GtkPaned *paned = GTK_PANED (child->parent);
-  gboolean is_child1 = (child == paned->child1);
+  gboolean is_child1 = (child == gtk_paned_get_child1 (paned));
   gboolean resize, shrink;
 
-  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
-  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
+  gtk_container_child_get (GTK_CONTAINER (paned), child,
+                           "resize", &resize,
+                           "shrink", &shrink,
+                           NULL);
 
   g_object_ref (child);
   gtk_container_remove (GTK_CONTAINER (child->parent), child);
@@ -59,11 +63,15 @@ create_pane_options (GtkPaned	 *paned,
 		     const gchar *label1,
 		     const gchar *label2)
 {
+  GtkWidget *child1, *child2;
   GtkWidget *frame;
   GtkWidget *table;
   GtkWidget *label;
   GtkWidget *check_button;
-  
+
+  child1 = gtk_paned_get_child1 (paned);
+  child2 = gtk_paned_get_child2 (paned);
+
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
   
@@ -78,16 +86,16 @@ create_pane_options (GtkPaned	 *paned,
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 1, 2);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child1);
-  
+		    G_CALLBACK (toggle_resize), child1);
+
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child1);
-  
+		    G_CALLBACK (toggle_shrink), child1);
+
   label = gtk_label_new (label2);
   gtk_table_attach_defaults (GTK_TABLE (table), label,
 			     1, 2, 0, 1);
@@ -98,15 +106,15 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), paned->child2);
-  
+		    G_CALLBACK (toggle_resize), child2);
+
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     1, 2, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), paned->child2);
+		    G_CALLBACK (toggle_shrink), child2);
 
   return frame;
 }

demos/gtk-demo/search_entry.c

@@ -241,6 +241,7 @@ entry_populate_popup (GtkEntry *entry,
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *label;
@@ -263,8 +264,10 @@ do_search_entry (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (search_entry_destroyed), &window);
 
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/sizegroup.c

@@ -82,6 +82,7 @@ toggle_grouping (GtkToggleButton *check_button,
 GtkWidget *
 do_sizegroup (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *table;
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -115,8 +116,10 @@ do_sizegroup (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

demos/gtk-demo/spinner.c

@@ -27,6 +27,7 @@ on_stop_clicked (GtkButton *button, gpointer user_data)
 GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *button;
@@ -47,8 +48,10 @@ do_spinner (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     /* Sensitive */

docs/faq/Makefile.am

@@ -17,6 +17,8 @@ pdf:
 	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
 	fi
 
+all-local: html
+
 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
 else

docs/reference/gdk/Makefile.am

@@ -21,14 +21,12 @@ CFILE_GLOB=$(top_srcdir)/gdk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=			\
-	gdkalias.h		\
 	gdkintl.h		\
 	gdkmarshalers.h		\
 	gdkkeysyms.h		\
 	gdkinternals.h		\
 	gdkprivate.h		\
 	gdkpoly-generic.h	\
-	gdkregion-generic.h	\
 	keyname-table.h		\
 	win32 			\
 	directfb		\

docs/reference/gdk/gdk3-sections.txt

@@ -74,7 +74,6 @@ gdk_extension_mode_get_type
 gdk_fill_get_type
 gdk_fill_rule_get_type
 gdk_filter_return_get_type
-gdk_font_type_get_type
 gdk_function_get_type
 gdk_gc_values_mask_get_type
 gdk_grab_ownership_get_type
@@ -394,31 +393,6 @@ gdk_colormap_get_type
 gdk_color_get_type
 </SECTION>
 
-<SECTION>
-<TITLE>Fonts</TITLE>
-<FILE>fonts</FILE>
-GdkFont
-GdkFontType
-gdk_font_load
-gdk_font_load_for_display
-gdk_fontset_load
-gdk_fontset_load_for_display
-gdk_font_from_description
-gdk_font_from_description_for_display
-gdk_font_get_display
-gdk_font_ref
-gdk_font_unref
-gdk_font_id
-gdk_font_equal
-
-<SUBSECTION Standard>
-GDK_TYPE_FONT
-GDK_TYPE_FONT_TYPE
-
-<SUBSECTION Private>
-gdk_font_get_type
-</SECTION>
-
 <SECTION>
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
@@ -621,6 +595,7 @@ gdk_window_move_resize
 gdk_window_scroll
 gdk_window_move_region
 gdk_window_flush
+gdk_window_has_native
 gdk_window_ensure_native
 gdk_window_reparent
 gdk_window_clear
@@ -751,7 +726,6 @@ gdk_window_get_effective_toplevel
 <SUBSECTION Standard>
 GDK_WINDOW
 GDK_WINDOW_GET_CLASS
-GDK_WINDOW_OBJECT
 GDK_TYPE_WINDOW
 GDK_IS_WINDOW
 GDK_WINDOW_CLASS
@@ -896,43 +870,6 @@ GdkRectangle
 gdk_rectangle_intersect
 gdk_rectangle_union
 
-<SUBSECTION>
-GdkRegion
-gdk_region_new
-gdk_region_polygon
-GdkFillRule
-gdk_region_copy
-gdk_region_rectangle
-gdk_region_destroy
-
-<SUBSECTION>
-gdk_region_get_clipbox
-gdk_region_get_rectangles
-gdk_region_empty
-gdk_region_equal
-gdk_region_rect_equal
-gdk_region_point_in
-gdk_region_rect_in
-GdkOverlapType
-
-<SUBSECTION>
-gdk_region_offset
-gdk_region_shrink
-gdk_region_union_with_rect
-gdk_region_intersect
-gdk_region_union
-gdk_region_subtract
-gdk_region_xor
-
-<SUBSECTION>
-GdkSpan
-GdkSpanFunc
-gdk_region_spans_intersect_foreach
-
-<SUBSECTION Standard>
-GDK_TYPE_OVERLAP_TYPE
-GDK_TYPE_RECTANGLE
-
 <SUBSECTION Private>
 gdk_rectangle_get_type
 </SECTION>
@@ -973,6 +910,7 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_direction
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_get_num_lock_state
 gdk_keymap_add_virtual_modifiers
 gdk_keymap_map_virtual_modifiers
 
@@ -1286,8 +1224,6 @@ GDK_SCREEN_XDISPLAY
 GDK_SCREEN_XNUMBER
 GDK_SCREEN_XSCREEN
 GDK_VISUAL_XVISUAL
-GDK_FONT_XDISPLAY
-GDK_FONT_XFONT
 GDK_CURSOR_XCURSOR
 GDK_CURSOR_XDISPLAY
 GDK_GC_XGC
@@ -1305,8 +1241,6 @@ gdk_window_lookup
 gdk_window_lookup_for_display
 gdk_pixmap_lookup
 gdk_pixmap_lookup_for_display
-gdk_font_lookup
-gdk_font_lookup_for_display
 gdk_x11_lookup_xdisplay
 gdk_x11_get_server_time
 gdk_net_wm_supports
@@ -1331,9 +1265,6 @@ gdk_x11_display_set_cursor_theme
 gdk_x11_register_standard_event_type
 gdk_x11_drawable_get_xdisplay
 gdk_x11_drawable_get_xid
-gdk_x11_font_get_name
-gdk_x11_font_get_xdisplay
-gdk_x11_font_get_xfont
 gdk_x11_gc_get_xdisplay
 gdk_x11_gc_get_xgc
 gdk_x11_get_default_root_xwindow

docs/reference/gdk/tmpl/fonts.sgml

@@ -1,371 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Fonts
-
-<!-- ##### SECTION Short_Description ##### -->
-Loading and manipulating fonts
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GdkFont data type represents a font for drawing on
-the screen. These functions provide support for
-loading fonts, and also for determining the dimensions
-of characters and strings when drawn with a particular
-font.
-</para>
-
-<para>
-Fonts in X are specified by a
-<firstterm>X Logical Font Description</firstterm>. 
-The following description is considerably simplified.
-For definitive information about XLFD's see the 
-X reference documentation. A X Logical Font Description (XLFD)
-consists of a sequence of fields separated (and surrounded by) '-'
-characters. For example, Adobe Helvetica Bold 12 pt, has the
-full description: 
-<informalexample><programlisting>
-"-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1"
-</programlisting></informalexample>
-</para>
-
-<para>
-The fields in the XLFD are:
-
-<informaltable pgwide="1" frame="none">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>Foundry</entry>
-<entry>the company or organization where the font originated.</entry>
-</row>
-
-<row>
-<entry>Family</entry>
-<entry>the font family (a group of related font designs).</entry>
-</row>
-
-<row>
-<entry>Weight</entry>
-<entry>A name for the font's typographic weight
-For example, 'bold' or 'medium').</entry>
-</row>
-
-<row>
-<entry>Slant</entry>
-<entry>The slant of the font. Common values are 'R' for Roman,
-'I' for italoc, and 'O' for oblique.</entry>
-</row>
-
-<row>
-<entry>Set Width</entry>
-<entry>A name for the width of the font. For example,
-'normal' or 'condensed'.</entry>
-</row>
-
-<row>
-<entry>Add Style</entry>
-<entry>Additional information to distinguish a font from
-other fonts of the same family.</entry>
-</row>
-
-<row>
-<entry>Pixel Size</entry>
-<entry>The body size of the font in pixels.</entry>
-</row>
-
-<row>
-<entry>Point Size</entry>
-<entry>The body size of the font in 10ths of a point.
-(A <firstterm>point</firstterm> is 1/72.27 inch) </entry>
-</row>
-
-<row>
-<entry>Resolution X</entry>
-<entry>The horizontal resolution that the font was designed for.</entry>
-</row>
-
-<row>
-<entry>Resolution Y</entry>
-<entry>The vertical resolution that the font was designed for .</entry>
-</row>
-
-<row>
-<entry>Spacing</entry>
-<entry>The type of spacing for the font - can be 'p' for proportional,
-'m' for monospaced or 'c' for charcell.</entry>
-</row>
-
-<row>
-<entry>Average Width</entry>
-<entry>The average width of a glyph in the font. For monospaced
-and charcell fonts, all glyphs in the font have this width</entry>
-</row>
-
-<row>
-<entry>Charset Registry</entry>
-<entry>The registration authority that owns the encoding for
-the font. Together with the Charset Encoding field, this
-defines the character set for the font.</entry>
-</row>
-
-<row>
-<entry>Charset Encoding</entry>
-<entry>An identifier for the particular character set encoding.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
-</para>
-
-<para>
-When specifying a font via a X logical Font Description,
-'*' can be used as a wildcard to match any portion of
-the XLFD. For instance, the above example could
-also be specified as
-<informalexample><programlisting>
-"-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1"
-</programlisting></informalexample>
-
-It is generally a good idea to use wildcards for any
-portion of the XLFD that your program does not care
-about specifically, since that will improve the
-chances of finding a matching font.
-</para>
-
-<para>
-A <firstterm>fontset</firstterm> is a list of fonts
-that is used for drawing international text that may
-contain characters from a number of different character
-sets. It is represented by a list of XLFD's. 
-</para>
-
-<para>
-The font for a given character set is determined by going
-through the list of XLFD's in order. For each one, if
-the registry and and encoding fields match the desired
-character set, then that font is used, otherwise if
-the XLFD contains wild-cards for the registry and encoding
-fields, the registry and encoding for the desired character
-set are substituted in and a lookup is done. If a match is found
-that font is used. Otherwise, processing continues
-on to the next font in the list.
-</para>
-
-<para>
-The functions for determining the metrics of a string
-come in several varieties that can take a number
-of forms of string input:
-
-<variablelist>
-  <varlistentry>
-    <term>8-bit string</term>
-    <listitem><para>
-    When using functions like gdk_string_width() that
-    take a <type>gchar *</type>, if the font is of type
-    %GDK_FONT_FONT and is an 8-bit font, then each
-    <type>gchar</type> indexes the glyphs in the font directly.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>16-bit string</term>
-    <listitem><para>
-    For functions taking a <type>gchar *</type>, if the
-    font is of type %GDK_FONT_FONT, and is a 16-bit
-    font, then the <type>gchar *</type> argument is
-    interpreted as a <type>guint16 *</type> cast to
-    a <type>gchar *</type> and each <type>guint16</type>
-    indexes the glyphs in the font directly.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>Multibyte string</term>
-    <listitem><para>
-    For functions taking a <type>gchar *</type>, if the
-    font is of type %GDK_FONT_FONTSET, then the input
-    string is interpreted as a <firstterm>multibyte</firstterm>
-    encoded according to the current locale. (A multibyte
-    string is one in which each character may consist
-    of one or more bytes, with different lengths for different
-    characters in the string). The string will
-    be rendered using one or more different fonts from
-    the fontset.
-    </para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<para>
-GDK provides functions to determine a number of different
-measurements (metrics) for a given string. (Need diagram
-here).
-
-<variablelist>
-  <varlistentry>
-    <term>ascent</term>
-    <listitem><para>
-    The vertical distance from the origin of the drawing
-    opereration to the top of the drawn character.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>descent</term>
-    <listitem><para>
-    The vertical distance from the origin of the drawing
-    opereration to the bottom of the drawn character.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>left bearing</term>
-    <listitem><para>
-    The horizontal distance from the origin of the drawing
-    operation to the left-most part of the drawn character.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>right bearing</term>
-    <listitem><para>
-    The horizontal distance from the origin of the drawing
-    operation to the right-most part of the drawn character.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>width bearing</term>
-    <listitem><para>
-    The horizontal distance from the origin of the drawing
-    operation to the correct origin for drawing another
-    string to follow the current one. Depending on the
-    font, this could be greater than or less than the 
-    right bearing.
-    </para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GdkFont ##### -->
-<para>
-The <structname>GdkFont</structname> structure represents a font or fontset. It
-contains the following public fields. A new <structname>GdkFont</structname>
-structure is returned by gdk_font_load() or gdk_fontset_load(),
-and is reference counted with gdk_font_ref() and gdk_font_unref()
-</para>
-
-@type: a value of type #GdkFontType which indicates
-  whether this font is a single font or a fontset.
-@ascent: the maximum distance that the font, when drawn,
-  ascends above the baseline.
-@descent: the maximum distance that the font, when drawn,
-descends below the baseline.
-
-<!-- ##### ENUM GdkFontType ##### -->
-<para>
-Indicates the type of a font. The possible values
-are currently:
-</para>
-
-@GDK_FONT_FONT: the font is a single font.
-@GDK_FONT_FONTSET: the font is a fontset.
-
-<!-- ##### FUNCTION gdk_font_load ##### -->
-<para>
-</para>
-
-@font_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_load_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@font_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_fontset_load ##### -->
-<para>
-</para>
-
-@fontset_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_fontset_load_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@fontset_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_from_description ##### -->
-<para>
-
-</para>
-
-@font_desc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_from_description_for_display ##### -->
-<para>
-
-</para>
-
-@display: 
-@font_desc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_get_display ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_ref ##### -->
-<para>
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_unref ##### -->
-<para>
-</para>
-
-@font: 
-
-
-<!-- ##### FUNCTION gdk_font_id ##### -->
-<para>
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_font_equal ##### -->
-<para>
-</para>
-
-@fonta: 
-@fontb: 
-@Returns: 

docs/reference/gdk/tmpl/gcs.sgml

@@ -79,7 +79,6 @@ A set of bit flags used to indicate which fields
 
 @GDK_GC_FOREGROUND: the @foreground is set.
 @GDK_GC_BACKGROUND: the @background is set.
-@GDK_GC_FONT: the @font is set.
 @GDK_GC_FUNCTION: the @function is set.
 @GDK_GC_FILL: the @fill is set.
 @GDK_GC_TILE: the @tile is set.

docs/reference/gdk/tmpl/images.sgml

@@ -195,6 +195,15 @@ and if that fails then %GDK_IMAGE_NORMAL will be used.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_image_get_pixels ##### -->
+<para>
+
+</para>
+
+@image: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_image_put_pixel ##### -->
 <para>
 Sets a pixel in a #GdkImage to a given pixel value.

docs/reference/gdk/tmpl/regions.sgml

@@ -1,13 +1,14 @@
 <!-- ##### SECTION Title ##### -->
-Points, Rectangles and Regions
+Points and Rectangles
 
 <!-- ##### SECTION Short_Description ##### -->
 Simple graphical data types
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-GDK provides the #GdkPoint, #GdkRectangle, #GdkRegion and #GdkSpan data types
-for representing pixels and sets of pixels on the screen.
+GDK provides the #GdkPoint and #GdkRectangle data types for representing pixels
+and sets of pixels on the screen. Together with Cairo's #cairo_region_t data
+type, they make up the central types for representing graphical data.
 </para>
 <para>
 #GdkPoint is a simple structure containing an x and y coordinate of a point.
@@ -19,13 +20,7 @@ gdk_rectangle_intersect(). To find the union of two rectangles use
 gdk_rectangle_union().
 </para>
 <para>
-#GdkRegion is an opaque data type holding a set of arbitrary pixels, and is
-usually used for clipping graphical operations (see gdk_gc_set_clip_region()).
-</para>
-<para>
-#GdkSpan is a structure holding a spanline. A spanline is a horizontal line that
-is one pixel wide. It is mainly used when rasterizing other graphics primitives.
-It can be intersected to regions by using gdk_region_spans_intersect_foreach().
+#cairo_region_t is usually used for managing clipping of graphical operations.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -47,15 +42,12 @@ Defines the x and y coordinates of a point.
 @x: the x coordinate of the point.
 @y: the y coordinate of the point.
 
-<!-- ##### STRUCT GdkRectangle ##### -->
+<!-- ##### TYPEDEF GdkRectangle ##### -->
 <para>
-Defines the position and size of a rectangle.
+Defines the position and size of a rectangle. It is identical to 
+#cairo_rectangle_int_t.
 </para>
 
-@x: the x coordinate of the left edge of the rectangle.
-@y: the y coordinate of the top of the rectangle.
-@width: the width of the rectangle.
-@height: the height of the rectangle.
 
 <!-- ##### FUNCTION gdk_rectangle_intersect ##### -->
 <para>
@@ -78,239 +70,3 @@ Defines the position and size of a rectangle.
 @dest: 
 
 
-<!-- ##### STRUCT GdkRegion ##### -->
-<para>
-A GdkRegion represents a set of pixels on the screen.
-</para>
-
-
-<!-- ##### FUNCTION gdk_region_new ##### -->
-<para>
-
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_polygon ##### -->
-<para>
-
-</para>
-
-@points: 
-@n_points: 
-@fill_rule: 
-@Returns: 
-
-
-<!-- ##### ENUM GdkFillRule ##### -->
-<para>
-The method for determining which pixels are included in a region, when
-creating a #GdkRegion from a polygon.
-The fill rule is only relevant for polygons which overlap themselves.
-</para>
-
-@GDK_EVEN_ODD_RULE: areas which are overlapped an odd number of times are
-included in the region, while areas overlapped an even number of times are not.
-@GDK_WINDING_RULE: overlapping areas are always included.
-
-<!-- ##### FUNCTION gdk_region_copy ##### -->
-<para>
-
-</para>
-
-@region: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_rectangle ##### -->
-<para>
-
-</para>
-
-@rectangle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_destroy ##### -->
-<para>
-
-</para>
-
-@region: 
-
-
-<!-- ##### FUNCTION gdk_region_get_clipbox ##### -->
-<para>
-
-</para>
-
-@region: 
-@rectangle: 
-
-
-<!-- ##### FUNCTION gdk_region_get_rectangles ##### -->
-<para>
-
-</para>
-
-@region: 
-@rectangles: 
-@n_rectangles: 
-
-
-<!-- ##### FUNCTION gdk_region_empty ##### -->
-<para>
-
-</para>
-
-@region: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_equal ##### -->
-<para>
-
-</para>
-
-@region1: 
-@region2: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_rect_equal ##### -->
-<para>
-
-</para>
-
-@region: 
-@rectangle: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_point_in ##### -->
-<para>
-
-</para>
-
-@region: 
-@x: 
-@y: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_region_rect_in ##### -->
-<para>
-
-</para>
-
-@region: 
-@rectangle: 
-@Returns: 
-
-
-<!-- ##### ENUM GdkOverlapType ##### -->
-<para>
-Specifies the possible values returned by gdk_region_rect_in().
-</para>
-
-@GDK_OVERLAP_RECTANGLE_IN: if the rectangle is inside the #GdkRegion.
-@GDK_OVERLAP_RECTANGLE_OUT: if the rectangle is outside the #GdkRegion.
-@GDK_OVERLAP_RECTANGLE_PART: if the rectangle is partly inside the #GdkRegion.
-
-<!-- ##### FUNCTION gdk_region_offset ##### -->
-<para>
-
-</para>
-
-@region: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION gdk_region_shrink ##### -->
-<para>
-
-</para>
-
-@region: 
-@dx: 
-@dy: 
-
-
-<!-- ##### FUNCTION gdk_region_union_with_rect ##### -->
-<para>
-
-</para>
-
-@region: 
-@rect: 
-
-
-<!-- ##### FUNCTION gdk_region_intersect ##### -->
-<para>
-</para>
-
-@source1: 
-@source2: 
-
-
-<!-- ##### FUNCTION gdk_region_union ##### -->
-<para>
-
-</para>
-
-@source1: 
-@source2: 
-
-
-<!-- ##### FUNCTION gdk_region_subtract ##### -->
-<para>
-</para>
-
-@source1: 
-@source2: 
-
-
-<!-- ##### FUNCTION gdk_region_xor ##### -->
-<para>
-</para>
-
-@source1: 
-@source2: 
-
-
-<!-- ##### STRUCT GdkSpan ##### -->
-<para>
-A GdkSpan represents a horizontal line of pixels starting
-at the pixel with coordinates @x, @y and ending before @x + @width, @y.
-</para>
-
-@x: x coordinate of the first pixel.
-@y: y coordinate of the first pixel.
-@width: number of pixels in the span.
-
-<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
-<para>
-This defines the type of the function passed to 
-gdk_region_spans_intersect_foreach(). 
-</para>
-
-@span: a #GdkSpan.
-@data: the user data passed to gdk_region_spans_intersect_foreach().
-
-
-<!-- ##### FUNCTION gdk_region_spans_intersect_foreach ##### -->
-<para>
-
-</para>
-
-@region: 
-@spans: 
-@n_spans: 
-@sorted: 
-@function: 
-@data: 
-
-

docs/reference/gdk/tmpl/x_interaction.sgml

@@ -179,24 +179,6 @@ Returns the X visual belonging to a #GdkVisual.
 @Returns: an Xlib <type>Visual*</type>.
 
 
-<!-- ##### MACRO GDK_FONT_XDISPLAY ##### -->
-<para>
-Returns the display of a #GdkFont.
-</para>
-
-@font: a #GdkFont.
-@Returns: an Xlib <type>Display*</type>.
-
-
-<!-- ##### MACRO GDK_FONT_XFONT ##### -->
-<para>
-Returns the X font belonging to a #GdkFont.
-</para>
-
-@font: a #GdkFont.
-@Returns: an Xlib <type>XFontStruct*</type> or an <type>XFontSet</type>.
-
-
 <!-- ##### MACRO GDK_CURSOR_XCURSOR ##### -->
 <para>
 Returns the X cursor belonging to a #GdkCursor.
@@ -355,26 +337,6 @@ Another name for GDK_DRAWABLE_XID().
 @Returns: 
 
 
-<!-- ##### MACRO gdk_font_lookup ##### -->
-<para>
-Obtains the #GdkFont for the given Xlib font ID, or %NULL if no #GdkFont has
-been created for @xid.
-</para>
-
-@xid: an Xlib font ID
-
-
-<!-- ##### MACRO gdk_font_lookup_for_display ##### -->
-<para>
-Obtains the #GdkFont for the given Xlib font ID on @display, or %NULL if no
-#GdkFont has been created for @xid.
-</para>
-
-@display: a #GdkDisplay
-@xid: an Xlib font ID
-Since: 2.2
-
-
 <!-- ##### FUNCTION gdk_x11_lookup_xdisplay ##### -->
 <para>
 
@@ -595,33 +557,6 @@ Since: 2.2
 @Returns: 
 
 
-<!-- ##### FUNCTION gdk_x11_font_get_name ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_x11_font_get_xdisplay ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gdk_x11_font_get_xfont ##### -->
-<para>
-
-</para>
-
-@font: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_gc_get_xdisplay ##### -->
 <para>
 

docs/reference/gtk/Makefile.am

@@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
-	gtkalias.h			\
 	fnmatch.h			\
 	gtkdebug.h			\
 	gtkbuilderprivate.h		\
@@ -79,7 +78,6 @@ IGNORE_HFILES=				\
 	gtktexttypes.h			\
 	gtktextutil.h			\
 	gtkthemes.h			\
-	gtktoggleactionprivate.h	\
 	gtktrayicon.h			\
 	gtktreedatalist.h		\
 	gtktreeprivate.h		\

docs/reference/gtk/gtk-docs.sgml

@@ -318,7 +318,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
       <xi:include href="xml/gtktable.xml" />
       <xi:include href="xml/gtkexpander.xml" />
       <xi:include href="xml/gtkorientable.xml" />
-      <xi:include href="xml/gtkextendedlayout.xml" />
+      <xi:include href="xml/gtksizerequest.xml" />
     </chapter>
 
     <chapter id="Ornaments">

docs/reference/gtk/gtk3-sections.txt

@@ -4942,6 +4942,7 @@ gtk_widget_get_requisition
 gtk_widget_device_is_shadowed
 
 <SUBSECTION>
+gtk_requisition_new
 gtk_requisition_copy
 gtk_requisition_free
 

docs/reference/gtk/tmpl/.gitignore

@@ -1,6 +1,10 @@
+gtkactiongroup.sgml
 gtkbbox.sgml
 gtkbox.sgml
 gtkbuilder.sgml
+gtkbutton.sgml
+gtkcalendar.sgml
+gtkcelleditable.sgml
 gtkhbox.sgml
 gtkiconview.sgml
 gtkmessagedialog.sgml

docs/reference/gtk/tmpl/gtkactiongroup.sgml

@@ -1,401 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkActionGroup
-
-<!-- ##### SECTION Short_Description ##### -->
-A group of actions
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-Actions are organised into groups.  An action group is essentially a
-map from names to #GtkAction objects.
-</para>
-<para>
-All actions that would make sense to use in a particular context
-should be in a single group.  Multiple action groups may be used for a
-particular user interface.  In fact, it is expected that most nontrivial 
-applications will make use of multiple groups.  For example, in an application
-that can edit multiple documents, one group holding global actions 
-(e.g. quit, about, new), and one group per document holding actions that 
-act on that document (eg. save, cut/copy/paste, etc).  Each window's menus 
-would be constructed from a combination of two action groups.
-</para>
-<para id="Action-Accel">
-Accelerators are handled by the GTK+ accelerator map. All actions are assigned an 
-accelerator path (which normally has the form 
-<literal>&lt;Actions&gt;/<replaceable>group-name</replaceable>/<replaceable>action-name</replaceable></literal>) 
-and a shortcut is associated with this accelerator path. All menuitems and 
-toolitems take on this accelerator path. The GTK+ accelerator map code makes 
-sure that the correct shortcut is displayed next to the menu item.
-</para>
-
-<refsect2 id="GtkActionGroup-BUILDER-UI">
-<title>GtkActionGroup as GtkBuildable</title>
-<para>
-The GtkActionGroup implementation of the GtkBuildable interface accepts
-GtkAction objects as &lt;child&gt; elements in UI definitions.
-</para>
-<para>
-Note that it is probably more common to define actions and action groups
-in the code, since they are directly related to what the code can do.
-</para>
-<para>
-The GtkActionGroup implementation of the GtkBuildable interface supports a 
-custom &lt;accelerator&gt; element, which has attributes named key and
-modifiers and allows to specify accelerators. This is similar to the 
-&lt;accelerator&gt; element of GtkWidget, the main difference is that 
-it doesn't allow you to specify a signal.
-</para>
-<example>
-<title>A <structname>GtkDialog</structname> UI definition fragment.</title>
-<programlisting><![CDATA[
-<object class="GtkActionGroup" id="actiongroup">
-  <child>
-      <object class="GtkAction" id="About">
-          <property name="name">About</property>
-          <property name="stock_id">gtk-about</property>
-          <signal handler="about_activate" name="activate"/>
-      </object>
-      <accelerator key="F1" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
-  </child>
-</object>
-]]></programlisting>
-</example>
-</refsect2>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkActionGroup ##### -->
-<para>
-The <structname>GtkActionGroup</structname> struct contains only private 
-members and should not be accessed directly.
-</para>
-
-
-<!-- ##### SIGNAL GtkActionGroup::connect-proxy ##### -->
-<para>
-
-</para>
-
-@actiongroup: the object which received the signal.
-@arg1: 
-@widget: 
-
-<!-- ##### SIGNAL GtkActionGroup::disconnect-proxy ##### -->
-<para>
-
-</para>
-
-@actiongroup: the object which received the signal.
-@arg1: 
-@widget: 
-
-<!-- ##### SIGNAL GtkActionGroup::post-activate ##### -->
-<para>
-
-</para>
-
-@actiongroup: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL GtkActionGroup::pre-activate ##### -->
-<para>
-
-</para>
-
-@actiongroup: the object which received the signal.
-@arg1: 
-
-<!-- ##### ARG GtkActionGroup:name ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkActionGroup:sensitive ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkActionGroup:visible ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_action_group_new ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_name ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_sensitive ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_set_sensitive ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@sensitive: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_visible ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_set_visible ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@visible: 
-
-
-<!-- ##### FUNCTION gtk_action_group_get_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action_name: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_list_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_action_with_accel ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action: 
-@accelerator: 
-
-
-<!-- ##### FUNCTION gtk_action_group_remove_action ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@action: 
-
-
-<!-- ##### STRUCT GtkActionEntry ##### -->
-<para>
-<structname>GtkActionEntry</structname> structs are used with 
-gtk_action_group_add_actions() to construct actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain(). If @label
-    is %NULL, the label of the stock item with id @stock_id is used.
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked 
-    for translation, see gtk_action_group_set_translation_domain().
-@callback: The function to call when the action is activated.
-
-<!-- ##### FUNCTION gtk_action_group_add_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### STRUCT GtkToggleActionEntry ##### -->
-<para>
-<structname>GtkToggleActionEntry</structname> structs are used with 
-gtk_action_group_add_toggle_actions() to construct toggle actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked 
-    for translation, see gtk_action_group_set_translation_domain().
-@callback: The function to call when the action is activated.
-@is_active: The initial state of the toggle action.
-
-<!-- ##### FUNCTION gtk_action_group_add_toggle_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_toggle_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### STRUCT GtkRadioActionEntry ##### -->
-<para>
-<structname>GtkRadioActionEntry</structname> structs are used with 
-gtk_action_group_add_radio_actions() to construct groups of radio actions.
-</para>
-
-@name: The name of the action.
-@stock_id: The stock id for the action, or the name of an icon from the icon 
-    theme.
-@label: The label for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@accelerator: The accelerator for the action, in the format understood by 
-    gtk_accelerator_parse().
-@tooltip: The tooltip for the action. This field should typically be marked for 
-    translation, see gtk_action_group_set_translation_domain().
-@value: The value to set on the radio action. See gtk_radio_action_get_current_value().
-
-<!-- ##### FUNCTION gtk_action_group_add_radio_actions ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@value: 
-@on_change: 
-@user_data: 
-
-
-<!-- ##### FUNCTION gtk_action_group_add_radio_actions_full ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@entries: 
-@n_entries: 
-@value: 
-@on_change: 
-@user_data: 
-@destroy: 
-
-
-<!-- ##### USER_FUNCTION GtkTranslateFunc ##### -->
-<para>
-The function used to translate messages in e.g. #GtkIconFactory
-and #GtkActionGroup. 
-</para>
-
-@path: The id of the message. In #GtkItemFactory this will be a path
-  from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label
-  or tooltip from a #GtkActionEntry.
-@func_data: user data passed in when registering the function
-@Returns: the translated message
-
-
-<!-- ##### FUNCTION gtk_action_group_set_translate_func ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@func: 
-@data: 
-@notify: 
-
-
-<!-- ##### FUNCTION gtk_action_group_set_translation_domain ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@domain: 
-
-
-<!-- ##### FUNCTION gtk_action_group_translate_string ##### -->
-<para>
-
-</para>
-
-@action_group: 
-@string: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkbutton.sgml

@@ -1,389 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkButton
-
-<!-- ##### SECTION Short_Description ##### -->
-A widget that creates a signal when clicked on
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkButton widget is generally used to attach a function to that
-is called when the button is pressed.  The various signals and how to use
-them are outlined below.
-</para>
-<para>
-The #GtkButton widget can hold any valid child widget.  That is it can
-hold most any other standard #GtkWidget.  The most commonly used child is
-the #GtkLabel.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkButton ##### -->
-<para>
-This should not be accessed directly.  Use the accessor functions below.
-</para>
-
-
-<!-- ##### SIGNAL GtkButton::activate ##### -->
-<para>
-
-</para>
-
-@button: the object which received the signal.
-
-<!-- ##### SIGNAL GtkButton::clicked ##### -->
-<para>
-
-</para>
-
-@button: 
-
-<!-- ##### SIGNAL GtkButton::enter ##### -->
-<para>
-
-</para>
-
-@button: 
-
-<!-- ##### SIGNAL GtkButton::leave ##### -->
-<para>
-
-</para>
-
-@button: 
-
-<!-- ##### SIGNAL GtkButton::pressed ##### -->
-<para>
-
-</para>
-
-@button: 
-
-<!-- ##### SIGNAL GtkButton::released ##### -->
-<para>
-
-</para>
-
-@button: 
-
-<!-- ##### ARG GtkButton:focus-on-click ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:image ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:image-position ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:label ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:relief ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:use-stock ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:use-underline ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:xalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:yalign ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:child-displacement-x ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:child-displacement-y ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:default-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:default-outside-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:displace-focus ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:image-spacing ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkButton:inner-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_button_new ##### -->
-<para>
-Creates a new #GtkButton widget. To add a child widget to the button,
-use gtk_container_add().
-</para>
-
-@void: 
-@Returns: The newly created #GtkButton widget.
-
-
-<!-- ##### FUNCTION gtk_button_new_with_label ##### -->
-<para>
-Creates a #GtkButton widget with a #GtkLabel child containing the given
-text.
-</para>
-
-@label: The text you want the #GtkLabel to hold.
-@Returns: The newly created #GtkButton widget.
-
-
-<!-- ##### FUNCTION gtk_button_new_with_mnemonic ##### -->
-<para>
-
-</para>
-
-@label: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_new_from_stock ##### -->
-<para>
-
-</para>
-
-@stock_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_pressed ##### -->
-<para>
-Emits a #GtkButton::pressed signal to the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want to send the signal to.
-@Deprecated: 2.20: Use the #GtkWidget::button-press-event signal.
-
-
-<!-- ##### FUNCTION gtk_button_released ##### -->
-<para>
-Emits a #GtkButton::released signal to the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want to send the signal to.
-@Deprecated: 2.20: Use the #GtkWidget::button-release-event signal.
-
-
-<!-- ##### FUNCTION gtk_button_clicked ##### -->
-<para>
-Emits a #GtkButton::clicked signal to the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want to send the signal to.
-
-
-<!-- ##### FUNCTION gtk_button_enter ##### -->
-<para>
-Emits a #GtkButton::enter signal to the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want to send the signal to.
-@Deprecated: 2.20: Use the #GtkWidget::enter-notify-event signal.
-
-
-<!-- ##### FUNCTION gtk_button_leave ##### -->
-<para>
-Emits a #GtkButton::leave signal to the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want to send the signal to.
-@Deprecated: 2.20: Use the #GtkWidget::leave-notify-event signal.
-
-
-<!-- ##### FUNCTION gtk_button_set_relief ##### -->
-<para>
-Sets the relief style of the edges of the given #GtkButton widget.
-Three styles exist, GTK_RELIEF_NORMAL, GTK_RELIEF_HALF, GTK_RELIEF_NONE.
-The default style is, as one can guess, GTK_RELIEF_NORMAL.
-
-<!-- FIXME: put pictures of each style -->
-</para>
-
-@button: The #GtkButton you want to set relief styles of.
-@newstyle: The GtkReliefStyle as described above.
-
-
-<!-- ##### FUNCTION gtk_button_get_relief ##### -->
-<para>
-Returns the current relief style of the given #GtkButton.
-</para>
-
-@button: The #GtkButton you want the #GtkReliefStyle from.
-@Returns: The current #GtkReliefStyle
-
-
-<!-- ##### FUNCTION gtk_button_get_label ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_set_label ##### -->
-<para>
-
-</para>
-
-@button: 
-@label: 
-
-
-<!-- ##### FUNCTION gtk_button_get_use_stock ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_set_use_stock ##### -->
-<para>
-
-</para>
-
-@button: 
-@use_stock: 
-
-
-<!-- ##### FUNCTION gtk_button_get_use_underline ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_set_use_underline ##### -->
-<para>
-
-</para>
-
-@button: 
-@use_underline: 
-
-
-<!-- ##### FUNCTION gtk_button_set_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@focus_on_click: 
-
-
-<!-- ##### FUNCTION gtk_button_get_focus_on_click ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_set_alignment ##### -->
-<para>
-
-</para>
-
-@button: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_button_get_alignment ##### -->
-<para>
-
-</para>
-
-@button: 
-@xalign: 
-@yalign: 
-
-
-<!-- ##### FUNCTION gtk_button_set_image ##### -->
-<para>
-
-</para>
-
-@button: 
-@image: 
-
-
-<!-- ##### FUNCTION gtk_button_get_image ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_button_set_image_position ##### -->
-<para>
-
-</para>
-
-@button: 
-@position: 
-
-
-<!-- ##### FUNCTION gtk_button_get_image_position ##### -->
-<para>
-
-</para>
-
-@button: 
-@Returns: 
-
-

docs/reference/gtk/tmpl/gtkcalendar.sgml

@@ -1,318 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCalendar
-
-<!-- ##### SECTION Short_Description ##### -->
-Displays a calendar and allows the user to select a date
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-#GtkCalendar is a widget that displays a calendar, one month at a time. 
-It can be created with gtk_calendar_new().
-</para>
-<para>
-The month and year currently displayed can be altered with 
-gtk_calendar_select_month(). The exact day can be selected from the displayed 
-month using gtk_calendar_select_day().
-</para>
-<para>
-To place a visual marker on a particular day, use gtk_calendar_mark_day() 
-and to remove the marker, gtk_calendar_unmark_day().
-Alternative, all marks can be cleared with gtk_calendar_clear_marks().
-</para>
-<para>
-The way in which the calendar itself is displayed can be altered using
-gtk_calendar_set_display_options().
-</para>
-<para>
-The selected date can be retrieved from a #GtkCalendar using
-gtk_calendar_get_date().
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCalendar ##### -->
-<para>
-<structfield>num_marked_dates</structfield> is an integer containing the
-number of days that have a mark over them.
-</para>
-<para>
-<structfield>marked_date</structfield> is an array containing the day numbers
-that currently have a mark over them.
-</para>
-<para>
-<structfield>month</structfield>, <structfield>year</structfield>, and 
-<structfield>selected_day</structfield> contain the currently visible month,
-year, and selected day respectively.
-</para>
-<para>
-All of these fields should be considered read only, and everything in this
-struct should only be modified using the functions provided below.
-</para>
-<note>
-<para>
-Note that <structfield>month</structfield> is zero-based (i.e it allowed values
-are 0-11) while <structfield>selected_day</structfield> is one-based
-(i.e. allowed values are 1-31). 
-</para>
-</note>
-
-
-<!-- ##### SIGNAL GtkCalendar::day-selected ##### -->
-<para>
-Emitted when the user selects a day.
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::day-selected-double-click ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::month-changed ##### -->
-<para>
-Emitted when the user clicks a button to change the selected month on a
-calendar.
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::next-month ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::next-year ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::prev-month ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCalendar::prev-year ##### -->
-<para>
-
-</para>
-
-@calendar: the object which received the signal.
-
-<!-- ##### ARG GtkCalendar:day ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:detail-height-rows ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:detail-width-chars ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:month ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:no-month-change ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-day-names ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-details ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-heading ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:show-week-numbers ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkCalendar:year ##### -->
-<para>
-
-</para>
-
-<!-- ##### USER_FUNCTION GtkCalendarDetailFunc ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@year: 
-@month: 
-@day: 
-@user_data: 
-@Returns: 
-
-
-<!-- ##### ENUM GtkCalendarDisplayOptions ##### -->
-<para>
-</para>
-
-@GTK_CALENDAR_SHOW_HEADING: 
-@GTK_CALENDAR_SHOW_DAY_NAMES: 
-@GTK_CALENDAR_NO_MONTH_CHANGE: 
-@GTK_CALENDAR_SHOW_WEEK_NUMBERS: 
-@GTK_CALENDAR_WEEK_START_MONDAY: 
-@GTK_CALENDAR_SHOW_DETAILS: 
-
-<!-- ##### FUNCTION gtk_calendar_new ##### -->
-<para>
-</para>
-
-@void: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_select_month ##### -->
-<para>
-</para>
-
-@calendar: 
-@month: 
-@year: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_select_day ##### -->
-<para>
-</para>
-
-@calendar: 
-@day: 
-
-
-<!-- ##### FUNCTION gtk_calendar_mark_day ##### -->
-<para>
-</para>
-
-@calendar: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_unmark_day ##### -->
-<para>
-</para>
-
-@calendar: 
-@day: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_clear_marks ##### -->
-<para>
-</para>
-
-@calendar: 
-
-
-<!-- ##### FUNCTION gtk_calendar_get_display_options ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_set_display_options ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@flags: 
-
-
-<!-- ##### FUNCTION gtk_calendar_get_date ##### -->
-<para>
-</para>
-
-@calendar: 
-@year: 
-@month: 
-@day: 
-
-
-<!-- ##### FUNCTION gtk_calendar_set_detail_func ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@func: 
-@data: 
-@destroy: 
-
-
-<!-- ##### FUNCTION gtk_calendar_get_detail_width_chars ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_set_detail_width_chars ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@chars: 
-
-
-<!-- ##### FUNCTION gtk_calendar_get_detail_height_rows ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_calendar_set_detail_height_rows ##### -->
-<para>
-
-</para>
-
-@calendar: 
-@rows: 
-
-

docs/reference/gtk/tmpl/gtkcelleditable.sgml

@@ -1,83 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkCellEditable
-
-<!-- ##### SECTION Short_Description ##### -->
-Interface for widgets which can are used for editing cells
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkCellEditable interface must be implemented for widgets
-to be usable when editing the contents of a #GtkTreeView cell.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkCellEditable ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### SIGNAL GtkCellEditable::editing-done ##### -->
-<para>
-
-</para>
-
-@celleditable: the object which received the signal.
-
-<!-- ##### SIGNAL GtkCellEditable::remove-widget ##### -->
-<para>
-
-</para>
-
-@celleditable: the object which received the signal.
-
-<!-- ##### ARG GtkCellEditable:editing-canceled ##### -->
-<para>
-
-</para>
-
-<!-- ##### STRUCT GtkCellEditableIface ##### -->
-<para>
-
-</para>
-
-@g_iface: 
-@editing_done: 
-@remove_widget: 
-@start_editing: 
-
-<!-- ##### FUNCTION gtk_cell_editable_start_editing ##### -->
-<para>
-
-</para>
-
-@cell_editable: 
-@event: 
-
-
-<!-- ##### FUNCTION gtk_cell_editable_editing_done ##### -->
-<para>
-
-</para>
-
-@cell_editable: 
-
-
-<!-- ##### FUNCTION gtk_cell_editable_remove_widget ##### -->
-<para>
-
-</para>
-
-@cell_editable: 
-
-

docs/reference/gtk/tmpl/gtkentry.sgml

@@ -785,7 +785,6 @@ Specifies the side of the entry at which an icon is placed.
 
 @GTK_ENTRY_ICON_PRIMARY: At the beginning of the entry (depending on the text direction).
 @GTK_ENTRY_ICON_SECONDARY: At the end of the entry (depending on the text direction).
-
 @Since: 2.16
 
 <!-- ##### FUNCTION gtk_entry_set_icon_from_pixbuf ##### -->

docs/reference/gtk/tmpl/gtkfontsel.sgml

@@ -48,11 +48,6 @@ only be accessed using the functions below.
 </para>
 
 
-<!-- ##### ARG GtkFontSelection:font ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkFontSelection:font-name ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtkfontseldlg.sgml

@@ -118,3 +118,12 @@ fonts.</para></listitem>
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_font_selection_dialog_get_font_selection ##### -->
+<para>
+
+</para>
+
+@fsd: 
+@Returns: 
+
+

docs/reference/gtk/tmpl/gtkicontheme.sgml

@@ -19,7 +19,7 @@ their icons, but more additional application themes can be
 installed as operating system vendors and users choose.
 </para>
 <para>
-Named icons are similar to the <xref linkend="gtk-Themeable-Stock-Images"/>
+Named icons are similar to the <xref linkend="gtk3-Themeable-Stock-Images"/>
 facility, and the distinction between the two may be a bit confusing.
 A few things to keep in mind:
 </para>
@@ -27,7 +27,7 @@ A few things to keep in mind:
 <listitem>
 <para>
 Stock images usually are used in conjunction with
-<xref linkend="gtk-Stock-Items"/>., such as %GTK_STOCK_OK or
+<xref linkend="gtk3-Stock-Items"/>., such as %GTK_STOCK_OK or
 %GTK_STOCK_OPEN. Named icons are easier to set up and therefore
 are more useful for new icons that an application wants to
 add, such as application icons or window icons.
@@ -436,6 +436,19 @@ The #GQuark used for #GtkIconThemeError errors.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_icon_info_load_symbolic_for_style ##### -->
+<para>
+
+</para>
+
+@icon_info: 
+@style: 
+@state: 
+@was_symbolic: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_icon_info_set_raw_coordinates ##### -->
 <para>
 

docs/reference/gtk/tmpl/gtknotebook.sgml

@@ -487,17 +487,6 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_notebook_query_tab_label_packing ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@expand: 
-@fill: 
-@pack_type: 
-
-
 <!-- ##### FUNCTION gtk_notebook_set_menu_label ##### -->
 <para>
 </para>
@@ -525,17 +514,6 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
 @tab_label: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_tab_label_packing ##### -->
-<para>
-</para>
-
-@notebook: 
-@child: 
-@expand: 
-@fill: 
-@pack_type: 
-
-
 <!-- ##### FUNCTION gtk_notebook_set_tab_label_text ##### -->
 <para>
 </para>

docs/reference/gtk/tmpl/gtkpaned.sgml

@@ -54,7 +54,7 @@ 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 + GTK_PANED (hpaned)->gutter_size, -1);
+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);

docs/reference/gtk/tmpl/gtkprogressbar.sgml

@@ -89,6 +89,11 @@ and should be accessed using the functions below.
 
 </para>
 
+<!-- ##### ARG GtkProgressBar:show-text ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkProgressBar:text ##### -->
 <para>
 
@@ -141,15 +146,6 @@ Creates a new #GtkProgressBar.
 @pbar: 
 
 
-<!-- ##### FUNCTION gtk_progress_bar_set_text ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@text: 
-
-
 <!-- ##### FUNCTION gtk_progress_bar_set_fraction ##### -->
 <para>
 
@@ -159,31 +155,13 @@ Creates a new #GtkProgressBar.
 @fraction: 
 
 
-<!-- ##### FUNCTION gtk_progress_bar_set_pulse_step ##### -->
+<!-- ##### FUNCTION gtk_progress_bar_get_fraction ##### -->
 <para>
 
 </para>
 
 @pbar: 
-@fraction: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_orientation ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@orientation: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_set_ellipsize ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@mode: 
+@Returns: 
 
 
 <!-- ##### ENUM GtkProgressBarOrientation ##### -->
@@ -197,31 +175,13 @@ directions for the visible progress bar.
 @GTK_PROGRESS_BOTTOM_TO_TOP: A vertical progress bar growing from bottom to top.
 @GTK_PROGRESS_TOP_TO_BOTTOM: A vertical progress bar growing from top to bottom.
 
-<!-- ##### FUNCTION gtk_progress_bar_get_text ##### -->
+<!-- ##### FUNCTION gtk_progress_bar_set_orientation ##### -->
 <para>
 
 </para>
 
 @pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_fraction ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_progress_bar_get_pulse_step ##### -->
-<para>
-
-</para>
-
-@pbar: 
-@Returns: 
+@orientation: 
 
 
 <!-- ##### FUNCTION gtk_progress_bar_get_orientation ##### -->
@@ -233,6 +193,51 @@ directions for the visible progress bar.
 @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>
 
@@ -242,11 +247,21 @@ directions for the visible progress bar.
 @Returns: 
 
 
-<!-- ##### ENUM GtkProgressBarStyle ##### -->
+<!-- ##### FUNCTION gtk_progress_bar_set_pulse_step ##### -->
 <para>
-An enumeration representing the styles for drawing the progress bar.
+
 </para>
 
-@GTK_PROGRESS_CONTINUOUS: The progress bar grows in a smooth, continuous manner.
-@GTK_PROGRESS_DISCRETE: The progress bar grows in discrete, visible blocks.
+@pbar: 
+@fraction: 
+
+
+<!-- ##### FUNCTION gtk_progress_bar_get_pulse_step ##### -->
+<para>
+
+</para>
+
+@pbar: 
+@Returns: 
+
 

docs/reference/gtk/tmpl/gtktable.sgml

@@ -131,7 +131,8 @@ The <structname>GtkTable</structname> structure holds the data for the actual ta
 Used to create a new table widget. An initial size must be given by
 specifying how many rows and columns the table should have, although
 this can be changed later with gtk_table_resize().  @rows and @columns
-must both be in the range 0 .. 65535.
+must both be in the range 1 .. 65535. For historical reasons, 0 is accepted
+as well and is silently interpreted as 1.
 </para>
 
 @rows: The number of rows the new table should have.
@@ -151,6 +152,16 @@ If you need to change a table's size <emphasis>after</emphasis> it has been crea
 @columns: The new number of columns.
 
 
+<!-- ##### FUNCTION gtk_table_get_size ##### -->
+<para>
+
+</para>
+
+@table: 
+@rows: 
+@columns: 
+
+
 <!-- ##### FUNCTION gtk_table_attach ##### -->
 <para>
 Adds a widget to a table. The number of 'cells' that a widget will occupy is

docs/reference/gtk/tmpl/gtkwindowgroup.sgml

@@ -62,6 +62,15 @@ Limit the effect of grabs
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_window_group_get_current_grab ##### -->
+<para>
+
+</para>
+
+@window_group: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_window_group_get_current_device_grab ##### -->
 <para>
 

docs/tools/widgets.c

@@ -279,13 +279,15 @@ create_combo_box_entry (void)
 {
   GtkWidget *widget;
   GtkWidget *align;
+  GtkWidget *child;
   
   gtk_rc_parse_string ("style \"combo-box-entry-style\" {\n"
 		       "  GtkComboBox::appears-as-list = 1\n"
 		       "}\n"
 		       "widget_class \"GtkComboBoxEntry\" style \"combo-box-entry-style\"\n" );
   widget = gtk_combo_box_entry_new_text ();
-  gtk_entry_set_text (GTK_ENTRY (GTK_BIN (widget)->child), "Combo Box Entry");
+  child = gtk_bin_get_child (GTK_BIN (widget));
+  gtk_entry_set_text (GTK_ENTRY (child), "Combo Box Entry");
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   gtk_container_add (GTK_CONTAINER (align), widget);
 
@@ -612,10 +614,12 @@ create_colorsel (void)
   WidgetInfo *info;
   GtkWidget *widget;
   GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
   GdkColor color;
 
   widget = gtk_color_selection_dialog_new ("Color Selection Dialog");
-  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (widget)->colorsel);
+  selection_dialog = GTK_COLOR_SELECTION_DIALOG (widget);
+  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
 
   color.red   = 0x7979;
   color.green = 0xdbdb;
@@ -995,7 +999,7 @@ create_volume_button (void)
   button = gtk_volume_button_new ();
   gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33);
   /* Hack: get the private dock */
-  widget = GTK_SCALE_BUTTON (button)->plus_button->parent->parent->parent;
+  widget = gtk_scale_button_get_plus_button (GTK_SCALE_BUTTON (button))->parent->parent->parent;
   gtk_widget_show_all (widget);
   return new_widget_info ("volumebutton", widget, ASIS);
 }

docs/tutorial/Makefile.am

@@ -37,7 +37,7 @@ EXTRA_DIST += \
 	images/tictactoe.png
 
 if HAVE_DOCBOOK
-html:
+html: gtk-tut.sgml
 	if test -w $(srcdir); then \
 	  (cd $(srcdir); \
 	   db2html gtk-tut.sgml; \
@@ -47,11 +47,13 @@ html:
 	   cp images/*.png html/images); \
 	fi
 
-pdf:
+pdf: gtk-tut.sgml
 	if test -w $(srcdir); then \
 	  (cd $(srcdir); db2pdf gtk-tut.sgml); \
 	fi
 
+all-local: html
+
 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
 else

examples/colorsel/colorsel.c

@@ -27,6 +27,7 @@ static gboolean area_event( GtkWidget *widget,
   gint handled = FALSE;
   gint response;
   GtkColorSelection *colorsel;
+  GtkColorSelectionDialog *selection_dialog;
 
   /* Check if we've received a button pressed event */
 
@@ -39,7 +40,8 @@ static gboolean area_event( GtkWidget *widget,
         colorseldlg = gtk_color_selection_dialog_new ("Select background color");
 
       /* Get the ColorSelection widget */
-      colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (colorseldlg)->colorsel);
+      selection_dialog = GTK_COLOR_SELECTION_DIALOG (colorseldlg);
+      colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_colorsel (selection_dialog));
 
       gtk_color_selection_set_previous_color (colorsel, &color);
       gtk_color_selection_set_current_color (colorsel, &color);

examples/gdk/composited-window-example.c

@@ -45,7 +45,7 @@ static gboolean
 window_expose_event (GtkWidget      *widget,
 		     GdkEventExpose *event)
 {
-  GdkRegion *region;
+  cairo_region_t *region;
   GtkWidget *child;
   cairo_t *cr;
 
@@ -61,10 +61,11 @@ window_expose_event (GtkWidget      *widget,
 			       child->allocation.y);
 
   /* draw no more than our expose event intersects our child */
-  region = gdk_region_rectangle (&child->allocation);
-  gdk_region_intersect (region, event->region);
+  region = cairo_region_create_rectangle (&child->allocation);
+  cairo_region_intersect (region, region, event->region);
   gdk_cairo_region (cr, region);
   cairo_clip (cr);
+  cairo_region_destroy (region);
 
   /* composite, with a 50% opacity */
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);

gdk/Makefile.am

@@ -26,11 +26,9 @@ EXTRA_DIST +=			\
 	makeenums.pl		\
 	makefile.msc		\
 	gdk.symbols		\
-	makegdkalias.pl		\
 	gdkenumtypes.c.template	\
 	gdkenumtypes.h.template	\
-	abicheck.sh		\
-	pltcheck.sh
+	abicheck.sh
 
 INCLUDES =                              \
 	-DG_LOG_DOMAIN=\"Gdk\"		\
@@ -50,6 +48,7 @@ endif
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
 LDADD = \
+	$(GTK_LINK_FLAGS)						\
 	-version-info $(LT_VERSION_INFO)		 		\
 	-export-dynamic 						\
 	-rpath $(libdir) 						\
@@ -82,7 +81,6 @@ gdk_public_h_sources =				\
 	gdkdnd.h				\
 	gdkdrawable.h				\
 	gdkevents.h				\
-	gdkfont.h				\
 	gdkgc.h					\
 	gdkimage.h				\
 	gdkinput.h				\
@@ -93,7 +91,6 @@ gdk_public_h_sources =				\
 	gdkpixmap.h				\
 	gdkprivate.h				\
 	gdkproperty.h				\
-	gdkregion.h				\
 	gdkrgb.h				\
 	gdkscreen.h				\
 	gdkselection.h				\
@@ -106,15 +103,11 @@ gdk_public_h_sources =				\
 gdk_built_public_sources =			\
 	gdkenumtypes.h
 
-gdk_built_private_headers =			\
-	gdkalias.h
-
 gdk_private_headers =				\
 	gdkinternals.h				\
 	gdkdeviceprivate.h			\
 	gdkintl.h				\
-	gdkpoly-generic.h			\
-	gdkregion-generic.h
+	gdkpoly-generic.h
 
 gdk_c_sources =                 \
 	$(medialib_sources)     \
@@ -130,7 +123,6 @@ gdk_c_sources =                 \
 	gdkdnd.c		\
 	gdkdraw.c		\
 	gdkevents.c     	\
-	gdkfont.c		\
 	gdkgc.c			\
 	gdkglobals.c		\
 	gdkimage.c		\
@@ -141,9 +133,7 @@ gdk_c_sources =                 \
 	gdkpixbuf-drawable.c	\
 	gdkpixbuf-render.c	\
 	gdkpixmap.c		\
-	gdkpolyreg-generic.c	\
 	gdkrectangle.c		\
-	gdkregion-generic.c	\
 	gdkrgb.c		\
 	gdkscreen.c		\
 	gdkselection.c		\
@@ -152,12 +142,10 @@ gdk_c_sources =                 \
 	gdkwindowimpl.c
 
 gdk_built_sources =				\
-	gdkaliasdef.c				\
 	gdkenumtypes.c				\
 	gdkmarshalers.h 			\
 	gdkmarshalers.c				\
-	$(gdk_built_public_sources)		\
-	$(gdk_built_private_headers)
+	$(gdk_built_public_sources)
 
 #
 # setup GDK sources and their dependencies
@@ -166,9 +154,9 @@ gdk_built_sources =				\
 gdkincludedir = $(includedir)/gtk-3.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
-common_sources =                \
-	$(gdk_private_headers)      \
-    $(gdk_c_sources)	\
+common_sources = 		\
+	$(gdk_private_headers)	\
+	$(gdk_c_sources)	\
 	gdkenumtypes.c		\
 	gdkmarshalers.c		\
 	gdkmarshalers.h
@@ -192,30 +180,67 @@ libgdk_win32_3_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(src
 
 if HAVE_INTROSPECTION
 
-introspection_files = \
-		$(gdk_public_h_sources) \
-		$(gdk_c_sources) \
-        gdkenumtypes.c \
+introspection_files = 		\
+	$(gdk_public_h_sources)	\
+	$(gdk_c_sources)	\
+        gdkenumtypes.c		\
         gdkenumtypes.h
 
 Gdk-3.0.gir: $(gdktargetlib) Makefile
 Gdk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
-Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = $(gdktargetlib)
-Gdk_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Gdk_3_0_gir_FILES = $(introspection_files)
 Gdk_3_0_gir_CFLAGS = $(INCLUDES)
 INTROSPECTION_GIRS += Gdk-3.0.gir
 
 if USE_X11
-x11_introspection_files = \
-        x11/*.c \
+x11_introspection_files = 		\
+	x11/checksettings.c		\
+	x11/gdkapplaunchcontext-x11.c	\
+	x11/gdkasync.c			\
+	x11/gdkcolor-x11.c		\
+	x11/gdkcursor-x11.c		\
+	x11/gdkdevice-core.c		\
+	x11/gdkdevicemanager-core.c	\
+	x11/gdkdevicemanager-x11.c	\
+	x11/gdkdevicemanager-xi2.c	\
+	x11/gdkdevicemanager-xi.c	\
+	x11/gdkdevice-xi2.c		\
+	x11/gdkdevice-xi.c		\
+	x11/gdkdisplay-x11.c		\
+	x11/gdkdnd-x11.c		\
+	x11/gdkdrawable-x11.c		\
+	x11/gdkeventsource.c		\
+	x11/gdkeventtranslator.c	\
+	x11/gdkgc-x11.c			\
+	x11/gdkgeometry-x11.c		\
+	x11/gdkglobals-x11.c		\
+	x11/gdkimage-x11.c		\
+	x11/gdkim-x11.c			\
+	x11/gdkinput.c			\
+	x11/gdkkeys-x11.c		\
+	x11/gdkmain-x11.c		\
+	x11/gdkpixmap-x11.c		\
+	x11/gdkproperty-x11.c		\
+	x11/gdkscreen-x11.c		\
+	x11/gdkselection-x11.c		\
+	x11/gdksettings.c		\
+	x11/gdkspawn-x11.c		\
+	x11/gdktestutils-x11.c		\
+	x11/gdkvisual-x11.c		\
+	x11/gdkwindow-x11.c		\
+	x11/gdkxftdefaults.c		\
+	x11/gdkxid.c			\
+	x11/xsettings-client.c		\
+	x11/xsettings-common.c		\
         x11/gdkx.h
 
-GdkX11-3.0.gir: $(gdktargetlib) Makefile
+GdkX11-3.0.gir: $(gdktargetlib) Gdk-3.0.gir Makefile
 GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = $(gdktargetlib)
-GdkX11_3_0_gir_FILES = $(addprefix $(srcdir)/,$(x11_introspection_files))
+GdkX11_3_0_gir_FILES = $(x11_introspection_files)
 GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 endif # USE_X11
@@ -261,15 +286,9 @@ endif
 gdk.def: gdk.symbols
 	(echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
 
-gdkalias.h: gdk.symbols
-	 $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h
-
-gdkaliasdef.c: gdk.symbols
-	 $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
-
 TESTS_ENVIRONMENT = srcdir="$(srcdir)"
 if OS_LINUX
-TESTS = abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 
 
@@ -325,7 +344,7 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
 	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
 	|| ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-	(echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp	\
+	$(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp	\
 	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
 	|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
 

gdk/directfb/Makefile.am

@@ -27,7 +27,6 @@ libgdk_directfb_la_SOURCES =	\
 	gdkdisplay-directfb.h   \
 	gdkdrawable-directfb.c	\
 	gdkevents-directfb.c	\
-	gdkfont-directfb.c	\
 	gdkgc-directfb.c	\
 	gdkgeometry-directfb.c	\
 	gdkglobals-directfb.c	\

gdk/directfb/TODO

@@ -31,7 +31,6 @@ gdkdisplay-directfb.c
 gdkdnd-directfb.c
 gdkdrawable-directfb.c
 gdkevents-directfb.c
-gdkfont-directfb.c
 gdkgc-directfb.c
 gdkgeometry-directfb.c
 gdkglobals-directfb.c

gdk/directfb/gdkcolor-directfb.c

@@ -42,7 +42,6 @@
 #include "gdkinternals.h"
 #include "gdkdirectfb.h"
 #include "gdkprivate-directfb.h"
-#include "gdkalias.h"
 
 
 typedef struct {
@@ -510,5 +509,3 @@ gdk_directfb_allocate_color_key (GdkColormap *colormap)
 
   private->info[255].ref_count++;
 }
-#define __GDK_COLOR_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkcursor-directfb.c

@@ -35,7 +35,6 @@
 #include "gdkdirectfb.h"
 #include "gdkprivate-directfb.h"
 #include "gdkcursor.h"
-#include "gdkalias.h"
 
 #include "x-cursors.xbm"
 
@@ -545,7 +544,3 @@ gdk_display_supports_cursor_color (GdkDisplay *display)
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
   return TRUE;
 }
-
-#define __GDK_CURSOR_X11_C__
-#include "gdkaliasdef.c"
-

gdk/directfb/gdkdisplay-directfb.c

@@ -32,7 +32,6 @@
 #include "gdkprivate-directfb.h"
 #include "gdkscreen.h"
 #include "gdkdisplaymanager.h"
-#include "gdkalias.h"
 
 
 extern void _gdk_visual_init            (void);
@@ -540,8 +539,3 @@ gdk_display_supports_composite (GdkDisplay *display)
 {
     return FALSE;
 }
-
-
-#define __GDK_DISPLAY_X11_C__
-#include "gdkaliasdef.c"
-

gdk/directfb/gdkdnd-directfb.c

@@ -37,7 +37,6 @@
 
 #include "gdkdnd.h"
 #include "gdkproperty.h"
-#include "gdkalias.h"
 
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 
@@ -633,6 +632,3 @@ gdk_drag_get_selection (GdkDragContext *context)
   else
     return GDK_NONE;
 }
-
-#define __GDK_DND_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkdrawable-directfb.c

@@ -43,10 +43,6 @@
 
 #include "gdkinternals.h"
 
-
-#include "gdkregion-generic.h"
-#include "gdkalias.h"
-
 #include "cairo-directfb.h"
 
 
@@ -226,7 +222,7 @@ void
 gdk_directfb_clip_region (GdkDrawable  *drawable,
                           GdkGC        *gc,
                           GdkRectangle *draw_rect,
-                          GdkRegion    *ret_clip)
+                          cairo_region_t    *ret_clip)
 {
   GdkDrawableImplDirectFB *private;
   GdkRectangle             rect;
@@ -258,13 +254,13 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
                    GDKDFB_RECTANGLE_VALS_FROM_BOX( &private->paint_region.extents ),
                    private->paint_region.numRects );
 
-    gdk_region_intersect (ret_clip, &private->paint_region);
+    cairo_region_intersect (ret_clip, &private->paint_region);
   }
 
   if (gc)
     {
       GdkGCDirectFB *gc_private = GDK_GC_DIRECTFB (gc);
-      GdkRegion     *region     = &gc_private->clip_region;
+      cairo_region_t     *region     = &gc_private->clip_region;
 
       if (region->numRects)
         {
@@ -273,13 +269,13 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
 
           if (gc->clip_x_origin || gc->clip_y_origin)
             {
-              gdk_region_offset (ret_clip, -gc->clip_x_origin, -gc->clip_y_origin);
-              gdk_region_intersect (ret_clip, region);
-              gdk_region_offset (ret_clip, gc->clip_x_origin, gc->clip_y_origin);
+              cairo_region_translate (ret_clip, -gc->clip_x_origin, -gc->clip_y_origin);
+              cairo_region_intersect (ret_clip, region);
+              cairo_region_translate (ret_clip, gc->clip_x_origin, gc->clip_y_origin);
             }
           else
             {
-              gdk_region_intersect (ret_clip, region);
+              cairo_region_intersect (ret_clip, region);
             }
         }
 
@@ -299,7 +295,7 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
       !GDK_WINDOW_OBJECT (private->wrapper)->input_only)
     {
       GList     *cur;
-      GdkRegion  temp;
+      cairo_region_t  temp;
 
       temp.numRects = 1;
       temp.rects = &temp.extents;
@@ -327,7 +323,7 @@ gdk_directfb_clip_region (GdkDrawable  *drawable,
           D_DEBUG_AT( GDKDFB_DrawClip, "  -> clipping child    [ %4d,%4d - %4dx%4d ]  (%ld boxes)\n",
                       GDKDFB_RECTANGLE_VALS_FROM_BOX( &temp.extents ), temp.numRects );
 
-          gdk_region_subtract (ret_clip, &temp);
+          cairo_region_subtract (ret_clip, &temp);
         }
     }
 
@@ -428,7 +424,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
                              gint         height)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkGCDirectFB           *gc_private = NULL;
   IDirectFBSurface        *surface    = NULL;
   gint  i;
@@ -543,7 +539,7 @@ gdk_directfb_draw_rectangle (GdkDrawable *drawable,
 
           for (i = 0; i < clip.numRects; i++)
             {
-              GdkRegionBox *box = &clip.rects[i];
+              cairo_region_tBox *box = &clip.rects[i];
 
               rects[i].x = box->x1;
               rects[i].y = box->y1;
@@ -606,7 +602,7 @@ gdk_directfb_draw_polygon (GdkDrawable *drawable,
                                  points[0].y == points[npoints-1].y))
           {
             GdkDrawableImplDirectFB *impl;
-            GdkRegion                clip;
+            cairo_region_t                clip;
             gint                     i;
 
             impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -671,7 +667,7 @@ gdk_directfb_draw_drawable (GdkDrawable *drawable,
 {
   GdkDrawableImplDirectFB *impl;
   GdkDrawableImplDirectFB *src_impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkRectangle             dest_rect = { xdest,
                                          ydest,
                 xdest + width ,
@@ -721,7 +717,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
                           gint         npoints)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
 
   DFBRegion region = { points->x, points->y, points->x, points->y };
 
@@ -739,7 +735,7 @@ gdk_directfb_draw_points (GdkDrawable *drawable,
 
   while (npoints > 0)
     {
-      if (gdk_region_point_in (&clip, points->x, points->y))
+      if (cairo_region_contains_point (&clip, points->x, points->y))
         {
           impl->surface->FillRectangle (impl->surface,
                                         points->x, points->y, 1, 1);
@@ -769,7 +765,7 @@ gdk_directfb_draw_segments (GdkDrawable *drawable,
                             gint         nsegs)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   gint                     i;
 
 //  DFBRegion region = { segs->x1, segs->y1, segs->x2, segs->y2 };
@@ -847,7 +843,7 @@ gdk_directfb_draw_lines (GdkDrawable *drawable,
                          gint         npoints)
 {
   GdkDrawableImplDirectFB *impl;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   gint                     i;
 
   DFBRegion lines[npoints > 1 ? npoints - 1 : 1];
@@ -920,7 +916,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
 {
   GdkDrawableImplDirectFB *impl;
   GdkImageDirectFB        *image_private;
-  GdkRegion                clip;
+  cairo_region_t                clip;
   GdkRectangle             dest_rect = { xdest, ydest, width, height };
 
   gint pitch = 0;
@@ -940,7 +936,7 @@ gdk_directfb_draw_image (GdkDrawable *drawable,
 
   gdk_directfb_clip_region (drawable, gc, &dest_rect, &clip);
 
-  if (!gdk_region_empty (&clip))
+  if (!cairo_region_is_empty (&clip))
     {
       DFBRectangle  src_rect = { xsrc, ysrc, width, height };
 
@@ -1156,8 +1152,8 @@ gdk_directfb_draw_pixbuf (GdkDrawable  *drawable,
 {
   GdkPixbuf *composited = NULL;
 #if 0
-  GdkRegion *clip;
-  GdkRegion *drect;
+  cairo_region_t *clip;
+  cairo_region_t *drect;
   GdkRectangle tmp_rect;
 #endif
   GdkDrawableImplDirectFB *impl = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -1218,15 +1214,15 @@ gdk_directfb_draw_pixbuf (GdkDrawable  *drawable,
   tmp_rect.width = width;
   tmp_rect.height = height;
 
-  drect = gdk_region_rectangle (&tmp_rect);
+  drect = cairo_region_create_rectangle (&tmp_rect);
   clip = gdk_drawable_get_clip_region (drawable);
 
-  gdk_region_intersect (drect, clip);
+  cairo_region_intersect (drect, clip);
 
-  gdk_region_get_clipbox (drect, &tmp_rect);
+  cairo_region_get_extents (drect, &tmp_rect);
   
-  gdk_region_destroy (drect);
-  gdk_region_destroy (clip);
+  cairo_region_destroy (drect);
+  cairo_region_destroy (clip);
 
   if (tmp_rect.width == 0 ||
       tmp_rect.height == 0)
@@ -1635,6 +1631,3 @@ gdk_directfb_ref_cairo_surface (GdkDrawable *drawable)
   g_assert (impl->cairo_surface != NULL);
   return impl->cairo_surface;
 }
-
-#define __GDK_DRAWABLE_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkevents-directfb.c

@@ -47,16 +47,10 @@
 gboolean gdk_net_wm_supports (GdkAtom property);
 #endif
 
-#include "gdkalias.h"
-
 #define EventBuffer _gdk_display->buffer
 #define DirectFB _gdk_display->directfb
 
 
-
-
-#include "gdkaliasdef.c"
-
 /*********************************************
  * Functions for maintaining the event queue *
  *********************************************/
@@ -967,6 +961,3 @@ void
 _gdk_windowing_event_data_free (GdkEvent *event)
 {
 }
-
-#define __GDK_EVENTS_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkfont-directfb.c

@@ -1,206 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.
- */
-
-/*
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002  convergence integrated media GmbH
- * Copyright (C) 2002-2004  convergence GmbH
- * Written by Denis Oliver Kropp <dok@convergence.de> and
- *            Sven Neumann <sven@convergence.de>
- */
-
-#undef GDK_DISABLE_DEPRECATED
-
-#include "config.h"
-#include "gdk.h"
-
-#include <string.h>
-
-#include "gdkdirectfb.h"
-#include "gdkprivate-directfb.h"
-
-#include "gdkinternals.h"
-
-#include "gdkfont.h"
-#include "gdkalias.h"
-
-
-typedef struct _GdkFontDirectFB  GdkFontDirectFB;
-
-struct _GdkFontDirectFB
-{
-  GdkFontPrivate    base;
-  gint              size;
-  IDirectFBFont    *dfbfont;
-};
-
-
-static GdkFont *
-gdk_directfb_bogus_font (gint height)
-{
-  GdkFont         *font;
-  GdkFontDirectFB *private;
-
-  private = g_new0 (GdkFontDirectFB, 1);
-  font = (GdkFont *)private;
-
-  font->type = GDK_FONT_FONT;
-  font->ascent = height*3/4;
-  font->descent = height/4;
-  private->size = height;
-  private->base.ref_count = 1;
-  return font;
-}
-
-GdkFont*
-gdk_font_from_description_for_display (GdkDisplay * display,PangoFontDescription *font_desc)
-{
-  gint size;
-
-  g_return_val_if_fail (font_desc, NULL);
-
-  size = pango_font_description_get_size (font_desc);
-
-  return gdk_directfb_bogus_font (PANGO_PIXELS (size));
-}
-
-/* ********************* */
-
-GdkFont*
-gdk_fontset_load (const gchar *fontset_name)
-{
-  return gdk_directfb_bogus_font (10);
-}
-
-GdkFont *
-gdk_fontset_load_for_display (GdkDisplay *display,const gchar *font_name) {
-  return gdk_directfb_bogus_font (10);
-}
-
-GdkFont *
-gdk_font_load_for_display (GdkDisplay *display,const gchar *font_name)
-{
-  return gdk_directfb_bogus_font (10);
-}
-
-void
-_gdk_font_destroy (GdkFont *font)
-{
-  switch (font->type)
-    {
-    case GDK_FONT_FONT:
-      break;
-    case GDK_FONT_FONTSET:
-      break;
-    default:
-      g_error ("unknown font type.");
-      break;
-    }
-
-  g_free (font);
-}
-
-gint
-_gdk_font_strlen (GdkFont     *font,
-                  const gchar *str)
-{
-  GdkFontDirectFB *font_private;
-  gint length = 0;
-
-  g_return_val_if_fail (font != NULL, -1);
-  g_return_val_if_fail (str != NULL, -1);
-
-  font_private = (GdkFontDirectFB*) font;
-
-  if (font->type == GDK_FONT_FONT)
-    {
-      guint16 *string_2b = (guint16 *)str;
-
-      while (*(string_2b++))
-        length++;
-    }
-  else if (font->type == GDK_FONT_FONTSET)
-    {
-      length = strlen (str);
-    }
-  else
-    g_error("undefined font type\n");
-
-  return length;
-}
-
-gint
-gdk_font_id (const GdkFont *font)
-{
-  const GdkFontDirectFB *font_private;
-
-  g_return_val_if_fail (font != NULL, 0);
-
-  font_private = (const GdkFontDirectFB*) font;
-
-  if (font->type == GDK_FONT_FONT)
-    {
-      return -1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-gint
-gdk_font_equal (const GdkFont *fonta,
-                const GdkFont *fontb)
-{
-  const GdkFontDirectFB *privatea;
-  const GdkFontDirectFB *privateb;
-
-  g_return_val_if_fail (fonta != NULL, FALSE);
-  g_return_val_if_fail (fontb != NULL, FALSE);
-
-  privatea = (const GdkFontDirectFB*) fonta;
-  privateb = (const GdkFontDirectFB*) fontb;
-
-  if(fonta == fontb)
-    return TRUE;
-
-  return FALSE;
-}
-
-GdkFont *
-gdk_font_lookup (GdkNativeWindow xid)
-{
-	g_warning(" gdk_font_lookup unimplemented \n");
-  return NULL;
-}
-
-GdkDisplay*
-gdk_font_get_display (GdkFont* font)
-{
-	g_warning(" gdk_font_get_display unimplemented \n");
-  return NULL;
-}
-
-#define __GDK_FONT_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkgc-directfb.c

@@ -41,11 +41,7 @@
 #include "gdkprivate-directfb.h"
 
 #include "gdkgc.h"
-#include "gdkfont.h"
 #include "gdkpixmap.h"
-#include "gdkregion-generic.h"
-
-#include "gdkalias.h"
 
 static void gdk_directfb_gc_get_values (GdkGC           *gc,
                                         GdkGCValues     *values);
@@ -173,17 +169,6 @@ gdk_directfb_gc_set_values (GdkGC           *gc,
       private->values_mask |= GDK_GC_BACKGROUND;
     }
 
-  if (values_mask & GDK_GC_FONT)
-    {
-      GdkFont *oldf = private->values.font;
-
-      private->values.font = gdk_font_ref (values->font);
-      private->values_mask |= GDK_GC_FONT;
-
-      if (oldf)
-        gdk_font_unref (oldf);
-    }
-
   if (values_mask & GDK_GC_FUNCTION)
     {
       private->values.function = values->function;
@@ -325,7 +310,7 @@ gc_unset_clip_mask (GdkGC *gc)
 
 void
 _gdk_windowing_gc_set_clip_region (GdkGC           *gc,
-                                   const GdkRegion *region,
+                                   const cairo_region_t *region,
                                    gboolean         reset_origin)
 {
   GdkGCDirectFB *data;
@@ -366,8 +351,6 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
 
   temp_region_reset(&dst_private->clip_region);
 
-  if (dst_private->values_mask & GDK_GC_FONT)
-    gdk_font_unref (dst_private->values.font);
   if (dst_private->values_mask & GDK_GC_TILE)
     g_object_unref (dst_private->values.tile);
   if (dst_private->values_mask & GDK_GC_STIPPLE)
@@ -376,8 +359,6 @@ _gdk_windowing_gc_copy (GdkGC *dst_gc,
     g_object_unref (dst_private->values.clip_mask);
 
   *dst_gc = *src_gc;
-  if (dst_private->values_mask & GDK_GC_FONT)
-    gdk_font_ref (dst_private->values.font);
   if (dst_private->values_mask & GDK_GC_TILE)
     g_object_ref (dst_private->values.tile);
   if (dst_private->values_mask & GDK_GC_STIPPLE)
@@ -403,5 +384,3 @@ gdk_gc_get_screen (GdkGC *gc)
   
   return _gdk_screen;
 }
-#define __GDK_GC_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkgeometry-directfb.c

@@ -37,7 +37,6 @@
 #include "gdkprivate-directfb.h"
 
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 
 void
@@ -53,7 +52,7 @@ _gdk_directfb_window_get_offsets (GdkWindow *window,
 
 gboolean
 _gdk_windowing_window_queue_antiexpose (GdkWindow *window,
-                                        GdkRegion *area)
+                                        cairo_region_t *area)
 {
   return FALSE;
 }
@@ -75,7 +74,7 @@ _gdk_directfb_window_scroll (GdkWindow *window,
 {
   GdkWindowObject         *private;
   GdkDrawableImplDirectFB *impl;
-  GdkRegion               *invalidate_region = NULL;
+  cairo_region_t               *invalidate_region = NULL;
   GList                   *list;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -91,24 +90,24 @@ _gdk_directfb_window_scroll (GdkWindow *window,
 
   /* Move the current invalid region */
   if (private->update_area)
-    gdk_region_offset (private->update_area, dx, dy);
+    cairo_region_translate (private->update_area, dx, dy);
 
   if (GDK_WINDOW_IS_MAPPED (window))
     {
       GdkRectangle  clip_rect = {  0,  0, impl->width, impl->height };
       GdkRectangle  rect      = { dx, dy, impl->width, impl->height };
 
-      invalidate_region = gdk_region_rectangle (&clip_rect);
+      invalidate_region = cairo_region_create_rectangle (&clip_rect);
 
       if (gdk_rectangle_intersect (&rect, &clip_rect, &rect) &&
           (!private->update_area ||
-           !gdk_region_rect_in (private->update_area, &rect)))
+           !cairo_region_contains_rectangle (private->update_area, &rect)))
         {
-          GdkRegion *region;
+          cairo_region_t *region;
 
-          region = gdk_region_rectangle (&rect);
-          gdk_region_subtract (invalidate_region, region);
-          gdk_region_destroy (region);
+          region = cairo_region_create_rectangle (&rect);
+          cairo_region_subtract (invalidate_region, region);
+          cairo_region_destroy (region);
 
           if (impl->surface)
             {
@@ -141,14 +140,14 @@ _gdk_directfb_window_scroll (GdkWindow *window,
   if (invalidate_region)
     {
       gdk_window_invalidate_region (window, invalidate_region, TRUE);
-      gdk_region_destroy (invalidate_region);
+      cairo_region_destroy (invalidate_region);
     }
 }
 
 /**
  * gdk_window_move_region:
  * @window: a #GdkWindow
- * @region: The #GdkRegion to move
+ * @region: The #cairo_region_t to move
  * @dx: Amount to move in the X direction
  * @dy: Amount to move in the Y direction
  * 
@@ -162,17 +161,17 @@ _gdk_directfb_window_scroll (GdkWindow *window,
  **/
 void
 _gdk_directfb_window_move_region (GdkWindow       *window,
-                                  const GdkRegion *region,
+                                  const cairo_region_t *region,
                                   gint             dx,
                                   gint             dy)
 {
   GdkWindowObject         *private;
   GdkDrawableImplDirectFB *impl;
-  GdkRegion *window_clip;
-  GdkRegion *src_region;
-  GdkRegion *brought_in;
-  GdkRegion *dest_region;
-  GdkRegion *moving_invalid_region;
+  cairo_region_t *window_clip;
+  cairo_region_t *src_region;
+  cairo_region_t *brought_in;
+  cairo_region_t *dest_region;
+  cairo_region_t *moving_invalid_region;
   GdkRectangle dest_extents;
   
   g_return_if_fail (GDK_IS_WINDOW (window));
@@ -188,31 +187,31 @@ _gdk_directfb_window_move_region (GdkWindow       *window,
     return;
 
   GdkRectangle  clip_rect = {  0,  0, impl->width, impl->height };
-  window_clip = gdk_region_rectangle (&clip_rect);
+  window_clip = cairo_region_create_rectangle (&clip_rect);
 
   /* compute source regions */
-  src_region = gdk_region_copy (region);
-  brought_in = gdk_region_copy (region);
-  gdk_region_intersect (src_region, window_clip);
+  src_region = cairo_region_copy (region);
+  brought_in = cairo_region_copy (region);
+  cairo_region_intersect (src_region, window_clip);
 
-  gdk_region_subtract (brought_in, src_region);
-  gdk_region_offset (brought_in, dx, dy);
+  cairo_region_subtract (brought_in, src_region);
+  cairo_region_translate (brought_in, dx, dy);
 
   /* compute destination regions */
-  dest_region = gdk_region_copy (src_region);
-  gdk_region_offset (dest_region, dx, dy);
-  gdk_region_intersect (dest_region, window_clip);
-  gdk_region_get_clipbox (dest_region, &dest_extents);
+  dest_region = cairo_region_copy (src_region);
+  cairo_region_translate (dest_region, dx, dy);
+  cairo_region_intersect (dest_region, window_clip);
+  cairo_region_get_extents (dest_region, &dest_extents);
 
-  gdk_region_destroy (window_clip);
+  cairo_region_destroy (window_clip);
 
   /* calculating moving part of current invalid area */
   moving_invalid_region = NULL;
   if (private->update_area)
     {
-      moving_invalid_region = gdk_region_copy (private->update_area);
-      gdk_region_intersect (moving_invalid_region, src_region);
-      gdk_region_offset (moving_invalid_region, dx, dy);
+      moving_invalid_region = cairo_region_copy (private->update_area);
+      cairo_region_intersect (moving_invalid_region, src_region);
+      cairo_region_translate (moving_invalid_region, dx, dy);
     }
   
   /* invalidate all of the src region */
@@ -220,18 +219,18 @@ _gdk_directfb_window_move_region (GdkWindow       *window,
 
   /* un-invalidate destination region */
   if (private->update_area)
-    gdk_region_subtract (private->update_area, dest_region);
+    cairo_region_subtract (private->update_area, dest_region);
   
   /* invalidate moving parts of existing update area */
   if (moving_invalid_region)
     {
       gdk_window_invalidate_region (window, moving_invalid_region, FALSE);
-      gdk_region_destroy (moving_invalid_region);
+      cairo_region_destroy (moving_invalid_region);
     }
 
   /* invalidate area brought in from off-screen */
   gdk_window_invalidate_region (window, brought_in, FALSE);
-  gdk_region_destroy (brought_in);
+  cairo_region_destroy (brought_in);
 
   /* Actually do the moving */
 	if (impl->surface)
@@ -250,9 +249,6 @@ _gdk_directfb_window_move_region (GdkWindow       *window,
               impl->surface->SetClip (impl->surface, NULL);
               impl->surface->Flip(impl->surface,&destination,0);
 	}
-  gdk_region_destroy (src_region);
-  gdk_region_destroy (dest_region);
+  cairo_region_destroy (src_region);
+  cairo_region_destroy (dest_region);
 }
-
-#define __GDK_GEOMETRY_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkglobals-directfb.c

@@ -36,8 +36,6 @@
 #include "gdkdirectfb.h"
 #include "gdkprivate-directfb.h"
 
-#include "gdkalias.h"
-
 
 GdkDisplayDFB *_gdk_display = NULL;
 GdkScreen          * _gdk_screen                              = NULL;
@@ -58,5 +56,3 @@ GdkEventMask         _gdk_directfb_keyboard_grab_events       = 0;
 GdkCursor          * _gdk_directfb_pointer_grab_cursor        = NULL;
 
 GdkAtom              _gdk_selection_property                  = 0;
-
-#include "gdkaliasdef.c"

gdk/directfb/gdkimage-directfb.c

@@ -40,7 +40,6 @@
 #include "gdkinternals.h"
 
 #include "gdkimage.h"
-#include "gdkalias.h"
 
 
 static GList    *image_list   = NULL;
@@ -404,6 +403,3 @@ _gdk_windowing_get_bits_for_depth (GdkDisplay *display,
 
   return 0;
 }
-
-#define __GDK_IMAGE_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkinput-directfb.c

@@ -40,7 +40,6 @@
 
 #include "gdkinput.h"
 #include "gdkkeysyms.h"
-#include "gdkalias.h"
 
 
 static GdkDeviceAxis gdk_input_core_axes[] =
@@ -326,7 +325,3 @@ gdk_device_set_source (GdkDevice      *device,
   g_return_if_fail (device != NULL);
   device->source = source;
 }
-
-#define __GDK_INPUT_NONE_C__
-#define __GDK_INPUT_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkkeys-directfb.c

@@ -36,12 +36,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 #include "gdkdirectfb.h"
 #include "gdkprivate-directfb.h"
 
 #include "gdkkeysyms.h"
-#include "gdkalias.h"
+
 
 static struct gdk_key *gdk_keys_by_name = NULL;
 
@@ -1758,6 +1757,24 @@ gdk_keymap_get_caps_lock_state (GdkKeymap *keymap)
   return FALSE;
 }
 
+/**
+ * gdk_keymap_get_num_lock_state:
+ * @keymap: a #GdkKeymap
+ *
+ * Returns whether the Num Lock modifer is locked.
+ *
+ * Returns: %TRUE if Num Lock is on
+ *
+ * Since: 3.0
+ */
+gboolean
+gdk_keymap_get_num_lock_state (GdkKeymap *keymap)
+{
+  /* FIXME: Can we implement this? */
+
+  return FALSE;
+}
+
 /**
  * gdk_keymap_get_entries_for_keycode:
  * @keymap: a #GdkKeymap or %NULL to use the default keymap
@@ -2013,6 +2030,3 @@ gdk_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
 
   return TRUE;
 }
-
-#define __GDK_KEYS_DIRECTFB_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkmain-directfb.c

@@ -53,7 +53,6 @@
 #include "gdkinput-directfb.h"
 
 #include "gdkintl.h"
-#include "gdkalias.h"
 
 
 void
@@ -416,6 +415,3 @@ _gdk_windowing_pointer_grab (GdkWindow    *window,
 
   return GDK_GRAB_SUCCESS;
 }
-
-#define __GDK_MAIN_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkpixmap-directfb.c

@@ -43,7 +43,6 @@
 #include "gdkinternals.h"
 
 #include "gdkpixmap.h"
-#include "gdkalias.h"
 
 
 static void gdk_pixmap_impl_directfb_init       (GdkPixmapImplDirectFB      *pixmap);
@@ -336,6 +335,3 @@ GdkPixmap* gdk_pixmap_lookup_for_display (GdkDisplay *display,GdkNativeWindow an
 {
   return gdk_pixmap_lookup (anid);
 }
-
-#define __GDK_PIXMAP_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkprivate-directfb.h

@@ -38,7 +38,6 @@
 #include "gdkinternals.h"
 #include "gdkcursor.h"
 #include "gdkdisplay-directfb.h"
-#include "gdkregion-generic.h"
 #include <cairo.h>
 
 #include <string.h>
@@ -72,14 +71,14 @@ struct _GdkDrawableImplDirectFB
 
   gboolean                buffered;
 
-  GdkRegion               paint_region;
+  cairo_region_t               paint_region;
   gint                    paint_depth;
   gint                    width;
   gint                    height;
   gint                    abs_x;
   gint                    abs_y;
 
-  GdkRegion               clip_region;
+  cairo_region_t               clip_region;
 
   GdkColormap            *colormap;
 
@@ -179,7 +178,7 @@ void        _gdk_directfb_window_scroll         (GdkWindow       *window,
                                                  gint             dx,
                                                  gint             dy);
 void        _gdk_directfb_window_move_region    (GdkWindow       *window,
-                                                 const GdkRegion *region,
+                                                 const cairo_region_t *region,
                                                  gint             dx,
                                                  gint             dy);
 
@@ -213,7 +212,7 @@ typedef struct
 {
   GdkGC             parent_instance;
 
-  GdkRegion         clip_region;
+  cairo_region_t         clip_region;
 
   GdkGCValuesMask   values_mask;
   GdkGCValues       values;
@@ -335,14 +334,14 @@ void gdk_fb_window_set_child_handler (GdkWindow              *window,
 void gdk_directfb_clip_region (GdkDrawable  *drawable,
                                GdkGC        *gc,
                                GdkRectangle *draw_rect,
-                               GdkRegion    *ret_clip);
+                               cairo_region_t    *ret_clip);
 
 
 /* Utilities for avoiding mallocs */
 
 static inline void
-temp_region_init_copy( GdkRegion       *region, 
-                       const GdkRegion *source)
+temp_region_init_copy( cairo_region_t       *region, 
+                       const cairo_region_t *source)
 {
   if (region != source) /*  don't want to copy to itself */
     {  
@@ -351,19 +350,19 @@ temp_region_init_copy( GdkRegion       *region,
           if (region->rects && region->rects != &region->extents)
             g_free( region->rects );
 
-          region->rects = g_new (GdkRegionBox, source->numRects);
+          region->rects = g_new (cairo_region_tBox, source->numRects);
           region->size  = source->numRects;
         }
 
       region->numRects = source->numRects;
       region->extents  = source->extents;
 
-      memcpy( region->rects, source->rects, source->numRects * sizeof (GdkRegionBox) );
+      memcpy( region->rects, source->rects, source->numRects * sizeof (cairo_region_tBox) );
     }
 }
 
 static inline void
-temp_region_init_rectangle( GdkRegion          *region,
+temp_region_init_rectangle( cairo_region_t          *region,
                             const GdkRectangle *rect )
 {
      region->numRects = 1;
@@ -376,7 +375,7 @@ temp_region_init_rectangle( GdkRegion          *region,
 }
 
 static inline void
-temp_region_init_rectangle_vals( GdkRegion *region,
+temp_region_init_rectangle_vals( cairo_region_t *region,
                                  int        x,
                                  int        y,
                                  int        w,
@@ -392,7 +391,7 @@ temp_region_init_rectangle_vals( GdkRegion *region,
 }
 
 static inline void
-temp_region_reset( GdkRegion *region )
+temp_region_reset( cairo_region_t *region )
 {
      if (region->size > 32 && region->rects && region->rects != &region->extents) {
           g_free( region->rects );
@@ -405,7 +404,7 @@ temp_region_reset( GdkRegion *region )
 }
 
 static inline void
-temp_region_deinit( GdkRegion *region )
+temp_region_deinit( cairo_region_t *region )
 {
      if (region->rects && region->rects != &region->extents) {
           g_free( region->rects );

gdk/directfb/gdkproperty-directfb.c

@@ -42,7 +42,6 @@
 
 #include "gdkinternals.h"
 
-#include "gdkalias.h"
 
 static GHashTable *names_to_atoms;
 static GPtrArray *atoms_to_names;
@@ -396,5 +395,3 @@ gdk_property_change (GdkWindow    *window,
       event->property.state = GDK_PROPERTY_NEW_VALUE;
     }
 }
-#define __GDK_PROPERTY_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkscreen-directfb.c

@@ -38,7 +38,6 @@
 #include "gdkprivate-directfb.h"
 
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 
 static GdkColormap *default_colormap = NULL;
@@ -247,6 +246,3 @@ gdk_screen_is_composited (GdkScreen *screen)
    g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
    return FALSE;
 } 
-
-#define __GDK_SCREEN_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkselection-directfb.c

@@ -40,7 +40,6 @@
 #include "gdkproperty.h"
 #include "gdkselection.h"
 #include "gdkprivate.h"
-#include "gdkalias.h"
 
 
 typedef struct _OwnerInfo OwnerInfo;
@@ -493,6 +492,3 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay     *display,
       return count;
     }
 }
-
-#define __GDK_SELECTION_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkspawn-directfb.c

@@ -24,7 +24,6 @@
 #include "gdk.h"
 #include "gdkspawn.h"
 #include "gdkprivate.h"
-#include "gdkalias.h"
 
 
 gboolean
@@ -103,6 +102,3 @@ gdk_spawn_command_line_on_screen (GdkScreen    *screen,
 
   return retval;
 }
-
-#define __GDK_SPAWN_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdktestutils-directfb.c

@@ -35,7 +35,6 @@
 
 #include <gdk/gdktestutils.h>
 #include <gdk/gdkkeysyms.h>
-#include "gdkalias.h"
 
 
 static DFBInputDeviceKeySymbol
@@ -262,6 +261,3 @@ gdk_test_simulate_button (GdkWindow      *window,
 
   return TRUE;
 }
-
-#define __GDK_TEST_UTILS_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkvisual-directfb.c

@@ -37,7 +37,6 @@
 
 #include "gdkscreen.h"
 #include "gdkvisual.h"
-#include "gdkalias.h"
 
 
 struct _GdkVisualClass
@@ -492,6 +491,3 @@ gdk_directfb_visual_create (DFBSurfacePixelFormat  pixelformat)
 
   return (GdkVisualDirectFB *) visual;
 }
-
-#define __GDK_VISUAL_X11_C__
-#include "gdkaliasdef.c"

gdk/directfb/gdkwindow-directfb.c

@@ -40,10 +40,7 @@
 #include "gdkprivate-directfb.h"
 #include "gdkdisplay-directfb.h"
 
-#include "gdkregion-generic.h"
-
 #include "gdkinternals.h"
-#include "gdkalias.h"
 #include "cairo.h"
 #include <assert.h>
 
@@ -57,7 +54,7 @@ D_DEBUG_DOMAIN( GDKDFB_Paintable, "GDKDFB/Paintable", "GDK DirectFB Paintable" )
 D_DEBUG_DOMAIN( GDKDFB_Window,    "GDKDFB/Window",    "GDK DirectFB Window" );
 
 
-static GdkRegion * gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable);
+static cairo_region_t * gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable);
 static void        gdk_window_impl_directfb_set_colormap       (GdkDrawable *drawable,
                                                                 GdkColormap *colormap);
 static void gdk_window_impl_directfb_init       (GdkWindowImplDirectFB      *window);
@@ -209,7 +206,7 @@ gdk_window_impl_directfb_finalize (GObject *object)
     G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static GdkRegion*
+static cairo_region_t*
 gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable)
 {
   GdkDrawableImplDirectFB *priv = GDK_DRAWABLE_IMPL_DIRECTFB (drawable);
@@ -227,7 +224,7 @@ gdk_window_impl_directfb_get_visible_region (GdkDrawable *drawable)
 
   D_DEBUG_AT( GDKDFB_Window, "  -> returning %4d,%4d-%4dx%4d\n", drect.x, drect.y, drect.w, drect.h );
 
-  return gdk_region_rectangle (&rect);
+  return cairo_region_create_rectangle (&rect);
 }
 
 static void
@@ -1942,7 +1939,7 @@ gdk_directfb_window_set_events (GdkWindow    *window,
 
 static void
 gdk_directfb_window_shape_combine_region (GdkWindow       *window,
-                                          const GdkRegion *shape_region,
+                                          const cairo_region_t *shape_region,
                                           gint             offset_x,
                                           gint             offset_y)
 {
@@ -1950,7 +1947,7 @@ gdk_directfb_window_shape_combine_region (GdkWindow       *window,
 
 void
 gdk_directfb_window_input_shape_combine_region (GdkWindow       *window,
-                                                const GdkRegion *shape_region,
+                                                const cairo_region_t *shape_region,
                                                 gint             offset_x,
                                                 gint             offset_y)
 {
@@ -1959,7 +1956,7 @@ gdk_directfb_window_input_shape_combine_region (GdkWindow       *window,
 static void
 gdk_directfb_window_queue_translation (GdkWindow *window,
 				       GdkGC     *gc,
-                                       GdkRegion *region,
+                                       cairo_region_t *region,
                                        gint       dx,
                                        gint       dy)
 {
@@ -2622,7 +2619,7 @@ gdk_window_set_urgency_hint (GdkWindow *window,
 static void
 gdk_window_impl_directfb_begin_paint_region (GdkPaintable    *paintable,
                                              GdkWindow       *window,
-                                             const GdkRegion *region)
+                                             const cairo_region_t *region)
 {
   GdkDrawableImplDirectFB *impl;
   GdkWindowImplDirectFB   *wimpl;
@@ -2648,7 +2645,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable    *paintable,
                   DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
 
       /* Add the new region to the paint region... */
-      gdk_region_union (&impl->paint_region, region);
+      cairo_region_union (&impl->paint_region, region);
     }
   else
     {
@@ -2668,7 +2665,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable    *paintable,
               DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
 
   /* ...but clip the initial/compound result against the clip region. */
-  gdk_region_intersect (&impl->paint_region, &impl->clip_region);
+  cairo_region_intersect (&impl->paint_region, &impl->clip_region);
 
   D_DEBUG_AT( GDKDFB_Window, "  -> clipped  %4d,%4d-%4dx%4d (%ld boxes)\n",
               DFB_RECTANGLE_VALS_FROM_REGION( &impl->paint_region.extents ), impl->paint_region.numRects );
@@ -2679,7 +2676,7 @@ gdk_window_impl_directfb_begin_paint_region (GdkPaintable    *paintable,
 
   for (i = 0; i < region->numRects; i++)
     {
-      GdkRegionBox *box = &region->rects[i];
+      cairo_region_tBox *box = &region->rects[i];
 
       D_DEBUG_AT( GDKDFB_Window, "  -> [%2d] %4d,%4d-%4dx%4d\n", i, GDKDFB_RECTANGLE_VALS_FROM_BOX( box ) );
 
@@ -2766,13 +2763,13 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
     D_DEBUG_AT( GDKDFB_Window, "  -> depth is still %d\n", impl->paint_depth );
 }
 
-GdkRegion *
+cairo_region_t *
 _gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
 {
   return NULL;
 }
 
-GdkRegion *
+cairo_region_t *
 _gdk_windowing_window_get_shape (GdkWindow *window)
 {
   return NULL;
@@ -2784,7 +2781,7 @@ _gdk_windowing_window_get_next_serial (GdkDisplay *display)
   return 0;
 }
 
-GdkRegion *
+cairo_region_t *
 _gdk_windowing_window_get_input_shape (GdkWindow *window)
 {
   return NULL;
@@ -2802,7 +2799,7 @@ _gdk_windowing_after_process_all_updates (void)
 
 void
 _gdk_windowing_window_process_updates_recurse (GdkWindow *window,
-                                               GdkRegion *region)
+                                               cairo_region_t *region)
 {
   _gdk_window_process_updates_recurse (window, region);
 }
@@ -2861,7 +2858,7 @@ gdk_directfb_window_get_root_coords (GdkWindow *window,
 
 static gboolean
 gdk_directfb_window_queue_antiexpose (GdkWindow *window,
-                                      GdkRegion *area)
+                                      cairo_region_t *area)
 {
   return FALSE;
 }
@@ -2892,7 +2889,3 @@ gdk_window_impl_iface_init (GdkWindowImplIface *iface)
   iface->queue_translation = gdk_directfb_window_queue_translation;
   iface->destroy = gdk_directfb_window_destroy;
 }
-
-#define __GDK_WINDOW_X11_C__
-#include "gdkaliasdef.c"
-

gdk/gdk.c

@@ -36,7 +36,6 @@
 #ifndef HAVE_XCONVERTCASE
 #include "gdkkeysyms.h"
 #endif
-#include "gdkalias.h"
 
 typedef struct _GdkPredicate  GdkPredicate;
 
@@ -809,6 +808,3 @@ gdk_enable_multidevice (void)
 
   _gdk_enable_multidevice = TRUE;
 }
-
-#define __GDK_C__
-#include "gdkaliasdef.c"

gdk/gdk.h

@@ -41,7 +41,6 @@
 #include <gdk/gdkdrawable.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
 #include <gdk/gdkgc.h>
 #include <gdk/gdkimage.h>
 #include <gdk/gdkinput.h>
@@ -50,7 +49,6 @@
 #include <gdk/gdkpixbuf.h>
 #include <gdk/gdkpixmap.h>
 #include <gdk/gdkproperty.h>
-#include <gdk/gdkregion.h>
 #include <gdk/gdkrgb.h>
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkselection.h>

gdk/gdk.symbols

@@ -258,7 +258,6 @@ gdk_extension_mode_get_type G_GNUC_CONST
 gdk_event_mask_get_type G_GNUC_CONST
 gdk_event_type_get_type G_GNUC_CONST
 gdk_fill_get_type G_GNUC_CONST
-gdk_fill_rule_get_type G_GNUC_CONST
 gdk_filter_return_get_type G_GNUC_CONST
 gdk_function_get_type G_GNUC_CONST
 gdk_grab_ownership_get_type G_GNUC_CONST
@@ -268,7 +267,6 @@ gdk_join_style_get_type G_GNUC_CONST
 gdk_line_style_get_type G_GNUC_CONST
 gdk_modifier_type_get_type G_GNUC_CONST
 gdk_notify_type_get_type G_GNUC_CONST
-gdk_overlap_type_get_type G_GNUC_CONST
 gdk_owner_change_get_type G_GNUC_CONST
 gdk_property_state_get_type G_GNUC_CONST
 gdk_prop_mode_get_type G_GNUC_CONST
@@ -279,7 +277,6 @@ gdk_subwindow_mode_get_type G_GNUC_CONST
 gdk_visibility_state_get_type G_GNUC_CONST
 gdk_wm_decoration_get_type G_GNUC_CONST
 gdk_wm_function_get_type G_GNUC_CONST
-gdk_font_type_get_type G_GNUC_CONST
 gdk_cursor_type_get_type G_GNUC_CONST
 gdk_drag_action_get_type G_GNUC_CONST
 gdk_gc_values_mask_get_type G_GNUC_CONST
@@ -295,34 +292,6 @@ gdk_visual_type_get_type G_GNUC_CONST
 #endif
 #endif
 
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_font_from_description
-#endif
-gdk_font_get_type G_GNUC_CONST
-gdk_font_ref
-gdk_font_unref
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_font_load
-#endif
-#endif
-#endif
-
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_font_get_display
-gdk_fontset_load
-#endif
-gdk_font_id
-gdk_font_equal
-gdk_font_load_for_display
-gdk_font_from_description_for_display
-gdk_fontset_load_for_display
-#endif
-#endif
-
 #if IN_HEADER(__GDK_CAIRO_H__)
 #if IN_FILE(__GDK_CAIRO_C__)
 gdk_cairo_create
@@ -692,6 +661,7 @@ gdk_window_get_root_coords
 gdk_window_get_deskrelative_origin
 gdk_window_set_support_multidevice
 gdk_window_get_support_multidevice
+gdk_window_has_native
 gdk_window_set_background
 gdk_window_set_back_pixmap
 gdk_window_set_cursor
@@ -891,6 +861,7 @@ gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_for_display
 gdk_keymap_have_bidi_layouts
 gdk_keymap_get_caps_lock_state
+gdk_keymap_get_num_lock_state
 gdk_keymap_lookup_key
 gdk_keymap_translate_keyboard_state
 gdk_keymap_add_virtual_modifiers
@@ -908,6 +879,7 @@ gdk_keymap_get_entries_for_keycode
 gdk_keymap_get_entries_for_keyval
 gdk_keymap_get_for_display
 gdk_keymap_get_caps_lock_state
+gdk_keymap_get_num_lock_state
 gdk_keymap_lookup_key
 gdk_keymap_translate_keyboard_state
 gdk_keymap_add_virtual_modifiers
@@ -1004,36 +976,6 @@ gdk_pixmap_lookup_for_display
 #endif
 #endif
 
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_REGION_GENERIC_C__)
-gdk_region_copy
-gdk_region_destroy
-gdk_region_empty
-gdk_region_equal
-gdk_region_rect_equal
-gdk_region_get_clipbox
-gdk_region_get_rectangles
-gdk_region_intersect
-gdk_region_new
-gdk_region_offset
-gdk_region_point_in
-gdk_region_rectangle
-gdk_region_rect_in
-gdk_region_shrink
-gdk_region_spans_intersect_foreach
-gdk_region_subtract
-gdk_region_union
-gdk_region_union_with_rect
-gdk_region_xor
-#endif
-#endif
-
-#if IN_HEADER(__GDK_REGION_H__)
-#if IN_FILE(__GDK_POLYREG_GENERIC_C__)
-gdk_region_polygon
-#endif
-#endif
-
 #if IN_HEADER(__GDK_RGB_H__)
 #if IN_FILE(__GDK_RGB_C__)
 gdk_rgb_cmap_free
@@ -1262,14 +1204,6 @@ gdk_x11_window_get_drawable_impl
 gdk_x11_pixmap_get_drawable_impl
 #endif
 
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_x11_font_get_name
-gdk_x11_font_get_xdisplay
-#endif
-gdk_x11_font_get_xfont
-#endif
-
 #if IN_FILE(__GDK_GC_X11_C__)
 gdk_x11_gc_get_xdisplay
 gdk_x11_gc_get_xgc

gdk/gdkapplaunchcontext.c

@@ -26,7 +26,6 @@
 #include "gdkinternals.h"
 #include "gdkscreen.h"
 #include "gdkintl.h"
-#include "gdkalias.h"
 
 
 static void    gdk_app_launch_context_finalize    (GObject           *object);
@@ -287,6 +286,3 @@ gdk_app_launch_context_new (void)
 {
   return g_object_new (GDK_TYPE_APP_LAUNCH_CONTEXT, NULL);
 }
-
-#define __GDK_APP_LAUNCH_CONTEXT_C__
-#include "gdkaliasdef.c"

gdk/gdkcairo.c

@@ -20,8 +20,7 @@
 #include "gdkcairo.h"
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
-#include "gdkregion-generic.h"
-#include "gdkalias.h"
+
 
 /**
  * gdk_cairo_create:
@@ -133,7 +132,7 @@ gdk_cairo_rectangle (cairo_t            *cr,
 /**
  * gdk_cairo_region:
  * @cr: a #cairo_t
- * @region: a #GdkRegion
+ * @region: a #cairo_region_t
  * 
  * Adds the given region to the current path of @cr.
  *
@@ -141,23 +140,21 @@ gdk_cairo_rectangle (cairo_t            *cr,
  **/
 void
 gdk_cairo_region (cairo_t         *cr,
-		  const GdkRegion *region)
+		  const cairo_region_t *region)
 {
-  GdkRegionBox *boxes;
+  cairo_rectangle_int_t box;
   gint n_boxes, i;
 
   g_return_if_fail (cr != NULL);
   g_return_if_fail (region != NULL);
 
-  boxes = region->rects;
-  n_boxes = region->numRects;
+  n_boxes = cairo_region_num_rectangles (region);
 
   for (i = 0; i < n_boxes; i++)
-    cairo_rectangle (cr,
-		     boxes[i].x1,
-		     boxes[i].y1,
-		     boxes[i].x2 - boxes[i].x1,
-		     boxes[i].y2 - boxes[i].y1);
+    {
+      cairo_region_get_rectangle (region, i, &box);
+      cairo_rectangle (cr, box.x, box.y, box.width, box.height);
+    }
 }
 
 /**
@@ -290,7 +287,3 @@ gdk_cairo_set_source_pixmap (cairo_t   *cr,
   cairo_set_source_surface (cr, surface, pixmap_x, pixmap_y);
   cairo_surface_destroy (surface);
 }
-
-
-#define __GDK_CAIRO_C__
-#include "gdkaliasdef.c"

gdk/gdkcairo.h

@@ -48,7 +48,7 @@ void     gdk_cairo_set_source_pixmap (cairo_t            *cr,
 void     gdk_cairo_rectangle         (cairo_t            *cr,
                                       const GdkRectangle *rectangle);
 void     gdk_cairo_region            (cairo_t            *cr,
-                                      const GdkRegion    *region);
+                                      const cairo_region_t    *region);
 
 G_END_DECLS
 

gdk/gdkcolor.c

@@ -30,7 +30,6 @@
 #include "gdkscreen.h"
 #include "gdkcolor.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 
 /**
@@ -247,6 +246,3 @@ gdk_colormap_get_system (void)
 {
   return gdk_screen_get_system_colormap (gdk_screen_get_default ());
 }
-
-#define __GDK_COLOR_C__
-#include "gdkaliasdef.c"

gdk/gdkcursor.c

@@ -28,7 +28,7 @@
 #include "gdkcursor.h"
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
+
 
 GType
 gdk_cursor_get_type (void)
@@ -97,6 +97,3 @@ gdk_cursor_new (GdkCursorType cursor_type)
 {
   return gdk_cursor_new_for_display (gdk_display_get_default(), cursor_type);
 }
-
-#define __GDK_CURSOR_C__
-#include "gdkaliasdef.c"

gdk/gdkdevice.c

@@ -22,7 +22,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkintl.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
+
 
 typedef struct _GdkAxisInfo GdkAxisInfo;
 
@@ -1394,6 +1394,3 @@ _gdk_device_translate_axis (GdkDevice *device,
 
   return TRUE;
 }
-
-#define __GDK_DEVICE_C__
-#include "gdkaliasdef.c"

gdk/gdkdevicemanager.c

@@ -21,7 +21,7 @@
 #include "gdkdevicemanager.h"
 #include "gdkintl.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
+
 
 /**
  * SECTION:gdkdevicemanager
@@ -320,7 +320,3 @@ gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager)
 
   return GDK_DEVICE_MANAGER_GET_CLASS (device_manager)->get_client_pointer (device_manager);
 }
-
-
-#define __GDK_DEVICE_MANAGER_C__
-#include "gdkaliasdef.c"

gdk/gdkdisplay.c

@@ -30,7 +30,7 @@
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
 #include "gdkscreen.h"
-#include "gdkalias.h"
+
 
 enum {
   OPENED,
@@ -1813,6 +1813,3 @@ gdk_display_get_device_manager (GdkDisplay *display)
 
   return display->device_manager;
 }
-
-#define __GDK_DISPLAY_C__
-#include "gdkaliasdef.c"

gdk/gdkdisplaymanager.c

@@ -35,7 +35,6 @@
 
 #include "gdkintl.h"
 
-#include "gdkalias.h"
 
 struct _GdkDisplayManager
 {
@@ -248,8 +247,9 @@ gdk_display_manager_set_default_display (GdkDisplayManager *display_manager,
  *
  * List all currently open displays.
  * 
- * Return value: a newly allocated #GSList of #GdkDisplay objects.
- *  Free this list with g_slist_free() when you are done with it.
+ * Return value: (transfer container) (element-type GdkDisplay): a newly allocated
+ * #GSList of #GdkDisplay objects. Free this list with g_slist_free() when you
+ * are done with it.
  *
  * Since: 2.2
  **/
@@ -258,6 +258,3 @@ gdk_display_manager_list_displays (GdkDisplayManager *display_manager)
 {
   return g_slist_copy (_gdk_displays);
 }
-
-#define __GDK_DISPLAY_MANAGER_C__
-#include "gdkaliasdef.c"

gdk/gdkdnd.c

@@ -28,7 +28,7 @@
 #include <gdkdnd.h>
 #include <gdkdrawable.h>
 #include <gdkdisplay.h>
-#include "gdkalias.h"
+
 
 /**
  * SECTION:dnd
@@ -183,6 +183,3 @@ gdk_drag_context_get_source_window (GdkDragContext *context)
 
   return context->source_window;
 }
-
-#define __GDK_DND_C__
-#include "gdkaliasdef.c"

gdk/gdkdraw.c

@@ -34,7 +34,7 @@
 #include "gdkwindow.h"
 #include "gdkscreen.h"
 #include "gdkpixbuf.h"
-#include "gdkalias.h"
+
 
 static GdkImage*    gdk_drawable_real_get_image (GdkDrawable     *drawable,
 						 gint             x,
@@ -48,7 +48,7 @@ static GdkDrawable* gdk_drawable_real_get_composite_drawable (GdkDrawable  *draw
 							      gint          height,
 							      gint         *composite_x_offset,
 							      gint         *composite_y_offset);
-static GdkRegion *  gdk_drawable_real_get_visible_region     (GdkDrawable  *drawable);
+static cairo_region_t *  gdk_drawable_real_get_visible_region     (GdkDrawable  *drawable);
 static void         gdk_drawable_real_draw_pixbuf            (GdkDrawable  *drawable,
 							      GdkGC        *gc,
 							      GdkPixbuf    *pixbuf,
@@ -1059,10 +1059,10 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
  * but no area outside of this region will be affected by drawing
  * primitives.
  * 
- * Returns: a #GdkRegion. This must be freed with gdk_region_destroy()
+ * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
  *          when you are done.
  **/
-GdkRegion *
+cairo_region_t *
 gdk_drawable_get_clip_region (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
@@ -1079,10 +1079,10 @@ gdk_drawable_get_clip_region (GdkDrawable *drawable)
  * obscured by other windows, but no area outside of this region
  * is visible.
  * 
- * Returns: a #GdkRegion. This must be freed with gdk_region_destroy()
+ * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
  *          when you are done.
  **/
-GdkRegion *
+cairo_region_t *
 gdk_drawable_get_visible_region (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
@@ -1090,7 +1090,7 @@ gdk_drawable_get_visible_region (GdkDrawable *drawable)
   return GDK_DRAWABLE_GET_CLASS (drawable)->get_visible_region (drawable);
 }
 
-static GdkRegion *
+static cairo_region_t *
 gdk_drawable_real_get_visible_region (GdkDrawable *drawable)
 {
   GdkRectangle rect;
@@ -1100,7 +1100,7 @@ gdk_drawable_real_get_visible_region (GdkDrawable *drawable)
 
   gdk_drawable_get_size (drawable, &rect.width, &rect.height);
 
-  return gdk_region_rectangle (&rect);
+  return cairo_region_create_rectangle (&rect);
 }
 
 /**
@@ -1371,8 +1371,8 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable  *drawable,
 {
   GdkPixbuf *composited = NULL;
   gint dwidth, dheight;
-  GdkRegion *clip;
-  GdkRegion *drect;
+  cairo_region_t *clip;
+  cairo_region_t *drect;
   GdkRectangle tmp_rect;
   GdkDrawable  *real_drawable;
 
@@ -1431,15 +1431,15 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable  *drawable,
   tmp_rect.width = width;
   tmp_rect.height = height;
 
-  drect = gdk_region_rectangle (&tmp_rect);
+  drect = cairo_region_create_rectangle (&tmp_rect);
   clip = gdk_drawable_get_clip_region (drawable);
 
-  gdk_region_intersect (drect, clip);
+  cairo_region_intersect (drect, clip);
 
-  gdk_region_get_clipbox (drect, &tmp_rect);
+  cairo_region_get_extents (drect, &tmp_rect);
   
-  gdk_region_destroy (drect);
-  gdk_region_destroy (clip);
+  cairo_region_destroy (drect);
+  cairo_region_destroy (clip);
 
   if (tmp_rect.width == 0 ||
       tmp_rect.height == 0)
@@ -1730,7 +1730,3 @@ _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
   return GDK_DRAWABLE_GET_CLASS (drawable)->create_cairo_surface (drawable,
 								  width, height);
 }
-
-
-#define __GDK_DRAW_C__
-#include "gdkaliasdef.c"

gdk/gdkdrawable.h

@@ -140,8 +140,8 @@ struct _GdkDrawableClass
                               gint          width,
                               gint          height);
 
-  GdkRegion*   (*get_clip_region)    (GdkDrawable  *drawable);
-  GdkRegion*   (*get_visible_region) (GdkDrawable  *drawable);
+  cairo_region_t*   (*get_clip_region)    (GdkDrawable  *drawable);
+  cairo_region_t*   (*get_visible_region) (GdkDrawable  *drawable);
 
   GdkDrawable* (*get_composite_drawable) (GdkDrawable *drawable,
                                           gint         x,
@@ -372,8 +372,8 @@ GdkImage *gdk_drawable_copy_to_image (GdkDrawable  *drawable,
 				      gint          width,
 				      gint          height);
 
-GdkRegion *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
-GdkRegion *gdk_drawable_get_visible_region (GdkDrawable *drawable);
+cairo_region_t *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
+cairo_region_t *gdk_drawable_get_visible_region (GdkDrawable *drawable);
 
 G_END_DECLS
 

gdk/gdkenumtypes.c.template

@@ -1,7 +1,6 @@
 /*** BEGIN file-header ***/
 #define GDK_ENABLE_BROKEN
 #include "gdk.h"
-#include "gdkalias.h"
 
 /*** END file-header ***/
 
@@ -33,6 +32,5 @@ GType
 /*** END value-tail ***/
 
 /*** BEGIN file-tail ***/
-#define __GDK_ENUM_TYPES_C__
-#include "gdkaliasdef.c"
+ /**/
 /*** END file-tail ***/

gdk/gdkevents.c

@@ -30,7 +30,7 @@
 
 #include "gdk.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
+
 
 typedef struct _GdkIOClosure GdkIOClosure;
 
@@ -473,7 +473,7 @@ gdk_event_copy (const GdkEvent *event)
     case GDK_EXPOSE:
     case GDK_DAMAGE:
       if (event->expose.region)
-	new_event->expose.region = gdk_region_copy (event->expose.region);
+	new_event->expose.region = cairo_region_copy (event->expose.region);
       break;
       
     case GDK_SETTING:
@@ -510,8 +510,8 @@ gdk_event_copy (const GdkEvent *event)
  * 
  * Frees a #GdkEvent, freeing or decrementing any resources associated with it.
  * Note that this function should only be called with events returned from
- * functions such as gdk_event_peek(), gdk_event_get(),
- * gdk_event_get_graphics_expose(), gdk_event_copy() and gdk_event_new().
+ * functions such as gdk_event_peek(), gdk_event_get(), gdk_event_copy()
+ * and gdk_event_new().
  **/
 void
 gdk_event_free (GdkEvent *event)
@@ -551,7 +551,7 @@ gdk_event_free (GdkEvent *event)
     case GDK_EXPOSE:
     case GDK_DAMAGE:
       if (event->expose.region)
-	gdk_region_destroy (event->expose.region);
+	cairo_region_destroy (event->expose.region);
       break;
       
     case GDK_MOTION_NOTIFY:
@@ -1541,6 +1541,3 @@ gdk_setting_get (const gchar *name,
 {
   return gdk_screen_get_setting (gdk_screen_get_default (), name, value);
 }
-
-#define __GDK_EVENTS_C__
-#include "gdkaliasdef.c"

gdk/gdkevents.h

@@ -279,7 +279,7 @@ struct _GdkEventExpose
   GdkWindow *window;
   gint8 send_event;
   GdkRectangle area;
-  GdkRegion *region;
+  cairo_region_t *region;
   gint count; /* If non-zero, how many more events follow. */
 };
 

gdk/gdkfont.c

@@ -1,125 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#undef GDK_DISABLE_DEPRECATED
-
-#include "config.h"
-#include "gdkdisplay.h"
-#include "gdkfont.h"
-#include "gdkinternals.h"
-#include "gdkalias.h"
-
-GType
-gdk_font_get_type (void)
-{
-  static GType our_type = 0;
-  
-  if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkFont"),
-					     (GBoxedCopyFunc)gdk_font_ref,
-					     (GBoxedFreeFunc)gdk_font_unref);
-  return our_type;
-}
-
-/**
- * gdk_font_ref:
- * @font: a #GdkFont
- * 
- * Increases the reference count of a font by one.
- * 
- * Return value: @font
- **/
-GdkFont*
-gdk_font_ref (GdkFont *font)
-{
-  GdkFontPrivate *private;
-
-  g_return_val_if_fail (font != NULL, NULL);
-
-  private = (GdkFontPrivate*) font;
-  private->ref_count += 1;
-  return font;
-}
-
-/**
- * gdk_font_unref:
- * @font: a #GdkFont
- * 
- * Decreases the reference count of a font by one.
- * If the result is zero, destroys the font.
- **/
-void
-gdk_font_unref (GdkFont *font)
-{
-  GdkFontPrivate *private;
-  private = (GdkFontPrivate*) font;
-
-  g_return_if_fail (font != NULL);
-  g_return_if_fail (private->ref_count > 0);
-
-  private->ref_count -= 1;
-  if (private->ref_count == 0)
-    _gdk_font_destroy (font);
-}
-
-/**
- * gdk_font_from_description:
- * @font_desc: a #PangoFontDescription.
- * 
- * Load a #GdkFont based on a Pango font description. This font will
- * only be an approximation of the Pango font, and
- * internationalization will not be handled correctly. This function
- * should only be used for legacy code that cannot be easily converted
- * to use Pango. Using Pango directly will produce better results.
- * 
- * Return value: the newly loaded font, or %NULL if the font
- * cannot be loaded.
- **/
-GdkFont*
-gdk_font_from_description (PangoFontDescription *font_desc)
-{
-  return gdk_font_from_description_for_display (gdk_display_get_default (),font_desc);
-}
-
-/**
- * gdk_font_load:
- * @font_name: a XLFD describing the font to load.
- * 
- * Loads a font.
- * 
- * The font may be newly loaded or looked up the font in a cache. 
- * You should make no assumptions about the initial reference count.
- * 
- * Return value: a #GdkFont, or %NULL if the font could not be loaded.
- **/
-GdkFont*
-gdk_font_load (const gchar *font_name)
-{  
-   return gdk_font_load_for_display (gdk_display_get_default(), font_name);
-}
-
-#define __GDK_FONT_C__
-#include "gdkaliasdef.c"

gdk/gdkfont.h

@@ -1,87 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION) || defined(GTK_COMPILATION)
-
-#ifndef __GDK_FONT_H__
-#define __GDK_FONT_H__
-
-#include <gdk/gdktypes.h>
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_FONT gdk_font_get_type ()
-
-/* Types of font.
- *   GDK_FONT_FONT: the font is an XFontStruct.
- *   GDK_FONT_FONTSET: the font is an XFontSet used for I18N.
- */
-typedef enum
-{
-  GDK_FONT_FONT,
-  GDK_FONT_FONTSET
-} GdkFontType;
-
-struct _GdkFont
-{
-  GdkFontType type;
-  gint ascent;
-  gint descent;
-};
-
-GType    gdk_font_get_type  (void) G_GNUC_CONST;
-
-GdkFont* gdk_font_ref	    (GdkFont        *font);
-void	 gdk_font_unref	    (GdkFont        *font);
-gint	 gdk_font_id	    (const GdkFont  *font);
-gboolean gdk_font_equal	    (const GdkFont  *fonta,
-			     const GdkFont  *fontb);
-
-GdkFont *gdk_font_load_for_display             (GdkDisplay           *display,
-						const gchar          *font_name);
-GdkFont *gdk_fontset_load_for_display          (GdkDisplay           *display,
-						const gchar          *fontset_name);
-GdkFont *gdk_font_from_description_for_display (GdkDisplay           *display,
-						PangoFontDescription *font_desc);
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-#ifndef GDK_MULTIHEAD_SAFE
-GdkFont* gdk_font_load             (const gchar          *font_name);
-GdkFont* gdk_fontset_load          (const gchar          *fontset_name);
-GdkFont* gdk_font_from_description (PangoFontDescription *font_desc);
-#endif
-
-GdkDisplay * gdk_font_get_display (GdkFont *font);
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-G_END_DECLS
-
-#endif /* __GDK_FONT_H__ */
-
-#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION || GTK_COMPILATION */

gdk/gdkgc.c

@@ -33,7 +33,7 @@
 #include "gdkpixmap.h"
 #include "gdkrgb.h"
 #include "gdkprivate.h"
-#include "gdkalias.h"
+
 
 static void gdk_gc_finalize   (GObject      *object);
 
@@ -41,13 +41,13 @@ typedef struct _GdkGCPrivate GdkGCPrivate;
 
 struct _GdkGCPrivate
 {
-  GdkRegion *clip_region;
+  cairo_region_t *clip_region;
 
   guint32 region_tag_applied;
   int region_tag_offset_x;
   int region_tag_offset_y;
 
-  GdkRegion *old_clip_region;
+  cairo_region_t *old_clip_region;
   GdkPixmap *old_clip_mask;
 
   GdkBitmap *stipple;
@@ -205,9 +205,9 @@ gdk_gc_finalize (GObject *object)
   GdkGCPrivate *priv = GDK_GC_GET_PRIVATE (gc);
 
   if (priv->clip_region)
-    gdk_region_destroy (priv->clip_region);
+    cairo_region_destroy (priv->clip_region);
   if (priv->old_clip_region)
-    gdk_region_destroy (priv->old_clip_region);
+    cairo_region_destroy (priv->old_clip_region);
   if (priv->clip_mask)
     g_object_unref (priv->clip_mask);
   if (priv->old_clip_mask)
@@ -293,7 +293,7 @@ gdk_gc_set_values (GdkGC           *gc,
       
       if (priv->clip_region)
 	{
-	  gdk_region_destroy (priv->clip_region);
+	  cairo_region_destroy (priv->clip_region);
 	  priv->clip_region = NULL;
 	}
     }
@@ -538,7 +538,7 @@ gdk_gc_set_clip_mask (GdkGC	*gc,
 /* Takes ownership of passed in region */
 static void
 _gdk_gc_set_clip_region_real (GdkGC     *gc,
-			      GdkRegion *region,
+			      cairo_region_t *region,
 			      gboolean reset_origin)
 {
   GdkGCPrivate *priv = GDK_GC_GET_PRIVATE (gc);
@@ -550,7 +550,7 @@ _gdk_gc_set_clip_region_real (GdkGC     *gc,
     }
   
   if (priv->clip_region)
-    gdk_region_destroy (priv->clip_region);
+    cairo_region_destroy (priv->clip_region);
 
   priv->clip_region = region;
 
@@ -560,7 +560,7 @@ _gdk_gc_set_clip_region_real (GdkGC     *gc,
 /* Doesn't copy region, allows not to reset origin */
 void
 _gdk_gc_set_clip_region_internal (GdkGC     *gc,
-				  GdkRegion *region,
+				  cairo_region_t *region,
 				  gboolean reset_origin)
 {
   _gdk_gc_remove_drawable_clip (gc);
@@ -571,7 +571,7 @@ _gdk_gc_set_clip_region_internal (GdkGC     *gc,
 void
 _gdk_gc_add_drawable_clip (GdkGC     *gc,
 			   guint32    region_tag,
-			   GdkRegion *region,
+			   cairo_region_t *region,
 			   int        offset_x,
 			   int        offset_y)
 {
@@ -585,9 +585,9 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
   if (priv->region_tag_applied)
     _gdk_gc_remove_drawable_clip (gc);
 
-  region = gdk_region_copy (region);
+  region = cairo_region_copy (region);
   if (offset_x != 0 || offset_y != 0)
-    gdk_region_offset (region, offset_x, offset_y);
+    cairo_region_translate (region, offset_x, offset_y);
 
   if (priv->clip_mask)
     {
@@ -596,7 +596,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       GdkGC *tmp_gc;
       GdkColor black = {0, 0, 0, 0};
       GdkRectangle r;
-      GdkOverlapType overlap;
+      cairo_region_overlap_t overlap;
 
       gdk_drawable_get_size (priv->clip_mask, &w, &h);
 
@@ -609,8 +609,8 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
        * the region, so we try to avoid allocating bitmaps that are just fully
        * set or completely unset.
        */
-      overlap = gdk_region_rect_in (region, &r);
-      if (overlap == GDK_OVERLAP_RECTANGLE_PART)
+      overlap = cairo_region_contains_rectangle (region, &r);
+      if (overlap == CAIRO_REGION_OVERLAP_PART)
 	{
 	   /* The region and the mask intersect, create a new clip mask that
 	      includes both areas */
@@ -631,12 +631,12 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
 	  gdk_gc_set_clip_mask (gc, new_mask);
 	  g_object_unref (new_mask);
 	}
-      else if (overlap == GDK_OVERLAP_RECTANGLE_OUT)
+      else if (overlap == CAIRO_REGION_OVERLAP_OUT)
 	{
 	  /* No intersection, set empty clip region */
-	  GdkRegion *empty = gdk_region_new ();
+	  cairo_region_t *empty = cairo_region_create ();
 
-	  gdk_region_destroy (region);
+	  cairo_region_destroy (region);
 	  priv->old_clip_mask = g_object_ref (priv->clip_mask);
 	  priv->clip_region = empty;
 	  _gdk_windowing_gc_set_clip_region (gc, empty, FALSE);
@@ -644,7 +644,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       else
 	{
 	  /* Completely inside region, don't set unnecessary clip */
-	  gdk_region_destroy (region);
+	  cairo_region_destroy (region);
 	  return;
 	}
     }
@@ -653,7 +653,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       priv->old_clip_region = priv->clip_region;
       priv->clip_region = region;
       if (priv->old_clip_region)
-	gdk_region_intersect (region, priv->old_clip_region);
+	cairo_region_intersect (region, priv->old_clip_region);
 
       _gdk_windowing_gc_set_clip_region (gc, priv->clip_region, FALSE);
     }
@@ -704,14 +704,14 @@ void
 gdk_gc_set_clip_rectangle (GdkGC              *gc,
 			   const GdkRectangle *rectangle)
 {
-  GdkRegion *region;
+  cairo_region_t *region;
   
   g_return_if_fail (GDK_IS_GC (gc));
 
   _gdk_gc_remove_drawable_clip (gc);
   
   if (rectangle)
-    region = gdk_region_rectangle (rectangle);
+    region = cairo_region_create_rectangle (rectangle);
   else
     region = NULL;
 
@@ -721,7 +721,7 @@ gdk_gc_set_clip_rectangle (GdkGC              *gc,
 /**
  * gdk_gc_set_clip_region:
  * @gc: a #GdkGC.
- * @region: the #GdkRegion. 
+ * @region: the #cairo_region_t. 
  * 
  * Sets the clip mask for a graphics context from a region structure.
  * The clip mask is interpreted relative to the clip origin. (See
@@ -729,16 +729,16 @@ gdk_gc_set_clip_rectangle (GdkGC              *gc,
  **/
 void
 gdk_gc_set_clip_region (GdkGC           *gc,
-			const GdkRegion *region)
+			const cairo_region_t *region)
 {
-  GdkRegion *copy;
+  cairo_region_t *copy;
 
   g_return_if_fail (GDK_IS_GC (gc));
 
   _gdk_gc_remove_drawable_clip (gc);
   
   if (region)
-    copy = gdk_region_copy (region);
+    copy = cairo_region_copy (region);
   else
     copy = NULL;
 
@@ -755,7 +755,7 @@ gdk_gc_set_clip_region (GdkGC           *gc,
  *   (if a clip mask is set, the return will be %NULL)
  *   This value is owned by the GC and must not be freed.
  **/
-GdkRegion *
+cairo_region_t *
 _gdk_gc_get_clip_region (GdkGC *gc)
 {
   g_return_val_if_fail (GDK_IS_GC (gc), NULL);
@@ -1063,20 +1063,20 @@ gdk_gc_copy (GdkGC *dst_gc,
   dst_gc->colormap = src_gc->colormap;
 
   if (dst_priv->clip_region)
-    gdk_region_destroy (dst_priv->clip_region);
+    cairo_region_destroy (dst_priv->clip_region);
 
   if (src_priv->clip_region)
-    dst_priv->clip_region = gdk_region_copy (src_priv->clip_region);
+    dst_priv->clip_region = cairo_region_copy (src_priv->clip_region);
   else
     dst_priv->clip_region = NULL;
 
   dst_priv->region_tag_applied = src_priv->region_tag_applied;
   
   if (dst_priv->old_clip_region)
-    gdk_region_destroy (dst_priv->old_clip_region);
+    cairo_region_destroy (dst_priv->old_clip_region);
 
   if (src_priv->old_clip_region)
-    dst_priv->old_clip_region = gdk_region_copy (src_priv->old_clip_region);
+    dst_priv->old_clip_region = cairo_region_copy (src_priv->old_clip_region);
   else
     dst_priv->old_clip_region = NULL;
 
@@ -1458,7 +1458,3 @@ _gdk_gc_update_context (GdkGC          *gc,
     }
 
 }
-
-
-#define __GDK_GC_C__
-#include "gdkaliasdef.c"

gdk/gdkgc.h

@@ -139,29 +139,27 @@ typedef enum
 {
   GDK_GC_FOREGROUND    = 1 << 0,
   GDK_GC_BACKGROUND    = 1 << 1,
-  GDK_GC_FONT	       = 1 << 2,
-  GDK_GC_FUNCTION      = 1 << 3,
-  GDK_GC_FILL	       = 1 << 4,
-  GDK_GC_TILE	       = 1 << 5,
-  GDK_GC_STIPPLE       = 1 << 6,
-  GDK_GC_CLIP_MASK     = 1 << 7,
-  GDK_GC_SUBWINDOW     = 1 << 8,
-  GDK_GC_TS_X_ORIGIN   = 1 << 9,
-  GDK_GC_TS_Y_ORIGIN   = 1 << 10,
-  GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-  GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-  GDK_GC_EXPOSURES     = 1 << 13,
-  GDK_GC_LINE_WIDTH    = 1 << 14,
-  GDK_GC_LINE_STYLE    = 1 << 15,
-  GDK_GC_CAP_STYLE     = 1 << 16,
-  GDK_GC_JOIN_STYLE    = 1 << 17
+  GDK_GC_FUNCTION      = 1 << 2,
+  GDK_GC_FILL	       = 1 << 3,
+  GDK_GC_TILE	       = 1 << 4,
+  GDK_GC_STIPPLE       = 1 << 5,
+  GDK_GC_CLIP_MASK     = 1 << 6,
+  GDK_GC_SUBWINDOW     = 1 << 7,
+  GDK_GC_TS_X_ORIGIN   = 1 << 8,
+  GDK_GC_TS_Y_ORIGIN   = 1 << 9,
+  GDK_GC_CLIP_X_ORIGIN = 1 << 10,
+  GDK_GC_CLIP_Y_ORIGIN = 1 << 11,
+  GDK_GC_EXPOSURES     = 1 << 12,
+  GDK_GC_LINE_WIDTH    = 1 << 13,
+  GDK_GC_LINE_STYLE    = 1 << 14,
+  GDK_GC_CAP_STYLE     = 1 << 15,
+  GDK_GC_JOIN_STYLE    = 1 << 16
 } GdkGCValuesMask;
 
 struct _GdkGCValues
 {
   GdkColor	    foreground;
   GdkColor	    background;
-  GdkFont	   *font;
   GdkFunction	    function;
   GdkFill	    fill;
   GdkPixmap	   *tile;
@@ -254,7 +252,7 @@ void   gdk_gc_set_clip_mask	  (GdkGC	    *gc,
 void   gdk_gc_set_clip_rectangle  (GdkGC	    *gc,
 				   const GdkRectangle *rectangle);
 void   gdk_gc_set_clip_region	  (GdkGC	    *gc,
-				   const GdkRegion  *region);
+				   const cairo_region_t  *region);
 void   gdk_gc_set_subwindow	  (GdkGC	    *gc,
 				   GdkSubwindowMode  mode);
 void   gdk_gc_set_exposures	  (GdkGC	    *gc,

gdk/gdkglobals.c

@@ -30,7 +30,7 @@
 
 #include "gdktypes.h"
 #include "gdkprivate.h"
-#include "gdkalias.h"
+
 
 guint               _gdk_debug_flags = 0;
 gint                _gdk_error_code = 0;

gdk/gdkimage.c

@@ -32,7 +32,6 @@
 #include "gdkimage.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"	/* For scratch_image code */
-#include "gdkalias.h"
 
 /**
  * gdk_image_set_colormap:
@@ -565,6 +564,3 @@ gdk_image_new (GdkImageType  type,
   return _gdk_image_new_for_depth (gdk_visual_get_screen (visual), type,
 				   visual, width, height, -1);
 }
-
-#define __GDK_IMAGE_C__
-#include "gdkaliasdef.c"

gdk/gdkinternals.h

@@ -89,18 +89,6 @@ typedef enum {
   GDK_DEBUG_EVENTLOOP     = 1 <<15
 } GdkDebugFlag;
 
-#ifndef GDK_DISABLE_DEPRECATED
-
-typedef struct _GdkFontPrivate	       GdkFontPrivate;
-
-struct _GdkFontPrivate
-{
-  GdkFont font;
-  guint ref_count;
-};
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
 extern GList            *_gdk_default_filters;
 extern GdkWindow  	*_gdk_parent_root;
 extern gint		 _gdk_error_code;
@@ -200,9 +188,10 @@ typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay           *display,
    is public for historical reasons. Don't change that part */
 typedef struct _GdkWindowPaint             GdkWindowPaint;
 
+#define GDK_WINDOW_OBJECT(object)    ((GdkWindowObject *) GDK_WINDOW (object))
+
 struct _GdkWindowObject
 {
-  /* vvvvvvv THIS PART IS PUBLIC. DON'T CHANGE vvvvvvvvvvvvvv */
   GdkDrawable parent_instance;
 
   GdkDrawable *impl; /* window-system-specific delegate object */  
@@ -224,7 +213,7 @@ struct _GdkWindowObject
   
   GSList *paint_stack;
   
-  GdkRegion *update_area;
+  cairo_region_t *update_area;
   guint update_freeze_count;
   
   guint8 window_type;
@@ -251,8 +240,6 @@ struct _GdkWindowObject
 
   GdkWindowRedirect *redirect;
 
-  /* ^^^^^^^^^^ THIS PART IS PUBLIC. DON'T CHANGE ^^^^^^^^^^ */
-  
   /* The GdkWindowObject that has the impl, ref:ed if another window.
    * This ref is required to keep the wrapper of the impl window alive
    * for as long as any GdkWindow references the impl. */
@@ -260,8 +247,8 @@ struct _GdkWindowObject
   int abs_x, abs_y; /* Absolute offset in impl */
   gint width, height;
   guint32 clip_tag;
-  GdkRegion *clip_region; /* Clip region (wrt toplevel) in window coords */
-  GdkRegion *clip_region_with_children; /* Clip region in window coords */
+  cairo_region_t *clip_region; /* Clip region (wrt toplevel) in window coords */
+  cairo_region_t *clip_region_with_children; /* Clip region in window coords */
   GdkCursor *cursor;
   GHashTable *device_cursor;
   gint8 toplevel_window_type;
@@ -278,8 +265,8 @@ struct _GdkWindowObject
 
   GList *outstanding_moves;
 
-  GdkRegion *shape;
-  GdkRegion *input_shape;
+  cairo_region_t *shape;
+  cairo_region_t *input_shape;
   
   cairo_surface_t *cairo_surface;
   guint outstanding_surfaces; /* only set on impl window */
@@ -409,7 +396,7 @@ void       _gdk_window_update_size       (GdkWindow      *window);
 gboolean   _gdk_window_update_viewable   (GdkWindow      *window);
 
 void       _gdk_window_process_updates_recurse (GdkWindow *window,
-                                                GdkRegion *expose_region);
+                                                cairo_region_t *expose_region);
 
 void       _gdk_screen_close             (GdkScreen      *screen);
 
@@ -420,7 +407,7 @@ void _gdk_gc_init (GdkGC           *gc,
 		   GdkGCValues     *values,
 		   GdkGCValuesMask  values_mask);
 
-GdkRegion *_gdk_gc_get_clip_region (GdkGC *gc);
+cairo_region_t *_gdk_gc_get_clip_region (GdkGC *gc);
 GdkBitmap *_gdk_gc_get_clip_mask   (GdkGC *gc);
 gboolean   _gdk_gc_get_exposures   (GdkGC *gc);
 GdkFill    _gdk_gc_get_fill        (GdkGC *gc);
@@ -430,12 +417,12 @@ guint32    _gdk_gc_get_fg_pixel    (GdkGC *gc);
 guint32    _gdk_gc_get_bg_pixel    (GdkGC *gc);
 void      _gdk_gc_add_drawable_clip     (GdkGC     *gc,
 					 guint32    region_tag,
-					 GdkRegion *region,
+					 cairo_region_t *region,
 					 int        offset_x,
 					 int        offset_y);
 void      _gdk_gc_remove_drawable_clip  (GdkGC     *gc);
 void       _gdk_gc_set_clip_region_internal (GdkGC     *gc,
-					     GdkRegion *region,
+					     cairo_region_t *region,
 					     gboolean reset_origin);
 GdkSubwindowMode _gdk_gc_get_subwindow (GdkGC *gc);
 
@@ -452,8 +439,6 @@ void         _gdk_drawable_end_direct_draw (gpointer priv_data);
  *****************************************/
 
 /* Font/string functions implemented in module-specific code */
-gint _gdk_font_strlen (GdkFont *font, const char *str);
-void _gdk_font_destroy (GdkFont *font);
 
 void _gdk_colormap_real_destroy (GdkColormap *colormap);
 
@@ -471,9 +456,9 @@ gulong   _gdk_windowing_window_get_next_serial  (GdkDisplay *display);
 void     _gdk_windowing_window_get_offsets      (GdkWindow  *window,
 						 gint       *x_offset,
 						 gint       *y_offset);
-GdkRegion *_gdk_windowing_window_get_shape      (GdkWindow  *window);
-GdkRegion *_gdk_windowing_window_get_input_shape(GdkWindow  *window);
-GdkRegion *_gdk_windowing_get_shape_for_mask    (GdkBitmap *mask);
+cairo_region_t *_gdk_windowing_window_get_shape      (GdkWindow  *window);
+cairo_region_t *_gdk_windowing_window_get_input_shape(GdkWindow  *window);
+cairo_region_t *_gdk_windowing_get_shape_for_mask    (GdkBitmap *mask);
 void     _gdk_windowing_window_beep             (GdkWindow *window);
 
 
@@ -503,7 +488,7 @@ void _gdk_windowing_got_event                (GdkDisplay       *display,
 					      gulong            serial);
 
 void _gdk_windowing_window_process_updates_recurse (GdkWindow *window,
-                                                    GdkRegion *expose_region);
+                                                    cairo_region_t *expose_region);
 void _gdk_windowing_before_process_all_updates     (void);
 void _gdk_windowing_after_process_all_updates      (void);
 
@@ -542,7 +527,7 @@ struct _GdkPaintableIface
   
   void (* begin_paint_region)       (GdkPaintable    *paintable,
                                      GdkWindow       *window,
-                                     const GdkRegion *region);
+                                     const cairo_region_t *region);
   void (* end_paint)                (GdkPaintable    *paintable);
 };
 
@@ -569,7 +554,7 @@ GType _gdk_pixmap_impl_get_type (void) G_GNUC_CONST;
  * will already return the new region.
  **/
 void _gdk_windowing_gc_set_clip_region (GdkGC           *gc,
-					const GdkRegion *region,
+					const cairo_region_t *region,
 					gboolean reset_origin);
 
 /**
@@ -644,7 +629,7 @@ void _gdk_display_pointer_info_foreach (GdkDisplay                   *display,
                                         gpointer                      user_data);
 
 void _gdk_window_invalidate_for_expose (GdkWindow       *window,
-					GdkRegion       *region);
+					cairo_region_t       *region);
 
 void _gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
 					    int width,
@@ -661,7 +646,7 @@ GdkWindow * _gdk_window_find_descendant_at (GdkWindow *toplevel,
 					    double *found_y);
 
 void _gdk_window_add_damage (GdkWindow *toplevel,
-			     GdkRegion *damaged_region);
+			     cairo_region_t *damaged_region);
 
 GdkEvent * _gdk_make_event (GdkWindow    *window,
 			    GdkEventType  type,
@@ -689,7 +674,7 @@ void _gdk_display_set_window_under_pointer (GdkDisplay *display,
 
 void _gdk_synthesize_crossing_events_for_geometry_change (GdkWindow *changed_window);
 
-GdkRegion *_gdk_window_calculate_full_clip_region    (GdkWindow     *window,
+cairo_region_t *_gdk_window_calculate_full_clip_region    (GdkWindow     *window,
                                                       GdkWindow     *base_window,
                                                       gboolean       do_children,
                                                       gint          *base_x_offset,
@@ -700,7 +685,6 @@ GdkWindow *_gdk_window_get_input_window_for_event (GdkWindow *native_window,
 						   GdkEventType event_type,
 						   int x, int y,
 						   gulong serial);
-GdkRegion  *_gdk_region_new_from_yxbanded_rects (GdkRectangle *rects, int n_rects);
 
 /*****************************
  * offscreen window routines *

gdk/gdkkeynames.c

@@ -31,7 +31,6 @@
 
 #include "gdkkeysyms.h"
 #include "gdkinternals.h"
-#include "gdkalias.h"
 
 /* Key handling not part of the keymap */
 
@@ -101,6 +100,3 @@ gdk_keyval_from_name (const gchar *keyval_name)
   else
     return GDK_VoidSymbol;
 }
-
-#define __GDK_KEYNAMES_C__
-#include "gdkaliasdef.c"

gdk/gdkkeys.c

@@ -28,7 +28,7 @@
 
 #include "gdkdisplay.h"
 #include "gdkkeys.h"
-#include "gdkalias.h"
+
 
 enum {
   DIRECTION_CHANGED,
@@ -311,6 +311,3 @@ gdk_keymap_get_default (void)
 {
   return gdk_keymap_get_for_display (gdk_display_get_default ());
 }
-
-#define __GDK_KEYS_C__
-#include "gdkaliasdef.c"

gdk/gdkkeys.h

@@ -108,6 +108,7 @@ gboolean       gdk_keymap_get_entries_for_keycode  (GdkKeymap           *keymap,
 PangoDirection gdk_keymap_get_direction            (GdkKeymap           *keymap);
 gboolean       gdk_keymap_have_bidi_layouts        (GdkKeymap           *keymap);
 gboolean       gdk_keymap_get_caps_lock_state      (GdkKeymap           *keymap);
+gboolean       gdk_keymap_get_num_lock_state       (GdkKeymap           *keymap);
 void           gdk_keymap_add_virtual_modifiers    (GdkKeymap           *keymap,
                                                     GdkModifierType     *state);
 gboolean       gdk_keymap_map_virtual_modifiers    (GdkKeymap           *keymap,

gdk/gdkkeyuni.c

@@ -26,7 +26,7 @@
 
 #include "config.h"
 #include "gdk.h"
-#include "gdkalias.h"
+
 
 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
  * mapping functions, from the xterm sources.
@@ -1695,6 +1695,3 @@ gdk_unicode_to_keyval (guint32 wc)
    */
   return wc | 0x01000000;
 }
-
-#define __GDK_KEYUNI_C__
-#include "gdkaliasdef.c"