Remove GtkWidgetPath

... and all associated demos and tests.

3 files changed, 0 insertions, 986 deletions

diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index 3a58d42011..a60a21721b 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -173,7 +173,6 @@
     <file>fishbowl.c</file>
     <file>fixed.c</file>
     <file>flowbox.c</file>
-    <file>foreigndrawing.c</file>
     <file>font_features.c</file>
     <file>fontplane.c</file>
     <file>fontrendering.c</file>
diff --git a/demos/gtk-demo/foreigndrawing.c b/demos/gtk-demo/foreigndrawing.c
deleted file mode 100644
index 447d895487..0000000000
--- a/demos/gtk-demo/foreigndrawing.c
+++ /dev/null
@@ -1,984 +0,0 @@
-/* Foreign drawing
- *
- * Many applications can't use GTK widgets, for a variety of reasons,
- * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK themes. This demo shows how to
- * use GtkStyleContext and the gtk_render_ APIs to achieve this.
- *
- * Note that this is a very simple, non-interactive example.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-static void
-append_element (GtkWidgetPath *path,
-                const char    *selector)
-{
-  static const struct {
-    const char    *name;
-    GtkStateFlags  state_flag;
-  } pseudo_classes[] = {
-    { "active",        GTK_STATE_FLAG_ACTIVE },
-    { "hover",         GTK_STATE_FLAG_PRELIGHT },
-    { "selected",      GTK_STATE_FLAG_SELECTED },
-    { "disabled",      GTK_STATE_FLAG_INSENSITIVE },
-    { "indeterminate", GTK_STATE_FLAG_INCONSISTENT },
-    { "focus",         GTK_STATE_FLAG_FOCUSED },
-    { "backdrop",      GTK_STATE_FLAG_BACKDROP },
-    { "dir(ltr)",      GTK_STATE_FLAG_DIR_LTR },
-    { "dir(rtl)",      GTK_STATE_FLAG_DIR_RTL },
-    { "link",          GTK_STATE_FLAG_LINK },
-    { "visited",       GTK_STATE_FLAG_VISITED },
-    { "checked",       GTK_STATE_FLAG_CHECKED },
-    { "drop(active)",  GTK_STATE_FLAG_DROP_ACTIVE }
-  };
-  const char *next;
-  char *name;
-  char type;
-  guint i;
-
-  next = strpbrk (selector, "#.:");
-  if (next == NULL)
-    next = selector + strlen (selector);
-
-  name = g_strndup (selector, next - selector);
-  if (g_ascii_isupper (selector[0]))
-    {
-      GType gtype;
-      gtype = g_type_from_name (name);
-      if (gtype == G_TYPE_INVALID)
-        {
-          g_critical ("Unknown type name `%s'", name);
-          g_free (name);
-          return;
-        }
-      gtk_widget_path_append_type (path, gtype);
-    }
-  else
-    {
-      /* Omit type, we're using name */
-      gtk_widget_path_append_type (path, G_TYPE_NONE);
-      gtk_widget_path_iter_set_object_name (path, -1, name);
-    }
-  g_free (name);
-
-  while (*next != '\0')
-    {
-      type = *next;
-      selector = next + 1;
-      next = strpbrk (selector, "#.:");
-      if (next == NULL)
-        next = selector + strlen (selector);
-      name = g_strndup (selector, next - selector);
-
-      switch (type)
-        {
-        case '#':
-          gtk_widget_path_iter_set_name (path, -1, name);
-          break;
-
-        case '.':
-          gtk_widget_path_iter_add_class (path, -1, name);
-          break;
-
-        case ':':
-          for (i = 0; i < G_N_ELEMENTS (pseudo_classes); i++)
-            {
-              if (g_str_equal (pseudo_classes[i].name, name))
-                {
-                  gtk_widget_path_iter_set_state (path,
-                                                  -1,
-                                                  gtk_widget_path_iter_get_state (path, -1)
-                                                  | pseudo_classes[i].state_flag);
-                  break;
-                }
-            }
-          if (i == G_N_ELEMENTS (pseudo_classes))
-            g_critical ("Unknown pseudo-class :%s", name);
-          break;
-
-        default:
-          g_assert_not_reached ();
-          break;
-        }
-
-      g_free (name);
-    }
-}
-
-static GtkStyleContext *
-create_context_for_path (GtkWidgetPath   *path,
-                         GtkStyleContext *parent)
-{
-  GtkStyleContext *context;
-
-  context = gtk_style_context_new ();
-  gtk_style_context_set_path (context, path);
-  gtk_style_context_set_parent (context, parent);
-  /* Unfortunately, we have to explicitly set the state again here
-   * for it to take effect
-   */
-  gtk_style_context_set_state (context, gtk_widget_path_iter_get_state (path, -1));
-  gtk_widget_path_unref (path);
-
-  return context;
-}
-
-static GtkStyleContext *
-get_style (GtkStyleContext *parent,
-           const char      *selector)
-{
-  GtkWidgetPath *path;
-
-  if (parent)
-    path = gtk_widget_path_copy (gtk_style_context_get_path (parent));
-  else
-    path = gtk_widget_path_new ();
-
-  append_element (path, selector);
-
-  return create_context_for_path (path, parent);
-}
-
-static GtkStyleContext *
-get_style_with_siblings (GtkStyleContext *parent,
-                         const char      *selector,
-                         const char     **siblings,
-                         gint             position)
-{
-  GtkWidgetPath *path, *siblings_path;
-  guint i;
-
-  if (parent)
-    path = gtk_widget_path_copy (gtk_style_context_get_path (parent));
-  else
-    path = gtk_widget_path_new ();
-
-  siblings_path = gtk_widget_path_new ();
-  for (i = 0; siblings[i]; i++)
-    append_element (siblings_path, siblings[i]);
-
-  gtk_widget_path_append_with_siblings (path, siblings_path, position);
-  gtk_widget_path_unref (siblings_path);
-
-  return create_context_for_path (path, parent);
-}
-
-static void
-draw_style_common (GtkStyleContext *context,
-                   cairo_t         *cr,
-                   gint             x,
-                   gint             y,
-                   gint             width,
-                   gint             height,
-                   gint            *contents_x,
-                   gint            *contents_y,
-                   gint            *contents_width,
-                   gint            *contents_height)
-{
-  GtkBorder margin, border, padding;
-  int min_width, min_height;
-
-  gtk_style_context_get_margin (context, &margin);
-  gtk_style_context_get_border (context, &border);
-  gtk_style_context_get_padding (context, &padding);
-
-  gtk_style_context_get (context,
-                         "min-width", &min_width,
-                         "min-height", &min_height,
-                         NULL);
-  x += margin.left;
-  y += margin.top;
-  width -= margin.left + margin.right;
-  height -= margin.top + margin.bottom;
-
-  width = MAX (width, min_width);
-  height = MAX (height, min_height);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-
-  if (contents_x)
-    *contents_x = x + border.left + padding.left;
-  if (contents_y)
-    *contents_y = y + border.top + padding.top;
-  if (contents_width)
-    *contents_width = width - border.left - border.right - padding.left - padding.right;
-  if (contents_height)
-    *contents_height = height - border.top - border.bottom - padding.top - padding.bottom;
-}
-
-static void
-query_size (GtkStyleContext *context,
-            gint            *width,
-            gint            *height)
-{
-  GtkBorder margin, border, padding;
-  int min_width, min_height;
-
-  gtk_style_context_get_margin (context, &margin);
-  gtk_style_context_get_border (context, &border);
-  gtk_style_context_get_padding (context, &padding);
-
-  gtk_style_context_get (context,
-                         "min-width", &min_width,
-                         "min-height", &min_height,
-                         NULL);
-
-  min_width += margin.left + margin.right + border.left + border.right + padding.left + padding.right;
-  min_height += margin.top + margin.bottom + border.top + border.bottom + padding.top + padding.bottom;
-
-  if (width)
-    *width = MAX (*width, min_width);
-  if (height)
-    *height = MAX (*height, min_height);
-}
-
-static void
-draw_menu (GtkWidget *widget,
-           cairo_t   *cr,
-           gint       x,
-           gint       y,
-           gint       width,
-           gint      *height)
-{
-  GtkStyleContext *menu_context;
-  GtkStyleContext *menuitem_context;
-  GtkStyleContext *hovermenuitem_context;
-  GtkStyleContext *hoveredarrowmenuitem_context;
-  GtkStyleContext *arrowmenuitem_context;
-  GtkStyleContext *checkmenuitem_context;
-  GtkStyleContext *disabledarrowmenuitem_context;
-  GtkStyleContext *disabledcheckmenuitem_context;
-  GtkStyleContext *radiomenuitem_context;
-  GtkStyleContext *disablemenuitem_context;
-  GtkStyleContext *disabledradiomenuitem_context;
-  GtkStyleContext *separatormenuitem_context;
-  gint menuitem1_height, menuitem2_height, menuitem3_height, menuitem4_height, menuitem5_height;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint menu_x, menu_y, menu_width, menu_height;
-  gint arrow_width, arrow_height, arrow_size;
-  gint toggle_x, toggle_y, toggle_width, toggle_height;
-
-  /* This information is taken from the GtkMenu docs, see "CSS nodes" */
-  menu_context = get_style (NULL, "menu");
-  hovermenuitem_context = get_style (menu_context, "menuitem:hover");
-  hoveredarrowmenuitem_context = get_style (hovermenuitem_context, "arrow.right:dir(ltr)");
-  menuitem_context = get_style (menu_context, "menuitem");
-  arrowmenuitem_context = get_style (menuitem_context, "arrow:dir(rtl)");
-  disablemenuitem_context = get_style (menu_context, "menuitem:disabled");
-  disabledarrowmenuitem_context = get_style (disablemenuitem_context, "arrow:dir(rtl)");
-  checkmenuitem_context = get_style (menuitem_context, "check:checked");
-  disabledcheckmenuitem_context = get_style (disablemenuitem_context, "check");
-  separatormenuitem_context = get_style (menu_context, "separator:disabled");
-  radiomenuitem_context = get_style (menuitem_context, "radio:checked");
-  disabledradiomenuitem_context = get_style (disablemenuitem_context, "radio");
-
-  *height = 0;
-  query_size (menu_context, NULL, height);
-  menuitem1_height = 0;
-  query_size (hovermenuitem_context, NULL, &menuitem1_height);
-  query_size (hoveredarrowmenuitem_context, NULL, &menuitem1_height);
-  *height += menuitem1_height;
-  menuitem2_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem2_height);
-  query_size (arrowmenuitem_context, NULL, &menuitem2_height);
-  query_size (disabledarrowmenuitem_context, NULL, &menuitem2_height);
-  *height += menuitem2_height;
-  menuitem3_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem3_height);
-  query_size (checkmenuitem_context, NULL, &menuitem3_height);
-  query_size (disabledcheckmenuitem_context, NULL, &menuitem3_height);
-  *height += menuitem3_height;
-  menuitem4_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (separatormenuitem_context, NULL, &menuitem4_height);
-  *height += menuitem4_height;
-  menuitem5_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem5_height);
-  query_size (radiomenuitem_context, NULL, &menuitem5_height);
-  query_size (disabledradiomenuitem_context, NULL, &menuitem5_height);
-  *height += menuitem5_height;
-
-  draw_style_common (menu_context, cr, x, y, width, *height,
-                     &menu_x, &menu_y, &menu_width, &menu_height);
-
-  /* Hovered with right arrow */
-  gtk_style_context_get (hoveredarrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  draw_style_common (hovermenuitem_context, cr, menu_x, menu_y, menu_width, menuitem1_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_arrow (hoveredarrowmenuitem_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-  /* Left arrow sensitive, and right arrow insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height, menu_width, menuitem2_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (arrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  gtk_render_arrow (arrowmenuitem_context, cr, G_PI / 2,
-                    contents_x,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-  gtk_style_context_get (disabledarrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  gtk_render_arrow (disabledarrowmenuitem_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-
-  /* Left check enabled, sensitive, and right check unchecked, insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height, menu_width, menuitem3_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (checkmenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (checkmenuitem_context, cr,
-                     contents_x,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (checkmenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-  gtk_style_context_get (disabledcheckmenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (disabledcheckmenuitem_context, cr,
-                     contents_x + contents_width - toggle_width,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (disabledcheckmenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-
-  /* Separator */
-  draw_style_common (separatormenuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height + menuitem3_height,
-                     menu_width, menuitem4_height,
-                     NULL, NULL, NULL, NULL);
-
-  /* Left check enabled, sensitive, and right check unchecked, insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height + menuitem3_height + menuitem4_height,
-                     menu_width, menuitem5_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (radiomenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (radiomenuitem_context, cr,
-                     contents_x,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (radiomenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-  gtk_style_context_get (disabledradiomenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (disabledradiomenuitem_context, cr,
-                     contents_x + contents_width - toggle_width,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (disabledradiomenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-
-  g_object_unref (menu_context);
-  g_object_unref (menuitem_context);
-  g_object_unref (hovermenuitem_context);
-  g_object_unref (hoveredarrowmenuitem_context);
-  g_object_unref (arrowmenuitem_context);
-  g_object_unref (checkmenuitem_context);
-  g_object_unref (disabledarrowmenuitem_context);
-  g_object_unref (disabledcheckmenuitem_context);
-  g_object_unref (radiomenuitem_context);
-  g_object_unref (disablemenuitem_context);
-  g_object_unref (disabledradiomenuitem_context);
-  g_object_unref (separatormenuitem_context);
-}
-
-static void
-draw_menubar (GtkWidget     *widget,
-              cairo_t       *cr,
-              gint           x,
-              gint           y,
-              gint           width,
-              gint          *height)
-{
-  GtkStyleContext *frame_context;
-  GtkStyleContext *border_context;
-  GtkStyleContext *menubar_context;
-  GtkStyleContext *hovered_menuitem_context;
-  GtkStyleContext *menuitem_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint item_width;
-
-  /* Menubar background is the same color as our base background, so use a frame */
-  frame_context = get_style (NULL, "frame");
-  border_context = get_style (frame_context, "border");
-
-  /* This information is taken from the GtkPopoverMenuBar docs, see "CSS nodes" */
-  menubar_context = get_style (NULL, "menubar");
-  hovered_menuitem_context = get_style (menubar_context, "menuitem:hover");
-  menuitem_context = get_style (menubar_context, "menuitem");
-
-  *height = 0;
-  query_size (frame_context, NULL, height);
-  query_size (border_context, NULL, height);
-  query_size (menubar_context, NULL, height);
-  query_size (hovered_menuitem_context, NULL, height);
-  query_size (menuitem_context, NULL, height);
-
-  draw_style_common (frame_context, cr, x, y, width, *height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (border_context, cr, x, y, width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (menubar_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  item_width = contents_width / 3;
-  draw_style_common (hovered_menuitem_context, cr, contents_x, contents_y, item_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (menuitem_context, cr, contents_x + item_width * 2, contents_y, item_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (menuitem_context);
-  g_object_unref (hovered_menuitem_context);
-  g_object_unref (menubar_context);
-  g_object_unref (border_context);
-  g_object_unref (frame_context);
-}
-
-static void
-draw_notebook (GtkWidget     *widget,
-               cairo_t       *cr,
-               gint           x,
-               gint           y,
-               gint           width,
-               gint           height)
-{
-  GtkStyleContext *notebook_context;
-  GtkStyleContext *header_context;
-  GtkStyleContext *tabs_context;
-  GtkStyleContext *tab1_context, *tab2_context;
-  GtkStyleContext *stack_context;
-  gint header_height;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkNotebook docs, see "CSS nodes" */
-  notebook_context = get_style (NULL, "notebook.frame");
-  header_context = get_style (notebook_context, "header.top");
-  tabs_context = get_style (header_context, "tabs");
-  tab1_context = get_style (tabs_context, "tab:checked");
-  tab2_context = get_style (tabs_context, "tab:hover");
-  stack_context = get_style (notebook_context, "stack");
-
-  header_height = 0;
-  query_size (notebook_context, NULL, &header_height);
-  query_size (header_context, NULL, &header_height);
-  query_size (tabs_context, NULL, &header_height);
-  query_size (tab1_context, NULL, &header_height);
-  query_size (tab2_context, NULL, &header_height);
-
-  draw_style_common (notebook_context, cr, x, y, width, height, NULL, NULL, NULL, NULL);
-  draw_style_common (header_context, cr, x, y, width, header_height, NULL, NULL, NULL, NULL);
-  draw_style_common (tabs_context, cr, x, y, width, header_height, NULL, NULL, NULL, NULL);
-  draw_style_common (tab1_context, cr, x, y, width / 2, header_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (tab2_context, cr, x + width / 2, y, width / 2, header_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (stack_context, cr, x, y + header_height, width,height - header_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (stack_context);
-  g_object_unref (tabs_context);
-  g_object_unref (tab1_context);
-  g_object_unref (tab2_context);
-  g_object_unref (header_context);
-  g_object_unref (notebook_context);
-}
-
-static void
-draw_horizontal_scrollbar (GtkWidget     *widget,
-                           cairo_t       *cr,
-                           gint           x,
-                           gint           y,
-                           gint           width,
-                           gint           position,
-                           GtkStateFlags  state,
-                           gint          *height)
-{
-  GtkStyleContext *scrollbar_context;
-  GtkStyleContext *contents_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *slider_context;
-  gint slider_width;
-
-  /* This information is taken from the GtkScrollbar docs, see "CSS nodes" */
-  scrollbar_context = get_style (NULL, "scrollbar.horizontal.bottom");
-  contents_context = get_style (scrollbar_context, "contents");
-  trough_context = get_style (contents_context, "trough");
-  slider_context = get_style (trough_context, "slider");
-
-  gtk_style_context_set_state (scrollbar_context, state);
-  gtk_style_context_set_state (contents_context, state);
-  gtk_style_context_set_state (trough_context, state);
-  gtk_style_context_set_state (slider_context, state);
-
-  *height = 0;
-  query_size (scrollbar_context, NULL, height);
-  query_size (contents_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (slider_context, NULL, height);
-
-  gtk_style_context_get (slider_context,
-                         "min-width", &slider_width, NULL);
-
-  draw_style_common (scrollbar_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (contents_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (trough_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (slider_context, cr, x + position, y, slider_width, *height, NULL, NULL, NULL, NULL);
-
-  g_object_unref (slider_context);
-  g_object_unref (trough_context);
-  g_object_unref (contents_context);
-  g_object_unref (scrollbar_context);
-}
-
-static void
-draw_text (GtkWidget     *widget,
-           cairo_t       *cr,
-           gint           x,
-           gint           y,
-           gint           width,
-           gint           height,
-           const gchar   *text,
-           GtkStateFlags  state)
-{
-  GtkStyleContext *label_context;
-  GtkStyleContext *selection_context;
-  GtkStyleContext *context;
-  PangoLayout *layout;
-
-  /* This information is taken from the GtkLabel docs, see "CSS nodes" */
-  label_context = get_style (NULL, "label.view");
-  selection_context = get_style (label_context, "selection");
-
-  gtk_style_context_set_state (label_context, state);
-
-  if (state & GTK_STATE_FLAG_SELECTED)
-    context = selection_context;
-  else
-    context = label_context;
-
-  layout = gtk_widget_create_pango_layout (widget, text);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-  gtk_render_layout (context, cr, x, y, layout);
-
-  g_object_unref (layout);
-
-  g_object_unref (selection_context);
-  g_object_unref (label_context);
-}
-
-static void
-draw_check (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state,
-            gint          *width,
-            gint          *height)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkCheckButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "checkbutton");
-  check_context = get_style (button_context, "check");
-
-  gtk_style_context_set_state (check_context, state);
-
-  *width = *height = 0;
-  query_size (button_context, width, height);
-  query_size (check_context, width, height);
-
-  draw_style_common (button_context, cr, x, y, *width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (check_context, cr, x, y, *width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_check (check_context, cr, contents_x, contents_y, contents_width, contents_height);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_radio (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state,
-            gint          *width,
-            gint          *height)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkRadioButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "radiobutton");
-  check_context = get_style (button_context, "radio");
-
-  gtk_style_context_set_state (check_context, state);
-
-  *width = *height = 0;
-  query_size (button_context, width, height);
-  query_size (check_context, width, height);
-
-  draw_style_common (button_context, cr, x, y, *width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (check_context, cr, x, y, *width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_check (check_context, cr, contents_x, contents_y, contents_width, contents_height);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_progress (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gint       position,
-               gint      *height)
-{
-  GtkStyleContext *bar_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *progress_context;
-
-  /* This information is taken from the GtkProgressBar docs, see "CSS nodes" */
-  bar_context = get_style (NULL, "progressbar.horizontal");
-  trough_context = get_style (bar_context, "trough");
-  progress_context = get_style (trough_context, "progress.left");
-
-  *height = 0;
-  query_size (bar_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (progress_context, NULL, height);
-
-  draw_style_common (bar_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (trough_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (progress_context, cr, x, y, position, *height, NULL, NULL, NULL, NULL);
-
-  g_object_unref (progress_context);
-  g_object_unref (trough_context);
-  g_object_unref (bar_context);
-}
-
-static void
-draw_scale (GtkWidget *widget,
-            cairo_t   *cr,
-            gint       x,
-            gint       y,
-            gint       width,
-            gint       position,
-            gint      *height)
-{
-  GtkStyleContext *scale_context;
-  GtkStyleContext *contents_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *slider_context;
-  GtkStyleContext *highlight_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint trough_height, slider_height;
-
-  scale_context = get_style (NULL, "scale.horizontal");
-  contents_context = get_style (scale_context, "contents");
-  trough_context = get_style (contents_context, "trough");
-  slider_context = get_style (trough_context, "slider");
-  highlight_context = get_style (trough_context, "highlight.top");
-
-  *height = 0;
-  query_size (scale_context, NULL, height);
-  query_size (contents_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (slider_context, NULL, height);
-  query_size (highlight_context, NULL, height);
-
-  draw_style_common (scale_context, cr, x, y, width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (contents_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  /* Scale trough defines its size querying slider and highlight */
-  trough_height = 0;
-  query_size (trough_context, NULL, &trough_height);
-  slider_height = 0;
-  query_size (slider_context, NULL, &slider_height);
-  query_size (highlight_context, NULL, &slider_height);
-  trough_height += slider_height;
-  draw_style_common (trough_context, cr, contents_x, contents_y, contents_width, trough_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (highlight_context, cr, contents_x, contents_y,
-                     contents_width / 2, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (slider_context, cr, contents_x + position, contents_y, contents_height, contents_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (scale_context);
-  g_object_unref (contents_context);
-  g_object_unref (trough_context);
-  g_object_unref (slider_context);
-  g_object_unref (highlight_context);
-}
-
-static void
-draw_combobox (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gboolean   has_entry,
-               gint      *height)
-{
-  GtkStyleContext *combo_context;
-  GtkStyleContext *box_context;
-  GtkStyleContext *button_context;
-  GtkStyleContext *button_box_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *arrow_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint button_width;
-  gint arrow_width, arrow_height, arrow_size;
-
-  /* This information is taken from the GtkComboBox docs, see "CSS nodes" */
-  combo_context = get_style (NULL, "combobox:focus");
-  box_context = get_style (combo_context, "box.horizontal.linked");
-  if (has_entry)
-    {
-      const char *siblings[3] = { "entry.combo:focus", "button.combo" , NULL };
-
-      entry_context = get_style_with_siblings (box_context, "entry.combo:focus", siblings, 0);
-      button_context = get_style_with_siblings (box_context, "button.combo", siblings, 1);
-    }
-  else
-    {
-      const char *siblings[2] = { "button.combo" , NULL };
-
-      button_context = get_style_with_siblings (box_context, "button.combo", siblings, 0);
-    }
-  button_box_context = get_style (button_context, "box.horizontal");
-  arrow_context = get_style (button_box_context, "arrow");
-
-  *height = 0;
-  query_size (combo_context, NULL, height);
-  query_size (box_context, NULL, height);
-  if (has_entry)
-    query_size (entry_context, NULL, height);
-  query_size (button_context, NULL, height);
-  query_size (button_box_context, NULL, height);
-  query_size (arrow_context, NULL, height);
-
-  gtk_style_context_get (arrow_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-
-  draw_style_common (combo_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (box_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  if (has_entry)
-    {
-      button_width = *height;
-      draw_style_common (entry_context, cr, x, y, width - button_width, *height, NULL, NULL, NULL, NULL);
-      draw_style_common (button_context, cr, x + width - button_width, y, button_width, *height,
-                         &contents_x, &contents_y, &contents_width, &contents_height);
-    }
-  else
-    {
-      button_width = width;
-      draw_style_common (button_context, cr, x, y, width, *height,
-                         &contents_x, &contents_y, &contents_width, &contents_height);
-    }
-
-  draw_style_common (button_box_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (arrow_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  gtk_render_arrow (arrow_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-  g_object_unref (arrow_context);
-  if (has_entry)
-    g_object_unref (entry_context);
-  g_object_unref (button_context);
-  g_object_unref (combo_context);
-}
-
-static void
-draw_spinbutton (GtkWidget *widget,
-                 cairo_t   *cr,
-                 gint       x,
-                 gint       y,
-                 gint       width,
-                 gint      *height)
-{
-  GtkStyleContext *spin_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *up_context;
-  GtkStyleContext *down_context;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  GdkTexture *texture;
-  gint icon_width, icon_height, icon_size;
-  gint button_width;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkSpinButton docs, see "CSS nodes" */
-  spin_context = get_style (NULL, "spinbutton.horizontal:focus");
-  entry_context = get_style (spin_context, "entry:focus");
-  up_context = get_style (spin_context, "button.up:focus:active");
-  down_context = get_style (spin_context, "button.down:focus");
-
-  *height = 0;
-  query_size (spin_context, NULL, height);
-  query_size (entry_context, NULL, height);
-  query_size (up_context, NULL, height);
-  query_size (down_context, NULL, height);
-  button_width = *height;
-
-  draw_style_common (spin_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (entry_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
-
-  gtk_style_context_get (up_context,
-                         "min-width", &icon_width, "min-height", &icon_height, NULL);
-  icon_size = MIN (icon_width, icon_height);
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL));
-  g_object_unref (icon_info);
-  draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
-  g_object_unref (texture);
-
-  gtk_style_context_get (down_context,
-                         "min-width", &icon_width, "min-height", &icon_height, NULL);
-  icon_size = MIN (icon_width, icon_height);
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL));
-  g_object_unref (icon_info);
-  draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
-  g_object_unref (texture);
-
-  g_object_unref (down_context);
-  g_object_unref (up_context);
-  g_object_unref (entry_context);
-  g_object_unref (spin_context);
-}
-
-static void
-draw_func (GtkDrawingArea *da,
-           cairo_t        *cr,
-           int             width,
-           int             height,
-           gpointer        data)
-{
-  GtkWidget *widget = GTK_WIDGET (da);
-  gint panewidth;
-  gint x, y;
-
-  panewidth = width / 2;
-
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_set_source_rgb (cr, 0.9, 0.9, 0.9);
-  cairo_fill (cr);
-
-  x = y = 10;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 30, GTK_STATE_FLAG_NORMAL, &height);
-  y += height + 8;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 40, GTK_STATE_FLAG_PRELIGHT, &height);
-  y += height + 8;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 50, GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_PRELIGHT, &height);
-
-  y += height + 8;
-  draw_text (widget, cr, x,  y, panewidth - 20, 20, "Not selected", GTK_STATE_FLAG_NORMAL);
-  y += 20 + 10;
-  draw_text (widget, cr, x, y, panewidth - 20, 20, "Selected", GTK_STATE_FLAG_SELECTED);
-
-  x = 10;
-  y += 20 + 10;
-  draw_check (widget, cr,  x, y, GTK_STATE_FLAG_NORMAL, &width, &height);
-  x += width + 10;
-  draw_check (widget, cr,  x, y, GTK_STATE_FLAG_CHECKED, &width, &height);
-  x += width + 10;
-  draw_radio (widget, cr,  x, y, GTK_STATE_FLAG_NORMAL, &width, &height);
-  x += width + 10;
-  draw_radio (widget, cr, x, y, GTK_STATE_FLAG_CHECKED, &width, &height);
-  x = 10;
-
-  y += height + 10;
-  draw_progress (widget, cr, x, y, panewidth - 20, 50, &height);
-
-  y += height + 10;
-  draw_scale (widget, cr, x, y, panewidth - 20, 75, &height);
-
-  y += height + 20;
-  draw_notebook (widget, cr, x, y, panewidth - 20, 160);
-
-  /* Second column */
-  x += panewidth;
-  y = 10;
-  draw_menu (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 10;
-  draw_menubar (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 20;
-  draw_spinbutton (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 30;
-  draw_combobox (widget, cr, x, y, panewidth - 20, FALSE, &height);
-
-  y += height + 10;
-  draw_combobox (widget, cr, 10 + panewidth, y, panewidth - 20, TRUE, &height);
-}
-
-GtkWidget *
-do_foreigndrawing (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *da;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (window), box);
-      da = gtk_drawing_area_new ();
-      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
-      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);
-      gtk_widget_set_hexpand (da, TRUE);
-      gtk_widget_set_vexpand (da, TRUE);
-      gtk_container_add (GTK_CONTAINER (box), da);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 4f5209d6d9..eee93be78e 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -28,7 +28,6 @@ demos = files([
   'fishbowl.c',
   'fixed.c',
   'fontrendering.c',
-  'foreigndrawing.c',
   'gestures.c',
   'glarea.c',
   'headerbar.c',