summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog21
-rw-r--r--ChangeLog.pre-2-021
-rw-r--r--ChangeLog.pre-2-1021
-rw-r--r--ChangeLog.pre-2-221
-rw-r--r--ChangeLog.pre-2-421
-rw-r--r--ChangeLog.pre-2-621
-rw-r--r--ChangeLog.pre-2-821
-rw-r--r--gdk/gdkdnd.c3
-rw-r--r--gdk/gdkinputcommon.h8
-rw-r--r--gdk/gdkregion.c2
-rw-r--r--gdk/x11/gdkdnd-x11.c3
-rw-r--r--gdk/x11/gdkinput-x11.c8
-rw-r--r--gdk/x11/gdkregion-x11.c2
-rw-r--r--glib/ChangeLog7
-rw-r--r--glib/glib.h2
-rw-r--r--glib/gutils.c6
-rw-r--r--gtk/gtkcombo.c2
-rw-r--r--gtk/gtkmain.c2
-rw-r--r--gtk/gtknotebook.h4
-rw-r--r--gtk/gtkstatusbar.c2
-rw-r--r--gtk/gtktree.c7
-rw-r--r--gtk/testgtk.c19
-rw-r--r--tests/testgtk.c19
23 files changed, 219 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index dc873376a..647a37f97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dc873376a..647a37f97 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,24 @@
+Mon Mar 2 17:48:38 1998 Owen Taylor <owt1@cornell.edu>
+
+ Miscellaneous minor fixes to remove ANSI C incompatibilities
+
+ * gdk/gdkregion.c gtk/gtkclist.c: fix // comments
+
+ * gdk/gdkdnd.c gdk/gdkinputcommon.h: change types of
+ some arguments to ANSI functions
+
+ * gtk/gtkcombo.c gtk/gtktree.c: fix casts of function pointers
+ to void *
+
+ * gtk/gtkmain.c: An actual bug! (in deprecated gtk_input_add_interp)
+
+ * gtk/gtknotebook.h: Bitfields must be gint or guint. (and should
+ be guint)
+
+ * gtk/gtkstatusbar.c: trailing ';'
+
+ * gtk/testgtk.c: GList where there should have been GSList
+
Mon Mar 2 12:26:59 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.c: Changed 'entry != NULL' to 'editable != NULL'
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 4f38fd94f..28900bbf5 100644
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -86,6 +86,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
GdkWindow *mypix, *opix;
GdkPoint *myhotspot;
gint itmp;
+ guint masktmp;
Window wtmp;
if(x == -2 && y == -2) /* Hide the cursors */
@@ -97,7 +98,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
if(x == -1 && y == -1) /* We're supposed to find it out for ourselves */
XQueryPointer(gdk_display, gdk_root_window,
- &wtmp, &wtmp, &x, &y, &itmp, &itmp, &itmp);
+ &wtmp, &wtmp, &x, &y, &itmp, &itmp, &masktmp);
if(drag_ok)
{
diff --git a/gdk/gdkinputcommon.h b/gdk/gdkinputcommon.h
index 7f0ab8c37..80e9d0ded 100644
--- a/gdk/gdkinputcommon.h
+++ b/gdk/gdkinputcommon.h
@@ -72,9 +72,11 @@ gdk_input_get_root_relative_geometry(Display *dpy, Window w, int *x_ret, int *y_
{
Window root,parent;
Window *children;
- int nchildren;
- int x,y,width,height;
- int xc,yc,widthc,heightc,border_widthc,depthc;
+ guint nchildren;
+ gint x,y;
+ guint width, height;
+ gint xc,yc;
+ guint widthc,heightc,border_widthc,depthc;
XQueryTree(dpy,w,&root,&parent,&children,&nchildren);
if (children) XFree(children);
diff --git a/gdk/gdkregion.c b/gdk/gdkregion.c
index 50b4b5539..8863d62e6 100644
--- a/gdk/gdkregion.c
+++ b/gdk/gdkregion.c
@@ -115,7 +115,7 @@ gdk_region_rect_in (GdkRegion *region,
case RectanglePart: return GDK_OVERLAP_RECTANGLE_PART;
}
- return GDK_OVERLAP_RECTANGLE_OUT; // what else ?
+ return GDK_OVERLAP_RECTANGLE_OUT; /*what else ? */
}
void
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 4f38fd94f..28900bbf5 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -86,6 +86,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
GdkWindow *mypix, *opix;
GdkPoint *myhotspot;
gint itmp;
+ guint masktmp;
Window wtmp;
if(x == -2 && y == -2) /* Hide the cursors */
@@ -97,7 +98,7 @@ gdk_dnd_display_drag_cursor(gint x, gint y, gboolean drag_ok,
if(x == -1 && y == -1) /* We're supposed to find it out for ourselves */
XQueryPointer(gdk_display, gdk_root_window,
- &wtmp, &wtmp, &x, &y, &itmp, &itmp, &itmp);
+ &wtmp, &wtmp, &x, &y, &itmp, &itmp, &masktmp);
if(drag_ok)
{
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 7f0ab8c37..80e9d0ded 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -72,9 +72,11 @@ gdk_input_get_root_relative_geometry(Display *dpy, Window w, int *x_ret, int *y_
{
Window root,parent;
Window *children;
- int nchildren;
- int x,y,width,height;
- int xc,yc,widthc,heightc,border_widthc,depthc;
+ guint nchildren;
+ gint x,y;
+ guint width, height;
+ gint xc,yc;
+ guint widthc,heightc,border_widthc,depthc;
XQueryTree(dpy,w,&root,&parent,&children,&nchildren);
if (children) XFree(children);
diff --git a/gdk/x11/gdkregion-x11.c b/gdk/x11/gdkregion-x11.c
index 50b4b5539..8863d62e6 100644
--- a/gdk/x11/gdkregion-x11.c
+++ b/gdk/x11/gdkregion-x11.c
@@ -115,7 +115,7 @@ gdk_region_rect_in (GdkRegion *region,
case RectanglePart: return GDK_OVERLAP_RECTANGLE_PART;
}
- return GDK_OVERLAP_RECTANGLE_OUT; // what else ?
+ return GDK_OVERLAP_RECTANGLE_OUT; /*what else ? */
}
void
diff --git a/glib/ChangeLog b/glib/ChangeLog
index ee714bc9c..03a804298 100644
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 2 17:51:18 1998 Owen Taylor <owt1@cornell.edu>
+
+ * glib.h gutils.c : changed g_strcasecmp
+ to take gchar* not guchar*
+
+ * testglib.c: Remove trailing ; after functions
+
Sun Mar 1 19:04:40 1998 Owen Taylor <owt1@cornell.edu>
* glib.h gstring.c: Added g_string_insert[_c]()
diff --git a/glib/glib.h b/glib/glib.h
index c3728cf2b..6db8b58cd 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -660,7 +660,7 @@ gchar* g_strconcat (const gchar *string1, ...); /* NULL terminated */
gdouble g_strtod (const gchar *nptr, gchar **endptr);
gchar* g_strerror (gint errnum);
gchar* g_strsignal (gint signum);
-gint g_strcasecmp (const guchar *s1, const guchar *s2);
+gint g_strcasecmp (const gchar *s1, const gchar *s2);
gint g_snprintf (gchar *str, gulong n, gchar const *fmt, ...);
diff --git a/glib/gutils.c b/glib/gutils.c
index 9e665ba6b..2db0c13b8 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -845,7 +845,7 @@ g_snprintf (gchar *str,
}
gint
-g_strcasecmp (const guchar *s1, const guchar *s2)
+g_strcasecmp (const gchar *s1, const gchar *s2)
{
#ifdef HAVE_STRCASECMP
return strcasecmp(s1, s2);
@@ -854,12 +854,12 @@ g_strcasecmp (const guchar *s1, const guchar *s2)
while (*s1 && *s2)
{
- c1 = tolower(*s1++); c2 = tolower(*s2++);
+ c1 = tolower((guchar)(*s1++)); c2 = tolower((guchar)(*s2++));
if (c1 != c2)
return (c1 - c2);
}
- return ((gint) *s1 - (gint) *s2);
+ return (((gint)(guchar) *s1) - ((gint)(guchar) *s2));
#endif
}
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index fb86774d1..8e2203809 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -152,7 +152,7 @@ gtk_combo_find (GtkCombo * combo)
if (combo->case_sensitive)
string_compare = strcmp;
else
- string_compare = (void*) g_strcasecmp;
+ string_compare = g_strcasecmp;
text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
clist = GTK_LIST (combo->list)->children;
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index a3bf76a17..3dc5645cd 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1140,7 +1140,7 @@ gtk_input_add_interp (gint source,
gpointer data,
GtkDestroyNotify destroy)
{
- return gdk_input_add_full (source, condition, NULL, callback, data);
+ return gtk_input_add_full (source, condition, NULL, callback, data, destroy);
}
void
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index e02881b1a..060509245 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -76,8 +76,8 @@ struct _GtkNotebookPage
GtkWidget *child;
GtkWidget *tab_label;
GtkWidget *menu_label;
- gint8 default_menu : 1;
- gint8 default_tab : 1;
+ guint default_menu : 1;
+ guint default_tab : 1;
GtkRequisition requisition;
GtkAllocation allocation;
};
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index d8fd06bde..770b67104 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -68,7 +68,7 @@ gtk_statusbar_get_type ()
}
return statusbar_type;
-};
+}
static void
gtk_statusbar_marshal_text_p (GtkObject *object,
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index e753a9a44..317a4749c 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -149,7 +149,8 @@ gtk_tree_class_init (GtkTreeClass *class)
widget_class->size_allocate = gtk_tree_size_allocate;
container_class->add = gtk_tree_add;
- container_class->remove = (void *) gtk_tree_remove_item;
+ container_class->remove =
+ (void (*)(GtkContainer *, GtkWidget *)) gtk_tree_remove_item;
container_class->foreach = gtk_tree_foreach;
class->selection_changed = NULL;
@@ -619,8 +620,8 @@ gtk_tree_realize (GtkWidget *widget)
}
void
-gtk_tree_remove_item (GtkTree *container,
- GtkWidget *widget)
+gtk_tree_remove_item (GtkTree *container,
+ GtkWidget *widget)
{
GList *item_list;
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index b83dd7ba5..9ed009eea 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -886,7 +886,7 @@ static void
statusbar_dump_stack (GtkWidget *button,
GtkStatusbar *statusbar)
{
- GList *list;
+ GSList *list;
for (list = statusbar->messages; list; list = list->next)
{
@@ -3251,6 +3251,15 @@ create_rulers ()
}
+static void
+text_toggle_editable (GtkWidget *checkbutton,
+ GtkWidget *text)
+{
+ gtk_text_set_editable(GTK_TEXT(text),
+ GTK_TOGGLE_BUTTON(checkbutton)->active);
+}
+
+
/*
* GtkText
*/
@@ -3261,6 +3270,7 @@ create_text ()
GtkWidget *box1;
GtkWidget *box2;
GtkWidget *button;
+ GtkWidget *editable_check;
GtkWidget *separator;
GtkWidget *table;
GtkWidget *hscrollbar;
@@ -3364,6 +3374,13 @@ create_text ()
gtk_text_thaw (GTK_TEXT (text));
+ editable_check = gtk_check_button_new_with_label("Editable");
+ gtk_box_pack_start (GTK_BOX (box2), editable_check, TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT(editable_check), "toggled",
+ GTK_SIGNAL_FUNC(text_toggle_editable), text);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(editable_check), TRUE);
+ gtk_widget_show (editable_check);
+
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index b83dd7ba5..9ed009eea 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -886,7 +886,7 @@ static void
statusbar_dump_stack (GtkWidget *button,
GtkStatusbar *statusbar)
{
- GList *list;
+ GSList *list;
for (list = statusbar->messages; list; list = list->next)
{
@@ -3251,6 +3251,15 @@ create_rulers ()
}
+static void
+text_toggle_editable (GtkWidget *checkbutton,
+ GtkWidget *text)
+{
+ gtk_text_set_editable(GTK_TEXT(text),
+ GTK_TOGGLE_BUTTON(checkbutton)->active);
+}
+
+
/*
* GtkText
*/
@@ -3261,6 +3270,7 @@ create_text ()
GtkWidget *box1;
GtkWidget *box2;
GtkWidget *button;
+ GtkWidget *editable_check;
GtkWidget *separator;
GtkWidget *table;
GtkWidget *hscrollbar;
@@ -3364,6 +3374,13 @@ create_text ()
gtk_text_thaw (GTK_TEXT (text));
+ editable_check = gtk_check_button_new_with_label("Editable");
+ gtk_box_pack_start (GTK_BOX (box2), editable_check, TRUE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT(editable_check), "toggled",
+ GTK_SIGNAL_FUNC(text_toggle_editable), text);
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(editable_check), TRUE);
+ gtk_widget_show (editable_check);
+
separator = gtk_hseparator_new ();
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
gtk_widget_show (separator);
View Lorry Controller Status