AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GCompareFunc -> GEqualFunc where applicable.

Browse Source 
2000-11-13  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
	gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
	gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
	gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
	GEqualFunc where applicable.

	* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
	pango_font_description_equal as changed in pango.

	* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.

	* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.

	* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.

	* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.

	* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.

	* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.

	* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
	gtk_gc_drawable_compare -> gtk_gc_drawable_equal.

	* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
	gtk_rc_styles_compare -> gtk_rc_styles_equal.
This commit is contained in:
Sebastian Wilhelmi 2000-11-13 13:15:41 +00:00 committed by Sebastian Wilhelmi
parent 1ddb7f30f6
commit b664be5ffb
18 changed files with 291 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-0
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-10
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-2
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-4
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-6
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

29
ChangeLog.pre-2-8
View File

@ -1,3 +1,32 @@
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/linux-fb/gdkcolor-fb.c, gdk/nanox/gdkmain-nanox.c,
gdk/win32/gdkcolor-win32.c, gdk/win32/gdkwin32id.c,
gdk/x11/gdkcolor-x11.c, gdk/x11/gdkvisual-x11.c, gdk/x11/gdkxid.c,
gtk/gtkgc.c, gtk/gtkrc.c, gtk/gtktext.c: GCompareFunc ->
GEqualFunc where applicable.
* gdk/linux-fb/gdkpango-fb.c: pango_font_description_compare ->
pango_font_description_equal as changed in pango.
* gdk/nanox/gdkmain-nanox.c: gdk_xid_compare -> gdk_xid_equal.
* gdk/win32/gdkcolor-win32.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/win32/gdkwin32id.c: gdk_handle_compare -> gdk_handle_equal.
* gdk/x11/gdkcolor-x11.c: gdk_colormap_cmp -> gdk_colormap_equal.
* gdk/x11/gdkvisual-x11.c: gdk_visual_compare -> gdk_visual_equal.
* gdk/x11/gdkxid.c: gdk_xid_compare -> gdk_xid_equal.
* gtk/gtkgc.c: gtk_gc_key_compare -> gtk_gc_key_equal and
gtk_gc_drawable_compare -> gtk_gc_drawable_equal.
* gtk/gtkrc.c: gtk_rc_style_compare -> gtk_rc_style_equal and
gtk_rc_styles_compare -> gtk_rc_styles_equal.
2000-11-12 Havoc Pennington <hp@pobox.com>
* demos/gtk-demo/Makefile.am (democodedir): change demo install

2
gdk/linux-fb/gdkcolor-fb.c
View File

@ -133,7 +133,7 @@ gdk_colormap_new (GdkVisual *visual,
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
(GEqualFunc) gdk_color_equal);
if (private_cmap)
{

4
gdk/linux-fb/gdkpango-fb.c
View File

@ -143,7 +143,7 @@ pango_fb_font_map_load_font(PangoFontMap *fontmap,
{
fl = g_ptr_array_index(fbfm->all_descs, i);
/* Can't use pango_font_description_compare() because it checks ->size as well */
/* Can't use pango_font_description_equal() because it checks ->size as well */
if(!g_strcasecmp(desc->family_name, fl->desc.family_name)
&& desc->style == fl->desc.style
&& desc->weight == fl->desc.weight
@ -276,7 +276,7 @@ pango_fb_font_map_init(PangoFBFontMap *fontmap)
};
int i;
fontmap->all_fonts = g_hash_table_new(pango_font_description_hash, (GCompareFunc)pango_font_description_compare);
fontmap->all_fonts = g_hash_table_new(pango_font_description_hash, (GEqualFunc)pango_font_description_equal);
fontmap->all_descs = g_ptr_array_new();
for(i = 0; font_dirs[i]; i++)
list_fonts(fontmap, NULL, fontmap->all_descs, font_dirs[i]);

16
gdk/nanox/gdkmain-nanox.c
View File

@ -168,9 +168,9 @@ gdk_keyval_convert_case (guint symbol,
}
*/
static guint gdk_xid_hash (guint *xid);
static gint gdk_xid_compare (guint *a,
guint *b);
static guint gdk_xid_hash (guint *xid);
static gboolean gdk_xid_equal (guint *a,
guint *b);
static GHashTable *xid_ht = NULL;
@ -184,7 +184,7 @@ gdk_xid_table_insert (guint *xid,
if (!xid_ht)
xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GCompareFunc) gdk_xid_compare);
(GEqualFunc) gdk_xid_equal);
g_hash_table_insert (xid_ht, xid, data);
}
@ -194,7 +194,7 @@ gdk_xid_table_remove (guint xid)
{
if (!xid_ht)
xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GCompareFunc) gdk_xid_compare);
(GEqualFunc) gdk_xid_equal);
g_hash_table_remove (xid_ht, &xid);
}
@ -217,9 +217,9 @@ gdk_xid_hash (guint *xid)
return *xid;
}
static gint
gdk_xid_compare (guint *a,
guint *b)
static gboolean
gdk_xid_equal (guint *a,
guint *b)
{
return (*a == *b);
}

