API: gdk: Remove visual querying APIs

They are unused, only work on the default display anyway and visuals are
on their way out.

15 files changed, 0 insertions, 840 deletions

diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 58efcdfdfb..799c61b146 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -91,22 +91,6 @@ gboolean _gdk_keymap_key_is_modifier   (GdkKeymap       *keymap,
 
 void _gdk_broadway_screen_events_init   (GdkScreen *screen);
 GdkVisual *_gdk_broadway_screen_get_system_visual (GdkScreen * screen);
-gint _gdk_broadway_screen_visual_get_best_depth (GdkScreen * screen);
-GdkVisualType _gdk_broadway_screen_visual_get_best_type (GdkScreen * screen);
-GdkVisual*_gdk_broadway_screen_visual_get_best (GdkScreen * screen);
-GdkVisual*_gdk_broadway_screen_visual_get_best_with_depth (GdkScreen * screen,
-							   gint depth);
-GdkVisual*_gdk_broadway_screen_visual_get_best_with_type (GdkScreen * screen,
-							  GdkVisualType visual_type);
-GdkVisual*_gdk_broadway_screen_visual_get_best_with_both (GdkScreen * screen,
-							  gint          depth,
-							  GdkVisualType visual_type);
-void _gdk_broadway_screen_query_depths  (GdkScreen * screen,
-					 gint **depths,
-					 gint  *count);
-void _gdk_broadway_screen_query_visual_types (GdkScreen * screen,
-					      GdkVisualType **visual_types,
-					      gint           *count);
 GList *_gdk_broadway_screen_list_visuals (GdkScreen *screen);
 void _gdk_broadway_screen_size_changed (GdkScreen *screen, 
 					BroadwayInputScreenResizeNotify *msg);
diff --git a/gdk/broadway/gdkscreen-broadway.c b/gdk/broadway/gdkscreen-broadway.c
index b08e7da8c4..0bece910e4 100644
--- a/gdk/broadway/gdkscreen-broadway.c
+++ b/gdk/broadway/gdkscreen-broadway.c
@@ -182,14 +182,6 @@ gdk_broadway_screen_class_init (GdkBroadwayScreenClass *klass)
   screen_class->get_setting = gdk_broadway_screen_get_setting;
   screen_class->get_rgba_visual = gdk_broadway_screen_get_rgba_visual;
   screen_class->get_system_visual = _gdk_broadway_screen_get_system_visual;
-  screen_class->visual_get_best_depth = _gdk_broadway_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = _gdk_broadway_screen_visual_get_best_type;
-  screen_class->visual_get_best = _gdk_broadway_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = _gdk_broadway_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = _gdk_broadway_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = _gdk_broadway_screen_visual_get_best_with_both;
-  screen_class->query_depths = _gdk_broadway_screen_query_depths;
-  screen_class->query_visual_types = _gdk_broadway_screen_query_visual_types;
   screen_class->list_visuals = _gdk_broadway_screen_list_visuals;
 }
 
diff --git a/gdk/broadway/gdkvisual-broadway.c b/gdk/broadway/gdkvisual-broadway.c
index 9550682185..81a1b4bed8 100644
--- a/gdk/broadway/gdkvisual-broadway.c
+++ b/gdk/broadway/gdkvisual-broadway.c
@@ -110,18 +110,6 @@ _gdk_broadway_screen_init_visuals (GdkScreen *screen)
   broadway_screen->nvisuals = nvisuals;
 }
 
-gint
-_gdk_broadway_screen_visual_get_best_depth (GdkScreen * screen)
-{
-  return GDK_BROADWAY_SCREEN (screen)->available_depths[0];
-}
-
-GdkVisualType
-_gdk_broadway_screen_visual_get_best_type (GdkScreen * screen)
-{
-  return GDK_BROADWAY_SCREEN (screen)->available_types[0];
-}
-
 GdkVisual *
 _gdk_broadway_screen_get_system_visual (GdkScreen * screen)
 {
@@ -130,95 +118,6 @@ _gdk_broadway_screen_get_system_visual (GdkScreen * screen)
   return ((GdkVisual *) GDK_BROADWAY_SCREEN (screen)->system_visual);
 }
 
