summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@gtk.org>1998-06-09 23:18:11 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-06-09 23:18:11 +0000
commit2cabeeb1c3ec0c1a17c4c372191dbe64ce5987af (patch)
tree30c846619e032f4c47a2b4e70ff70b70988ec564 /gdk
parenta1fe6d0337f1f234a6ac3ece433be960d17a9578 (diff)
downloadgtk+-2cabeeb1c3ec0c1a17c4c372191dbe64ce5987af.tar.gz
Removed g_object_pointer_hash, which was just g_direct_hash.
Tue Jun 9 18:44:57 1998 Owen Taylor <otaylor@gtk.org> * gtk/gtkobject.c: Removed g_object_pointer_hash, which was just g_direct_hash. Mon May 25 19:54:20 1998 Owen Taylor <otaylor@gtk.org> * configure.in: x_libs=, not $x_libs=. Enough said. (Case only hit for --disable-xshm) Mon May 25 12:08:14 1998 Owen Taylor <otaylor@gtk.org> * configure.in (LDFLAGS): Add to $CFLAGS and $LDFLAGS when testing for X libraries, don't replace them. Because the user might have specified the path to the X libraries themself before running configure. * examples/**.c: Changed all gpointer * to gpointer Sat May 23 21:54:05 1998 Owen Taylor <otaylor@gtk.org> * configure.in (LDFLAGS): Bomb out with a moderately helpful message if detection of X libraries fails. Sat May 23 18:57:06 1998 Owen Taylor <otaylor@gtk.org> [ Combination of: gtk-rrh-980412-0.patch (Raja R Harinath <harinath@cs.umn.edu>) gtk-jbuhler-980516-0 (Jeremy Buhler <jbuhler@cs.washington.edu>) ] * gdk/gdk.h gdk/gdkcc.c gdk/gdkfont.c gtk/gtkmain.c gtk/gtksignal.c gtk/gtktext.c: Fixups for warnings from adding const to type of GHashFunc, GCompareFunc * gtk/gtkcombo.c (gtk_combo_entry_key_press): Minor style/ ansi-warnings fixups. Tue Jun 9 17:47:33 1998 Owen Taylor <otaylor@gtk.org> * glib.h: Remove #error - HP/UX. Sat May 23 19:00:01 1998 Owen Taylor <otaylor@gtk.org> [ Combination of: gtk-rrh-980412-0.patch (Raja R Harinath <harinath@cs.umn.edu>) gtk-jbuhler-980516-0 (Jeremy Buhler <jbuhler@cs.washington.edu>) ] * glib.h ghash.c gstring.c gdataset.c gutils.c: - Added new typedef g_const_pointer; expunged all incorrect uses of 'const gpointer'. - Fixed up warnings that that created, - Changed GHashFunc and GCompareFunc to take g_const_pointer arguments. (Necessary, but will cause warnings in existing code until fixed) - Added other new const in harmless positions.
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.h6
-rw-r--r--gdk/gdkcc.c12
-rw-r--r--gdk/gdkfont.c18
-rw-r--r--gdk/x11/gdkcc-x11.c12
-rw-r--r--gdk/x11/gdkfont-x11.c18
5 files changed, 33 insertions, 33 deletions
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 72ff69822b..3d4d956924 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -490,9 +490,9 @@ GdkFont* gdk_font_load (const gchar *font_name);
GdkFont* gdk_fontset_load (gchar *fontset_name);
GdkFont* gdk_font_ref (GdkFont *font);
void gdk_font_unref (GdkFont *font);
-gint gdk_font_id (GdkFont *font);
-gint gdk_font_equal (GdkFont *fonta,
- GdkFont *fontb);
+gint gdk_font_id (const GdkFont *font);
+gint gdk_font_equal (const GdkFont *fonta,
+ const GdkFont *fontb);
gint gdk_string_width (GdkFont *font,
const gchar *string);
gint gdk_text_width (GdkFont *font,
diff --git a/gdk/gdkcc.c b/gdk/gdkcc.c
index ed9444aed4..0465094972 100644
--- a/gdk/gdkcc.c
+++ b/gdk/gdkcc.c
@@ -66,19 +66,19 @@
static guint
-hash_color (gpointer key)
+hash_color (g_const_pointer key)
{
- GdkColor *color = key;
+ const GdkColor *color = key;
return (color->red * 33023 + color->green * 30013 + color->blue * 27011);
}
static gint
-compare_colors (gpointer a,
- gpointer b)
+compare_colors (g_const_pointer a,
+ g_const_pointer b)
{
- GdkColor *aa = a;
- GdkColor *bb = b;
+ const GdkColor *aa = a;
+ const GdkColor *bb = b;
return ((aa->red == bb->red) && (aa->green == bb->green) && (aa->blue == bb->blue));
}
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index 888afbf69e..352de2003f 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -149,13 +149,13 @@ gdk_font_unref (GdkFont *font)
}
gint
-gdk_font_id (GdkFont *font)
+gdk_font_id (const GdkFont *font)
{
- GdkFontPrivate *font_private;
+ const GdkFontPrivate *font_private;
g_return_val_if_fail (font != NULL, 0);
- font_private = (GdkFontPrivate*) font;
+ font_private = (const GdkFontPrivate*) font;
if (font->type == GDK_FONT_FONT)
{
@@ -168,17 +168,17 @@ gdk_font_id (GdkFont *font)
}
gint
-gdk_font_equal (GdkFont *fonta,
- GdkFont *fontb)
+gdk_font_equal (const GdkFont *fonta,
+ const GdkFont *fontb)
{
- GdkFontPrivate *privatea;
- GdkFontPrivate *privateb;
+ const GdkFontPrivate *privatea;
+ const GdkFontPrivate *privateb;
g_return_val_if_fail (fonta != NULL, FALSE);
g_return_val_if_fail (fontb != NULL, FALSE);
- privatea = (GdkFontPrivate*) fonta;
- privateb = (GdkFontPrivate*) fontb;
+ privatea = (const GdkFontPrivate*) fonta;
+ privateb = (const GdkFontPrivate*) fontb;
if (fonta->type == GDK_FONT_FONT && fontb->type == GDK_FONT_FONT)
{
diff --git a/gdk/x11/gdkcc-x11.c b/gdk/x11/gdkcc-x11.c
index ed9444aed4..0465094972 100644
--- a/gdk/x11/gdkcc-x11.c
+++ b/gdk/x11/gdkcc-x11.c
@@ -66,19 +66,19 @@
static guint
-hash_color (gpointer key)
+hash_color (g_const_pointer key)
{
- GdkColor *color = key;
+ const GdkColor *color = key;
return (color->red * 33023 + color->green * 30013 + color->blue * 27011);
}
static gint
-compare_colors (gpointer a,
- gpointer b)
+compare_colors (g_const_pointer a,
+ g_const_pointer b)
{
- GdkColor *aa = a;
- GdkColor *bb = b;
+ const GdkColor *aa = a;
+ const GdkColor *bb = b;
return ((aa->red == bb->red) && (aa->green == bb->green) && (aa->blue == bb->blue));
}
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 888afbf69e..352de2003f 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -149,13 +149,13 @@ gdk_font_unref (GdkFont *font)
}
gint
-gdk_font_id (GdkFont *font)
+gdk_font_id (const GdkFont *font)
{
- GdkFontPrivate *font_private;
+ const GdkFontPrivate *font_private;
g_return_val_if_fail (font != NULL, 0);
- font_private = (GdkFontPrivate*) font;
+ font_private = (const GdkFontPrivate*) font;
if (font->type == GDK_FONT_FONT)
{
@@ -168,17 +168,17 @@ gdk_font_id (GdkFont *font)
}
gint
-gdk_font_equal (GdkFont *fonta,
- GdkFont *fontb)
+gdk_font_equal (const GdkFont *fonta,
+ const GdkFont *fontb)
{
- GdkFontPrivate *privatea;
- GdkFontPrivate *privateb;
+ const GdkFontPrivate *privatea;
+ const GdkFontPrivate *privateb;
g_return_val_if_fail (fonta != NULL, FALSE);
g_return_val_if_fail (fontb != NULL, FALSE);
- privatea = (GdkFontPrivate*) fonta;
- privateb = (GdkFontPrivate*) fontb;
+ privatea = (const GdkFontPrivate*) fonta;
+ privateb = (const GdkFontPrivate*) fontb;
if (fonta->type == GDK_FONT_FONT && fontb->type == GDK_FONT_FONT)
{