38
gdk/win32/gdkcolor-win32.c
View File

@ -34,20 +34,20 @@
#include "gdkcolor.h"
#include "gdkprivate-win32.h"
static void free_colormap (Colormap colormap);
static void free_colormap (Colormap colormap);
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
const gchar *available);
static void gdk_colormap_add (GdkColormap *cmap);
static void gdk_colormap_remove (GdkColormap *cmap);
static guint gdk_colormap_hash (Colormap *cmap);
static gint gdk_colormap_cmp (Colormap *a,
Colormap *b);
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
const gchar *available);
static void gdk_colormap_add (GdkColormap *cmap);
static void gdk_colormap_remove (GdkColormap *cmap);
static guint gdk_colormap_hash (Colormap *cmap);
static gboolean gdk_colormap_equal (Colormap *a,
Colormap *b);
static void gdk_colormap_init (GdkColormap *colormap);
static void gdk_colormap_class_init (GdkColormapClass *klass);
static void gdk_colormap_finalize (GObject *object);
static void gdk_colormap_init (GdkColormap *colormap);
static void gdk_colormap_class_init (GdkColormapClass *klass);
static void gdk_colormap_finalize (GObject *object);
static gpointer parent_class = NULL;
@ -1421,7 +1421,7 @@ gdk_colormap_new (GdkVisual *visual,
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
(GEqualFunc) gdk_color_equal);
private->private_val = private_cmap;
private->xcolormap = create_colormap (gdk_root_window, xvisual, private_cmap);
@ -1543,7 +1543,7 @@ gdk_colormap_get_system (void)
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
(GEqualFunc) gdk_color_equal);
gdk_colormap_sync (colormap, TRUE);
}
@ -2231,7 +2231,7 @@ gdk_colormap_add (GdkColormap *cmap)
if (!colormap_hash)
colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
(GCompareFunc) gdk_colormap_cmp);
(GEqualFunc) gdk_colormap_equal);
private = GDK_COLORMAP_PRIVATE_DATA (cmap);
@ -2245,7 +2245,7 @@ gdk_colormap_remove (GdkColormap *cmap)
if (!colormap_hash)
colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
(GCompareFunc) gdk_colormap_cmp);
(GEqualFunc) gdk_colormap_equal);
private = GDK_COLORMAP_PRIVATE_DATA (cmap);
@ -2258,9 +2258,9 @@ gdk_colormap_hash (Colormap *cmap)
return (guint) *cmap;
}
static gint
gdk_colormap_cmp (Colormap *a,
Colormap *b)
static gboolean
gdk_colormap_equal (Colormap *a,
Colormap *b)
{
return (*a == *b);
}

6
gdk/win32/gdkwin32id.c
View File

@ -37,7 +37,7 @@ gdk_handle_hash (HANDLE *handle)
}
static gint
gdk_handle_compare (HANDLE *a,
gdk_handle_equal (HANDLE *a,
HANDLE *b)
{
return (*a == *b);
@ -51,7 +51,7 @@ gdk_win32_handle_table_insert (HANDLE *handle,
if (!handle_ht)
handle_ht = g_hash_table_new ((GHashFunc) gdk_handle_hash,
(GCompareFunc) gdk_handle_compare);
(GEqualFunc) gdk_handle_equal);
g_hash_table_insert (handle_ht, handle, data);
}
@ -61,7 +61,7 @@ gdk_win32_handle_table_remove (HANDLE handle)
{
if (!handle_ht)
handle_ht = g_hash_table_new ((GHashFunc) gdk_handle_hash,
(GCompareFunc) gdk_handle_compare);
(GEqualFunc) gdk_handle_equal);
g_hash_table_remove (handle_ht, &handle);
}

30
gdk/x11/gdkcolor-x11.c
View File