-GdkVisual*
-_gdk_broadway_screen_visual_get_best (GdkScreen * screen)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  return (GdkVisual *)broadway_screen->visuals[0];
-}
-
-GdkVisual*
-_gdk_broadway_screen_visual_get_best_with_depth (GdkScreen * screen,
-						 gint depth)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-
-  return_val = NULL;
-  for (i = 0; i < broadway_screen->nvisuals; i++)
-    if (depth == broadway_screen->visuals[i]->depth)
-      {
-	return_val = (GdkVisual *) broadway_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-GdkVisual*
-_gdk_broadway_screen_visual_get_best_with_type (GdkScreen * screen,
-						GdkVisualType visual_type)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-
-  return_val = NULL;
-  for (i = 0; i < broadway_screen->nvisuals; i++)
-    if (visual_type == broadway_screen->visuals[i]->type)
-      {
-	return_val = (GdkVisual *) broadway_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-GdkVisual*
-_gdk_broadway_screen_visual_get_best_with_both (GdkScreen * screen,
-						gint          depth,
-						GdkVisualType visual_type)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-
-  return_val = NULL;
-  for (i = 0; i < broadway_screen->nvisuals; i++)
-    if ((depth == broadway_screen->visuals[i]->depth) &&
-	(visual_type == broadway_screen->visuals[i]->type))
-      {
-	return_val = (GdkVisual *) broadway_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-void
-_gdk_broadway_screen_query_depths  (GdkScreen * screen,
-				    gint **depths,
-				    gint  *count)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  *count = broadway_screen->navailable_depths;
-  *depths = broadway_screen->available_depths;
-}
-
-void
-_gdk_broadway_screen_query_visual_types (GdkScreen * screen,
-					 GdkVisualType **visual_types,
-					 gint           *count)
-{
-  GdkBroadwayScreen *broadway_screen = GDK_BROADWAY_SCREEN (screen);
-
-  *count = broadway_screen->navailable_types;
-  *visual_types = broadway_screen->available_types;
-}
-
 GList *
 _gdk_broadway_screen_list_visuals (GdkScreen *screen)
 {
diff --git a/gdk/gdkscreenprivate.h b/gdk/gdkscreenprivate.h
index 8d46cd69c8..5234b46a75 100644
--- a/gdk/gdkscreenprivate.h
+++ b/gdk/gdkscreenprivate.h
@@ -65,22 +65,6 @@ struct _GdkScreenClass
   gboolean     (* get_setting)           (GdkScreen   *screen,
                                           const gchar *name,
                                           GValue      *value);
-  gint         (* visual_get_best_depth) (GdkScreen   *screen);
-  GdkVisualType (* visual_get_best_type) (GdkScreen   *screen);
-  GdkVisual *  (* visual_get_best)       (GdkScreen   *screen);
-  GdkVisual *  (* visual_get_best_with_depth) (GdkScreen   *screen,
-                                               gint depth);
-  GdkVisual *  (* visual_get_best_with_type) (GdkScreen   *screen,
-                                              GdkVisualType visual_type);
-  GdkVisual *  (* visual_get_best_with_both) (GdkScreen   *screen,
-                                              gint depth,
-                                              GdkVisualType visual_type);
-  void         (* query_depths)          (GdkScreen   *screen,
-                                          gint **depths,
-                                          gint  *count);
-  void         (* query_visual_types)    (GdkScreen   *screen,
-                                          GdkVisualType **visual_types,
-                                          gint           *count);
   gint         (* get_monitor_scale_factor) (GdkScreen *screen,
                                              gint       monitor_num);
 
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index 29fb6966e1..af579546aa 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -76,192 +76,6 @@ gdk_visual_class_init (GdkVisualClass *visual_class)
 }
 
 /**
- * gdk_list_visuals:
- *
- * Lists the available visuals for the default screen.
- * (See gdk_screen_list_visuals())
- * A visual describes a hardware image data format.
- * For example, a visual might support 24-bit color, or 8-bit color,
- * and might expect pixels to be in a certain format.
- *
- * Call g_list_free() on the return value when you’re finished with it.
- *
- * Returns: (transfer container) (element-type GdkVisual):
- *     a list of visuals; the list must be freed, but not its contents
- */
-GList*
-gdk_list_visuals (void)
-{
-  return gdk_screen_list_visuals (gdk_screen_get_default ());
-}
-
-/**
- * gdk_visual_get_system:
- *
- * Get the system’s default visual for the default GDK screen.
- * This is the visual for the root window of the display.
- * The return value should not be freed.
- *
- * Returns: (transfer none): system visual
- */
-GdkVisual*
-gdk_visual_get_system (void)
-{
-  return gdk_screen_get_system_visual (gdk_screen_get_default());
-}
-
-/**
- * gdk_visual_get_best_depth:
- *
- * Get the best available depth for the default GDK screen.  “Best”
- * means “largest,” i.e. 32 preferred over 24 preferred over 8 bits
- * per pixel.
- *
- * Returns: best available depth
- */
-gint
-gdk_visual_get_best_depth (void)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best_depth (screen);
-}
-
-/**
- * gdk_visual_get_best_type:
- *
- * Return the best available visual type for the default GDK screen.
- *
- * Returns: best visual type
- */
-GdkVisualType
-gdk_visual_get_best_type (void)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best_type (screen);
-}
-
-/**
- * gdk_visual_get_best:
- *
- * Get the visual with the most available colors for the default
- * GDK screen. The return value should not be freed.
- *
- * Returns: (transfer none): best visual
- */
-GdkVisual*
-gdk_visual_get_best (void)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best (screen);
-}
-
-/**
- * gdk_visual_get_best_with_depth:
- * @depth: a bit depth
- *
- * Get the best visual with depth @depth for the default GDK screen.
- * Color visuals and visuals with mutable colormaps are preferred
- * over grayscale or fixed-colormap visuals. The return value should
- * not be freed. %NULL may be returned if no visual supports @depth.
- *
- * Returns: (transfer none): best visual for the given depth
- */
-GdkVisual*
-gdk_visual_get_best_with_depth (gint depth)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best_with_depth (screen, depth);
-}
-
-/**
- * gdk_visual_get_best_with_type:
- * @visual_type: a visual type
- *
- * Get the best visual of the given @visual_type for the default GDK screen.
- * Visuals with higher color depths are considered better. The return value
- * should not be freed. %NULL may be returned if no visual has type
- * @visual_type.
- *
- * Returns: (transfer none): best visual of the given type
- */
-GdkVisual*
-gdk_visual_get_best_with_type (GdkVisualType visual_type)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best_with_type (screen,
-                                                                  visual_type);
-}
-
-/**
- * gdk_visual_get_best_with_both:
- * @depth: a bit depth
- * @visual_type: a visual type
- *
- * Combines gdk_visual_get_best_with_depth() and
- * gdk_visual_get_best_with_type().
- *
- * Returns: (nullable) (transfer none): best visual with both @depth
- *     and @visual_type, or %NULL if none
- */
-GdkVisual*
-gdk_visual_get_best_with_both (gint          depth,
-			       GdkVisualType visual_type)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  return GDK_SCREEN_GET_CLASS(screen)->visual_get_best_with_both (screen, depth, visual_type);
-}
-
-/**
- * gdk_query_depths:
- * @depths: (out) (array length=count) (transfer none): return
- *     location for available depths
- * @count: return location for number of available depths
- *
- * This function returns the available bit depths for the default
- * screen. It’s equivalent to listing the visuals
- * (gdk_list_visuals()) and then looking at the depth field in each
- * visual, removing duplicates.
- *
- * The array returned by this function should not be freed.
- */
-void
-gdk_query_depths (gint **depths,
-                  gint  *count)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  GDK_SCREEN_GET_CLASS(screen)->query_depths (screen, depths, count);
-}
-
-/**
- * gdk_query_visual_types:
- * @visual_types: (out) (array length=count) (transfer none): return
- *     location for the available visual types
- * @count: return location for the number of available visual types
- *
- * This function returns the available visual types for the default
- * screen. It’s equivalent to listing the visuals
- * (gdk_list_visuals()) and then looking at the type field in each
- * visual, removing duplicates.
- *
- * The array returned by this function should not be freed.
- */
-void
-gdk_query_visual_types (GdkVisualType **visual_types,
-                        gint           *count)
-{
-  GdkScreen *screen = gdk_screen_get_default();
-
-  GDK_SCREEN_GET_CLASS(screen)->query_visual_types (screen, visual_types, count);
-}
-
-/**
  * gdk_visual_get_visual_type:
  * @visual: A #GdkVisual.
  *
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index 3445d3137b..75a29e5402 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -83,32 +83,6 @@ GDK_AVAILABLE_IN_ALL
 GType         gdk_visual_get_type            (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-gint          gdk_visual_get_best_depth      (void);
-GDK_AVAILABLE_IN_ALL
-GdkVisualType gdk_visual_get_best_type       (void);
-GDK_AVAILABLE_IN_ALL
-GdkVisual*    gdk_visual_get_system          (void);
-GDK_AVAILABLE_IN_ALL
-GdkVisual*    gdk_visual_get_best            (void);
-GDK_AVAILABLE_IN_ALL
-GdkVisual*    gdk_visual_get_best_with_depth (gint           depth);
-GDK_AVAILABLE_IN_ALL
-GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
-GDK_AVAILABLE_IN_ALL
-GdkVisual*    gdk_visual_get_best_with_both  (gint           depth,
-                                              GdkVisualType  visual_type);
-
-GDK_AVAILABLE_IN_ALL
-void gdk_query_depths       (gint           **depths,
-                             gint            *count);
-GDK_AVAILABLE_IN_ALL
-void gdk_query_visual_types (GdkVisualType  **visual_types,
-                             gint            *count);
-
-GDK_AVAILABLE_IN_ALL
-GList* gdk_list_visuals (void);
-
-GDK_AVAILABLE_IN_ALL
 GdkScreen    *gdk_visual_get_screen (GdkVisual *visual);
 
 GDK_AVAILABLE_IN_ALL
diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
index b9e62860f5..7ec9d1161d 100644
--- a/gdk/mir/gdkmirscreen.c
+++ b/gdk/mir/gdkmirscreen.c
@@ -678,74 +678,6 @@ gdk_mir_screen_get_setting (GdkScreen   *screen,
 }
 
 static gint
-gdk_mir_screen_visual_get_best_depth (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best_depth\n");
-  return VISUAL_DEPTH;
-}
-
-static GdkVisualType
-gdk_mir_screen_visual_get_best_type (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best_type\n");
-  return VISUAL_TYPE;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best (GdkScreen *screen)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best\n");
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_depth (GdkScreen *screen,
-                                           gint       depth)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best_with_depth (%d)\n", depth);
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_type (GdkScreen     *screen,
-                                          GdkVisualType  visual_type)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best_with_type (%d)\n", visual_type);
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_mir_screen_visual_get_best_with_both (GdkScreen     *screen,
-                                          gint           depth,
-                                          GdkVisualType  visual_type)
-{
-  //g_printerr ("gdk_mir_screen_visual_get_best_with_both\n");
-  return GDK_MIR_SCREEN (screen)->visual;
-}
-
-static void
-gdk_mir_screen_query_depths (GdkScreen  *screen,
-                             gint      **depths,
-                             gint       *count)
-{
-  //g_printerr ("gdk_mir_screen_query_depths\n");
-  static gint supported_depths[] = { VISUAL_DEPTH };
-  *depths = supported_depths;
-  *count = 1;
-}
-
-static void
-gdk_mir_screen_query_visual_types (GdkScreen      *screen,
-                                   GdkVisualType **visual_types,
-                                   gint           *count)
-{
-  //g_printerr ("gdk_mir_screen_query_visual_types\n");
-  static GdkVisualType supported_visual_types[] = { VISUAL_TYPE };
-  *visual_types = supported_visual_types;
-  *count = 1;
-}
-
-static gint
 gdk_mir_screen_get_monitor_scale_factor (GdkScreen *screen,
                                          gint       monitor_num)
 {
@@ -790,13 +722,5 @@ gdk_mir_screen_class_init (GdkMirScreenClass *klass)
   screen_class->get_rgba_visual = gdk_mir_screen_get_rgba_visual;
   screen_class->is_composited = gdk_mir_screen_is_composited;
   screen_class->get_setting = gdk_mir_screen_get_setting;
-  screen_class->visual_get_best_depth = gdk_mir_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = gdk_mir_screen_visual_get_best_type;
-  screen_class->visual_get_best = gdk_mir_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = gdk_mir_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = gdk_mir_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = gdk_mir_screen_visual_get_best_with_both;
-  screen_class->query_depths = gdk_mir_screen_query_depths;
-  screen_class->query_visual_types = gdk_mir_screen_query_visual_types;
   screen_class->get_monitor_scale_factor = gdk_mir_screen_get_monitor_scale_factor;
 }
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 69491b03f9..79d2778d68 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -164,23 +164,6 @@ void        _gdk_quartz_screen_update_window_sizes      (GdkScreen *screen);
 /* Screen methods - visual */
 GdkVisual *   _gdk_quartz_screen_get_rgba_visual            (GdkScreen      *screen);
 GdkVisual *   _gdk_quartz_screen_get_system_visual          (GdkScreen      *screen);
