Commit 52658cd3 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

Applied patch from Nils Barth (bug # 51041) to replace "gint" with

2001-03-16  Havoc Pennington  <hp@redhat.com>

	* Applied patch from Nils Barth (bug # 51041) to
	replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
	in various places.
parent e7a21a2e
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
2001-03-16 Havoc Pennington <hp@redhat.com>
* Applied patch from Nils Barth (bug # 51041) to
replace "gint" with "gboolean" and 0/1 with TRUE/FALSE
in various places.
2001-03-15 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
......
......@@ -30,6 +30,7 @@ GtkCellRenderer
</para>
@parent:
@can_activate:
@visible:
@xalign:
@yalign:
......@@ -43,6 +44,9 @@ GtkCellRenderer
@cell:
@widget:
@cell_area:
@x_offset:
@y_offset:
@width:
@height:
......
......@@ -64,7 +64,7 @@ static GMemChunk *accel_entries_mem_chunk = NULL;
/* --- functions --- */
static gint
static gboolean
gtk_accel_entries_equal (gconstpointer a,
gconstpointer b)
{
......
......@@ -39,21 +39,21 @@ enum {
ARG_ACCEL_WIDGET
};
static void gtk_accel_label_class_init (GtkAccelLabelClass *klass);
static void gtk_accel_label_init (GtkAccelLabel *accel_label);
static void gtk_accel_label_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_accel_label_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_accel_label_destroy (GtkObject *object);
static void gtk_accel_label_finalize (GObject *object);
static void gtk_accel_label_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static gint gtk_accel_label_expose_event (GtkWidget *widget,
GdkEventExpose *event);
static gboolean gtk_accel_label_refetch_idle (GtkAccelLabel *accel_label);
static void gtk_accel_label_class_init (GtkAccelLabelClass *klass);
static void gtk_accel_label_init (GtkAccelLabel *accel_label);
static void gtk_accel_label_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_accel_label_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_accel_label_destroy (GtkObject *object);
static void gtk_accel_label_finalize (GObject *object);
static void gtk_accel_label_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static gboolean gtk_accel_label_expose_event (GtkWidget *widget,
GdkEventExpose *event);
static gboolean gtk_accel_label_refetch_idle (GtkAccelLabel *accel_label);
static GtkAccelLabelClass *accel_label_class = NULL;
static GtkLabelClass *parent_class = NULL;
......@@ -249,7 +249,7 @@ gtk_accel_label_size_request (GtkWidget *widget,
g_object_unref (G_OBJECT (layout));
}
static gint
static gboolean
gtk_accel_label_expose_event (GtkWidget *widget,
GdkEventExpose *event)
{
......
......@@ -166,7 +166,7 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
gfloat lower,
gfloat upper)
{
gint need_emission;
gboolean need_emission;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
......
......@@ -450,7 +450,7 @@ gtk_arg_reset (GtkArg *arg)
arg->type = GTK_TYPE_INVALID;
}
gint
gboolean
gtk_arg_info_equal (gconstpointer arg_info_1,
gconstpointer arg_info_2)
{
......
......@@ -92,7 +92,7 @@ GtkArg* gtk_args_query (GtkType class_type,
guint32 **arg_flags,
guint *n_args_p);
gchar* gtk_arg_name_strip_type (const gchar *arg_name);
gint gtk_arg_info_equal (gconstpointer arg_info_1,
gboolean gtk_arg_info_equal (gconstpointer arg_info_1,
gconstpointer arg_info_2);
guint gtk_arg_info_hash (gconstpointer arg_info);
void gtk_arg_to_valueloc (GtkArg *arg,
......
......@@ -221,7 +221,7 @@ gtk_arrow_set (GtkArrow *arrow,
}
static gint
static gboolean
gtk_arrow_expose (GtkWidget *widget,
GdkEventExpose *event)
{
......
......@@ -709,7 +709,7 @@ gtk_button_paint (GtkWidget *widget,
}
}
static gint
static gboolean
gtk_button_expose (GtkWidget *widget,
GdkEventExpose *event)
{
......@@ -731,7 +731,7 @@ gtk_button_expose (GtkWidget *widget,
return FALSE;
}
static gint
static gboolean
gtk_button_button_press (GtkWidget *widget,
GdkEventButton *event)
{
......@@ -755,7 +755,7 @@ gtk_button_button_press (GtkWidget *widget,
return TRUE;
}
static gint
static gboolean
gtk_button_button_release (GtkWidget *widget,
GdkEventButton *event)
{
......@@ -791,7 +791,7 @@ gtk_button_key_release (GtkWidget *widget,
return FALSE;
}
static gint
static gboolean
gtk_button_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
......@@ -815,7 +815,7 @@ gtk_button_enter_notify (GtkWidget *widget,
return FALSE;
}
static gint
static gboolean
gtk_button_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
......
......@@ -1449,7 +1449,7 @@ gtk_calendar_draw_focus (GtkWidget *widget)
}
}
static gint
static gboolean
gtk_calendar_expose (GtkWidget *widget,
GdkEventExpose *event)
{
......@@ -2161,7 +2161,7 @@ gtk_calendar_display_options (GtkCalendar *calendar,
}
gint
gboolean
gtk_calendar_select_month (GtkCalendar *calendar,
guint month,
guint year)
......@@ -2238,7 +2238,7 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
}
}
gint
gboolean
gtk_calendar_mark_day (GtkCalendar *calendar,
guint day)
{
......@@ -2258,7 +2258,7 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
return TRUE;
}
gint
gboolean
gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day)
{
......@@ -2298,7 +2298,7 @@ gtk_calendar_get_date (GtkCalendar *calendar,
*day = calendar->selected_day;
}
static gint
static gboolean
gtk_calendar_button_press (GtkWidget *widget,
GdkEventButton *event)
{
......@@ -2337,7 +2337,7 @@ gtk_calendar_button_press (GtkWidget *widget,
return FALSE;
}
static gint
static gboolean
gtk_calendar_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
......@@ -2379,7 +2379,7 @@ gtk_calendar_motion_notify (GtkWidget *widget,
return TRUE;
}
static gint
static gboolean
gtk_calendar_enter_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
......@@ -2419,7 +2419,7 @@ gtk_calendar_enter_notify (GtkWidget *widget,
return TRUE;
}
static gint
static gboolean
gtk_calendar_leave_notify (GtkWidget *widget,
GdkEventCrossing *event)
{
......@@ -2625,7 +2625,7 @@ gtk_calendar_destroy (GtkObject *object)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static gint
static gboolean
gtk_calendar_key_press (GtkWidget *widget,
GdkEventKey *event)
{
......
......@@ -110,15 +110,15 @@ struct _GtkCalendarClass
GtkType gtk_calendar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_calendar_new (void);
gint gtk_calendar_select_month (GtkCalendar *calendar,
gboolean gtk_calendar_select_month (GtkCalendar *calendar,
guint month,
guint year);
void gtk_calendar_select_day (GtkCalendar *calendar,
guint day);
gint gtk_calendar_mark_day (GtkCalendar *calendar,
gboolean gtk_calendar_mark_day (GtkCalendar *calendar,
guint day);
gint gtk_calendar_unmark_day (GtkCalendar *calendar,
gboolean gtk_calendar_unmark_day (GtkCalendar *calendar,
guint day);
void gtk_calendar_clear_marks (GtkCalendar *calendar);
......
......@@ -724,11 +724,11 @@ gtk_combo_init (GtkCombo * combo)
GtkWidget *event_box;
GdkCursor *cursor;
combo->case_sensitive = 0;
combo->value_in_list = 0;
combo->ok_if_empty = 1;
combo->use_arrows = 1;
combo->use_arrows_always = 0;
combo->case_sensitive = FALSE;
combo->value_in_list = FALSE;
combo->ok_if_empty = TRUE;
combo->use_arrows = TRUE;
combo->use_arrows_always = FALSE;
combo->entry = gtk_entry_new ();
combo->button = gtk_button_new ();
combo->current_button = 0;
......@@ -849,7 +849,7 @@ gtk_combo_new (void)
}
void
gtk_combo_set_value_in_list (GtkCombo * combo, gint val, gint ok_if_empty)
gtk_combo_set_value_in_list (GtkCombo * combo, gboolean val, gboolean ok_if_empty)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
......@@ -859,7 +859,7 @@ gtk_combo_set_value_in_list (GtkCombo * combo, gint val, gint ok_if_empty)
}
void
gtk_combo_set_case_sensitive (GtkCombo * combo, gint val)
gtk_combo_set_case_sensitive (GtkCombo * combo, gboolean val)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
......@@ -869,7 +869,7 @@ gtk_combo_set_case_sensitive (GtkCombo * combo, gint val)
}
void
gtk_combo_set_use_arrows (GtkCombo * combo, gint val)
gtk_combo_set_use_arrows (GtkCombo * combo, gboolean val)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
......@@ -879,13 +879,13 @@ gtk_combo_set_use_arrows (GtkCombo * combo, gint val)
}
void
gtk_combo_set_use_arrows_always (GtkCombo * combo, gint val)
gtk_combo_set_use_arrows_always (GtkCombo * combo, gboolean val)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->use_arrows_always = val;
combo->use_arrows = 1;
combo->use_arrows = TRUE;
g_object_notify (G_OBJECT (combo), "enable_arrows");
g_object_notify (G_OBJECT (combo), "enable_arrows_always");
}
......
......@@ -76,17 +76,17 @@ GtkType gtk_combo_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_combo_new (void);
/* the text in the entry must be or not be in the list */
void gtk_combo_set_value_in_list (GtkCombo* combo,
gint val,
gint ok_if_empty);
/* set/unset arrows working for changing the value (can be annoying */
gboolean val,
gboolean ok_if_empty);
/* set/unset arrows working for changing the value (can be annoying) */
void gtk_combo_set_use_arrows (GtkCombo* combo,
gint val);
gboolean val);
/* up/down arrows change value if current value not in list */
void gtk_combo_set_use_arrows_always (GtkCombo* combo,
gint val);
gboolean val);
/* perform case-sensitive compares */
void gtk_combo_set_case_sensitive (GtkCombo* combo,
gint val);
gboolean val);
/* call this function on an item if it isn't a label or you
want it to have a different value to be displayed in the entry */
void gtk_combo_set_item_string (GtkCombo* combo,
......
......@@ -4884,54 +4884,54 @@ gtk_ctree_node_get_cell_type (GtkCTree *ctree,
return GTK_CTREE_ROW (node)->row.cell[column].type;
}
gint
gboolean
gtk_ctree_node_get_text (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
gchar **text)
{
g_return_val_if_fail (ctree != NULL, 0);
g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
g_return_val_if_fail (node != NULL, 0);
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CLIST (ctree)->columns)
return 0;
return FALSE;
if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_TEXT)
return 0;
return FALSE;
if (text)
*text = GTK_CELL_TEXT (GTK_CTREE_ROW (node)->row.cell[column])->text;
return 1;
return TRUE;
}
gint
gboolean
gtk_ctree_node_get_pixmap (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
g_return_val_if_fail (ctree != NULL, 0);
g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
g_return_val_if_fail (node != NULL, 0);
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CLIST (ctree)->columns)
return 0;
return FALSE;
if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_PIXMAP)
return 0;
return FALSE;
if (pixmap)
*pixmap = GTK_CELL_PIXMAP (GTK_CTREE_ROW(node)->row.cell[column])->pixmap;
if (mask)
*mask = GTK_CELL_PIXMAP (GTK_CTREE_ROW (node)->row.cell[column])->mask;
return 1;
return TRUE;
}
gint
gboolean
gtk_ctree_node_get_pixtext (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
......@@ -4940,15 +4940,15 @@ gtk_ctree_node_get_pixtext (GtkCTree *ctree,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
g_return_val_if_fail (ctree != NULL, 0);
g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
g_return_val_if_fail (node != NULL, 0);
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
if (column < 0 || column >= GTK_CLIST (ctree)->columns)
return 0;
return FALSE;
if (GTK_CTREE_ROW (node)->row.cell[column].type != GTK_CELL_PIXTEXT)
return 0;
return FALSE;
if (text)
*text = GTK_CELL_PIXTEXT (GTK_CTREE_ROW (node)->row.cell[column])->text;
......@@ -4961,10 +4961,10 @@ gtk_ctree_node_get_pixtext (GtkCTree *ctree,
if (mask)
*mask = GTK_CELL_PIXTEXT (GTK_CTREE_ROW (node)->row.cell[column])->mask;
return 1;
return TRUE;
}
gint
gboolean
gtk_ctree_get_node_info (GtkCTree *ctree,
GtkCTreeNode *node,
gchar **text,
......@@ -4976,9 +4976,9 @@ gtk_ctree_get_node_info (GtkCTree *ctree,
gboolean *is_leaf,
gboolean *expanded)
{
g_return_val_if_fail (ctree != NULL, 0);
g_return_val_if_fail (GTK_IS_CTREE (ctree), 0);
g_return_val_if_fail (node != NULL, 0);
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
g_return_val_if_fail (node != NULL, FALSE);
if (text)
*text = GTK_CELL_PIXTEXT
......@@ -4999,7 +4999,7 @@ gtk_ctree_get_node_info (GtkCTree *ctree,
if (expanded)
*expanded = GTK_CTREE_ROW (node)->expanded;
return 1;
return TRUE;
}
void
......
......@@ -342,23 +342,23 @@ gboolean gtk_ctree_node_get_selectable (GtkCTree *ctree,
GtkCellType gtk_ctree_node_get_cell_type (GtkCTree *ctree,
GtkCTreeNode *node,
gint column);
gint gtk_ctree_node_get_text (GtkCTree *ctree,
gboolean gtk_ctree_node_get_text (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
gchar **text);
gint gtk_ctree_node_get_pixmap (GtkCTree *ctree,
gboolean gtk_ctree_node_get_pixmap (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
GdkPixmap **pixmap,
GdkBitmap **mask);
gint gtk_ctree_node_get_pixtext (GtkCTree *ctree,
gboolean gtk_ctree_node_get_pixtext (GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
gchar **text,
guint8 *spacing,
GdkPixmap **pixmap,
GdkBitmap **mask);
gint gtk_ctree_get_node_info (GtkCTree *ctree,
gboolean gtk_ctree_get_node_info (GtkCTree *ctree,
GtkCTreeNode *node,
gchar **text,
guint8 *spacing,
......
......@@ -717,7 +717,7 @@ gtk_events_pending (void)
return result;
}
gint
gboolean
gtk_main_iteration (void)
{
GDK_THREADS_LEAVE ();
......@@ -730,7 +730,7 @@ gtk_main_iteration (void)
return TRUE;
}
gint
gboolean
gtk_main_iteration_do (gboolean blocking)
{
GDK_THREADS_LEAVE ();
......@@ -950,13 +950,13 @@ gtk_main_do_event (GdkEvent *event)
g_list_free_1 (tmp_list);
}
gint
gboolean
gtk_true (void)
{
return TRUE;
}
gint
gboolean
gtk_false (void)
{
return FALSE;
......
......@@ -116,17 +116,17 @@ gint gtk_events_pending (void);
* we expose it mainly to allow filtering of events between
* GDK and GTK+.
*/
void gtk_main_do_event (GdkEvent *event);
void gtk_main_do_event (GdkEvent *event);
void gtk_main (void);
guint gtk_main_level (void);
void gtk_main_quit (void);
gint gtk_main_iteration (void);
void gtk_main (void);
guint gtk_main_level (void);
void gtk_main_quit (void);
gboolean gtk_main_iteration (void);
/* gtk_main_iteration() calls gtk_main_iteration_do(TRUE) */
gint gtk_main_iteration_do (gboolean blocking);
gboolean gtk_main_iteration_do (gboolean blocking);
gint gtk_true (void) G_GNUC_CONST;
gint gtk_false (void) G_GNUC_CONST;
gboolean gtk_true (void) G_GNUC_CONST;
gboolean gtk_false (void) G_GNUC_CONST;
void gtk_grab_add (GtkWidget *widget);
GtkWidget* gtk_grab_get_current (void);
......
......@@ -300,14 +300,14 @@ gtk_menu_item_set_placement (GtkMenuItem *menu_item,
void
gtk_menu_item_configure (GtkMenuItem *menu_item,
gint show_toggle_indicator,
gint show_submenu_indicator)
gboolean show_toggle_indicator,
gboolean show_submenu_indicator)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
menu_item->show_toggle_indicator = (show_toggle_indicator == TRUE);
menu_item->show_submenu_indicator = (show_submenu_indicator == TRUE);
menu_item->show_toggle_indicator = show_toggle_indicator;
menu_item->show_submenu_indicator = show_submenu_indicator;
}
void
......
......@@ -96,8 +96,8 @@ void gtk_menu_item_remove_submenu (GtkMenuItem *menu_item);
void gtk_menu_item_set_placement (GtkMenuItem *menu_item,
GtkSubmenuPlacement placement);
void gtk_menu_item_configure (GtkMenuItem *menu_item,
gint show_toggle_indicator,
gint show_submenu_indicator);
gboolean show_toggle_indicator,
gboolean show_submenu_indicator);
void gtk_menu_item_select (GtkMenuItem *menu_item);
void gtk_menu_item_deselect (GtkMenuItem *menu_item);
void gtk_menu_item_activate (GtkMenuItem *menu_item);
......
......@@ -245,7 +245,7 @@ gtk_pixmap_expose (GtkWidget *widget,
}
void
gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap, guint build)
gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap, gboolean build)
{
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
......
......@@ -78,7 +78,7 @@ void gtk_pixmap_get (GtkPixmap *pixmap,
GdkBitmap **mask);
void gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap,
guint build);
gboolean build);
#ifdef __cplusplus
......
......@@ -53,7 +53,7 @@ struct _GtkPlug
GtkWindow window;
GdkWindow *socket_window;
gint same_app;
gboolean same_app;
};
struct _GtkPlugClass
......
......@@ -171,10 +171,10 @@ gtk_progress_get_arg (GtkObject *object,
switch (arg_id)
{
case ARG_ACTIVITY_MODE:
GTK_VALUE_BOOL (*arg) = (progress->activity_mode != 0);
GTK_VALUE_BOOL (*arg) = (progress->activity_mode != FALSE);
break;
case ARG_SHOW_TEXT:
GTK_VALUE_BOOL (*arg) = (progress->show_text != 0);
GTK_VALUE_BOOL (*arg) = (progress->show_text != FALSE);
break;
case ARG_TEXT_XALIGN:
GTK_VALUE_FLOAT (*arg) = progress->x_align;
......@@ -591,7 +591,7 @@ gtk_progress_get_value (GtkProgress *progress)
void
gtk_progress_set_show_text (GtkProgress *progress,
gint show_text)
gboolean show_text)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
......@@ -677,14 +677,14 @@ gtk_progress_get_text_from_value (GtkProgress *progress,
void
gtk_progress_set_activity_mode (GtkProgress *progress,
guint activity_mode)
gboolean activity_mode)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (progress->activity_mode != (activity_mode != 0))
if (progress->activity_mode != (activity_mode != FALSE))
{
progress->activity_mode = (activity_mode != 0);
progress->activity_mode = (activity_mode != FALSE);
if (progress->activity_mode)
GTK_PROGRESS_GET_CLASS (progress)->act_mode_enter (progress);
......
......@@ -84,7 +84,7 @@ struct _GtkProgressClass
GtkType gtk_progress_get_type (void) G_GNUC_CONST;
void gtk_progress_set_show_text (GtkProgress *progress,
gint show_text);
gboolean show_text);
void gtk_progress_set_text_alignment (GtkProgress *progress,
gfloat x_align,
gfloat y_align);
......@@ -102,7 +102,7 @@ void gtk_progress_set_value (GtkProgress *progress,
gfloat value);
gfloat gtk_progress_get_value (GtkProgress *progress);
void gtk_progress_set_activity_mode (GtkProgress *progress,
guint activity_mode);
gboolean activity_mode);
gchar* gtk_progress_get_current_text (GtkProgress *progress);