diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-12-05 20:53:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-12-05 20:53:30 +0000 |
| commit | a4b2a6a857cea010ed0c2a16097bae61ad31c510 (patch) | |
| tree | 4ef3004d65f13bada7cef4be302f8dd6550e242d /gtk | |
| parent | 691576eb4087b87608d65d349e6f3bba608c74d5 (diff) | |
| download | gtk+-a4b2a6a857cea010ed0c2a16097bae61ad31c510.tar.gz | |
Fix link to PNG home, remove reference to fribidi.
Tue Dec 5 15:49:31 2000 Owen Taylor <otaylor@redhat.com>
* INSTALL: Fix link to PNG home, remove reference
to fribidi.
* gdk/x11/gdkevents-x11.c: Fix up for new GMain API.
* gdk/win32/gdkevents-win32.c: Fix up for new GMain API. (Not
tested.)
* gtk/gtkcheckmenuitem.c: Permanently turn on
always_show_toggle.
* gtk/gtkclist.c (gtk_clist_get_pixtext): Allow mask to
be NULL. (Vladimir Klebanov, #26545)
* gtk/gtkspinbutton.c (gtk_spin_button_insert_text): Fix
some signed/unsigned comparison problems. (#6510,
David Kaelbling)
* gtk/gtkwidget.[ch] (gtk_widget_is_ancestor): Change
return type to boolean (Oskar Liljeblad, #18648)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkcheckmenuitem.c | 6 | ||||
| -rw-r--r-- | gtk/gtkclist.c | 3 | ||||
| -rw-r--r-- | gtk/gtkspinbutton.c | 6 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.h | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 5c4560fde4..728b634439 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -162,8 +162,10 @@ gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, { g_return_if_fail (menu_item != NULL); g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item)); - + +#if 0 menu_item->always_show_toggle = always != FALSE; +#endif } void @@ -176,7 +178,7 @@ static void gtk_check_menu_item_init (GtkCheckMenuItem *check_menu_item) { check_menu_item->active = FALSE; - check_menu_item->always_show_toggle = FALSE; + check_menu_item->always_show_toggle = TRUE; } static gint diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 8af4a01eba..8d83c47f1b 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2364,7 +2364,8 @@ gtk_clist_get_pixtext (GtkCList *clist, *pixmap = GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap; /* mask can be NULL */ - *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask; + if (mask) + *mask = GTK_CELL_PIXTEXT (clist_row->cell[column])->mask; return 1; } diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index ce9a5356f6..2c5d6abf0c 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1209,7 +1209,7 @@ gtk_spin_button_insert_text (GtkEntry *entry, gint i; GdkWChar pos_sign; GdkWChar neg_sign; - guint entry_length; + gint entry_length; entry_length = entry->text_length; @@ -1244,7 +1244,7 @@ gtk_spin_button_insert_text (GtkEntry *entry, } if (dotpos > -1 && *position > dotpos && - spin->digits - entry_length + (gint)spin->digits - entry_length + dotpos - new_text_length + 1 < 0) return; @@ -1260,7 +1260,7 @@ gtk_spin_button_insert_text (GtkEntry *entry, { if (!spin->digits || dotpos > -1 || (new_text_length - 1 - i + entry_length - - *position > spin->digits)) + - *position > (gint)spin->digits)) return; dotpos = *position + i; } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f873fc7eba..3f7b4c9de3 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4294,7 +4294,7 @@ gtk_widget_get_pointer (GtkWidget *widget, * results: *****************************************/ -gint +gboolean gtk_widget_is_ancestor (GtkWidget *widget, GtkWidget *ancestor) { diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index fb76563f60..0d86f3fe75 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -546,7 +546,7 @@ void gtk_widget_get_pointer (GtkWidget *widget, gint *x, gint *y); -gint gtk_widget_is_ancestor (GtkWidget *widget, +gboolean gtk_widget_is_ancestor (GtkWidget *widget, GtkWidget *ancestor); /* Hide widget and return TRUE. |