-gint          _gdk_quartz_screen_visual_get_best_depth      (GdkScreen      *screen);
-GdkVisualType _gdk_quartz_screen_visual_get_best_type       (GdkScreen      *screen);
-GdkVisual *   _gdk_quartz_screen_get_system_visual          (GdkScreen      *screen);
-GdkVisual*    _gdk_quartz_screen_visual_get_best            (GdkScreen      *screen);
-GdkVisual*    _gdk_quartz_screen_visual_get_best_with_depth (GdkScreen      *screen,
-                                                             gint            depth);
-GdkVisual*    _gdk_quartz_screen_visual_get_best_with_type  (GdkScreen      *screen,
-                                                             GdkVisualType   visual_type);
-GdkVisual*    _gdk_quartz_screen_visual_get_best_with_both  (GdkScreen      *screen,
-                                                             gint            depth,
-                                                             GdkVisualType   visual_type);
-void          _gdk_quartz_screen_query_depths               (GdkScreen      *screen,
-                                                             gint          **depths,
-                                                             gint           *count);
-void          _gdk_quartz_screen_query_visual_types         (GdkScreen      *screen,
-                                                             GdkVisualType **visual_types,
-                                                             gint           *count);
 void          _gdk_quartz_screen_init_visuals               (GdkScreen      *screen);
 GList *       _gdk_quartz_screen_list_visuals               (GdkScreen      *screen);
 
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index 13b0274e64..d29615a718 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -480,14 +480,6 @@ gdk_quartz_screen_class_init (GdkQuartzScreenClass *klass)
   screen_class->get_setting = _gdk_quartz_screen_get_setting;
   screen_class->get_rgba_visual = _gdk_quartz_screen_get_rgba_visual;
   screen_class->get_system_visual = _gdk_quartz_screen_get_system_visual;
