From ad07608cc39bc1115de26f094b8aa08f46e23335 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 24 Sep 2002 21:54:15 +0000 Subject: [PATCH] Add a GtkAccelGroupFindFunc to clean up the prototype. (#76670, Vitaly Tue Sep 24 17:49:52 2002 Owen Taylor * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): Add a GtkAccelGroupFindFunc to clean up the prototype. (#76670, Vitaly Tishkov) * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename gdkx_visual_get_for_screen() to gdk_x11_screen_lookup_visual(). (#85702) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ gdk/x11/gdkvisual-x11.c | 11 ++++++----- gdk/x11/gdkx.h | 4 ++-- gtk/gtkaccelgroup.c | 8 +++----- gtk/gtkaccelgroup.h | 13 ++++++++----- 10 files changed, 79 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 97fdab1f87..f4d1df4353 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Tue Sep 24 17:49:52 2002 Owen Taylor + + * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find): + Add a GtkAccelGroupFindFunc to clean up the + prototype. (#76670, Vitaly Tishkov) + + * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename + gdkx_visual_get_for_screen() to + gdk_x11_screen_lookup_visual(). (#85702) + 2002-09-25 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_event_translate): diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index f9d1ffd7de..9e2b780b28 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -537,17 +537,18 @@ gdk_screen_list_visuals (GdkScreen *screen) } /** - * gdkx_visual_get_for_screen: + * gdk_x11_screen_lookup_visual * @screen: a #GdkScreen. * @xvisualid: an X Visual ID. * - * Returns a #GdkVisual from and X Visual id. + * Looks up the #GdkVisual for a particular screen and X Visual ID. * - * Returns: a #GdkVisual. + * Returns: the #GdkVisual (owned by the screen object), or %NULL + * if the visual ID wasn't found. */ GdkVisual * -gdkx_visual_get_for_screen (GdkScreen *screen, - VisualID xvisualid) +gdk_x11_screen_lookup_visual (GdkScreen *screen, + VisualID xvisualid) { int i; GdkScreenX11 *screen_x11; diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 11bd0e17a5..83a4807f7c 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -116,8 +116,8 @@ gint gdk_x11_get_default_screen (void); #endif /* INSIDE_GDK_X11 */ -GdkVisual* gdkx_visual_get_for_screen (GdkScreen *screen, - VisualID xvisualid); +GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen, + VisualID xvisualid); #ifndef GDK_MULTIHEAD_SAFE GdkVisual* gdkx_visual_get (VisualID xvisualid); #endif diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index d6cb323e98..b5c49fb980 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -269,11 +269,9 @@ gtk_accel_groups_from_object (GObject *object) * */ GtkAccelKey* -gtk_accel_group_find (GtkAccelGroup *accel_group, - gboolean (*find_func) (GtkAccelKey *key, - GClosure *closure, - gpointer data), - gpointer data) +gtk_accel_group_find (GtkAccelGroup *accel_group, + GtkAccelGroupFindFunc find_func, + gpointer data) { GtkAccelKey *key = NULL; guint i; diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index f006f38054..36666b31c5 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -61,6 +61,11 @@ typedef gboolean (*GtkAccelGroupActivate) (GtkAccelGroup *accel_group, GObject *acceleratable, guint keyval, GdkModifierType modifier); + +typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey *key, + GClosure *closure, + gpointer data) + struct _GtkAccelGroup { GObject parent; @@ -124,11 +129,9 @@ gboolean gtk_accel_groups_activate (GObject *object, guint accel_key, GdkModifierType accel_mods); GSList* gtk_accel_groups_from_object (GObject *object); -GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group, - gboolean (*find_func) (GtkAccelKey *key, - GClosure *closure, - gpointer data), - gpointer data); +GtkAccelKey* gtk_accel_group_find (GtkAccelGroup *accel_group, + GtkAccelGroupFindFunc find_func, + gpointer data); GtkAccelGroup* gtk_accel_group_from_accel_closure (GClosure *closure);