@ -31,14 +31,14 @@
#define GDK_COLORMAP_PRIVATE_DATA(cmap) ((GdkColormapPrivateX11 *) GDK_COLORMAP (cmap)->windowing_data)
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
const gchar *available);
static void gdk_colormap_add (GdkColormap *cmap);
static void gdk_colormap_remove (GdkColormap *cmap);
static guint gdk_colormap_hash (Colormap *cmap);
static gint gdk_colormap_cmp (Colormap *a,
Colormap *b);
static gint gdk_colormap_match_color (GdkColormap *cmap,
GdkColor *color,
const gchar *available);
static void gdk_colormap_add (GdkColormap *cmap);
static void gdk_colormap_remove (GdkColormap *cmap);
static guint gdk_colormap_hash (Colormap *cmap);
static gboolean gdk_colormap_equal (Colormap *a,
Colormap *b);
static void gdk_colormap_init (GdkColormap *colormap);
static void gdk_colormap_class_init (GdkColormapClass *klass);
@ -156,7 +156,7 @@ gdk_colormap_new (GdkVisual *visual,
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
(GEqualFunc) gdk_color_equal);
private->private_val = private_cmap;
private->xcolormap = XCreateColormap (private->xdisplay, gdk_root_window,
@ -304,7 +304,7 @@ gdk_colormap_get_system (void)
colormap->colors = g_new (GdkColor, colormap->size);
private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash,
(GCompareFunc) gdk_color_equal);
(GEqualFunc) gdk_color_equal);
gdk_colormap_sync (colormap, TRUE);
}
@ -1101,7 +1101,7 @@ gdk_colormap_add (GdkColormap *cmap)
if (!colormap_hash)
colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
(GCompareFunc) gdk_colormap_cmp);
(GEqualFunc) gdk_colormap_equal);
private = GDK_COLORMAP_PRIVATE_DATA (cmap);
@ -1115,7 +1115,7 @@ gdk_colormap_remove (GdkColormap *cmap)
if (!colormap_hash)
colormap_hash = g_hash_table_new ((GHashFunc) gdk_colormap_hash,
(GCompareFunc) gdk_colormap_cmp);
(GEqualFunc) gdk_colormap_equal);
private = GDK_COLORMAP_PRIVATE_DATA (cmap);
@ -1128,9 +1128,9 @@ gdk_colormap_hash (Colormap *cmap)
return *cmap;
}
static gint
gdk_colormap_cmp (Colormap *a,
Colormap *b)
static gboolean
gdk_colormap_equal (Colormap *a,
Colormap *b)
{
return (*a == *b);
}

22
gdk/x11/gdkvisual-x11.c
View File

@ -31,13 +31,13 @@
#include "gdkprivate-x11.h"
#include "gdkinternals.h"
static void gdk_visual_add (GdkVisual *visual);
static void gdk_visual_decompose_mask (gulong mask,
gint *shift,
gint *prec);
static guint gdk_visual_hash (Visual *key);
static gint gdk_visual_compare (Visual *a,
Visual *b);
static void gdk_visual_add (GdkVisual *visual);
static void gdk_visual_decompose_mask (gulong mask,
gint *shift,
gint *prec);
static guint gdk_visual_hash (Visual *key);
static gboolean gdk_visual_equal (Visual *a,
Visual *b);
static GdkVisualPrivate *system_visual;
@ -411,7 +411,7 @@ gdk_visual_add (GdkVisual *visual)
if (!visual_hash)
visual_hash = g_hash_table_new ((GHashFunc) gdk_visual_hash,
(GCompareFunc) gdk_visual_compare);
(GEqualFunc) gdk_visual_equal);
private = (GdkVisualPrivate*) visual;
@ -445,9 +445,9 @@ gdk_visual_hash (Visual *key)
return key->visualid;
}
static gint
gdk_visual_compare (Visual *a,
Visual *b)
static gboolean
gdk_visual_equal (Visual *a,
Visual *b)
{
return (a->visualid == b->visualid);
}

16
gdk/x11/gdkxid.c
View File

@ -27,9 +27,9 @@
#include "gdkprivate-x11.h"
#include <stdio.h>
static guint gdk_xid_hash (XID *xid);
static gint gdk_xid_compare (XID *a,
XID *b);
static guint gdk_xid_hash (XID *xid);
static gboolean gdk_xid_equal (XID *a,
XID *b);
static GHashTable *xid_ht = NULL;
@ -43,7 +43,7 @@ gdk_xid_table_insert (XID *xid,
if (!xid_ht)
xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GCompareFunc) gdk_xid_compare);
(GEqualFunc) gdk_xid_equal);
g_hash_table_insert (xid_ht, xid, data);
}
@ -53,7 +53,7 @@ gdk_xid_table_remove (XID xid)
{
if (!xid_ht)
xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
(GCompareFunc) gdk_xid_compare);
(GEqualFunc) gdk_xid_equal);
g_hash_table_remove (xid_ht, &xid);
}
@ -76,9 +76,9 @@ gdk_xid_hash (XID *xid)
return *xid;
}
static gint
gdk_xid_compare (XID *a,
XID *b)
static gboolean
gdk_xid_equal (XID *a,
XID *b)
{
return (*a == *b);
}