-  screen_class->visual_get_best_depth = _gdk_quartz_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = _gdk_quartz_screen_visual_get_best_type;
-  screen_class->visual_get_best = _gdk_quartz_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = _gdk_quartz_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = _gdk_quartz_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = _gdk_quartz_screen_visual_get_best_with_both;
-  screen_class->query_depths = _gdk_quartz_screen_query_depths;
-  screen_class->query_visual_types = _gdk_quartz_screen_query_visual_types;
   screen_class->list_visuals = _gdk_quartz_screen_list_visuals;
   screen_class->get_monitor_scale_factor = _gdk_quartz_screen_get_monitor_scale_factor;
 }
diff --git a/gdk/quartz/gdkvisual-quartz.c b/gdk/quartz/gdkvisual-quartz.c
index ea7d2c8d59..53d74aba7b 100644
--- a/gdk/quartz/gdkvisual-quartz.c
+++ b/gdk/quartz/gdkvisual-quartz.c
@@ -88,19 +88,6 @@ gdk_quartz_visual_class_init (GdkQuartzVisualClass *class)
 {
 }
 
-/* We prefer the system visual for now ... */
-gint
-_gdk_quartz_screen_visual_get_best_depth (GdkScreen *screen)
-{
-  return system_visual->depth;
-}
-
-GdkVisualType
-_gdk_quartz_screen_visual_get_best_type (GdkScreen *screen)
-{
-  return system_visual->type;
-}
-
 GdkVisual *
 _gdk_quartz_screen_get_rgba_visual (GdkScreen *screen)
 {
@@ -113,88 +100,6 @@ _gdk_quartz_screen_get_system_visual (GdkScreen *screen)
   return system_visual;
 }
 
