summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorTim Janik <timj@gimp.org>1998-03-12 07:28:41 +0000
committerTim Janik <timj@src.gnome.org>1998-03-12 07:28:41 +0000
commita8afd462c0d23eb1fed39394a523b364a4cdca39 (patch)
tree968bce7fcef1d8bdbb9dd2750d013701364650e7 /gdk
parent093dfedf74d607085b163bd254dea8682d0ba774 (diff)
downloadgtk+-a8afd462c0d23eb1fed39394a523b364a4cdca39.tar.gz
applied gtk-shige-980311-0.patch.gz, which removes the erronerous
Thu Mar 12 07:43:33 1998 Tim Janik <timj@gimp.org> * gdk/gdk.h: * gdk/gdkvisual.c: applied gtk-shige-980311-0.patch.gz, which removes the erronerous gdk_query_visuals() function in favour of gdk_list_visuals() which does a correct job. * gtk/gtkcontainer.h: applied gtk-draco-980311-0.patch.gz which fixes a class cast check. * gtk/gtkspinbutton.c: applied gtk-hamann_jeske-980312-0.patch.gz about '+' sign acceptance. * gtk/gtknotebook.c: applied gtk-hamann_jeske-980311-1.patch.gz which cares about delayed tab label creation.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.h4
-rw-r--r--gdk/gdkvisual.c15
-rw-r--r--gdk/x11/gdkvisual-x11.c15
3 files changed, 22 insertions, 12 deletions
diff --git a/gdk/gdk.h b/gdk/gdk.h
index b22570aa10..c8c94fc5af 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -111,8 +111,8 @@ void gdk_query_depths (gint **depths,
gint *count);
void gdk_query_visual_types (GdkVisualType **visual_types,
gint *count);
-void gdk_query_visuals (GdkVisual **visuals,
- gint *count);
+
+GList* gdk_list_visuals (void);
/* Windows
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index e2f1448eb4..16163dbddf 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -350,12 +350,17 @@ gdk_query_visual_types (GdkVisualType **visual_types,
*visual_types = available_types;
}
-void
-gdk_query_visuals (GdkVisual **visual_return,
- gint *count)
+GList*
+gdk_list_visuals (void)
{
- *count = nvisuals;
- *visual_return = (GdkVisual*) visuals;
+ GList *list;
+ guint i;
+
+ list = NULL;
+ for (i = 0; i < nvisuals; ++i)
+ list = g_list_append (list, (gpointer) &visuals[i]);
+
+ return list;
}
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index e2f1448eb4..16163dbddf 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -350,12 +350,17 @@ gdk_query_visual_types (GdkVisualType **visual_types,
*visual_types = available_types;
}
-void
-gdk_query_visuals (GdkVisual **visual_return,
- gint *count)
+GList*
+gdk_list_visuals (void)
{
- *count = nvisuals;
- *visual_return = (GdkVisual*) visuals;
+ GList *list;
+ guint i;
+
+ list = NULL;
+ for (i = 0; i < nvisuals; ++i)
+ list = g_list_append (list, (gpointer) &visuals[i]);
+
+ return list;
}