20
gtk/gtkgc.c
View File

@ -52,10 +52,10 @@ static gpointer gtk_gc_new (gpointer key);
static void gtk_gc_destroy (gpointer value);
static guint gtk_gc_key_hash (gpointer key);
static guint gtk_gc_value_hash (gpointer value);
static gint gtk_gc_key_compare (gpointer a,
static gint gtk_gc_key_equal (gpointer a,
gpointer b);
static guint gtk_gc_drawable_hash (GtkGCDrawable *d);
static gint gtk_gc_drawable_compare (GtkGCDrawable *a,
static gint gtk_gc_drawable_equal (GtkGCDrawable *a,
GtkGCDrawable *b);
@ -109,10 +109,10 @@ gtk_gc_init (void)
(GCacheDestroyFunc) gtk_gc_key_destroy,
(GHashFunc) gtk_gc_key_hash,
(GHashFunc) gtk_gc_value_hash,
(GCompareFunc) gtk_gc_key_compare);
(GEqualFunc) gtk_gc_key_equal);
gc_drawable_ht = g_hash_table_new ((GHashFunc) gtk_gc_drawable_hash,
(GCompareFunc) gtk_gc_drawable_compare);
(GEqualFunc) gtk_gc_drawable_equal);
}
static GtkGCKey*
@ -259,9 +259,9 @@ gtk_gc_value_hash (gpointer value)
return (gulong) value;
}
static gint
gtk_gc_key_compare (gpointer a,
gpointer b)
static gboolean
gtk_gc_key_equal (gpointer a,
gpointer b)
{
GtkGCKey *akey;
GtkGCKey *bkey;
@ -384,9 +384,9 @@ gtk_gc_drawable_hash (GtkGCDrawable *d)
return d->depth;
}
static gint
gtk_gc_drawable_compare (GtkGCDrawable *a,
GtkGCDrawable *b)
static gboolean
gtk_gc_drawable_equal (GtkGCDrawable *a,
GtkGCDrawable *b)
{
return (a->depth == b->depth);
}

20
gtk/gtkrc.c
View File

@ -81,10 +81,10 @@ struct _GtkRcFile
};
static guint gtk_rc_style_hash (const char *name);
static gint gtk_rc_style_compare (const char *a,
static gboolean gtk_rc_style_equal (const char *a,
const char *b);
static guint gtk_rc_styles_hash (const GSList *rc_styles);
static gint gtk_rc_styles_compare (const GSList *a,
static gboolean gtk_rc_styles_equal (const GSList *a,
const GSList *b);
static GtkRcStyle* gtk_rc_style_find (const char *name);
static GSList * gtk_rc_styles_match (GSList *rc_styles,
@ -1388,9 +1388,9 @@ gtk_rc_styles_hash (const GSList *rc_styles)
return result;
}
static gint
gtk_rc_styles_compare (const GSList *a,
const GSList *b)
static gboolean
gtk_rc_styles_equal (const GSList *a,
const GSList *b)
{
while (a && b)
{
@ -1415,9 +1415,9 @@ gtk_rc_style_hash (const char *name)
return result;
}
static gint
gtk_rc_style_compare (const char *a,
const char *b)
static gboolean
gtk_rc_style_equal (const char *a,
const char *b)
{
return (strcmp (a, b) == 0);
}
@ -1458,7 +1458,7 @@ gtk_rc_init_style (GSList *rc_styles)
if (!realized_style_ht)
realized_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_styles_hash,
(GCompareFunc) gtk_rc_styles_compare);
(GEqualFunc) gtk_rc_styles_equal);
style = g_hash_table_lookup (realized_style_ht, rc_styles);
@ -1817,7 +1817,7 @@ gtk_rc_parse_style (GScanner *scanner)
{
if (!rc_style_ht)
rc_style_ht = g_hash_table_new ((GHashFunc) gtk_rc_style_hash,
(GCompareFunc) gtk_rc_style_compare);
(GEqualFunc) gtk_rc_style_equal);
g_hash_table_insert (rc_style_ht, rc_style->name, rc_style);
}

2
gtk/gtktext.c
View File

@ -2923,7 +2923,7 @@ get_text_font (GdkFont* gfont)
gint i;
if (!font_cache_table)
font_cache_table = g_hash_table_new (font_hash, (GCompareFunc) gdk_font_equal);
font_cache_table = g_hash_table_new (font_hash, (GEqualFunc) gdk_font_equal);
tf = g_hash_table_lookup (font_cache_table, gfont);