-GdkVisual*
-_gdk_quartz_screen_visual_get_best (GdkScreen *screen)
-{
-  return system_visual;
-}
-
-GdkVisual*
-_gdk_quartz_screen_visual_get_best_with_depth (GdkScreen *screen,
-                                               gint       depth)
-{
-  GdkVisual *visual = NULL;
-
-  switch (depth)
-    {
-      case 32:
-        visual = rgba_visual;
-        break;
-
-      case 24:
-        visual = system_visual;
-        break;
-
-      case 1:
-        visual = gray_visual;
-        break;
-
-      default:
-        visual = NULL;
-    }
-
-  return visual;
-}
-
-GdkVisual*
-_gdk_quartz_screen_visual_get_best_with_type (GdkScreen     *screen,
-                                              GdkVisualType  visual_type)
-{
-  if (system_visual->type == visual_type)
-    return system_visual;
-  else if (gray_visual->type == visual_type)
-    return gray_visual;
-
-  return NULL;
-}
-
-GdkVisual*
-_gdk_quartz_screen_visual_get_best_with_both (GdkScreen     *screen,
-                                              gint           depth,
-                                              GdkVisualType  visual_type)
-{
-  if (system_visual->depth == depth
-      && system_visual->type == visual_type)
-    return system_visual;
-  else if (rgba_visual->depth == depth
-           && rgba_visual->type == visual_type)
-    return rgba_visual;
-  else if (gray_visual->depth == depth
-           && gray_visual->type == visual_type)
-    return gray_visual;
-
-  return NULL;
-}
-
-/* For these, we also prefer the system visual */
-void
-_gdk_quartz_screen_query_depths  (GdkScreen  *screen,
-                                  gint      **depths,
-                                  gint       *count)
-{
-  *count = 1;
-  *depths = &system_visual->depth;
-}
-
-void
-_gdk_quartz_screen_query_visual_types (GdkScreen      *screen,
-                                       GdkVisualType **visual_types,
-                                       gint           *count)
-{
-  *count = 1;
-  *visual_types = &system_visual->type;
-}
-
 void
 _gdk_quartz_screen_init_visuals (GdkScreen *screen)
 {
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index 8900f46971..c610688253 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -652,77 +652,6 @@ _gdk_wayland_visual_init (GdkWaylandVisual *visual)
 {
 }
 
-static gint
-gdk_wayland_screen_visual_get_best_depth (GdkScreen *screen)
-{
-  return 32;
-}
-
-static GdkVisualType
-gdk_wayland_screen_visual_get_best_type (GdkScreen *screen)
-{
-  return GDK_VISUAL_TRUE_COLOR;
-}
-
-static GdkVisual*
-gdk_wayland_screen_visual_get_best (GdkScreen *screen)
-{
-  return GDK_WAYLAND_SCREEN (screen)->visual;
-}
-
-static GdkVisual*
-gdk_wayland_screen_visual_get_best_with_depth (GdkScreen *screen,
-					       gint       depth)
-{
-  if (depth == 32)
-    return GDK_WAYLAND_SCREEN (screen)->visual;
-  else
-    return NULL;
-}
-
-static GdkVisual*
-gdk_wayland_screen_visual_get_best_with_type (GdkScreen     *screen,
-					      GdkVisualType  visual_type)
-{
-  if (visual_type == GDK_VISUAL_TRUE_COLOR)
-    return GDK_WAYLAND_SCREEN (screen)->visual;
-  else
-    return NULL;
-}
-
-static GdkVisual*
-gdk_wayland_screen_visual_get_best_with_both (GdkScreen     *screen,
-					      gint           depth,
-					      GdkVisualType  visual_type)
-{
-  if (depth == 32 && visual_type == GDK_VISUAL_TRUE_COLOR)
-    return GDK_WAYLAND_SCREEN (screen)->visual;
-  else
-    return NULL;
-}
-
-static void
-gdk_wayland_screen_query_depths  (GdkScreen  *screen,
-				  gint      **depths,
-				  gint       *count)
-{
-  static gint static_depths[] = { 32 };
-
-  *count = G_N_ELEMENTS(static_depths);
-  *depths = static_depths;
-}
-
-static void
-gdk_wayland_screen_query_visual_types (GdkScreen      *screen,
-				       GdkVisualType **visual_types,
-				       gint           *count)
-{
-  static GdkVisualType static_visual_types[] = { GDK_VISUAL_TRUE_COLOR };
-
-  *count = G_N_ELEMENTS(static_visual_types);
-  *visual_types = static_visual_types;
-}
-
 static GList *
 gdk_wayland_screen_list_visuals (GdkScreen *screen)
 {
@@ -795,14 +724,6 @@ _gdk_wayland_screen_class_init (GdkWaylandScreenClass *klass)
   screen_class->get_rgba_visual = gdk_wayland_screen_get_rgba_visual;
   screen_class->is_composited = gdk_wayland_screen_is_composited;
   screen_class->get_setting = gdk_wayland_screen_get_setting;
-  screen_class->visual_get_best_depth = gdk_wayland_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = gdk_wayland_screen_visual_get_best_type;
-  screen_class->visual_get_best = gdk_wayland_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = gdk_wayland_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = gdk_wayland_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = gdk_wayland_screen_visual_get_best_with_both;
-  screen_class->query_depths = gdk_wayland_screen_query_depths;
-  screen_class->query_visual_types = gdk_wayland_screen_query_visual_types;
   screen_class->list_visuals = gdk_wayland_screen_list_visuals;
 }
 
diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index df9d104033..ebb9ff3c10 100644
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -401,18 +401,6 @@ gdk_win32_screen_is_composited (GdkScreen *screen)
     }
 }
 
-static gint
-gdk_win32_screen_visual_get_best_depth (GdkScreen *screen)
-{
-  return GDK_WIN32_SCREEN (screen)->available_visual_depths[0];
-}
-
-static GdkVisualType
-gdk_win32_screen_visual_get_best_type (GdkScreen *screen)
-{
-  return GDK_WIN32_SCREEN (screen)->available_visual_types[0];
-}
-
 static GdkVisual *
 gdk_win32_screen_get_system_visual (GdkScreen *screen)
 {
@@ -425,73 +413,6 @@ gdk_win32_screen_get_rgba_visual (GdkScreen *screen)
   return GDK_WIN32_SCREEN (screen)->rgba_visual;
 }
 
-static GdkVisual*
-gdk_win32_screen_visual_get_best (GdkScreen *screen)
-{
-  return GDK_WIN32_SCREEN (screen)->rgba_visual;
-}
-
-static GdkVisual *
-gdk_win32_screen_visual_get_best_with_depth (GdkScreen *screen,
-                                             gint       depth)
-{
-  GdkWin32Screen *win32_screen = GDK_WIN32_SCREEN (screen);
-
-  if (depth == win32_screen->rgba_visual->depth)
-    return win32_screen->rgba_visual;
-  else if (depth == win32_screen->system_visual->depth)
-    return win32_screen->system_visual;
-
-  return NULL;
-}
-
-static GdkVisual *
-gdk_win32_screen_visual_get_best_with_type (GdkScreen     *screen,
-                                            GdkVisualType  visual_type)
-{
-  GdkWin32Screen *win32_screen = GDK_WIN32_SCREEN (screen);
-
-  if (visual_type == win32_screen->rgba_visual->type)
-    return win32_screen->rgba_visual;
-  else if (visual_type == win32_screen->system_visual->type)
-    return win32_screen->system_visual;
-
-  return NULL;
-}
-
-static GdkVisual *
-gdk_win32_screen_visual_get_best_with_both (GdkScreen     *screen,
-                                            gint           depth,
-                                            GdkVisualType  visual_type)
-{
-  GdkWin32Screen *win32_screen = GDK_WIN32_SCREEN (screen);
-
-  if ((depth == win32_screen->rgba_visual->depth) && (visual_type == win32_screen->rgba_visual->type))
-    return win32_screen->rgba_visual;
-  else if ((depth == win32_screen->system_visual->depth) && (visual_type == win32_screen->system_visual->type))
-    return win32_screen->system_visual;
-
-  return NULL;
-}
-
-static void
-gdk_win32_screen_query_depths (GdkScreen  *screen,
-                               gint      **depths,
-                               gint       *count)
-{
-  *count = 1;
-  *depths = GDK_WIN32_SCREEN (screen)->available_visual_depths;
-}
-
-static void
-gdk_win32_screen_query_visual_types (GdkScreen      *screen,
-                                     GdkVisualType **visual_types,
-                                     gint           *count)
-{
-  *count = 1;
-  *visual_types = GDK_WIN32_SCREEN (screen)->available_visual_types;
-}
-
 static GList *
 gdk_win32_screen_list_visuals (GdkScreen *screen)
 {
@@ -524,13 +445,5 @@ gdk_win32_screen_class_init (GdkWin32ScreenClass *klass)
   screen_class->get_setting = _gdk_win32_screen_get_setting;
   screen_class->get_system_visual = gdk_win32_screen_get_system_visual;
   screen_class->get_rgba_visual = gdk_win32_screen_get_rgba_visual;
-  screen_class->visual_get_best_depth = gdk_win32_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = gdk_win32_screen_visual_get_best_type;
-  screen_class->visual_get_best = gdk_win32_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = gdk_win32_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = gdk_win32_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = gdk_win32_screen_visual_get_best_with_both;
-  screen_class->query_depths = gdk_win32_screen_query_depths;
-  screen_class->query_visual_types = gdk_win32_screen_query_visual_types;
   screen_class->list_visuals = gdk_win32_screen_list_visuals;
 }
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 058a3878cb..b2f72675e3 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -50,23 +50,7 @@ void _gdk_x11_error_handler_pop  (void);
 
 Colormap _gdk_visual_get_x11_colormap (GdkVisual *visual);
 
-gint          _gdk_x11_screen_visual_get_best_depth      (GdkScreen      *screen);
-GdkVisualType _gdk_x11_screen_visual_get_best_type       (GdkScreen      *screen);
 GdkVisual *   _gdk_x11_screen_get_system_visual          (GdkScreen      *screen);
-GdkVisual*    _gdk_x11_screen_visual_get_best            (GdkScreen      *screen);
-GdkVisual*    _gdk_x11_screen_visual_get_best_with_depth (GdkScreen      *screen,
-                                                          gint            depth);
-GdkVisual*    _gdk_x11_screen_visual_get_best_with_type  (GdkScreen      *screen,
-                                                          GdkVisualType   visual_type);
-GdkVisual*    _gdk_x11_screen_visual_get_best_with_both  (GdkScreen      *screen,
-                                                          gint            depth,
-                                                          GdkVisualType   visual_type);
-void          _gdk_x11_screen_query_depths               (GdkScreen      *screen,
-                                                          gint          **depths,
-                                                          gint           *count);
-void          _gdk_x11_screen_query_visual_types         (GdkScreen      *screen,
-                                                          GdkVisualType **visual_types,
-                                                          gint           *count);
 GList *       _gdk_x11_screen_list_visuals               (GdkScreen      *screen);
 
 
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 1aa27ec31c..91fa9bec08 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1357,14 +1357,6 @@ gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
   screen_class->get_rgba_visual = gdk_x11_screen_get_rgba_visual;
   screen_class->is_composited = gdk_x11_screen_is_composited;
   screen_class->get_setting = gdk_x11_screen_get_setting;
-  screen_class->visual_get_best_depth = _gdk_x11_screen_visual_get_best_depth;
-  screen_class->visual_get_best_type = _gdk_x11_screen_visual_get_best_type;
-  screen_class->visual_get_best = _gdk_x11_screen_visual_get_best;
-  screen_class->visual_get_best_with_depth = _gdk_x11_screen_visual_get_best_with_depth;
-  screen_class->visual_get_best_with_type = _gdk_x11_screen_visual_get_best_with_type;
-  screen_class->visual_get_best_with_both = _gdk_x11_screen_visual_get_best_with_both;
-  screen_class->query_depths = _gdk_x11_screen_query_depths;
-  screen_class->query_visual_types = _gdk_x11_screen_query_visual_types;
   screen_class->list_visuals = _gdk_x11_screen_list_visuals;
 
   signals[WINDOW_MANAGER_CHANGED] =
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 81479d81f4..d9df8e33c6 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -309,18 +309,6 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen)
   _gdk_x11_screen_update_visuals_for_gl (screen);
 }
 
-gint
-_gdk_x11_screen_visual_get_best_depth (GdkScreen *screen)
-{
-  return GDK_X11_SCREEN (screen)->available_depths[0];
-}
-
-GdkVisualType
-_gdk_x11_screen_visual_get_best_type (GdkScreen *screen)
-{
-  return GDK_X11_SCREEN (screen)->available_types[0];
-}
-
 GdkVisual *
 _gdk_x11_screen_get_system_visual (GdkScreen *screen)
 {
@@ -329,95 +317,6 @@ _gdk_x11_screen_get_system_visual (GdkScreen *screen)
   return ((GdkVisual *) GDK_X11_SCREEN (screen)->system_visual);
 }
 
-GdkVisual*
-_gdk_x11_screen_visual_get_best (GdkScreen *screen)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-
-  return x11_screen->visuals[0];
-}
-
-GdkVisual*
-_gdk_x11_screen_visual_get_best_with_depth (GdkScreen *screen,
-                                            gint       depth)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-  
-  return_val = NULL;
-  for (i = 0; i < x11_screen->nvisuals; i++)
-    if (depth == x11_screen->visuals[i]->depth)
-      {
-	return_val = x11_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-GdkVisual*
-_gdk_x11_screen_visual_get_best_with_type (GdkScreen     *screen,
-                                           GdkVisualType  visual_type)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-
-  return_val = NULL;
-  for (i = 0; i < x11_screen->nvisuals; i++)
-    if (visual_type == x11_screen->visuals[i]->type)
-      {
-	return_val = x11_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-GdkVisual*
-_gdk_x11_screen_visual_get_best_with_both (GdkScreen     *screen,
-                                           gint           depth,
-                                           GdkVisualType  visual_type)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-  GdkVisual *return_val;
-  int i;
-
-  return_val = NULL;
-  for (i = 0; i < x11_screen->nvisuals; i++)
-    if ((depth == x11_screen->visuals[i]->depth) &&
-	(visual_type == x11_screen->visuals[i]->type))
-      {
-	return_val = x11_screen->visuals[i];
-	break;
-      }
-
-  return return_val;
-}
-
-void
-_gdk_x11_screen_query_depths  (GdkScreen  *screen,
-                               gint      **depths,
-                               gint       *count)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-
-  *count = x11_screen->navailable_depths;
-  *depths = x11_screen->available_depths;
-}
-
-void
-_gdk_x11_screen_query_visual_types (GdkScreen      *screen,
-                                    GdkVisualType **visual_types,
-                                    gint           *count)
-{
-  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-
-  *count = x11_screen->navailable_types;
-  *visual_types = x11_screen->available_types;
-}
-
 GList *
 _gdk_x11_screen_list_visuals (GdkScreen *screen)
 {