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

Patch from Matthias Clasen to remove remove all instances of

Browse Source 
Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/*.c: Patch from Matthias Clasen to remove remove
	all instances of g_return_if_fail (foo != NULL); that are
	immediately before a g_return_if_fail (GTK_IS_FOO (foo));
	since the second check catches the NULL anyways.
This commit is contained in:
Owen Taylor 2001-07-18 23:39:26 +00:00 committed by Owen Taylor
parent b613a74cb2
commit 4e2b60ac4d
105 changed files with 52 additions and 1180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Wed Jul 18 19:28:46 2001 Owen Taylor <otaylor@redhat.com>
* gtk/*.c: Patch from Matthias Clasen to remove remove
all instances of g_return_if_fail (foo != NULL); that are
immediately before a g_return_if_fail (GTK_IS_FOO (foo));
since the second check catches the NULL anyways.
Wed Jul 18 18:23:05 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c gtk/gtkentry.c gtk/gtkmenu.c gtk/gtktextview.c

9
gtk/gtkaccelgroup.c
View File

@ -183,7 +183,6 @@ gtk_accel_group_attach (GtkAccelGroup *accel_group,
GSList *slist;
g_return_if_fail (accel_group != NULL);
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (g_slist_find (accel_group->attach_objects, object) == NULL);
@ -206,7 +205,6 @@ gtk_accel_group_detach (GtkAccelGroup *accel_group,
GSList *slist;
g_return_if_fail (accel_group != NULL);
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (g_slist_find (accel_group->attach_objects, object) != NULL);
@ -276,7 +274,6 @@ gtk_accel_groups_activate (GtkObject *object,
guint accel_key,
GdkModifierType accel_mods)
{
g_return_val_if_fail (object != NULL, FALSE);
g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE);
if (gtk_accelerator_valid (accel_key, accel_mods))
@ -349,7 +346,6 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
GtkAccelEntry *entry;
g_return_if_fail (accel_group != NULL);
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (accel_signal != NULL);
@ -511,7 +507,6 @@ gtk_accel_group_handle_add (GtkObject *object,
{
GtkAccelEntry *entry;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (accel_group != NULL);
g_return_if_fail (accel_signal_id > 0);
@ -557,7 +552,6 @@ gtk_accel_group_remove (GtkAccelGroup *accel_group,
guint remove_accelerator_signal_id = 0;
g_return_if_fail (accel_group != NULL);
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
/* check for required signals in the objects branch
@ -612,7 +606,6 @@ gtk_accel_group_handle_remove (GtkObject *object,
{
GtkAccelEntry *entry;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (accel_group != NULL);
@ -688,7 +681,6 @@ gtk_accel_group_create_remove (GtkType class_type,
GSList*
gtk_accel_groups_from_object (GtkObject *object)
{
g_return_val_if_fail (object != NULL, NULL);
g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
return gtk_object_get_data_by_id (object, accel_groups_key_id);
@ -697,7 +689,6 @@ gtk_accel_groups_from_object (GtkObject *object)
GSList*
gtk_accel_group_entries_from_object (GtkObject *object)
{
g_return_val_if_fail (object != NULL, NULL);
g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
return gtk_object_get_data_by_id (object, accel_entries_key_id);

7
gtk/gtkaccellabel.c
View File

@ -202,7 +202,6 @@ gtk_accel_label_destroy (GtkObject *object)
{
GtkAccelLabel *accel_label;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_ACCEL_LABEL (object));
accel_label = GTK_ACCEL_LABEL (object);
@ -247,7 +246,6 @@ gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label)
guint
gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label)
{
g_return_val_if_fail (accel_label != NULL, 0);
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), 0);
return (accel_label->accel_string_width +
@ -262,7 +260,6 @@ gtk_accel_label_size_request (GtkWidget *widget,
PangoLayout *layout;
gint width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ACCEL_LABEL (widget));
g_return_if_fail (requisition != NULL);
@ -286,7 +283,6 @@ gtk_accel_label_expose_event (GtkWidget *widget,
GtkAccelLabel *accel_label;
PangoLayout *layout;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -343,7 +339,6 @@ gtk_accel_label_expose_event (GtkWidget *widget,
static void
gtk_accel_label_queue_refetch (GtkAccelLabel *accel_label)
{
g_return_if_fail (accel_label != NULL);
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_label->queue_id == 0)
@ -356,7 +351,6 @@ void
gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label,
GtkWidget *accel_widget)
{
g_return_if_fail (accel_label != NULL);
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_widget != NULL)
g_return_if_fail (GTK_IS_WIDGET (accel_widget));
@ -409,7 +403,6 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
{
GtkAccelLabelClass *class;
g_return_val_if_fail (accel_label != NULL, FALSE);
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), FALSE);
class = GTK_ACCEL_LABEL_GET_CLASS (accel_label);

1
gtk/gtkaccessible.c
View File

@ -71,7 +71,6 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
{
GtkAccessibleClass *class;
g_return_if_fail (accessible != NULL);
g_return_if_fail (GTK_IS_ACCESSIBLE (accessible));
class = GTK_ACCESSIBLE_GET_CLASS (accessible);

4
gtk/gtkadjustment.c
View File

@ -147,7 +147,6 @@ void
gtk_adjustment_set_value (GtkAdjustment *adjustment,
gdouble value)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
value = CLAMP (value, adjustment->lower, adjustment->upper);
@ -163,7 +162,6 @@ gtk_adjustment_set_value (GtkAdjustment *adjustment,
void
gtk_adjustment_changed (GtkAdjustment *adjustment)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[CHANGED]);
@ -172,7 +170,6 @@ gtk_adjustment_changed (GtkAdjustment *adjustment)
void
gtk_adjustment_value_changed (GtkAdjustment *adjustment)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[VALUE_CHANGED]);
@ -185,7 +182,6 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
{
gboolean need_emission;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
lower = CLAMP (lower, adjustment->lower, adjustment->upper);

3
gtk/gtkalignment.c
View File

@ -249,7 +249,6 @@ gtk_alignment_set (GtkAlignment *alignment,
{
gboolean values_changed = FALSE;
g_return_if_fail (alignment != NULL);
g_return_if_fail (GTK_IS_ALIGNMENT (alignment));
xalign = CLAMP (xalign, 0.0, 1.0);
@ -297,7 +296,6 @@ gtk_alignment_size_request (GtkWidget *widget,
GtkAlignment *alignment;
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ALIGNMENT (widget));
g_return_if_fail (requisition != NULL);
@ -329,7 +327,6 @@ gtk_alignment_size_allocate (GtkWidget *widget,
gint width, height;
gint x, y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ALIGNMENT (widget));
g_return_if_fail (allocation != NULL);

1
gtk/gtkarrow.c
View File

@ -196,7 +196,6 @@ gtk_arrow_set (GtkArrow *arrow,
{
gboolean changed = FALSE;
g_return_if_fail (arrow != NULL);
g_return_if_fail (GTK_IS_ARROW (arrow));
if ((GtkArrowType) arrow->arrow_type != arrow_type)

1
gtk/gtkaspectframe.c
View File

@ -243,7 +243,6 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
{
gboolean needs_resize = FALSE;
g_return_if_fail (aspect_frame != NULL);
g_return_if_fail (GTK_IS_ASPECT_FRAME (aspect_frame));
xalign = CLAMP (xalign, 0.0, 1.0);

1
gtk/gtkbbox.c
View File

@ -395,7 +395,6 @@ _gtk_button_box_child_requisition (GtkWidget *widget,
gint ipad_x;
gint ipad_y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BUTTON_BOX (widget));
bbox = GTK_BUTTON_BOX (widget);

7
gtk/gtkbin.c
View File

@ -115,7 +115,6 @@ gtk_bin_map (GtkWidget *widget)
{
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BIN (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -135,7 +134,6 @@ gtk_bin_unmap (GtkWidget *widget)
{
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BIN (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -154,9 +152,7 @@ gtk_bin_add (GtkContainer *container,
{
GtkBin *bin;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BIN (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
bin = GTK_BIN (container);
@ -195,9 +191,7 @@ gtk_bin_remove (GtkContainer *container,
GtkBin *bin;
gboolean widget_was_visible;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BIN (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
bin = GTK_BIN (container);
@ -223,7 +217,6 @@ gtk_bin_forall (GtkContainer *container,
{
GtkBin *bin;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BIN (container));
g_return_if_fail (callback != NULL);

14
gtk/gtkbox.c
View File

@ -360,7 +360,6 @@ gtk_box_pack_start (GtkBox *box,
{
GtkBoxChild *child_info;
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
g_return_if_fail (child->parent == NULL);
@ -406,7 +405,6 @@ gtk_box_pack_end (GtkBox *box,
{
GtkBoxChild *child_info;
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
g_return_if_fail (child->parent == NULL);
@ -447,7 +445,6 @@ void
gtk_box_pack_start_defaults (GtkBox *box,
GtkWidget *child)
{
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
@ -458,7 +455,6 @@ void
gtk_box_pack_end_defaults (GtkBox *box,
GtkWidget *child)
{
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
@ -469,7 +465,6 @@ void
gtk_box_set_homogeneous (GtkBox *box,
gboolean homogeneous)
{
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
if ((homogeneous ? TRUE : FALSE) != box->homogeneous)
@ -501,7 +496,6 @@ void
gtk_box_set_spacing (GtkBox *box,
gint spacing)
{
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
if (spacing != box->spacing)
@ -535,7 +529,6 @@ gtk_box_reorder_child (GtkBox *box,
{
GList *list;
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
@ -603,7 +596,6 @@ gtk_box_query_child_packing (GtkBox *box,
GList *list;
GtkBoxChild *child_info = NULL;
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
@ -641,7 +633,6 @@ gtk_box_set_child_packing (GtkBox *box,
GList *list;
GtkBoxChild *child_info = NULL;
g_return_if_fail (box != NULL);
g_return_if_fail (GTK_IS_BOX (box));
g_return_if_fail (child != NULL);
@ -683,7 +674,6 @@ gtk_box_map (GtkWidget *widget)
GtkBoxChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BOX (widget));
box = GTK_BOX (widget);
@ -708,7 +698,6 @@ gtk_box_unmap (GtkWidget *widget)
GtkBoxChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BOX (widget));
box = GTK_BOX (widget);
@ -730,7 +719,6 @@ static void
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BOX (container));
g_return_if_fail (widget != NULL);
@ -745,7 +733,6 @@ gtk_box_remove (GtkContainer *container,
GtkBoxChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BOX (container));
g_return_if_fail (widget != NULL);
@ -790,7 +777,6 @@ gtk_box_forall (GtkContainer *container,
GtkBoxChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_BOX (container));
g_return_if_fail (callback != NULL);

12
gtk/gtkbutton.c
View File

@ -431,7 +431,6 @@ gtk_button_new_with_mnemonic (const gchar *label)
void
gtk_button_pressed (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[PRESSED]);
@ -440,7 +439,6 @@ gtk_button_pressed (GtkButton *button)
void
gtk_button_released (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[RELEASED]);
@ -449,7 +447,6 @@ gtk_button_released (GtkButton *button)
void
gtk_button_clicked (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[CLICKED]);
@ -458,7 +455,6 @@ gtk_button_clicked (GtkButton *button)
void
gtk_button_enter (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[ENTER]);
@ -467,7 +463,6 @@ gtk_button_enter (GtkButton *button)
void
gtk_button_leave (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
gtk_signal_emit (GTK_OBJECT (button), button_signals[LEAVE]);
@ -477,7 +472,6 @@ void
gtk_button_set_relief (GtkButton *button,
GtkReliefStyle newrelief)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
button->relief = newrelief;
@ -502,7 +496,6 @@ gtk_button_realize (GtkWidget *widget)
gint attributes_mask;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_BUTTON (widget));
button = GTK_BUTTON (widget);
@ -946,7 +939,6 @@ gtk_real_button_pressed (GtkButton *button)
{
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
if (button->activate_timeout)
@ -968,7 +960,6 @@ gtk_real_button_released (GtkButton *button)
{
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
if (button->button_down)
@ -999,7 +990,6 @@ gtk_real_button_enter (GtkButton *button)
{
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
new_state = (button->button_down ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT);
@ -1017,7 +1007,6 @@ gtk_real_button_enter (GtkButton *button)
static void
gtk_real_button_leave (GtkButton *button)
{
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
if (button->activate_timeout)
@ -1047,7 +1036,6 @@ gtk_real_button_activate (GtkButton *button)
{
GtkWidget *widget = GTK_WIDGET (button);
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_BUTTON (button));
if (GTK_WIDGET_REALIZED (button) && !button->activate_timeout)

33
gtk/gtkcalendar.c
View File

@ -675,7 +675,6 @@ gtk_calendar_set_month_next (GtkCalendar *calendar)
{
gint month_len;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
@ -716,7 +715,6 @@ gtk_calendar_set_year_prev (GtkCalendar *calendar)
{
gint month_len;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
calendar->year--;
@ -747,7 +745,6 @@ gtk_calendar_set_year_next (GtkCalendar *calendar)
gint month_len;
GtkWidget *widget;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_WIDGET (calendar));
widget = GTK_WIDGET (calendar);
@ -831,7 +828,6 @@ gtk_calendar_realize_arrows (GtkWidget *widget)
gint attributes_mask;
gint i;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -898,7 +894,6 @@ gtk_calendar_realize_header (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -941,7 +936,6 @@ gtk_calendar_realize_day_names (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -985,7 +979,6 @@ gtk_calendar_realize_week_numbers (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -1028,7 +1021,6 @@ gtk_calendar_realize (GtkWidget *widget)
gint attributes_mask;
GdkGCValues values;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -1103,7 +1095,6 @@ gtk_calendar_unrealize (GtkWidget *widget)
GtkCalendarPrivateData *private_data;
gint i;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -1328,7 +1319,6 @@ gtk_calendar_size_allocate (GtkWidget *widget,
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (allocation != NULL);
@ -1425,7 +1415,6 @@ gtk_calendar_draw_focus (GtkWidget *widget)
gint width, height;
gint x, y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -1490,9 +1479,8 @@ gtk_calendar_paint (GtkWidget *widget,
GtkCalendar *calendar;
GtkCalendarPrivateData *private_data;
g_return_if_fail (widget != NULL);
g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
@ -1608,7 +1596,6 @@ gtk_calendar_paint_day_names (GtkWidget *widget)
PangoRectangle logical_rect;
GtkCalendarPrivateData *private_data;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
@ -1698,9 +1685,8 @@ gtk_calendar_paint_week_numbers (GtkWidget *widget)
PangoLayout *layout;
PangoRectangle logical_rect;
g_return_if_fail (widget != NULL);
g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
gc = calendar->gc;
@ -1781,7 +1767,6 @@ gtk_calendar_paint_day_num (GtkWidget *widget,
GtkCalendar *calendar;
gint r, c, row, col;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -1822,7 +1807,6 @@ gtk_calendar_paint_day (GtkWidget *widget,
PangoLayout *layout;
PangoRectangle logical_rect;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (row < 6);
g_return_if_fail (col < 7);
@ -1925,9 +1909,8 @@ gtk_calendar_paint_main (GtkWidget *widget)
GtkCalendarPrivateData *private_data;
gint row, col;
g_return_if_fail (widget != NULL);
g_return_if_fail (widget->window != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
g_return_if_fail (widget->window != NULL);
calendar = GTK_CALENDAR (widget);
private_data = GTK_CALENDAR_PRIVATE_DATA (widget);
@ -1959,7 +1942,6 @@ gtk_calendar_compute_days (GtkCalendar *calendar)
gint col;
gint day;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
year = calendar->year;
@ -2044,7 +2026,6 @@ gtk_calendar_display_options (GtkCalendar *calendar,
GtkWidget *widget;
gint i;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
widget = GTK_WIDGET (calendar);
@ -2187,7 +2168,6 @@ void
gtk_calendar_select_day (GtkCalendar *calendar,
guint day)
{
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
g_return_if_fail (day <= 31);
@ -2222,7 +2202,6 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
{
guint day;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
for (day = 0; day < 31; day++)
@ -2285,7 +2264,6 @@ gtk_calendar_get_date (GtkCalendar *calendar,
guint *month,
guint *day)
{
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
if (year)
@ -2519,7 +2497,6 @@ gtk_calendar_paint_arrow (GtkWidget *widget,
void
gtk_calendar_freeze (GtkCalendar *calendar)
{
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
GTK_CALENDAR_PRIVATE_DATA (calendar)->freeze_count++;
@ -2530,7 +2507,6 @@ gtk_calendar_thaw (GtkCalendar *calendar)
{
GtkCalendarPrivateData *private_data;
g_return_if_fail (calendar != NULL);
g_return_if_fail (GTK_IS_CALENDAR (calendar));
private_data = GTK_CALENDAR_PRIVATE_DATA (calendar);
@ -2563,7 +2539,6 @@ gtk_calendar_set_background (GtkWidget *widget)
GtkCalendarPrivateData *private_data;
gint i;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
calendar = GTK_CALENDAR (widget);
@ -2599,7 +2574,6 @@ static void
gtk_calendar_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
if (previous_style && GTK_WIDGET_REALIZED (widget))
@ -2610,7 +2584,6 @@ static void
gtk_calendar_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CALENDAR (widget));
gtk_calendar_set_background (widget);

4
gtk/gtkcheckbutton.c
View File

@ -230,7 +230,6 @@ gtk_check_button_size_request (GtkWidget *widget,
{
GtkToggleButton *toggle_button;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
g_return_if_fail (requisition != NULL);
@ -279,7 +278,6 @@ gtk_check_button_size_allocate (GtkWidget *widget,
GtkButton *button;
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CHECK_BUTTON (widget));
g_return_if_fail (allocation != NULL);
@ -365,7 +363,6 @@ gtk_check_button_draw_indicator (GtkCheckButton *check_button,
{
GtkCheckButtonClass *class;
g_return_if_fail (check_button != NULL);
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
class = GTK_CHECK_BUTTON_GET_CLASS (check_button);
@ -390,7 +387,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
gint indicator_spacing;
GdkWindow *window;
g_return_if_fail (check_button != NULL);
g_return_if_fail (GTK_IS_CHECK_BUTTON (check_button));
widget = GTK_WIDGET (check_button);

6
gtk/gtkcheckmenuitem.c
View File

@ -198,7 +198,6 @@ void
gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item,
gboolean is_active)
{
g_return_if_fail (check_menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
is_active = is_active != 0;
@ -231,7 +230,6 @@ static void
gtk_check_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
*requisition = CHECK_TOGGLE_SIZE;
@ -241,7 +239,6 @@ void
gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
gboolean always)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
#if 0
@ -330,7 +327,6 @@ gtk_check_menu_item_activate (GtkMenuItem *menu_item)
{
GtkCheckMenuItem *check_menu_item;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (menu_item));
check_menu_item = GTK_CHECK_MENU_ITEM (menu_item);
@ -344,7 +340,6 @@ static void
gtk_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
GdkRectangle *area)
{
g_return_if_fail (check_menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
g_return_if_fail (GTK_CHECK_MENU_ITEM_GET_CLASS (check_menu_item) != NULL);
@ -362,7 +357,6 @@ gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
gint width, height;
gint x, y;
g_return_if_fail (check_menu_item != NULL);
g_return_if_fail (GTK_IS_CHECK_MENU_ITEM (check_menu_item));
if (GTK_WIDGET_DRAWABLE (check_menu_item))

116
gtk/gtkclist.c
View File

@ -1158,7 +1158,6 @@ gtk_clist_set_hadjustment (GtkCList *clist,
{
GtkAdjustment *old_adjustment;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@ -1196,7 +1195,6 @@ gtk_clist_set_hadjustment (GtkCList *clist,
GtkAdjustment *
gtk_clist_get_hadjustment (GtkCList *clist)
{
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
return clist->hadjustment;
@ -1208,7 +1206,6 @@ gtk_clist_set_vadjustment (GtkCList *clist,
{
GtkAdjustment *old_adjustment;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@ -1246,7 +1243,6 @@ gtk_clist_set_vadjustment (GtkCList *clist,
GtkAdjustment *
gtk_clist_get_vadjustment (GtkCList *clist)
{
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
return clist->vadjustment;
@ -1267,7 +1263,6 @@ void
gtk_clist_set_shadow_type (GtkCList *clist,
GtkShadowType type)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
clist->shadow_type = type;
@ -1280,7 +1275,6 @@ void
gtk_clist_set_selection_mode (GtkCList *clist,
GtkSelectionMode mode)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (mode == clist->selection_mode)
@ -1312,7 +1306,6 @@ gtk_clist_set_selection_mode (GtkCList *clist,
void
gtk_clist_freeze (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
clist->freeze_count++;
@ -1321,7 +1314,6 @@ gtk_clist_freeze (GtkCList *clist)
void
gtk_clist_thaw (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (clist->freeze_count)
@ -1353,7 +1345,6 @@ gtk_clist_thaw (GtkCList *clist)
void
gtk_clist_column_titles_show (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (!GTK_CLIST_SHOW_TITLES(clist))
@ -1368,7 +1359,6 @@ gtk_clist_column_titles_show (GtkCList *clist)
void
gtk_clist_column_titles_hide (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (GTK_CLIST_SHOW_TITLES(clist))
@ -1384,7 +1374,6 @@ void
gtk_clist_column_title_active (GtkCList *clist,
gint column)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1409,7 +1398,6 @@ gtk_clist_column_title_passive (GtkCList *clist,
{
GtkButton *button;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1439,7 +1427,6 @@ gtk_clist_column_titles_active (GtkCList *clist)
{
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
for (i = 0; i < clist->columns; i++)
@ -1451,7 +1438,6 @@ gtk_clist_column_titles_passive (GtkCList *clist)
{
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
for (i = 0; i < clist->columns; i++)
@ -1468,7 +1454,6 @@ gtk_clist_set_column_title (GtkCList *clist,
GtkWidget *alignment = NULL;
GtkWidget *label;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1527,7 +1512,6 @@ gchar *
gtk_clist_get_column_title (GtkCList *clist,
gint column)
{
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
if (column < 0 || column >= clist->columns)
@ -1544,7 +1528,6 @@ gtk_clist_set_column_widget (GtkCList *clist,
gint new_button = 0;
GtkWidget *old_widget;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1583,7 +1566,6 @@ GtkWidget *
gtk_clist_get_column_widget (GtkCList *clist,
gint column)
{
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
if (column < 0 || column >= clist->columns)
@ -1602,7 +1584,6 @@ gtk_clist_set_column_justification (GtkCList *clist,
{
GtkWidget *alignment;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1648,7 +1629,6 @@ gtk_clist_set_column_visibility (GtkCList *clist,
gint column,
gboolean visible)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1688,7 +1668,6 @@ gtk_clist_set_column_resizeable (GtkCList *clist,
gint column,
gboolean resizeable)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1709,7 +1688,6 @@ gtk_clist_set_column_auto_resize (GtkCList *clist,
gint column,
gboolean auto_resize)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1740,7 +1718,6 @@ gtk_clist_columns_autosize (GtkCList *clist)
gint i;
gint width;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
gtk_clist_freeze (clist);
@ -1765,7 +1742,6 @@ gtk_clist_optimal_column_width (GtkCList *clist,
GList *list;
gint width;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_CLIST (clist), 0);
if (column < 0 || column >= clist->columns)
@ -1795,7 +1771,6 @@ gtk_clist_set_column_width (GtkCList *clist,
gint column,
gint width)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1810,7 +1785,6 @@ gtk_clist_set_column_min_width (GtkCList *clist,
gint column,
gint min_width)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1833,7 +1807,6 @@ gtk_clist_set_column_max_width (GtkCList *clist,
gint column,
gint max_width)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1917,7 +1890,6 @@ real_resize_column (GtkCList *clist,
gint column,
gint width)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -1945,7 +1917,6 @@ real_resize_column (GtkCList *clist,
static void
abort_column_resize (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (!GTK_CLIST_IN_DRAG(clist))
@ -2241,7 +2212,6 @@ gtk_clist_get_cell_type (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
if (row < 0 || row >= clist->rows)
@ -2262,7 +2232,6 @@ gtk_clist_set_text (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -2292,7 +2261,6 @@ gtk_clist_get_text (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
if (row < 0 || row >= clist->rows)
@ -2320,7 +2288,6 @@ gtk_clist_set_pixmap (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -2354,7 +2321,6 @@ gtk_clist_get_pixmap (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
if (row < 0 || row >= clist->rows)
@ -2388,7 +2354,6 @@ gtk_clist_set_pixtext (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -2422,7 +2387,6 @@ gtk_clist_get_pixtext (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
if (row < 0 || row >= clist->rows)
@ -2459,7 +2423,6 @@ gtk_clist_set_shift (GtkCList *clist,
GtkRequisition requisition = { 0 };
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -2502,7 +2465,6 @@ set_cell_contents (GtkCList *clist,
GdkPixmap *old_pixmap = NULL;
GdkBitmap *old_mask = NULL;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
g_return_if_fail (clist_row != NULL);
@ -2632,7 +2594,6 @@ cell_size_request (GtkCList *clist,
PangoLayout *layout;
PangoRectangle logical_rect;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
g_return_if_fail (requisition != NULL);
@ -2684,7 +2645,6 @@ gint
gtk_clist_prepend (GtkCList *clist,
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
g_return_val_if_fail (text != NULL, -1);
@ -2695,7 +2655,6 @@ gint
gtk_clist_append (GtkCList *clist,
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
g_return_val_if_fail (text != NULL, -1);
@ -2707,7 +2666,6 @@ gtk_clist_insert (GtkCList *clist,
gint row,
gchar *text[])
{
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
g_return_val_if_fail (text != NULL, -1);
@ -2727,7 +2685,6 @@ gtk_clist_remove (GtkCList *clist,
void
gtk_clist_clear (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
GTK_CLIST_GET_CLASS (clist)->clear (clist);
@ -2747,7 +2704,6 @@ real_insert_row (GtkCList *clist,
gint i;
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
g_return_val_if_fail (text != NULL, -1);
@ -2843,7 +2799,6 @@ real_remove_row (GtkCList *clist,
GList *list;
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
/* return if out of bounds */
@ -2908,7 +2863,6 @@ real_clear (GtkCList *clist)
GList *free_list;
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
/* free up the selection list */
@ -2967,7 +2921,6 @@ real_row_move (GtkCList *clist,
gint first, last;
gint d;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (GTK_CLIST_AUTO_SORT(clist))
@ -3044,7 +2997,6 @@ gtk_clist_moveto (GtkCList *clist,
gfloat row_align,
gfloat col_align)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < -1 || row >= clist->rows)
@ -3083,7 +3035,6 @@ gtk_clist_set_row_height (GtkCList *clist,
{
GtkWidget *widget;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
widget = GTK_WIDGET (clist);
@ -3132,7 +3083,6 @@ gtk_clist_set_row_data_full (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row > (clist->rows - 1))
@ -3153,7 +3103,6 @@ gtk_clist_get_row_data (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
if (row < 0 || row > (clist->rows - 1))
@ -3170,7 +3119,6 @@ gtk_clist_find_row_from_data (GtkCList *clist,
GList *list;
gint n;
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CLIST (clist), -1);
for (n = 0, list = clist->row_list; list; n++, list = list->next)
@ -3187,7 +3135,6 @@ gtk_clist_swap_rows (GtkCList *clist,
{
gint first, last;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
g_return_if_fail (row1 != row2);
@ -3210,7 +3157,6 @@ gtk_clist_row_move (GtkCList *clist,
gint source_row,
gint dest_row)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (GTK_CLIST_AUTO_SORT(clist))
@ -3231,7 +3177,6 @@ gtk_clist_row_is_visible (GtkCList *clist,
{
gint top;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
if (row < 0 || row >= clist->rows)
@ -3262,7 +3207,6 @@ gtk_clist_set_foreground (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3292,7 +3236,6 @@ gtk_clist_set_background (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3331,7 +3274,6 @@ gtk_clist_set_cell_style (GtkCList *clist,
GtkRequisition requisition = { 0 };
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3385,7 +3327,6 @@ gtk_clist_get_cell_style (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
if (row < 0 || row >= clist->rows || column < 0 || column >= clist->columns)
@ -3406,7 +3347,6 @@ gtk_clist_set_row_style (GtkCList *clist,
gint *old_width;
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3468,7 +3408,6 @@ gtk_clist_get_row_style (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_val_if_fail (clist != NULL, NULL);
g_return_val_if_fail (GTK_IS_CLIST (clist), NULL);
if (row < 0 || row >= clist->rows)
@ -3495,7 +3434,6 @@ gtk_clist_set_selectable (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3526,7 +3464,6 @@ gboolean
gtk_clist_get_selectable (GtkCList *clist,
gint row)
{
g_return_val_if_fail (clist != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (clist), FALSE);
if (row < 0 || row >= clist->rows)
@ -3540,7 +3477,6 @@ gtk_clist_select_row (GtkCList *clist,
gint row,
gint column)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3557,7 +3493,6 @@ gtk_clist_unselect_row (GtkCList *clist,
gint row,
gint column)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row >= clist->rows)
@ -3572,7 +3507,6 @@ gtk_clist_unselect_row (GtkCList *clist,
void
gtk_clist_select_all (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
GTK_CLIST_GET_CLASS (clist)->select_all (clist);
@ -3581,7 +3515,6 @@ gtk_clist_select_all (GtkCList *clist)
void
gtk_clist_unselect_all (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
GTK_CLIST_GET_CLASS (clist)->unselect_all (clist);
@ -3590,7 +3523,6 @@ gtk_clist_unselect_all (GtkCList *clist)
void
gtk_clist_undo_selection (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (clist->selection_mode == GTK_SELECTION_EXTENDED &&
@ -3755,7 +3687,6 @@ real_select_row (GtkCList *clist,
gint sel_row;
gboolean row_selected;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row > (clist->rows - 1))
@ -3817,7 +3748,6 @@ real_unselect_row (GtkCList *clist,
{
GtkCListRow *clist_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (row < 0 || row > (clist->rows - 1))
@ -3848,7 +3778,6 @@ real_select_all (GtkCList *clist)
GList *list;
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@ -3896,7 +3825,6 @@ real_unselect_all (GtkCList *clist)
GList *list;
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@ -3982,7 +3910,6 @@ real_undo_selection (GtkCList *clist)
{
GList *work;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) ||
@ -4037,7 +3964,6 @@ set_anchor (GtkCList *clist,
gint anchor,
gint undo_anchor)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (clist->selection_mode != GTK_SELECTION_EXTENDED || clist->anchor >= 0)
@ -4336,7 +4262,6 @@ update_extended_selection (GtkCList *clist,
static void
start_selection (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@ -4349,7 +4274,6 @@ start_selection (GtkCList *clist)
static void
end_selection (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_FOCUS(clist))
@ -4364,7 +4288,6 @@ extend_selection (GtkCList *clist,
gfloat position,
gboolean auto_start_selection)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist)) ||
@ -4442,7 +4365,6 @@ gtk_clist_destroy (GtkObject *object)
gint i;
GtkCList *clist;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_CLIST (object));
clist = GTK_CLIST (object);
@ -4531,7 +4453,6 @@ gtk_clist_realize (GtkWidget *widget)
gint i;
gint j;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
clist = GTK_CLIST (widget);
@ -4683,7 +4604,6 @@ gtk_clist_unrealize (GtkWidget *widget)
gint i;
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
clist = GTK_CLIST (widget);
@ -4757,7 +4677,6 @@ gtk_clist_map (GtkWidget *widget)
gint i;
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
clist = GTK_CLIST (widget);
@ -4797,7 +4716,6 @@ gtk_clist_unmap (GtkWidget *widget)
gint i;
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
clist = GTK_CLIST (widget);
@ -4854,7 +4772,6 @@ gtk_clist_expose (GtkWidget *widget,
{
GtkCList *clist;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -4894,7 +4811,6 @@ gtk_clist_style_set (GtkWidget *widget,
{
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
if (GTK_WIDGET_CLASS (parent_class)->style_set)
@ -4944,7 +4860,6 @@ gtk_clist_button_press (GtkWidget *widget,
gint column;
gint button_actions;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -5157,7 +5072,6 @@ gtk_clist_button_release (GtkWidget *widget,
GtkCList *clist;
gint button_actions;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -5259,7 +5173,6 @@ gtk_clist_motion (GtkWidget *widget,
gint new_width;
gint button_actions = 0;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
clist = GTK_CLIST (widget);
@ -5432,7 +5345,6 @@ gtk_clist_size_request (GtkWidget *widget,
GtkCList *clist;
gint i;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (requisition != NULL);
@ -5476,7 +5388,6 @@ gtk_clist_size_allocate (GtkWidget *widget,
GtkAllocation clist_allocation;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (allocation != NULL);
@ -5560,7 +5471,6 @@ gtk_clist_forall (GtkContainer *container,
GtkCList *clist;
guint i;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CLIST (container));
g_return_if_fail (callback != NULL);
@ -5975,7 +5885,6 @@ draw_rows (GtkCList *clist,
gint first_row;
gint last_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (clist->row_height == 0 ||
@ -6039,7 +5948,6 @@ draw_xor_line (GtkCList *clist)
static void
clist_refresh (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (CLIST_UNFROZEN (clist))
@ -6062,7 +5970,6 @@ get_selection_info (GtkCList *clist,
{
gint trow, tcol;
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
/* bounds checking, return false if the user clicked
@ -6091,7 +5998,6 @@ gtk_clist_get_selection_info (GtkCList *clist,
gint *row,
gint *column)
{
g_return_val_if_fail (clist != NULL, 0);
g_return_val_if_fail (GTK_IS_CLIST (clist), 0);
return get_selection_info (clist, x, y, row, column);
}
@ -6194,7 +6100,6 @@ vadjustment_value_changed (GtkAdjustment *adjustment,
gint dy, value;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (data != NULL);
g_return_if_fail (GTK_IS_CLIST (data));
clist = GTK_CLIST (data);
@ -6228,7 +6133,6 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
gint dx;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (data != NULL);
g_return_if_fail (GTK_IS_CLIST (data));
clist = GTK_CLIST (data);
@ -6564,7 +6468,6 @@ gtk_clist_draw_focus (GtkWidget *widget)
{
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
@ -6584,7 +6487,6 @@ gtk_clist_focus_in (GtkWidget *widget,
{
GtkCList *clist;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -6616,7 +6518,6 @@ gtk_clist_focus_out (GtkWidget *widget,
{
GtkCList *clist;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -6960,7 +6861,6 @@ scroll_vertical (GtkCList *clist,
{
gint old_focus_row;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (clist))
@ -7164,7 +7064,6 @@ remove_grab (GtkCList *clist)
void
gtk_clist_sort (GtkCList *clist)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
GTK_CLIST_GET_CLASS (clist)->sort_list (clist);
@ -7174,7 +7073,6 @@ void
gtk_clist_set_compare_func (GtkCList *clist,
GtkCListCompareFunc cmp_func)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
clist->compare = (cmp_func) ? cmp_func : default_compare;
@ -7184,7 +7082,6 @@ void
gtk_clist_set_auto_sort (GtkCList *clist,
gboolean auto_sort)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (GTK_CLIST_AUTO_SORT(clist) && !auto_sort)
@ -7200,7 +7097,6 @@ void
gtk_clist_set_sort_type (GtkCList *clist,
GtkSortType sort_type)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
clist->sort_type = sort_type;
@ -7210,7 +7106,6 @@ void
gtk_clist_set_sort_column (GtkCList *clist,
gint column)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (column < 0 || column >= clist->columns)
@ -7276,7 +7171,6 @@ real_sort_list (GtkCList *clist)
GList *work;
gint i;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (clist->rows <= 1)
@ -7482,7 +7376,6 @@ gtk_clist_drag_begin (GtkWidget *widget,
GtkCList *clist;
GtkCListCellInfo *info;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (context != NULL);
@ -7531,7 +7424,6 @@ gtk_clist_drag_end (GtkWidget *widget,
{
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (context != NULL);
@ -7549,7 +7441,6 @@ gtk_clist_drag_leave (GtkWidget *widget,
GtkCList *clist;
GtkCListDestInfo *dest_info;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (context != NULL);
@ -7596,7 +7487,6 @@ gtk_clist_drag_motion (GtkWidget *widget,
GtkCListDestInfo new_info;
GtkCListDestInfo *dest_info;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
clist = GTK_CLIST (widget);
@ -7689,7 +7579,6 @@ gtk_clist_drag_drop (GtkWidget *widget,
gint y,
guint time)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
g_return_val_if_fail (context != NULL, FALSE);
@ -7721,7 +7610,6 @@ gtk_clist_drag_data_received (GtkWidget *widget,
{
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (context != NULL);
g_return_if_fail (selection_data != NULL);
@ -7763,7 +7651,6 @@ gtk_clist_drag_data_get (GtkWidget *widget,
guint info,
guint time)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
g_return_if_fail (context != NULL);
g_return_if_fail (selection_data != NULL);
@ -7825,7 +7712,6 @@ gtk_clist_set_reorderable (GtkCList *clist,
{
GtkWidget *widget;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if ((GTK_CLIST_REORDERABLE(clist) != 0) == reorderable)
@ -7851,7 +7737,6 @@ void
gtk_clist_set_use_drag_icons (GtkCList *clist,
gboolean use_icons)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (use_icons != 0)
@ -7865,7 +7750,6 @@ gtk_clist_set_button_actions (GtkCList *clist,
guint button,
guint8 button_actions)
{
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CLIST (clist));
if (button < MAX_BUTTON)

18
gtk/gtkcolorsel.c
View File

@ -1927,7 +1927,6 @@ void
gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
GtkUpdateType policy)
{
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
/* */
g_warning (G_STRLOC ": This function is deprecated.");
@ -1946,7 +1945,6 @@ gtk_color_selection_get_has_opacity_control (GtkColorSelection *colorsel)
{
ColorSelectionPrivate *priv;
g_return_val_if_fail (colorsel != NULL, FALSE);
g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), FALSE);
priv = colorsel->private_data;
@ -1968,7 +1966,6 @@ gtk_color_selection_set_has_opacity_control (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2026,7 +2023,6 @@ gtk_color_selection_set_has_palette (GtkColorSelection *colorsel,
gboolean has_palette)
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2058,7 +2054,6 @@ gtk_color_selection_set_current_color (GtkColorSelection *colorsel,
ColorSelectionPrivate *priv;
gint i;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2097,7 +2092,6 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel,
ColorSelectionPrivate *priv;
gint i;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2130,7 +2124,6 @@ gtk_color_selection_set_color (GtkColorSelection *colorsel,
ColorSelectionPrivate *priv;
gint i;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2170,7 +2163,6 @@ gtk_color_selection_get_current_color (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2192,7 +2184,6 @@ gtk_color_selection_get_current_alpha (GtkColorSelection *colorsel)
{
ColorSelectionPrivate *priv;
g_return_val_if_fail (colorsel != NULL, 0);
g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), 0);
priv = colorsel->private_data;
@ -2213,7 +2204,6 @@ gtk_color_selection_get_color (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2240,7 +2230,6 @@ gtk_color_selection_set_previous_color (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2273,7 +2262,6 @@ gtk_color_selection_set_previous_alpha (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2298,7 +2286,6 @@ gtk_color_selection_get_previous_color (GtkColorSelection *colorsel,
{
ColorSelectionPrivate *priv;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
priv = colorsel->private_data;
@ -2320,7 +2307,6 @@ gtk_color_selection_get_previous_alpha (GtkColorSelection *colorsel)
{
ColorSelectionPrivate *priv;
g_return_val_if_fail (colorsel != NULL, 0);
g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), 0);
priv = colorsel->private_data;
@ -2345,7 +2331,6 @@ gtk_color_selection_set_palette_color (GtkColorSelection *colorsel,
gint x, y;
gdouble col[3];
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
g_return_if_fail (index >= 0 && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT);
@ -2381,7 +2366,6 @@ gtk_color_selection_get_palette_color (GtkColorSelection *colorsel,
gint x, y;
gdouble col[4];
g_return_val_if_fail (colorsel != NULL, FALSE);
g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), FALSE);
g_return_val_if_fail (index >= 0 && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT, FALSE);
@ -2417,7 +2401,6 @@ gtk_color_selection_unset_palette_color (GtkColorSelection *colorsel,
ColorSelectionPrivate *priv;
gint x, y;
g_return_if_fail (colorsel != NULL);
g_return_if_fail (GTK_IS_COLOR_SELECTION (colorsel));
g_return_if_fail (index >= 0 && index < GTK_CUSTOM_PALETTE_WIDTH*GTK_CUSTOM_PALETTE_HEIGHT);
@ -2457,7 +2440,6 @@ gtk_color_selection_is_adjusting (GtkColorSelection *colorsel)
{
ColorSelectionPrivate *priv;
g_return_val_if_fail (colorsel != NULL, FALSE);
g_return_val_if_fail (GTK_IS_COLOR_SELECTION (colorsel), FALSE);
priv = colorsel->private_data;

8
gtk/gtkcombo.c
View File

@ -872,7 +872,6 @@ gtk_combo_new (void)
void
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));
combo->value_in_list = val;
@ -882,7 +881,6 @@ gtk_combo_set_value_in_list (GtkCombo * combo, gboolean val, gboolean ok_if_empt
void
gtk_combo_set_case_sensitive (GtkCombo * combo, gboolean val)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->case_sensitive = val;
@ -892,7 +890,6 @@ gtk_combo_set_case_sensitive (GtkCombo * combo, gboolean val)
void
gtk_combo_set_use_arrows (GtkCombo * combo, gboolean val)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->use_arrows = val;
@ -902,7 +899,6 @@ gtk_combo_set_use_arrows (GtkCombo * combo, gboolean val)
void
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;
@ -917,7 +913,6 @@ gtk_combo_set_popdown_strings (GtkCombo * combo, GList * strings)
GList *list;
GtkWidget *li;
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
g_return_if_fail (strings != NULL);
@ -951,7 +946,6 @@ gtk_combo_set_item_string (GtkCombo * combo, GtkItem * item, const gchar * item_
gchar *val;
gint connected = 0;
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
g_return_if_fail (item != NULL);
@ -983,7 +977,6 @@ gtk_combo_size_allocate (GtkWidget *widget,
{
GtkCombo *combo;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_COMBO (widget));
g_return_if_fail (allocation != NULL);
@ -1007,7 +1000,6 @@ gtk_combo_size_allocate (GtkWidget *widget,
void
gtk_combo_disable_activate (GtkCombo* combo)
{
g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
if ( combo->activate_id ) {

5
gtk/gtkcontainer.c
View File

@ -259,7 +259,6 @@ gtk_container_child_type (GtkContainer *container)
GtkType slot;
GtkContainerClass *class;
g_return_val_if_fail (container != NULL, 0);
g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
class = GTK_CONTAINER_GET_CLASS (container);
@ -558,9 +557,7 @@ gtk_container_add_with_properties (GtkContainer *container,
const gchar *first_prop_name,
...)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget->parent == NULL);
@ -591,9 +588,7 @@ gtk_container_child_set (GtkContainer *container,
{
va_list var_args;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == GTK_WIDGET (container));

82
gtk/gtkctree.c
View File

@ -732,7 +732,6 @@ gtk_ctree_realize (GtkWidget *widget)
GtkCTreeNode *child;
gint i;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CTREE (widget));
GTK_WIDGET_CLASS (parent_class)->realize (widget);
@ -775,7 +774,6 @@ gtk_ctree_unrealize (GtkWidget *widget)
GtkCTree *ctree;
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CTREE (widget));
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
@ -812,7 +810,6 @@ gtk_ctree_button_press (GtkWidget *widget,
GtkCList *clist;
gint button_actions;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -869,7 +866,6 @@ draw_drag_highlight (GtkCList *clist,
gint i;
gint y = 0;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
ctree = GTK_CTREE (clist);
@ -2246,7 +2242,6 @@ gtk_ctree_unlink (GtkCTree *ctree,
GtkCTreeNode *parent;
GList *list;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -2365,7 +2360,6 @@ real_row_move (GtkCList *clist,
GtkCTree *ctree;
GtkCTreeNode *node;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
if (GTK_CLIST_AUTO_SORT (clist))
@ -2497,7 +2491,6 @@ change_focus_row_expansion (GtkCTree *ctree,
GtkCList *clist;
GtkCTreeNode *node;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -2543,7 +2536,6 @@ real_tree_expand (GtkCTree *ctree,
gboolean visible;
gint level;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (!node || GTK_CTREE_ROW (node)->expanded || GTK_CTREE_ROW (node)->is_leaf)
@ -2687,7 +2679,6 @@ real_tree_collapse (GtkCTree *ctree,
gboolean visible;
gint level;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (!node || !GTK_CTREE_ROW (node)->expanded ||
@ -2864,7 +2855,6 @@ cell_size_request (GtkCList *clist,
PangoLayout *layout;
PangoRectangle logical_rect;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
g_return_if_fail (requisition != NULL);
@ -2955,7 +2945,6 @@ set_cell_contents (GtkCList *clist,
GdkPixmap *old_pixmap = NULL;
GdkBitmap *old_mask = NULL;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
g_return_if_fail (clist_row != NULL);
@ -3326,7 +3315,6 @@ real_select_row (GtkCList *clist,
{
GList *node;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
if ((node = g_list_nth (clist->row_list, row)) &&
@ -3343,7 +3331,6 @@ real_unselect_row (GtkCList *clist,
{
GList *node;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
if ((node = g_list_nth (clist->row_list, row)))
@ -3361,7 +3348,6 @@ real_tree_select (GtkCTree *ctree,
GtkCTreeNode *sel_row;
gboolean node_selected;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (!node || GTK_CTREE_ROW (node)->row.state == GTK_STATE_SELECTED ||
@ -3417,7 +3403,6 @@ real_tree_unselect (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (!node || GTK_CTREE_ROW (node)->row.state != GTK_STATE_SELECTED)
@ -3455,7 +3440,6 @@ real_select_all (GtkCList *clist)
GtkCTree *ctree;
GtkCTreeNode *node;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
ctree = GTK_CTREE (clist);
@ -3504,7 +3488,6 @@ real_unselect_all (GtkCList *clist)
GtkCTreeNode *node;
GList *list;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
ctree = GTK_CTREE (clist);
@ -3559,7 +3542,6 @@ ctree_is_hot_spot (GtkCTree *ctree,
gint xl;
gint yu;
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);
@ -3655,7 +3637,6 @@ real_insert_row (GtkCList *clist,
GtkCTreeNode *sibling;
GtkCTreeNode *node;
g_return_val_if_fail (clist != NULL, -1);
g_return_val_if_fail (GTK_IS_CTREE (clist), -1);
sibling = GTK_CTREE_NODE (g_list_nth (clist->row_list, row));
@ -3690,7 +3671,6 @@ gtk_ctree_insert_node (GtkCTree *ctree,
GList *list;
gint i;
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
if (sibling)
g_return_val_if_fail (GTK_CTREE_ROW (sibling)->parent == parent, NULL);
@ -3768,7 +3748,6 @@ gtk_ctree_insert_gnode (GtkCTree *ctree,
GNode *work;
guint depth = 1;
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
g_return_val_if_fail (gnode != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
@ -3834,7 +3813,6 @@ gtk_ctree_export_to_gnode (GtkCTree *ctree,
GNode *gnode;
gint depth;
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
g_return_val_if_fail (node != NULL, NULL);
g_return_val_if_fail (func != NULL, NULL);
@ -3877,7 +3855,6 @@ real_remove_row (GtkCList *clist,
{
GtkCTreeNode *node;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
node = GTK_CTREE_NODE (g_list_nth (clist->row_list, row));
@ -3892,7 +3869,6 @@ gtk_ctree_remove_node (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -3926,7 +3902,6 @@ real_clear (GtkCList *clist)
GtkCTreeNode *work;
GtkCTreeNode *ptr;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
ctree = GTK_CTREE (clist);
@ -3965,7 +3940,6 @@ gtk_ctree_post_recursive (GtkCTree *ctree,
GtkCTreeNode *work;
GtkCTreeNode *tmp;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (func != NULL);
@ -3995,7 +3969,6 @@ gtk_ctree_post_recursive_to_depth (GtkCTree *ctree,
GtkCTreeNode *work;
GtkCTreeNode *tmp;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (func != NULL);
@ -4033,7 +4006,6 @@ gtk_ctree_pre_recursive (GtkCTree *ctree,
GtkCTreeNode *work;
GtkCTreeNode *tmp;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (func != NULL);
@ -4063,7 +4035,6 @@ gtk_ctree_pre_recursive_to_depth (GtkCTree *ctree,
GtkCTreeNode *work;
GtkCTreeNode *tmp;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (func != NULL);
@ -4099,7 +4070,6 @@ gtk_ctree_is_viewable (GtkCTree *ctree,
{
GtkCTreeRow *work;
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);
@ -4118,7 +4088,6 @@ GtkCTreeNode *
gtk_ctree_last (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
if (!node)
@ -4139,7 +4108,6 @@ gtk_ctree_find_node_ptr (GtkCTree *ctree,
{
GtkCTreeNode *node;
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
g_return_val_if_fail (ctree_row != NULL, FALSE);
@ -4158,7 +4126,6 @@ GtkCTreeNode *
gtk_ctree_node_nth (GtkCTree *ctree,
guint row)
{
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
if ((row < 0) || (row >= GTK_CLIST(ctree)->rows))
@ -4236,7 +4203,6 @@ gtk_ctree_find_all_by_row_data (GtkCTree *ctree,
{
GList *list = NULL;
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
/* if node == NULL then look in the whole tree */
@ -4297,7 +4263,6 @@ gtk_ctree_find_all_by_row_data_custom (GtkCTree *ctree,
{
GList *list = NULL;
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
g_return_val_if_fail (func != NULL, NULL);
@ -4335,7 +4300,6 @@ gtk_ctree_is_hot_spot (GtkCTree *ctree,
gint column;
gint row;
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
if (gtk_clist_get_selection_info (GTK_CLIST (ctree), x, y, &row, &column))
@ -4357,7 +4321,6 @@ gtk_ctree_move (GtkCTree *ctree,
GtkCTreeNode *new_parent,
GtkCTreeNode *new_sibling)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4369,7 +4332,6 @@ void
gtk_ctree_expand (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4386,7 +4348,6 @@ gtk_ctree_expand_recursive (GtkCTree *ctree,
GtkCList *clist;
gboolean thaw = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -4414,7 +4375,6 @@ gtk_ctree_expand_to_depth (GtkCTree *ctree,
GtkCList *clist;
gboolean thaw = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -4439,7 +4399,6 @@ void
gtk_ctree_collapse (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4457,7 +4416,6 @@ gtk_ctree_collapse_recursive (GtkCTree *ctree,
gboolean thaw = FALSE;
gint i;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (node && GTK_CTREE_ROW (node)->is_leaf)
@ -4492,7 +4450,6 @@ gtk_ctree_collapse_to_depth (GtkCTree *ctree,
gboolean thaw = FALSE;
gint i;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (node && GTK_CTREE_ROW (node)->is_leaf)
@ -4524,7 +4481,6 @@ void
gtk_ctree_toggle_expansion (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4541,7 +4497,6 @@ gtk_ctree_toggle_expansion_recursive (GtkCTree *ctree,
GtkCList *clist;
gboolean thaw = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (node && GTK_CTREE_ROW (node)->is_leaf)
@ -4566,7 +4521,6 @@ void
gtk_ctree_select (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4579,7 +4533,6 @@ void
gtk_ctree_unselect (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4609,7 +4562,6 @@ gtk_ctree_real_select_recursive (GtkCTree *ctree,
GtkCList *clist;
gboolean thaw = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -4661,7 +4613,6 @@ gtk_ctree_node_set_text (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4686,7 +4637,6 @@ gtk_ctree_node_set_pixmap (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
g_return_if_fail (pixmap != NULL);
@ -4718,7 +4668,6 @@ gtk_ctree_node_set_pixtext (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
if (column != ctree->tree_column)
@ -4757,7 +4706,6 @@ gtk_ctree_set_node_info (GtkCTree *ctree,
gboolean old_leaf;
gboolean old_expanded;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4806,7 +4754,6 @@ gtk_ctree_node_set_shift (GtkCTree *ctree,
GtkRequisition requisition;
gboolean visible = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4861,7 +4808,6 @@ gtk_ctree_node_set_selectable (GtkCTree *ctree,
GtkCTreeNode *node,
gboolean selectable)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -4902,7 +4848,6 @@ gtk_ctree_node_get_cell_type (GtkCTree *ctree,
GtkCTreeNode *node,
gint column)
{
g_return_val_if_fail (ctree != NULL, -1);
g_return_val_if_fail (GTK_IS_CTREE (ctree), -1);
g_return_val_if_fail (node != NULL, -1);
@ -4918,7 +4863,6 @@ gtk_ctree_node_get_text (GtkCTree *ctree,
gint column,
gchar **text)
{
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);
@ -4941,7 +4885,6 @@ gtk_ctree_node_get_pixmap (GtkCTree *ctree,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
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);
@ -4968,7 +4911,6 @@ gtk_ctree_node_get_pixtext (GtkCTree *ctree,
GdkPixmap **pixmap,
GdkBitmap **mask)
{
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);
@ -5004,7 +4946,6 @@ gtk_ctree_get_node_info (GtkCTree *ctree,
gboolean *is_leaf,
gboolean *expanded)
{
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);
@ -5040,7 +4981,6 @@ gtk_ctree_node_set_cell_style (GtkCTree *ctree,
GtkRequisition requisition;
gboolean visible = FALSE;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -5092,7 +5032,6 @@ gtk_ctree_node_get_cell_style (GtkCTree *ctree,
GtkCTreeNode *node,
gint column)
{
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
g_return_val_if_fail (node != NULL, NULL);
@ -5113,7 +5052,6 @@ gtk_ctree_node_set_row_style (GtkCTree *ctree,
gint *old_width = NULL;
gint i;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -5169,7 +5107,6 @@ GtkStyle *
gtk_ctree_node_get_row_style (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
g_return_val_if_fail (node != NULL, NULL);
@ -5181,7 +5118,6 @@ gtk_ctree_node_set_foreground (GtkCTree *ctree,
GtkCTreeNode *node,
GdkColor *color)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -5204,7 +5140,6 @@ gtk_ctree_node_set_background (GtkCTree *ctree,
GtkCTreeNode *node,
GdkColor *color)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -5239,7 +5174,6 @@ gtk_ctree_node_set_row_data_full (GtkCTree *ctree,
GtkDestroyNotify dnotify;
gpointer ddata;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (node != NULL);
@ -5257,7 +5191,6 @@ gpointer
gtk_ctree_node_get_row_data (GtkCTree *ctree,
GtkCTreeNode *node)
{
g_return_val_if_fail (ctree != NULL, NULL);
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
return node ? GTK_CTREE_ROW (node)->row.data : NULL;
@ -5273,7 +5206,6 @@ gtk_ctree_node_moveto (GtkCTree *ctree,
gint row = -1;
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -5310,7 +5242,6 @@ gtk_ctree_set_indent (GtkCTree *ctree,
{
GtkCList *clist;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (indent >= 0);
@ -5336,7 +5267,6 @@ gtk_ctree_set_spacing (GtkCTree *ctree,
GtkCList *clist;
gint old_spacing;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
g_return_if_fail (spacing >= 0);
@ -5361,7 +5291,6 @@ void
gtk_ctree_set_show_stub (GtkCTree *ctree,
gboolean show_stub)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
show_stub = show_stub != FALSE;
@ -5387,7 +5316,6 @@ gtk_ctree_set_line_style (GtkCTree *ctree,
GtkCList *clist;
GtkCTreeLineStyle old_style;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (line_style == ctree->line_style)
@ -5447,7 +5375,6 @@ gtk_ctree_set_expander_style (GtkCTree *ctree,
GtkCList *clist;
GtkCTreeExpanderStyle old_style;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
if (expander_style == ctree->expander_style)
@ -5557,7 +5484,6 @@ gtk_ctree_sort_recursive (GtkCTree *ctree,
GtkCList *clist;
GtkCTreeNode *focus_node = NULL;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -5605,7 +5531,6 @@ gtk_ctree_sort_node (GtkCTree *ctree,
GtkCList *clist;
GtkCTreeNode *focus_node = NULL;
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
clist = GTK_CLIST (ctree);
@ -5693,7 +5618,6 @@ resync_selection (GtkCList *clist, GdkEvent *event)
gint row;
gboolean unselect;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
if (clist->selection_mode != GTK_SELECTION_EXTENDED)
@ -5806,7 +5730,6 @@ real_undo_selection (GtkCList *clist)
GtkCTree *ctree;
GList *work;
g_return_if_fail (clist != NULL);
g_return_if_fail (GTK_IS_CTREE (clist));
if (clist->selection_mode != GTK_SELECTION_EXTENDED)
@ -5855,7 +5778,6 @@ void
gtk_ctree_set_drag_compare_func (GtkCTree *ctree,
GtkCTreeCompareDragFunc cmp_func)
{
g_return_if_fail (ctree != NULL);
g_return_if_fail (GTK_IS_CTREE (ctree));
ctree->drag_compare = cmp_func;
@ -5867,7 +5789,6 @@ check_drag (GtkCTree *ctree,
GtkCTreeNode *drag_target,
GtkCListDragPos insert_pos)
{
g_return_val_if_fail (ctree != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (ctree), FALSE);
if (drag_source && drag_source != drag_target &&
@ -5985,7 +5906,6 @@ gtk_ctree_drag_begin (GtkWidget *widget,
GtkCTree *ctree;
gboolean use_icons;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CTREE (widget));
g_return_if_fail (context != NULL);
@ -6035,7 +5955,6 @@ gtk_ctree_drag_motion (GtkWidget *widget,
GtkCListDestInfo new_info;
GtkCListDestInfo *dest_info;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_CTREE (widget), FALSE);
clist = GTK_CLIST (widget);
@ -6138,7 +6057,6 @@ gtk_ctree_drag_data_received (GtkWidget *widget,
GtkCTree *ctree;
GtkCList *clist;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CTREE (widget));
g_return_if_fail (context != NULL);
g_return_if_fail (selection_data != NULL);

1
gtk/gtkcurve.c
View File

@ -1013,7 +1013,6 @@ gtk_curve_finalize (GObject *object)
{
GtkCurve *curve;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_CURVE (object));
curve = GTK_CURVE (object);

1
gtk/gtkdialog.c
View File

@ -740,7 +740,6 @@ void
gtk_dialog_response (GtkDialog *dialog,
gint response_id)
{
g_return_if_fail (dialog != NULL);
g_return_if_fail (GTK_IS_DIALOG (dialog));
gtk_signal_emit (GTK_OBJECT (dialog),

2
gtk/gtkdrawingarea.c
View File

@ -102,7 +102,6 @@ gtk_drawing_area_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
darea = GTK_DRAWING_AREA (widget);
@ -133,7 +132,6 @@ static void
gtk_drawing_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
g_return_if_fail (allocation != NULL);

3
gtk/gtkeditable.c
View File

@ -145,7 +145,6 @@ gtk_editable_select_region (GtkEditable *editable,
void
gtk_editable_cut_clipboard (GtkEditable *editable)
{
g_return_if_fail (editable != NULL);
g_return_if_fail (GTK_IS_EDITABLE (editable));
gtk_signal_emit_by_name (GTK_OBJECT (editable), "cut_clipboard");
@ -154,7 +153,6 @@ gtk_editable_cut_clipboard (GtkEditable *editable)
void
gtk_editable_copy_clipboard (GtkEditable *editable)
{
g_return_if_fail (editable != NULL);
g_return_if_fail (GTK_IS_EDITABLE (editable));
gtk_signal_emit_by_name (GTK_OBJECT (editable), "copy_clipboard");
@ -163,7 +161,6 @@ gtk_editable_copy_clipboard (GtkEditable *editable)
void
gtk_editable_paste_clipboard (GtkEditable *editable)
{
g_return_if_fail (editable != NULL);
g_return_if_fail (GTK_IS_EDITABLE (editable));
gtk_signal_emit_by_name (GTK_OBJECT (editable), "paste_clipboard");

20
gtk/gtkentry.c
View File

@ -936,7 +936,6 @@ gtk_entry_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -1008,7 +1007,6 @@ gtk_entry_unrealize (GtkWidget *widget)
{
GtkEntry *entry;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
entry = GTK_ENTRY (widget);
@ -1047,7 +1045,6 @@ gtk_entry_size_request (GtkWidget *widget,
gint xborder, yborder;
PangoContext *context;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
g_return_if_fail (requisition != NULL);
@ -1180,7 +1177,6 @@ gtk_entry_size_allocate (GtkWidget *widget,
GtkEntry *entry;
GtkEditable *editable;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
g_return_if_fail (allocation != NULL);
@ -1217,7 +1213,6 @@ gtk_entry_draw_focus (GtkWidget *widget)
GtkEntry *entry;
gboolean interior_focus;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
gtk_widget_style_get (widget, "interior_focus", &interior_focus, NULL);
@ -1264,7 +1259,6 @@ gtk_entry_expose (GtkWidget *widget,
{
GtkEntry *entry;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_ENTRY (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1578,7 +1572,6 @@ static void
gtk_entry_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ENTRY (widget));
if (GTK_WIDGET_REALIZED (widget))
@ -1654,7 +1647,6 @@ gtk_entry_get_chars (GtkEditable *editable,
GtkEntry *entry;
gint start_index, end_index;
g_return_val_if_fail (editable != NULL, NULL);
g_return_val_if_fail (GTK_IS_ENTRY (editable), NULL);
entry = GTK_ENTRY (editable);
@ -2378,7 +2370,6 @@ gtk_entry_draw_text (GtkEntry *entry)
GtkWidget *widget;
PangoLayoutLine *line;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
if (!entry->visible && entry->invisible_char == 0)
@ -2457,7 +2448,6 @@ gtk_entry_draw_cursor (GtkEntry *entry,
GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
GtkTextDirection widget_direction = gtk_widget_get_direction (GTK_WIDGET (entry));
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
if (GTK_WIDGET_DRAWABLE (entry))
@ -2516,7 +2506,6 @@ gtk_entry_draw_cursor (GtkEntry *entry,
static void
gtk_entry_queue_draw (GtkEntry *entry)
{
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
if (GTK_WIDGET_REALIZED (entry))
@ -2610,7 +2599,6 @@ gtk_entry_adjust_scroll (GtkEntry *entry)
PangoLayoutLine *line;
PangoRectangle logical_rect;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
widget = GTK_WIDGET (entry);
@ -3025,7 +3013,6 @@ gtk_entry_set_text (GtkEntry *entry,
GtkEditable *editable;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
@ -3043,7 +3030,6 @@ gtk_entry_append_text (GtkEntry *entry,
{
gint tmp_pos;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
@ -3057,7 +3043,6 @@ gtk_entry_prepend_text (GtkEntry *entry,
{
gint tmp_pos;
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
@ -3069,7 +3054,6 @@ void
gtk_entry_set_position (GtkEntry *entry,
gint position)
{
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
gtk_editable_set_position (GTK_EDITABLE (entry), position);
@ -3079,7 +3063,6 @@ void
gtk_entry_set_visibility (GtkEntry *entry,
gboolean visible)
{
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
entry->visible = visible ? TRUE : FALSE;
@ -3154,7 +3137,6 @@ void
gtk_entry_set_editable (GtkEntry *entry,
gboolean editable)
{
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
gtk_editable_set_editable (GTK_EDITABLE (entry), editable);
@ -3163,7 +3145,6 @@ gtk_entry_set_editable (GtkEntry *entry,
G_CONST_RETURN gchar*
gtk_entry_get_text (GtkEntry *entry)
{
g_return_val_if_fail (entry != NULL, NULL);
g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
return entry->text;
@ -3181,7 +3162,6 @@ void
gtk_entry_set_max_length (GtkEntry *entry,
gint max)
{
g_return_if_fail (entry != NULL);
g_return_if_fail (GTK_IS_ENTRY (entry));
if (max > 0 && entry->text_length > max)

4
gtk/gtkeventbox.c
View File

@ -102,7 +102,6 @@ gtk_event_box_realize (GtkWidget *widget)
gint attributes_mask;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_EVENT_BOX (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -140,7 +139,6 @@ gtk_event_box_size_request (GtkWidget *widget,
{
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_EVENT_BOX (widget));
g_return_if_fail (requisition != NULL);
@ -167,7 +165,6 @@ gtk_event_box_size_allocate (GtkWidget *widget,
GtkBin *bin;
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_EVENT_BOX (widget));
g_return_if_fail (allocation != NULL);
@ -208,7 +205,6 @@ static gint
gtk_event_box_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

17
gtk/gtkfilesel.c
View File

@ -743,7 +743,6 @@ gtk_file_selection_new (const gchar *title)
void
gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
{
g_return_if_fail (filesel != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
/* delete, create directory, and rename */
@ -786,7 +785,6 @@ gtk_file_selection_show_fileop_buttons (GtkFileSelection *filesel)
void
gtk_file_selection_hide_fileop_buttons (GtkFileSelection *filesel)
{
g_return_if_fail (filesel != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
if (filesel->fileop_ren_file)
@ -818,7 +816,6 @@ gtk_file_selection_set_filename (GtkFileSelection *filesel,
gchar *buf;
const char *name, *last_slash;
g_return_if_fail (filesel != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
g_return_if_fail (filename != NULL);
@ -864,7 +861,6 @@ gtk_file_selection_get_filename (GtkFileSelection *filesel)
char *sys_filename;
char *text;
g_return_val_if_fail (filesel != NULL, nothing);
g_return_val_if_fail (GTK_IS_FILE_SELECTION (filesel), nothing);
#ifdef G_WITH_CYGWIN
@ -888,7 +884,6 @@ void
gtk_file_selection_complete (GtkFileSelection *filesel,
const gchar *pattern)
{
g_return_if_fail (filesel != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (filesel));
g_return_if_fail (pattern != NULL);
@ -972,7 +967,6 @@ gtk_file_selection_fileop_destroy (GtkWidget *widget,
{
GtkFileSelection *fs = data;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
fs->fileop_dialog = NULL;
@ -992,7 +986,6 @@ gtk_file_selection_create_dir_confirmed (GtkWidget *widget,
GError *error = NULL;
CompletionState *cmpl_state;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
dirname = gtk_entry_get_text (GTK_ENTRY (fs->fileop_entry));
@ -1038,7 +1031,6 @@ gtk_file_selection_create_dir (GtkWidget *widget,
GtkWidget *vbox;
GtkWidget *button;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
if (fs->fileop_dialog)
@ -1112,7 +1104,6 @@ gtk_file_selection_delete_file_confirmed (GtkWidget *widget,
GError *error = NULL;
gchar *buf;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
cmpl_state = (CompletionState*) fs->cmpl_state;
@ -1162,7 +1153,6 @@ gtk_file_selection_delete_file (GtkWidget *widget,
gchar *filename;
gchar *buf;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
if (fs->fileop_dialog)
@ -1243,7 +1233,6 @@ gtk_file_selection_rename_file_confirmed (GtkWidget *widget,
CompletionState *cmpl_state;
GError *error = NULL;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
file = gtk_entry_get_text (GTK_ENTRY (fs->fileop_entry));
@ -1312,7 +1301,6 @@ gtk_file_selection_rename_file (GtkWidget *widget,
GtkWidget *button;
gchar *buf;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
if (fs->fileop_dialog)
@ -1447,7 +1435,6 @@ gtk_file_selection_history_callback (GtkWidget *widget,
HistoryCallbackArg *callback_arg;
GList *list;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
list = fs->history_list;
@ -1476,7 +1463,6 @@ gtk_file_selection_update_history_menu (GtkFileSelection *fs,
gint dir_len;
gint i;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
g_return_if_fail (current_directory != NULL);
@ -1560,7 +1546,6 @@ gtk_file_selection_file_button (GtkWidget *widget,
g_return_if_fail (GTK_IS_CLIST (widget));
fs = user_data;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
gtk_clist_get_text (GTK_CLIST (fs->file_list), row, 0, &temp);
@ -1610,7 +1595,6 @@ gtk_file_selection_dir_button (GtkWidget *widget,
g_return_if_fail (GTK_IS_CLIST (widget));
fs = GTK_FILE_SELECTION (user_data);
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp);
@ -1695,7 +1679,6 @@ gtk_file_selection_populate (GtkFileSelection *fs,
gint possible_count = 0;
gint selection_index = -1;
g_return_if_fail (fs != NULL);
g_return_if_fail (GTK_IS_FILE_SELECTION (fs));
cmpl_state = (CompletionState*) fs->cmpl_state;

9
gtk/gtkfixed.c
View File

@ -129,7 +129,6 @@ gtk_fixed_put (GtkFixed *fixed,
{
GtkFixedChild *child_info;
g_return_if_fail (fixed != NULL);
g_return_if_fail (GTK_IS_FIXED (fixed));
g_return_if_fail (widget != NULL);
@ -163,7 +162,6 @@ gtk_fixed_move (GtkFixed *fixed,
GtkFixedChild *child;
GList *children;
g_return_if_fail (fixed != NULL);
g_return_if_fail (GTK_IS_FIXED (fixed));
g_return_if_fail (widget != NULL);
@ -193,7 +191,6 @@ gtk_fixed_map (GtkWidget *widget)
GtkFixedChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_FIXED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -219,7 +216,6 @@ gtk_fixed_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_FIXED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -254,7 +250,6 @@ gtk_fixed_size_request (GtkWidget *widget,
GList *children;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_FIXED (widget));
g_return_if_fail (requisition != NULL);
@ -296,7 +291,6 @@ gtk_fixed_size_allocate (GtkWidget *widget,
GList *children;
guint16 border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_FIXED(widget));
g_return_if_fail (allocation != NULL);
@ -334,7 +328,6 @@ static void
gtk_fixed_add (GtkContainer *container,
GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_FIXED (container));
g_return_if_fail (widget != NULL);
@ -349,7 +342,6 @@ gtk_fixed_remove (GtkContainer *container,
GtkFixedChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_FIXED (container));
g_return_if_fail (widget != NULL);
@ -390,7 +382,6 @@ gtk_fixed_forall (GtkContainer *container,
GtkFixedChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_FIXED (container));
g_return_if_fail (callback != NULL);

2
gtk/gtkfontsel.c
View File

@ -427,7 +427,6 @@ gtk_font_selection_finalize (GObject *object)
{
GtkFontSelection *fontsel;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_FONT_SELECTION (object));
fontsel = GTK_FONT_SELECTION (object);
@ -862,7 +861,6 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel,
int n_descs, i;
gboolean found = FALSE;
g_return_val_if_fail (fontsel != NULL, FALSE);
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), FALSE);
new_desc = pango_font_description_from_string (fontname);

6
gtk/gtkframe.c
View File

@ -300,7 +300,6 @@ void
gtk_frame_set_label (GtkFrame *frame,
const gchar *label)
{
g_return_if_fail (frame != NULL);
g_return_if_fail (GTK_IS_FRAME (frame));
if (!label)
@ -334,7 +333,6 @@ gtk_frame_set_label (GtkFrame *frame,
G_CONST_RETURN gchar *
gtk_frame_get_label (GtkFrame *frame)
{
g_return_val_if_fail (frame != NULL, NULL);
g_return_val_if_fail (GTK_IS_FRAME (frame), NULL);
if (frame->label_widget && GTK_IS_LABEL (frame->label_widget))
@ -358,7 +356,6 @@ gtk_frame_set_label_widget (GtkFrame *frame,
{
gboolean need_resize = FALSE;
g_return_if_fail (frame != NULL);
g_return_if_fail (GTK_IS_FRAME (frame));
g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget));
g_return_if_fail (label_widget == NULL || label_widget->parent == NULL);
@ -409,7 +406,6 @@ gtk_frame_set_label_align (GtkFrame *frame,
gfloat xalign,
gfloat yalign)
{
g_return_if_fail (frame != NULL);
g_return_if_fail (GTK_IS_FRAME (frame));
xalign = CLAMP (xalign, 0.0, 1.0);
@ -456,7 +452,6 @@ void
gtk_frame_set_shadow_type (GtkFrame *frame,
GtkShadowType type)
{
g_return_if_fail (frame != NULL);
g_return_if_fail (GTK_IS_FRAME (frame));
if ((GtkShadowType) frame->shadow_type != type)
@ -673,7 +668,6 @@ static void
gtk_frame_compute_child_allocation (GtkFrame *frame,
GtkAllocation *child_allocation)
{
g_return_if_fail (frame != NULL);
g_return_if_fail (GTK_IS_FRAME (frame));
g_return_if_fail (child_allocation != NULL);

1
gtk/gtkgamma.c
View File

@ -466,7 +466,6 @@ gtk_gamma_curve_destroy (GtkObject *object)
{
GtkGammaCurve *c;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_GAMMA_CURVE (object));
c = GTK_GAMMA_CURVE (object);

14
gtk/gtkhandlebox.c
View File

@ -319,7 +319,6 @@ gtk_handle_box_destroy (GtkObject *object)
{
GtkHandleBox *hb;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (object));
hb = GTK_HANDLE_BOX (object);
@ -334,7 +333,6 @@ gtk_handle_box_map (GtkWidget *widget)
GtkBin *bin;
GtkHandleBox *hb;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -362,7 +360,6 @@ gtk_handle_box_unmap (GtkWidget *widget)
{
GtkHandleBox *hb;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -384,7 +381,6 @@ gtk_handle_box_realize (GtkWidget *widget)
gint attributes_mask;
GtkHandleBox *hb;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
hb = GTK_HANDLE_BOX (widget);
@ -454,7 +450,6 @@ gtk_handle_box_unrealize (GtkWidget *widget)
{
GtkHandleBox *hb;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
hb = GTK_HANDLE_BOX (widget);
@ -476,7 +471,6 @@ gtk_handle_box_style_set (GtkWidget *widget,
{
GtkHandleBox *hb;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
hb = GTK_HANDLE_BOX (widget);
@ -499,7 +493,6 @@ gtk_handle_box_size_request (GtkWidget *widget,
GtkHandleBox *hb;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
g_return_if_fail (requisition != NULL);
@ -575,7 +568,6 @@ gtk_handle_box_size_allocate (GtkWidget *widget,
GtkHandleBox *hb;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
g_return_if_fail (allocation != NULL);
@ -736,7 +728,6 @@ void
gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box,
GtkShadowType type)
{
g_return_if_fail (handle_box != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
if ((GtkShadowType) handle_box->shadow_type != type)
@ -797,7 +788,6 @@ void
gtk_handle_box_set_snap_edge (GtkHandleBox *handle_box,
GtkPositionType edge)
{
g_return_if_fail (handle_box != NULL);
g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
if (handle_box->snap_edge != edge)
@ -918,7 +908,6 @@ gtk_handle_box_expose (GtkWidget *widget,
{
GtkHandleBox *hb;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -946,7 +935,6 @@ gtk_handle_box_button_changed (GtkWidget *widget,
gboolean event_handled;
GdkCursor *fleur;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1065,7 +1053,6 @@ gtk_handle_box_motion (GtkWidget *widget,
gint snap_edge;
gboolean is_snapped = FALSE;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1264,7 +1251,6 @@ gtk_handle_box_delete_event (GtkWidget *widget,
{
GtkHandleBox *hb;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

2
gtk/gtkhbox.c
View File

@ -101,7 +101,6 @@ gtk_hbox_size_request (GtkWidget *widget,
gint nvis_children;
gint width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HBOX (widget));
g_return_if_fail (requisition != NULL);
@ -165,7 +164,6 @@ gtk_hbox_size_allocate (GtkWidget *widget,
gint x;
GtkTextDirection direction;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_HBOX (widget));
g_return_if_fail (allocation != NULL);

2
gtk/gtkhpaned.c
View File

@ -91,7 +91,6 @@ gtk_hpaned_init (GtkHPaned *hpaned)
{
GtkPaned *paned;
g_return_if_fail (hpaned != NULL);
g_return_if_fail (GTK_IS_PANED (hpaned));
paned = GTK_PANED (hpaned);
@ -248,7 +247,6 @@ gtk_hpaned_expose (GtkWidget *widget,
GtkPaned *paned;
guint16 border_width;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PANED (widget), FALSE);
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))

3
gtk/gtkhruler.c
View File

@ -110,7 +110,6 @@ gtk_hruler_motion_notify (GtkWidget *widget,
GtkRuler *ruler;
gint x;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HRULER (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -155,7 +154,6 @@ gtk_hruler_draw_ticks (GtkRuler *ruler)
PangoLayout *layout;
PangoRectangle logical_rect, ink_rect;
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_HRULER (ruler));
if (!GTK_WIDGET_DRAWABLE (ruler))
@ -291,7 +289,6 @@ gtk_hruler_draw_pos (GtkRuler *ruler)
gint ythickness;
gdouble increment;
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_HRULER (ruler));
if (GTK_WIDGET_DRAWABLE (ruler))

1
gtk/gtkhseparator.c
View File

@ -86,7 +86,6 @@ static gint
gtk_hseparator_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HSEPARATOR (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

4
gtk/gtkhsv.c
View File

@ -1476,7 +1476,6 @@ gtk_hsv_get_color (GtkHSV *hsv, double *h, double *s, double *v)
{
HSVPrivate *priv;
g_return_if_fail (hsv != NULL);
g_return_if_fail (GTK_IS_HSV (hsv));
priv = hsv->priv;
@ -1507,7 +1506,6 @@ gtk_hsv_set_metrics (GtkHSV *hsv,
HSVPrivate *priv;
int same_size;
g_return_if_fail (hsv != NULL);
g_return_if_fail (GTK_IS_HSV (hsv));
g_return_if_fail (size > 0);
g_return_if_fail (ring_width > 0);
@ -1541,7 +1539,6 @@ gtk_hsv_get_metrics (GtkHSV *hsv,
{
HSVPrivate *priv;
g_return_if_fail (hsv != NULL);
g_return_if_fail (GTK_IS_HSV (hsv));
priv = hsv->priv;
@ -1571,7 +1568,6 @@ gtk_hsv_is_adjusting (GtkHSV *hsv)
{
HSVPrivate *priv;
g_return_val_if_fail (hsv != NULL, FALSE);
g_return_val_if_fail (GTK_IS_HSV (hsv), FALSE);
priv = hsv->priv;

1
gtk/gtkimage.c
View File

@ -869,7 +869,6 @@ static gint
gtk_image_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_IMAGE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

1
gtk/gtkimagemenuitem.c
View File

@ -188,7 +188,6 @@ gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_item,
{
GtkImageMenuItem *image_menu_item;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_IMAGE_MENU_ITEM (menu_item));
image_menu_item = GTK_IMAGE_MENU_ITEM (menu_item);

8
gtk/gtkimcontext.c
View File

@ -152,7 +152,6 @@ gtk_im_context_set_client_window (GtkIMContext *context,
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -184,7 +183,6 @@ gtk_im_context_get_preedit_string (GtkIMContext *context,
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -210,7 +208,6 @@ gtk_im_context_filter_keypress (GtkIMContext *context,
{
GtkIMContextClass *klass;
g_return_val_if_fail (context != NULL, FALSE);
g_return_val_if_fail (GTK_IS_IM_CONTEXT (context), FALSE);
g_return_val_if_fail (key != NULL, FALSE);
@ -232,7 +229,6 @@ gtk_im_context_focus_in (GtkIMContext *context)
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -254,7 +250,6 @@ gtk_im_context_focus_out (GtkIMContext *context)
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -275,7 +270,6 @@ gtk_im_context_reset (GtkIMContext *context)
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -298,7 +292,6 @@ gtk_im_context_set_cursor_location (GtkIMContext *context,
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);
@ -322,7 +315,6 @@ gtk_im_context_set_use_preedit (GtkIMContext *context,
{
GtkIMContextClass *klass;
g_return_if_fail (context != NULL);
g_return_if_fail (GTK_IS_IM_CONTEXT (context));
klass = GTK_IM_CONTEXT_GET_CLASS (context);

1
gtk/gtkinvisible.c
View File

@ -119,7 +119,6 @@ gtk_invisible_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_INVISIBLE (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);

5
gtk/gtkitem.c
View File

@ -149,7 +149,6 @@ gtk_item_map (GtkWidget *widget)
{
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ITEM (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -167,7 +166,6 @@ gtk_item_map (GtkWidget *widget)
static void
gtk_item_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ITEM (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -181,7 +179,6 @@ gtk_item_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_ITEM (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -215,7 +212,6 @@ static gint
gtk_item_enter (GtkWidget *widget,
GdkEventCrossing *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -226,7 +222,6 @@ static gint
gtk_item_leave (GtkWidget *widget,
GdkEventCrossing *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

13
gtk/gtkitemfactory.c
View File

@ -580,7 +580,6 @@ gtk_item_factory_construct (GtkItemFactory *ifactory,
{
guint len;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (ifactory->accel_group == NULL);
g_return_if_fail (path != NULL);
@ -659,7 +658,6 @@ gtk_item_factory_destroy (GtkObject *object)
GtkItemFactory *ifactory;
GSList *slist;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (object));
ifactory = (GtkItemFactory*) object;
@ -698,7 +696,6 @@ gtk_item_factory_finalize (GObject *object)
{
GtkItemFactory *ifactory;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (object));
ifactory = GTK_ITEM_FACTORY (object);
@ -716,7 +713,6 @@ gtk_item_factory_finalize (GObject *object)
GtkItemFactory*
gtk_item_factory_from_widget (GtkWidget *widget)
{
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_item_factory);
@ -725,7 +721,6 @@ gtk_item_factory_from_widget (GtkWidget *widget)
gchar*
gtk_item_factory_path_from_widget (GtkWidget *widget)
{
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_item_path);
@ -879,7 +874,6 @@ gtk_item_factory_create_items_ac (GtkItemFactory *ifactory,
{
guint i;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (callback_type >= 1 && callback_type <= 2);
@ -1114,7 +1108,6 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory,
gchar *item_type_path;
GtkStockItem stock_item;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (entry != NULL);
g_return_if_fail (entry->path != NULL);
@ -1449,7 +1442,6 @@ gtk_item_factory_delete_item (GtkItemFactory *ifactory,
GtkItemFactoryClass *class;
GtkWidget *widget;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (path != NULL);
@ -1470,7 +1462,6 @@ void
gtk_item_factory_delete_entry (GtkItemFactory *ifactory,
GtkItemFactoryEntry *entry)
{
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (entry != NULL);
@ -1484,7 +1475,6 @@ gtk_item_factory_delete_entries (GtkItemFactory *ifactory,
{
guint i;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
if (n_entries > 0)
g_return_if_fail (entries != NULL);
@ -1517,7 +1507,6 @@ gtk_item_factory_popup_data_from_widget (GtkWidget *widget)
{
GtkItemFactory *ifactory;
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
ifactory = gtk_item_factory_from_widget (widget);
@ -1530,7 +1519,6 @@ gtk_item_factory_popup_data_from_widget (GtkWidget *widget)
gpointer
gtk_item_factory_popup_data (GtkItemFactory *ifactory)
{
g_return_val_if_fail (ifactory != NULL, NULL);
g_return_val_if_fail (GTK_IS_ITEM_FACTORY (ifactory), NULL);
return gtk_object_get_data_by_id (GTK_OBJECT (ifactory), quark_popup_data);
@ -1567,7 +1555,6 @@ gtk_item_factory_popup_with_data (GtkItemFactory *ifactory,
{
MenuPos *mpos;
g_return_if_fail (ifactory != NULL);
g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
g_return_if_fail (GTK_IS_MENU (ifactory->widget));

2
gtk/gtklabel.c
View File

@ -898,7 +898,6 @@ gtk_label_set_markup_with_mnemonic (GtkLabel *label,
G_CONST_RETURN gchar *
gtk_label_get_text (GtkLabel *label)
{
g_return_val_if_fail (label != NULL, NULL);
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
return label->text;
@ -1058,7 +1057,6 @@ void
gtk_label_get (GtkLabel *label,
gchar **str)
{
g_return_if_fail (label != NULL);
g_return_if_fail (GTK_IS_LABEL (label));
g_return_if_fail (str != NULL);

19
gtk/gtklayout.c
View File

@ -111,7 +111,6 @@ gtk_layout_new (GtkAdjustment *hadjustment,
GtkAdjustment*
gtk_layout_get_hadjustment (GtkLayout *layout)
{
g_return_val_if_fail (layout != NULL, NULL);
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
return layout->hadjustment;
@ -119,7 +118,6 @@ gtk_layout_get_hadjustment (GtkLayout *layout)
GtkAdjustment*
gtk_layout_get_vadjustment (GtkLayout *layout)
{
g_return_val_if_fail (layout != NULL, NULL);
g_return_val_if_fail (GTK_IS_LAYOUT (layout), NULL);
return layout->vadjustment;
@ -132,7 +130,6 @@ gtk_layout_set_adjustments (GtkLayout *layout,
{
gboolean need_adjust = FALSE;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
if (hadj)
@ -199,7 +196,6 @@ void
gtk_layout_set_hadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
gtk_layout_set_adjustments (layout, adjustment, layout->vadjustment);
@ -211,7 +207,6 @@ void
gtk_layout_set_vadjustment (GtkLayout *layout,
GtkAdjustment *adjustment)
{
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
gtk_layout_set_adjustments (layout, layout->hadjustment, adjustment);
@ -227,9 +222,7 @@ gtk_layout_put (GtkLayout *layout,
{
GtkLayoutChild *child;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
g_return_if_fail (child_widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (child_widget));
child = g_new (GtkLayoutChild, 1);
@ -265,7 +258,6 @@ gtk_layout_move (GtkLayout *layout,
GList *tmp_list;
GtkLayoutChild *child;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
tmp_list = layout->children;
@ -317,7 +309,6 @@ gtk_layout_set_size (GtkLayout *layout,
{
GtkWidget *widget;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
widget = GTK_WIDGET (layout);
@ -370,7 +361,6 @@ gtk_layout_get_size (GtkLayout *layout,
void
gtk_layout_freeze (GtkLayout *layout)
{
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
layout->freeze_count++;
@ -379,7 +369,6 @@ gtk_layout_freeze (GtkLayout *layout)
void
gtk_layout_thaw (GtkLayout *layout)
{
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_LAYOUT (layout));
if (layout->freeze_count)
@ -581,7 +570,6 @@ gtk_layout_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LAYOUT (widget));
layout = GTK_LAYOUT (widget);
@ -634,7 +622,6 @@ gtk_layout_map (GtkWidget *widget)
GList *tmp_list;
GtkLayout *layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LAYOUT (widget));
layout = GTK_LAYOUT (widget);
@ -663,7 +650,6 @@ gtk_layout_unrealize (GtkWidget *widget)
{
GtkLayout *layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LAYOUT (widget));
layout = GTK_LAYOUT (widget);
@ -683,7 +669,6 @@ gtk_layout_size_request (GtkWidget *widget,
GList *tmp_list;
GtkLayout *layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LAYOUT (widget));
layout = GTK_LAYOUT (widget);
@ -711,7 +696,6 @@ gtk_layout_size_allocate (GtkWidget *widget,
GList *tmp_list;
GtkLayout *layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LAYOUT (widget));
widget->allocation = *allocation;
@ -757,7 +741,6 @@ gtk_layout_expose (GtkWidget *widget, GdkEventExpose *event)
{
GtkLayout *layout;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LAYOUT (widget), FALSE);
layout = GTK_LAYOUT (widget);
@ -780,7 +763,6 @@ gtk_layout_remove (GtkContainer *container,
GtkLayout *layout;
GtkLayoutChild *child = NULL;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LAYOUT (container));
layout = GTK_LAYOUT (container);
@ -814,7 +796,6 @@ gtk_layout_forall (GtkContainer *container,
GtkLayoutChild *child;
GList *tmp_list;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LAYOUT (container));
g_return_if_fail (callback != NULL);

66
gtk/gtklist.c
View File

@ -366,7 +366,6 @@ gtk_list_size_request (GtkWidget *widget,
GtkWidget *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
g_return_if_fail (requisition != NULL);
@ -408,7 +407,6 @@ gtk_list_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
g_return_if_fail (allocation != NULL);
@ -455,7 +453,6 @@ gtk_list_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -488,7 +485,6 @@ gtk_list_map (GtkWidget *widget)
GtkWidget *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -513,7 +509,6 @@ gtk_list_unmap (GtkWidget *widget)
{
GtkList *list;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
if (!GTK_WIDGET_MAPPED (widget))
@ -549,7 +544,6 @@ gtk_list_motion_notify (GtkWidget *widget,
gint focus_row = 0;
gint length = 0;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -653,7 +647,6 @@ gtk_list_button_press (GtkWidget *widget,
GtkList *list;
GtkWidget *item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -784,7 +777,6 @@ gtk_list_button_release (GtkWidget *widget,
GtkList *list;
GtkWidget *item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LIST (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -855,9 +847,7 @@ gtk_list_add (GtkContainer *container,
{
GList *item_list;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LIST (container));
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
item_list = g_list_alloc ();
@ -872,7 +862,6 @@ gtk_list_remove (GtkContainer *container,
{
GList *item_list;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LIST (container));
g_return_if_fail (widget != NULL);
g_return_if_fail (container == GTK_CONTAINER (widget->parent));
@ -895,7 +884,6 @@ gtk_list_forall (GtkContainer *container,
GtkWidget *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LIST (container));
g_return_if_fail (callback != NULL);
@ -923,7 +911,6 @@ gtk_list_set_focus_child (GtkContainer *container,
{
GtkList *list;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_LIST (container));
if (child)
@ -1032,7 +1019,6 @@ gtk_list_insert_items (GtkList *list,
GList *last;
gint nchildren;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (!items)
@ -1149,7 +1135,6 @@ void
gtk_list_append_items (GtkList *list,
GList *items)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_insert_items (list, items, -1);
@ -1159,7 +1144,6 @@ void
gtk_list_prepend_items (GtkList *list,
GList *items)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_insert_items (list, items, 0);
@ -1193,7 +1177,6 @@ gtk_list_clear_items (GtkList *list,
guint nchildren;
gboolean grab_focus = FALSE;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
nchildren = g_list_length (list->children);
@ -1290,7 +1273,6 @@ gtk_list_child_position (GtkList *list,
GList *children;
gint pos;
g_return_val_if_fail (list != NULL, -1);
g_return_val_if_fail (GTK_IS_LIST (list), -1);
g_return_val_if_fail (child != NULL, -1);
@ -1327,7 +1309,6 @@ gtk_list_remove_items_internal (GtkList *list,
GList *work;
gboolean grab_focus = FALSE;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (!items)
@ -1438,7 +1419,6 @@ void
gtk_list_set_selection_mode (GtkList *list,
GtkSelectionMode mode)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (list->selection_mode == mode)
@ -1463,7 +1443,6 @@ gtk_list_select_item (GtkList *list,
{
GList *tmp_list;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
tmp_list = g_list_nth (list->children, item);
@ -1477,7 +1456,6 @@ gtk_list_unselect_item (GtkList *list,
{
GList *tmp_list;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
tmp_list = g_list_nth (list->children, item);
@ -1505,7 +1483,6 @@ gtk_list_select_all (GtkList *list)
GtkContainer *container;
GList *work;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (!list->children)
@ -1564,7 +1541,6 @@ gtk_list_unselect_all (GtkList *list)
GtkWidget *item;
GList *work;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (!list->children)
@ -1612,7 +1588,6 @@ gtk_list_extend_selection (GtkList *list,
{
GtkContainer *container;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (list)) ||
@ -1640,7 +1615,6 @@ gtk_list_extend_selection (GtkList *list,
void
gtk_list_end_drag_selection (GtkList *list)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
list->drag_selection = FALSE;
@ -1665,7 +1639,6 @@ gtk_list_start_selection (GtkList *list)
GtkContainer *container;
gint focus_row;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (list))
@ -1689,7 +1662,6 @@ gtk_list_end_selection (GtkList *list)
GtkWidget *item;
gint item_index;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if ((gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (list)) ||
@ -1784,9 +1756,7 @@ void
gtk_list_toggle_row (GtkList *list,
GtkWidget *item)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (item));
switch (list->selection_mode)
@ -1883,7 +1853,6 @@ gtk_list_undo_selection (GtkList *list)
{
GList *work;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (list->selection_mode != GTK_SELECTION_EXTENDED ||
@ -1936,9 +1905,7 @@ static void
gtk_real_list_select_child (GtkList *list,
GtkWidget *child)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (child));
switch (child->state)
@ -1956,9 +1923,7 @@ static void
gtk_real_list_unselect_child (GtkList *list,
GtkWidget *child)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (child));
if (child->state == GTK_STATE_SELECTED)
@ -1982,7 +1947,6 @@ gtk_list_set_anchor (GtkList *list,
{
GList *work;
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (list->selection_mode != GTK_SELECTION_EXTENDED || list->anchor >= 0)
@ -2212,7 +2176,6 @@ gtk_list_scroll_vertical (GtkList *list,
GtkScrollType scroll_type,
gfloat position)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (list))
@ -2455,9 +2418,7 @@ static void
gtk_list_signal_toggle_focus_row (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_toggle_focus_row (list);
@ -2467,9 +2428,7 @@ static void
gtk_list_signal_select_all (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_select_all (list);
@ -2479,9 +2438,7 @@ static void
gtk_list_signal_unselect_all (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_unselect_all (list);
@ -2491,9 +2448,7 @@ static void
gtk_list_signal_undo_selection (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_undo_selection (list);
@ -2503,9 +2458,7 @@ static void
gtk_list_signal_start_selection (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_start_selection (list);
@ -2515,9 +2468,7 @@ static void
gtk_list_signal_end_selection (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_end_selection (list);
@ -2530,9 +2481,7 @@ gtk_list_signal_extend_selection (GtkListItem *list_item,
gboolean auto_start_selection,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_extend_selection (list, scroll_type, position,
@ -2545,9 +2494,7 @@ gtk_list_signal_scroll_horizontal (GtkListItem *list_item,
gfloat position,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_scroll_horizontal (list, scroll_type, position);
@ -2559,9 +2506,7 @@ gtk_list_signal_scroll_vertical (GtkListItem *list_item,
gfloat position,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_scroll_vertical (list, scroll_type, position);
@ -2571,9 +2516,7 @@ static void
gtk_list_signal_toggle_add_mode (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_toggle_add_mode (list);
@ -2587,9 +2530,7 @@ gtk_list_signal_item_select (GtkListItem *list_item,
GList *tmp_list;
GList *sel_list;
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (GTK_WIDGET (list_item)->state != GTK_STATE_SELECTED)
@ -2640,9 +2581,7 @@ gtk_list_signal_item_deselect (GtkListItem *list_item,
{
GList *node;
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if (GTK_WIDGET (list_item)->state != GTK_STATE_NORMAL)
@ -2663,9 +2602,7 @@ static void
gtk_list_signal_item_toggle (GtkListItem *list_item,
GtkList *list)
{
g_return_if_fail (list_item != 0);
g_return_if_fail (GTK_IS_LIST_ITEM (list_item));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
if ((list->selection_mode == GTK_SELECTION_BROWSE ||
@ -2694,9 +2631,7 @@ gtk_list_signal_drag_begin (GtkWidget *widget,
GdkDragContext *context,
GtkList *list)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
g_return_if_fail (list != NULL);
g_return_if_fail (GTK_IS_LIST (list));
gtk_list_drag_begin (GTK_WIDGET (list), context);
@ -2708,7 +2643,6 @@ gtk_list_drag_begin (GtkWidget *widget,
{
GtkList *list;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST (widget));
g_return_if_fail (context != NULL);

6
gtk/gtklistitem.c
View File

@ -418,7 +418,6 @@ gtk_list_item_realize (GtkWidget *widget)
/*if (GTK_WIDGET_CLASS (parent_class)->realize)
(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);*/
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -458,7 +457,6 @@ gtk_list_item_size_request (GtkWidget *widget,
GtkBin *bin;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
g_return_if_fail (requisition != NULL);
@ -484,7 +482,6 @@ gtk_list_item_size_allocate (GtkWidget *widget,
GtkBin *bin;
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (widget));
g_return_if_fail (allocation != NULL);
@ -579,7 +576,6 @@ gtk_list_item_expose (GtkWidget *widget,
static void
gtk_real_list_item_select (GtkItem *item)
{
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (item));
switch (GTK_WIDGET (item)->state)
@ -596,7 +592,6 @@ gtk_real_list_item_select (GtkItem *item)
static void
gtk_real_list_item_deselect (GtkItem *item)
{
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (item));
if (GTK_WIDGET (item)->state == GTK_STATE_SELECTED)
@ -606,7 +601,6 @@ gtk_real_list_item_deselect (GtkItem *item)
static void
gtk_real_list_item_toggle (GtkItem *item)
{
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_LIST_ITEM (item));
switch (GTK_WIDGET (item)->state)

3
gtk/gtkliststore.c
View File

@ -1649,7 +1649,6 @@ gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
{
GtkListStore *list_store = (GtkListStore *) sortable;
g_return_val_if_fail (sortable != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
if (list_store->sort_column_id == -1)
@ -1670,7 +1669,6 @@ gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
GtkListStore *list_store = (GtkListStore *) sortable;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
for (list = list_store->sort_list; list; list = list->next)
@ -1705,7 +1703,6 @@ gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
GtkTreeDataSortHeader *header = NULL;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
g_return_if_fail (func != NULL);

2
gtk/gtkmain.c
View File

@ -1231,7 +1231,6 @@ gtk_quit_add_destroy (guint main_level,
GtkObject **object_p;
g_return_if_fail (main_level > 0);
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
object_p = g_new (GtkObject*, 1);
@ -1610,7 +1609,6 @@ gtk_propagate_event (GtkWidget *widget,
{
gint handled_event;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (event != NULL);

24
gtk/gtkmenu.c
View File

@ -348,9 +348,7 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
{
GtkMenuAttachData *data;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (attach_widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (attach_widget));
g_return_if_fail (detacher != NULL);
@ -386,7 +384,6 @@ gtk_menu_get_attach_widget (GtkMenu *menu)
{
GtkMenuAttachData *data;
g_return_val_if_fail (menu != NULL, NULL);
g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
data = gtk_object_get_data (GTK_OBJECT (menu), attach_data_key);
@ -400,7 +397,6 @@ gtk_menu_detach (GtkMenu *menu)
{
GtkMenuAttachData *data;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
/* keep this function in sync with gtk_widget_unparent()
@ -518,7 +514,6 @@ gtk_menu_popup (GtkMenu *menu,
GdkEvent *current_event;
GtkMenuShell *menu_shell;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
widget = GTK_WIDGET (menu);
@ -629,7 +624,6 @@ gtk_menu_popdown (GtkMenu *menu)
{
GtkMenuShell *menu_shell;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
menu_shell = GTK_MENU_SHELL (menu);
@ -701,7 +695,6 @@ gtk_menu_get_active (GtkMenu *menu)
GtkWidget *child;
GList *children;
g_return_val_if_fail (menu != NULL, NULL);
g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
if (!menu->old_active_menu_item)
@ -734,7 +727,6 @@ gtk_menu_set_active (GtkMenu *menu,
GtkWidget *child;
GList *tmp_list;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
tmp_list = g_list_nth (GTK_MENU_SHELL (menu)->children, index);
@ -778,7 +770,6 @@ gtk_menu_get_accel_group (GtkMenu *menu)
void
gtk_menu_reposition (GtkMenu *menu)
{
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (GTK_WIDGET_DRAWABLE (menu) && !menu->torn_off)
@ -789,7 +780,6 @@ static void
gtk_menu_scrollbar_changed (GtkAdjustment *adjustment,
GtkMenu *menu)
{
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (adjustment->value != menu->scroll_offset)
@ -823,7 +813,6 @@ gtk_menu_set_tearoff_state (GtkMenu *menu,
{
gint width, height;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (menu->torn_off != torn_off)
@ -951,7 +940,6 @@ void
gtk_menu_set_title (GtkMenu *menu,
const gchar *title)
{
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
gtk_object_set_data_full (GTK_OBJECT (menu), "gtk-menu-title",
@ -1003,7 +991,6 @@ gtk_menu_realize (GtkWidget *widget)
GtkWidget *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
@ -1077,7 +1064,6 @@ gtk_menu_unrealize (GtkWidget *widget)
{
GtkMenu *menu;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
@ -1106,7 +1092,6 @@ gtk_menu_size_request (GtkWidget *widget,
GtkRequisition child_requisition;
gint width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
g_return_if_fail (requisition != NULL);
@ -1180,7 +1165,6 @@ gtk_menu_size_allocate (GtkWidget *widget,
gint x, y;
gint width, height;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
g_return_if_fail (allocation != NULL);
@ -1306,7 +1290,6 @@ gtk_menu_paint (GtkWidget *widget)
gint top_pos;
GtkMenu *menu;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
@ -1408,7 +1391,6 @@ static gboolean
gtk_menu_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1431,7 +1413,6 @@ gtk_menu_key_press (GtkWidget *widget,
gboolean delete = FALSE;
gchar *accel = NULL;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1973,7 +1954,6 @@ gtk_menu_deactivate (GtkMenuShell *menu_shell)
{
GtkWidget *parent;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU (menu_shell));
parent = menu_shell->parent_menu_shell;
@ -1997,7 +1977,6 @@ gtk_menu_position (GtkMenu *menu)
gint menu_height;
gboolean push_in;
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
widget = GTK_WIDGET (menu);
@ -2178,7 +2157,6 @@ gtk_menu_select_item (GtkMenuShell *menu_shell,
gint arrow_height;
gboolean last_child = 0;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU (menu_shell));
menu = GTK_MENU (menu_shell);
@ -2320,7 +2298,6 @@ gtk_menu_reparent (GtkMenu *menu,
static void
gtk_menu_show_all (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
/* Show children, but not self. */
@ -2331,7 +2308,6 @@ gtk_menu_show_all (GtkWidget *widget)
static void
gtk_menu_hide_all (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
/* Hide children, but not self. */

4
gtk/gtkmenubar.c
View File

@ -209,7 +209,6 @@ gtk_menu_bar_size_request (GtkWidget *widget,
GtkRequisition child_requisition;
gint ipadding;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (requisition != NULL);
@ -282,7 +281,6 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
guint offset;
gint ipadding;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (allocation != NULL);
@ -349,7 +347,6 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
static void
gtk_menu_bar_paint (GtkWidget *widget, GdkRectangle *area)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_BAR (widget));
if (GTK_WIDGET_DRAWABLE (widget))
@ -373,7 +370,6 @@ static gint
gtk_menu_bar_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_BAR (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

24
gtk/gtkmenuitem.c
View File

@ -263,7 +263,6 @@ gtk_menu_item_destroy (GtkObject *object)
{
GtkMenuItem *menu_item;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (object));
menu_item = GTK_MENU_ITEM (object);
@ -281,7 +280,6 @@ gtk_menu_item_detacher (GtkWidget *widget,
{
GtkMenuItem *menu_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
menu_item = GTK_MENU_ITEM (widget);
@ -294,7 +292,6 @@ void
gtk_menu_item_set_submenu (GtkMenuItem *menu_item,
GtkWidget *submenu)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
if (menu_item->submenu != submenu)
@ -331,7 +328,6 @@ gtk_menu_item_get_submenu (GtkMenuItem *menu_item)
void
gtk_menu_item_remove_submenu (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
if (menu_item->submenu)
@ -342,7 +338,6 @@ void
gtk_menu_item_set_placement (GtkMenuItem *menu_item,
GtkSubmenuPlacement placement)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
menu_item->submenu_placement = placement;
@ -353,7 +348,6 @@ gtk_menu_item_configure (GtkMenuItem *menu_item,
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;
@ -363,7 +357,6 @@ gtk_menu_item_configure (GtkMenuItem *menu_item,
void
gtk_menu_item_select (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_item_select (GTK_ITEM (menu_item));
@ -372,7 +365,6 @@ gtk_menu_item_select (GtkMenuItem *menu_item)
void
gtk_menu_item_deselect (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_item_deselect (GTK_ITEM (menu_item));
@ -381,7 +373,6 @@ gtk_menu_item_deselect (GtkMenuItem *menu_item)
void
gtk_menu_item_activate (GtkMenuItem *menu_item)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[ACTIVATE]);
@ -391,7 +382,6 @@ void
gtk_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[TOGGLE_SIZE_REQUEST], requisition);
@ -401,7 +391,6 @@ void
gtk_menu_item_toggle_size_allocate (GtkMenuItem *menu_item,
gint allocation)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
gtk_signal_emit (GTK_OBJECT (menu_item), menu_item_signals[TOGGLE_SIZE_ALLOCATE], allocation);
@ -434,7 +423,6 @@ gtk_menu_item_size_request (GtkWidget *widget,
GtkBin *bin;
guint accel_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (requisition != NULL);
@ -475,7 +463,6 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
GtkBin *bin;
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
g_return_if_fail (allocation != NULL);
@ -520,7 +507,6 @@ gtk_menu_item_paint (GtkWidget *widget,
gint width, height;
gint x, y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
if (GTK_WIDGET_DRAWABLE (widget))
@ -573,7 +559,6 @@ static gint
gtk_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -592,7 +577,6 @@ gtk_real_menu_item_select (GtkItem *item)
{
GtkMenuItem *menu_item;
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (item));
menu_item = GTK_MENU_ITEM (item);
@ -624,7 +608,6 @@ gtk_real_menu_item_deselect (GtkItem *item)
{
GtkMenuItem *menu_item;
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (item));
menu_item = GTK_MENU_ITEM (item);
@ -678,7 +661,6 @@ gtk_real_menu_item_activate_item (GtkMenuItem *menu_item)
GtkWidget *widget;
GtkMenuShell *submenu;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
widget = GTK_WIDGET (menu_item);
@ -713,7 +695,6 @@ static void
gtk_real_menu_item_toggle_size_request (GtkMenuItem *menu_item,
gint *requisition)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
*requisition = 0;
@ -723,7 +704,6 @@ static void
gtk_real_menu_item_toggle_size_allocate (GtkMenuItem *menu_item,
gint allocation)
{
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
menu_item->toggle_size = allocation;
@ -852,7 +832,6 @@ gtk_menu_item_position_menu (GtkMenu *menu,
void
gtk_menu_item_right_justify (GtkMenuItem *menuitem)
{
g_return_if_fail (menuitem != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menuitem));
menuitem->right_justify = 1;
@ -864,7 +843,6 @@ gtk_menu_item_show_all (GtkWidget *widget)
{
GtkMenuItem *menu_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
menu_item = GTK_MENU_ITEM (widget);
@ -882,7 +860,6 @@ gtk_menu_item_hide_all (GtkWidget *widget)
{
GtkMenuItem *menu_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
gtk_widget_hide (widget);
@ -904,7 +881,6 @@ gtk_menu_item_forall (GtkContainer *container,
GtkBin *bin;
GtkMenuItem *menu_item;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (container));
g_return_if_fail (callback != NULL);

18
gtk/gtkmenushell.c
View File

@ -320,9 +320,7 @@ gtk_menu_shell_insert (GtkMenuShell *menu_shell,
{
GtkMenuShellClass *class;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (child));
class = GTK_MENU_SHELL_GET_CLASS (menu_shell);
@ -355,7 +353,6 @@ gtk_menu_shell_real_insert (GtkMenuShell *menu_shell,
void
gtk_menu_shell_deactivate (GtkMenuShell *menu_shell)
{
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
gtk_signal_emit (GTK_OBJECT (menu_shell), menu_shell_signals[DEACTIVATE]);
@ -368,7 +365,6 @@ gtk_menu_shell_map (GtkWidget *widget)
GtkWidget *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (widget));
menu_shell = GTK_MENU_SHELL (widget);
@ -393,7 +389,6 @@ gtk_menu_shell_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -429,7 +424,6 @@ gtk_menu_shell_button_press (GtkWidget *widget,
GtkMenuShell *menu_shell;
GtkWidget *menu_item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -483,7 +477,6 @@ gtk_menu_shell_button_release (GtkWidget *widget,
GtkWidget *menu_item;
gint deactivate;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -562,7 +555,6 @@ gtk_menu_shell_key_press (GtkWidget *widget,
GtkMenuShell *menu_shell;
GtkWidget *toplevel;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -596,7 +588,6 @@ gtk_menu_shell_enter_notify (GtkWidget *widget,
GtkMenuShell *menu_shell;
GtkWidget *menu_item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -639,7 +630,6 @@ gtk_menu_shell_leave_notify (GtkWidget *widget,
GtkMenuItem *menu_item;
GtkWidget *event_widget;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -694,9 +684,7 @@ gtk_menu_shell_remove (GtkContainer *container,
GtkMenuShell *menu_shell;
gint was_visible;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (container));
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (widget));
was_visible = GTK_WIDGET_VISIBLE (widget);
@ -728,7 +716,6 @@ gtk_menu_shell_forall (GtkContainer *container,
GtkWidget *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (container));
g_return_if_fail (callback != NULL);
@ -779,7 +766,6 @@ gtk_menu_shell_is_item (GtkMenuShell *menu_shell,
{
GtkWidget *parent;
g_return_val_if_fail (menu_shell != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), FALSE);
g_return_val_if_fail (child != NULL, FALSE);
@ -819,9 +805,7 @@ gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
{
GtkMenuShellClass *class;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
class = GTK_MENU_SHELL_GET_CLASS (menu_shell);
@ -869,9 +853,7 @@ gtk_menu_shell_activate_item (GtkMenuShell *menu_shell,
GSList *slist, *shells = NULL;
gboolean deactivate = force_deactivate;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
if (!deactivate)

3
gtk/gtkmisc.c
View File

@ -206,7 +206,6 @@ gtk_misc_set_alignment (GtkMisc *misc,
gfloat xalign,
gfloat yalign)
{
g_return_if_fail (misc != NULL);
g_return_if_fail (GTK_IS_MISC (misc));
if (xalign < 0.0)
@ -271,7 +270,6 @@ gtk_misc_set_padding (GtkMisc *misc,
{
GtkRequisition *requisition;
g_return_if_fail (misc != NULL);
g_return_if_fail (GTK_IS_MISC (misc));
if (xpad < 0)
@ -330,7 +328,6 @@ gtk_misc_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MISC (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);

35
gtk/gtknotebook.c
View File

@ -577,7 +577,6 @@ gtk_notebook_destroy (GtkObject *object)
{
GtkNotebook *notebook;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (object));
notebook = GTK_NOTEBOOK (object);
@ -708,7 +707,6 @@ gtk_notebook_map (GtkWidget *widget)
GtkNotebookPage *page;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -744,7 +742,6 @@ gtk_notebook_map (GtkWidget *widget)
static void
gtk_notebook_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -760,7 +757,6 @@ gtk_notebook_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
notebook = GTK_NOTEBOOK (widget);
@ -796,7 +792,6 @@ gtk_notebook_unrealize (GtkWidget *widget)
{
GtkNotebook *notebook;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
notebook = GTK_NOTEBOOK (widget);
@ -823,7 +818,6 @@ gtk_notebook_size_request (GtkWidget *widget,
gboolean switch_page = FALSE;
gint vis_pages;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
g_return_if_fail (requisition != NULL);
@ -1077,7 +1071,6 @@ gtk_notebook_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
g_return_if_fail (allocation != NULL);
@ -1148,7 +1141,6 @@ gtk_notebook_expose (GtkWidget *widget,
GtkNotebook *notebook;
GdkRectangle child_area;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1235,7 +1227,6 @@ gtk_notebook_button_press (GtkWidget *widget,
GList *children;
gint num;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1308,7 +1299,6 @@ gtk_notebook_button_release (GtkWidget *widget,
{
GtkNotebook *notebook;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1344,7 +1334,6 @@ gtk_notebook_enter_notify (GtkWidget *widget,
{
GtkNotebook *notebook;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1374,7 +1363,6 @@ gtk_notebook_leave_notify (GtkWidget *widget,
{
GtkNotebook *notebook;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1392,7 +1380,6 @@ gtk_notebook_motion_notify (GtkWidget *widget,
{
GtkNotebook *notebook;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1426,7 +1413,6 @@ static gint
gtk_notebook_focus_in (GtkWidget *widget,
GdkEventFocus *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1440,7 +1426,6 @@ gtk_notebook_draw_focus (GtkWidget *widget)
{
GtkNotebook *notebook;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
notebook = GTK_NOTEBOOK (widget);
@ -1613,7 +1598,6 @@ static void
gtk_notebook_add (GtkContainer *container,
GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (container));
gtk_notebook_insert_page_menu (GTK_NOTEBOOK (container), widget,
@ -1629,7 +1613,6 @@ gtk_notebook_remove (GtkContainer *container,
GList *children;
guint page_num;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (container));
g_return_if_fail (widget != NULL);
@ -1802,7 +1785,6 @@ gtk_notebook_set_focus_child (GtkContainer *container,
{
GtkNotebook *notebook;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (container));
if (child)
@ -1839,7 +1821,6 @@ gtk_notebook_forall (GtkContainer *container,
GtkNotebook *notebook;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (container));
g_return_if_fail (callback != NULL);
@ -1888,7 +1869,6 @@ gtk_notebook_panel_realize (GtkNotebook *notebook)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
widget = GTK_WIDGET (notebook);
@ -1990,7 +1970,6 @@ static void
gtk_notebook_focus_changed (GtkNotebook *notebook,
GtkNotebookPage *old_page)
{
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
if (GTK_WIDGET_DRAWABLE (notebook) && notebook->show_tabs)
@ -2195,7 +2174,6 @@ gtk_notebook_real_page_position (GtkNotebook *notebook,
GList *work;
gint count_start;
g_return_val_if_fail (notebook != NULL, -1);
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1);
g_return_val_if_fail (list != NULL, -1);
@ -2223,7 +2201,6 @@ gtk_notebook_search_page (GtkNotebook *notebook,
GList *old_list = NULL;
gint flag = 0;
g_return_val_if_fail (notebook != NULL, NULL);
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL);
switch (direction)
@ -2297,7 +2274,6 @@ gtk_notebook_paint (GtkWidget *widget,
gint x, y;
gint gap_x = 0, gap_width = 0;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
g_return_if_fail (area != NULL);
@ -2515,7 +2491,6 @@ gtk_notebook_draw_arrow (GtkNotebook *notebook,
GtkShadowType shadow_type;
GtkWidget *widget;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
widget = GTK_WIDGET(notebook);
@ -3402,7 +3377,6 @@ gtk_notebook_real_switch_page (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num)
{
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (page != NULL);
@ -3438,7 +3412,6 @@ gtk_notebook_switch_page (GtkNotebook *notebook,
GtkNotebookPage *page,
gint page_num)
{
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (page != NULL);
@ -3461,7 +3434,6 @@ gtk_notebook_page_select (GtkNotebook *notebook,
GtkNotebookPage *page;
GtkDirectionType dir = GTK_DIR_DOWN; /* Quiet GCC */
g_return_val_if_fail (notebook != NULL, FALSE);
g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
if (!notebook->focus_tab)
@ -3502,7 +3474,6 @@ gtk_notebook_switch_focus_tab (GtkNotebook *notebook,
GtkNotebookPage *old_page = NULL;
GtkNotebookPage *page;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
if (notebook->focus_tab == new_child)
@ -3609,7 +3580,6 @@ gtk_notebook_menu_detacher (GtkWidget *widget,
{
GtkNotebook *notebook;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (widget));
notebook = GTK_NOTEBOOK (widget);
@ -3941,7 +3911,6 @@ gtk_notebook_remove_page (GtkNotebook *notebook,
{
GList *list;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
if (page_num >= 0)
@ -4150,7 +4119,6 @@ void
gtk_notebook_set_show_border (GtkNotebook *notebook,
gboolean show_border)
{
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
if (notebook->show_border != show_border)
@ -4195,7 +4163,6 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
GtkNotebookPage *page;
GList *children;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
show_tabs = show_tabs != FALSE;
@ -4709,7 +4676,6 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook,
GtkNotebookPage *page;
GList *list;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (child != NULL);
@ -4838,7 +4804,6 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
GtkNotebookPage *page;
GList *list;
g_return_if_fail (notebook != NULL);
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
g_return_if_fail (child != NULL);

3
gtk/gtkobject.c
View File

@ -448,7 +448,6 @@ gtk_object_get_property (GObject *object,
void
gtk_object_sink (GtkObject *object)
{
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
if (GTK_OBJECT_FLOATING (object))
@ -493,7 +492,6 @@ gtk_object_weakref (GtkObject *object,
{
GtkWeakRef *weak;
g_return_if_fail (object != NULL);
g_return_if_fail (notify != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
@ -514,7 +512,6 @@ gtk_object_weakunref (GtkObject *object,
{
GtkWeakRef *weaks, *w, **wp;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OBJECT (object));
if (!quark_weakrefs)

2
gtk/gtkoldeditable.c
View File

@ -748,7 +748,6 @@ gtk_old_editable_claim_selection (GtkOldEditable *old_editable,
gboolean claim,
guint32 time)
{
g_return_if_fail (old_editable != NULL);
g_return_if_fail (GTK_IS_OLD_EDITABLE (old_editable));
g_return_if_fail (GTK_WIDGET_REALIZED (old_editable));
@ -846,7 +845,6 @@ gtk_old_editable_real_paste_clipboard (GtkOldEditable *old_editable)
void
gtk_old_editable_changed (GtkOldEditable *old_editable)
{
g_return_if_fail (old_editable != NULL);
g_return_if_fail (GTK_IS_OLD_EDITABLE (old_editable));
gtk_signal_emit (GTK_OBJECT (old_editable), editable_signals[CHANGED]);

18
gtk/gtkoptionmenu.c
View File

@ -193,7 +193,6 @@ gtk_option_menu_new (void)
GtkWidget*
gtk_option_menu_get_menu (GtkOptionMenu *option_menu)
{
g_return_val_if_fail (option_menu != NULL, NULL);
g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), NULL);
return option_menu->menu;
@ -205,7 +204,6 @@ gtk_option_menu_detacher (GtkWidget *widget,
{
GtkOptionMenu *option_menu;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (widget));
option_menu = GTK_OPTION_MENU (widget);
@ -222,9 +220,7 @@ void
gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
GtkWidget *menu)
{
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (option_menu->menu != menu)
@ -255,7 +251,6 @@ gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
void
gtk_option_menu_remove_menu (GtkOptionMenu *option_menu)
{
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
if (option_menu->menu)
@ -268,7 +263,6 @@ gtk_option_menu_set_history (GtkOptionMenu *option_menu,
{
GtkWidget *menu_item;
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
if (option_menu->menu)
@ -316,7 +310,6 @@ gtk_option_menu_destroy (GtkObject *object)
{
GtkOptionMenu *option_menu;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (object));
option_menu = GTK_OPTION_MENU (object);
@ -433,7 +426,6 @@ gtk_option_menu_paint (GtkWidget *widget,
GtkOptionMenuProps props;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (widget));
g_return_if_fail (area != NULL);
@ -509,7 +501,6 @@ static gint
gtk_option_menu_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -569,7 +560,6 @@ gtk_option_menu_button_press (GtkWidget *widget,
GtkOptionMenu *option_menu;
GtkWidget *menu_item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -598,7 +588,6 @@ gtk_option_menu_key_press (GtkWidget *widget,
GtkOptionMenu *option_menu;
GtkWidget *menu_item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -626,7 +615,6 @@ gtk_option_menu_deactivate (GtkMenuShell *menu_shell,
GtkOptionMenu *option_menu)
{
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
gtk_option_menu_update_contents (option_menu);
@ -696,7 +684,6 @@ gtk_option_menu_update_contents (GtkOptionMenu *option_menu)
GtkWidget *child;
GtkRequisition child_requisition;
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
if (option_menu->menu)
@ -740,7 +727,6 @@ gtk_option_menu_remove_contents (GtkOptionMenu *option_menu)
{
GtkWidget *child;
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
if (option_menu->menu_item)
@ -774,7 +760,6 @@ gtk_option_menu_calc_size (GtkOptionMenu *option_menu)
gint old_width = option_menu->width;
gint old_height = option_menu->height;
g_return_if_fail (option_menu != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (option_menu));
option_menu->width = 0;
@ -819,7 +804,6 @@ gtk_option_menu_position (GtkMenu *menu,
gint menu_ypos;
gint menu_width;
g_return_if_fail (user_data != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (user_data));
option_menu = GTK_OPTION_MENU (user_data);
@ -874,7 +858,6 @@ gtk_option_menu_show_all (GtkWidget *widget)
GtkContainer *container;
GtkOptionMenu *option_menu;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (widget));
container = GTK_CONTAINER (widget);
option_menu = GTK_OPTION_MENU (widget);
@ -893,7 +876,6 @@ gtk_option_menu_hide_all (GtkWidget *widget)
{
GtkContainer *container;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_OPTION_MENU (widget));
container = GTK_CONTAINER (widget);

15
gtk/gtkpacker.c
View File

@ -563,7 +563,6 @@ void
gtk_packer_set_spacing (GtkPacker *packer,
guint spacing)
{
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
if (spacing != packer->spacing)
@ -609,7 +608,6 @@ void
gtk_packer_set_default_border_width (GtkPacker *packer,
guint border)
{
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
if (packer->default_border_width != border)
@ -625,7 +623,6 @@ gtk_packer_set_default_pad (GtkPacker *packer,
guint pad_x,
guint pad_y)
{
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
if (packer->default_pad_x != pad_x ||
@ -647,7 +644,6 @@ gtk_packer_set_default_ipad (GtkPacker *packer,
guint i_pad_x,
guint i_pad_y)
{
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
if (packer->default_i_pad_x != i_pad_x ||
@ -680,9 +676,7 @@ gtk_packer_add_defaults (GtkPacker *packer,
{
GtkPackerChild *pchild;
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
pchild = (GtkPackerChild*) g_malloc(sizeof(GtkPackerChild));
@ -730,9 +724,7 @@ gtk_packer_add (GtkPacker *packer,
{
GtkPackerChild *pchild;
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
pchild = (GtkPackerChild*) g_malloc(sizeof(GtkPackerChild));
@ -781,7 +773,6 @@ gtk_packer_set_child_packing (GtkPacker *packer,
GList *list;
GtkPackerChild *pchild;
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
g_return_if_fail (child != NULL);
@ -820,7 +811,6 @@ gtk_packer_reorder_child (GtkPacker *packer,
{
GList *list;
g_return_if_fail (packer != NULL);
g_return_if_fail (GTK_IS_PACKER (packer));
g_return_if_fail (child != NULL);
@ -921,7 +911,6 @@ gtk_packer_map (GtkWidget *widget)
GtkPackerChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PACKER (widget));
packer = GTK_PACKER (widget);
@ -946,7 +935,6 @@ gtk_packer_unmap (GtkWidget *widget)
GtkPackerChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PACKER (widget));
packer = GTK_PACKER (widget);
@ -977,7 +965,6 @@ gtk_packer_size_request (GtkWidget *widget,
gint width, height;
gint maxWidth, maxHeight;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PACKER (widget));
g_return_if_fail (requisition != NULL);
@ -1139,7 +1126,6 @@ gtk_packer_size_allocate (GtkWidget *widget,
gint frameHeight, frameWidth, frameX, frameY;
gint borderX, borderY;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PACKER (widget));
g_return_if_fail (allocation != NULL);
@ -1305,7 +1291,6 @@ gtk_packer_forall (GtkContainer *container,
GtkPackerChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PACKER (container));
g_return_if_fail (callback != NULL);

13
gtk/gtkpaned.c
View File

@ -223,7 +223,6 @@ gtk_paned_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PANED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -277,7 +276,6 @@ gtk_paned_map (GtkWidget *widget)
{
GtkPaned *paned;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PANED (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -298,7 +296,6 @@ gtk_paned_map (GtkWidget *widget)
static void
gtk_paned_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PANED (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -311,7 +308,6 @@ gtk_paned_unrealize (GtkWidget *widget)
{
GtkPaned *paned;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PANED (widget));
paned = GTK_PANED (widget);
@ -341,7 +337,6 @@ gtk_paned_expose (GtkWidget *widget,
{
GtkPaned *paned;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PANED (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -376,7 +371,6 @@ gtk_paned_pack1 (GtkPaned *paned,
gboolean resize,
gboolean shrink)
{
g_return_if_fail (paned != NULL);
g_return_if_fail (GTK_IS_PANED (paned));
g_return_if_fail (GTK_IS_WIDGET (child));
@ -407,7 +401,6 @@ gtk_paned_pack2 (GtkPaned *paned,
gboolean resize,
gboolean shrink)
{
g_return_if_fail (paned != NULL);
g_return_if_fail (GTK_IS_PANED (paned));
g_return_if_fail (GTK_IS_WIDGET (child));
@ -439,7 +432,6 @@ gtk_paned_add (GtkContainer *container,
{
GtkPaned *paned;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PANED (container));
g_return_if_fail (widget != NULL);
@ -458,7 +450,6 @@ gtk_paned_remove (GtkContainer *container,
GtkPaned *paned;
gboolean was_visible;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PANED (container));
g_return_if_fail (widget != NULL);
@ -493,7 +484,6 @@ gtk_paned_forall (GtkContainer *container,
{
GtkPaned *paned;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_PANED (container));
g_return_if_fail (callback != NULL);
@ -516,7 +506,6 @@ gtk_paned_forall (GtkContainer *container,
gint
gtk_paned_get_position (GtkPaned *paned)
{
g_return_val_if_fail (paned != NULL, 0);
g_return_val_if_fail (GTK_IS_PANED (paned), 0);
return paned->child1_size;
@ -536,7 +525,6 @@ gtk_paned_set_position (GtkPaned *paned,
{
GObject *object;
g_return_if_fail (paned != NULL);
g_return_if_fail (GTK_IS_PANED (paned));
object = G_OBJECT (paned);
@ -574,7 +562,6 @@ gtk_paned_compute_position(GtkPaned *paned,
{
gint old_position;
g_return_if_fail (paned != NULL);
g_return_if_fail (GTK_IS_PANED (paned));
old_position = paned->child1_size;

4
gtk/gtkpixmap.c
View File

@ -124,7 +124,6 @@ gtk_pixmap_set (GtkPixmap *pixmap,
gint oldwidth;
gint oldheight;
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
if (pixmap->pixmap != val)
@ -176,7 +175,6 @@ gtk_pixmap_get (GtkPixmap *pixmap,
GdkPixmap **val,
GdkBitmap **mask)
{
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
if (val)
@ -193,7 +191,6 @@ gtk_pixmap_expose (GtkWidget *widget,
GtkMisc *misc;
gint x, y;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PIXMAP (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -247,7 +244,6 @@ gtk_pixmap_expose (GtkWidget *widget,
void
gtk_pixmap_set_build_insensitive (GtkPixmap *pixmap, gboolean build)
{
g_return_if_fail (pixmap != NULL);
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
pixmap->build_insensitive = build;

2
gtk/gtkplug.c
View File

@ -365,7 +365,6 @@ gtk_plug_unrealize (GtkWidget *widget)
{
GtkPlug *plug;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PLUG (widget));
plug = GTK_PLUG (widget);
@ -398,7 +397,6 @@ gtk_plug_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PLUG (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);

8
gtk/gtkpreview.c
View File

@ -221,7 +221,6 @@ gtk_preview_size (GtkPreview *preview,
gint width,
gint height)
{
g_return_if_fail (preview != NULL);
g_return_if_fail (GTK_IS_PREVIEW (preview));
if ((width != GTK_WIDGET (preview)->requisition.width) ||
@ -253,7 +252,6 @@ gtk_preview_put (GtkPreview *preview,
guint bpp;
guint rowstride;
g_return_if_fail (preview != NULL);
g_return_if_fail (GTK_IS_PREVIEW (preview));
g_return_if_fail (window != NULL);
@ -313,7 +311,6 @@ gtk_preview_draw_row (GtkPreview *preview,
guint bpp;
guint rowstride;
g_return_if_fail (preview != NULL);
g_return_if_fail (GTK_IS_PREVIEW (preview));
g_return_if_fail (data != NULL);
g_return_if_fail (preview_class->info.visual != NULL);
@ -362,7 +359,6 @@ void
gtk_preview_set_expand (GtkPreview *preview,
gboolean expand)
{
g_return_if_fail (preview != NULL);
g_return_if_fail (GTK_IS_PREVIEW (preview));
expand = expand != FALSE;
@ -473,7 +469,6 @@ gtk_preview_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PREVIEW (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -515,7 +510,6 @@ gtk_preview_size_allocate (GtkWidget *widget,
GtkPreview *preview;
gint width, height;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PREVIEW (widget));
preview = GTK_PREVIEW (widget);
@ -548,7 +542,6 @@ gtk_preview_expose (GtkWidget *widget,
GtkPreview *preview;
gint width, height;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PREVIEW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -576,7 +569,6 @@ gtk_preview_make_buffer (GtkPreview *preview)
gint width;
gint height;
g_return_if_fail (preview != NULL);
g_return_if_fail (GTK_IS_PREVIEW (preview));
widget = GTK_WIDGET (preview);

18
gtk/gtkprogress.c
View File

@ -236,7 +236,6 @@ gtk_progress_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PROGRESS (widget));
progress = GTK_PROGRESS (widget);
@ -270,7 +269,6 @@ gtk_progress_destroy (GtkObject *object)
{
GtkProgress *progress;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_PROGRESS (object));
progress = GTK_PROGRESS (object);
@ -308,7 +306,6 @@ static gint
gtk_progress_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_PROGRESS (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -328,7 +325,6 @@ static void
gtk_progress_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PROGRESS (widget));
g_return_if_fail (allocation != NULL);
@ -349,7 +345,6 @@ gtk_progress_create_pixmap (GtkProgress *progress)
{
GtkWidget *widget;
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (GTK_WIDGET_REALIZED (progress))
@ -492,7 +487,6 @@ void
gtk_progress_set_adjustment (GtkProgress *progress,
GtkAdjustment *adjustment)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@ -528,7 +522,6 @@ gtk_progress_configure (GtkProgress *progress,
GtkAdjustment *adj;
gboolean changed = FALSE;
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
g_return_if_fail (min <= max);
g_return_if_fail (value >= min && value <= max);
@ -553,7 +546,6 @@ void
gtk_progress_set_percentage (GtkProgress *progress,
gdouble percentage)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
g_return_if_fail (percentage >= 0 && percentage <= 1.0);
@ -566,7 +558,6 @@ gtk_progress_set_percentage (GtkProgress *progress,
gdouble
gtk_progress_get_current_percentage (GtkProgress *progress)
{
g_return_val_if_fail (progress != NULL, 0);
g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
if (!progress->adjustment)
@ -580,7 +571,6 @@ gdouble
gtk_progress_get_percentage_from_value (GtkProgress *progress,
gdouble value)
{
g_return_val_if_fail (progress != NULL, 0);
g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
if (!progress->adjustment)
@ -598,7 +588,6 @@ void
gtk_progress_set_value (GtkProgress *progress,
gdouble value)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (!progress->adjustment)
@ -611,7 +600,6 @@ gtk_progress_set_value (GtkProgress *progress,
gdouble
gtk_progress_get_value (GtkProgress *progress)
{
g_return_val_if_fail (progress != NULL, 0);
g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
return progress->adjustment ? progress->adjustment->value : 0;
@ -621,7 +609,6 @@ void
gtk_progress_set_show_text (GtkProgress *progress,
gboolean show_text)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (progress->show_text != show_text)
@ -640,7 +627,6 @@ gtk_progress_set_text_alignment (GtkProgress *progress,
gfloat x_align,
gfloat y_align)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
g_return_if_fail (x_align >= 0.0 && x_align <= 1.0);
g_return_if_fail (y_align >= 0.0 && y_align <= 1.0);
@ -668,7 +654,6 @@ void
gtk_progress_set_format_string (GtkProgress *progress,
const gchar *format)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
/* Turn on format, in case someone called
@ -690,7 +675,6 @@ gtk_progress_set_format_string (GtkProgress *progress,
gchar *
gtk_progress_get_current_text (GtkProgress *progress)
{
g_return_val_if_fail (progress != NULL, 0);
g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
if (!progress->adjustment)
@ -704,7 +688,6 @@ gchar *
gtk_progress_get_text_from_value (GtkProgress *progress,
gdouble value)
{
g_return_val_if_fail (progress != NULL, 0);
g_return_val_if_fail (GTK_IS_PROGRESS (progress), 0);
if (!progress->adjustment)
@ -718,7 +701,6 @@ void
gtk_progress_set_activity_mode (GtkProgress *progress,
gboolean activity_mode)
{
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
if (progress->activity_mode != (activity_mode != FALSE))

14
gtk/gtkprogressbar.c
View File

@ -331,7 +331,6 @@ gtk_progress_bar_new_with_adjustment (GtkAdjustment *adjustment)
{
GtkWidget *pbar;
g_return_val_if_fail (adjustment != NULL, NULL);
g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), NULL);
pbar = gtk_widget_new (GTK_TYPE_PROGRESS_BAR,
@ -347,7 +346,6 @@ gtk_progress_bar_real_update (GtkProgress *progress)
GtkProgressBar *pbar;
GtkWidget *widget;
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS (progress));
pbar = GTK_PROGRESS_BAR (progress);
@ -453,7 +451,6 @@ gtk_progress_bar_size_request (GtkWidget *widget,
PangoRectangle logical_rect;
PangoLayout *layout;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
g_return_if_fail (requisition != NULL);
@ -573,7 +570,6 @@ gtk_progress_bar_paint (GtkProgress *progress)
gdouble percentage;
gint size;
g_return_if_fail (progress != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (progress));
pbar = GTK_PROGRESS_BAR (progress);
@ -862,7 +858,6 @@ void
gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
gdouble fraction)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
/* If we know the percentage, we don't want activity mode. */
@ -890,7 +885,6 @@ gtk_progress_bar_set_fraction (GtkProgressBar *pbar,
void
gtk_progress_bar_pulse (GtkProgressBar *pbar)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
/* If we don't know the percentage, we must want activity mode. */
@ -911,7 +905,6 @@ void
gtk_progress_bar_set_text (GtkProgressBar *pbar,
const gchar *text)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
/* We don't support formats in this interface */
@ -943,7 +936,6 @@ void
gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar,
gdouble fraction)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
pbar->pulse_fraction = fraction;
@ -955,7 +947,6 @@ void
gtk_progress_bar_update (GtkProgressBar *pbar,
gdouble percentage)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
/* Use of gtk_progress_bar_update() is deprecated !
@ -977,7 +968,6 @@ void
gtk_progress_bar_set_orientation (GtkProgressBar *pbar,
GtkProgressBarOrientation orientation)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
if (pbar->orientation != orientation)
@ -1065,7 +1055,6 @@ void
gtk_progress_bar_set_bar_style (GtkProgressBar *pbar,
GtkProgressBarStyle bar_style)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
if (pbar->bar_style != bar_style)
@ -1083,7 +1072,6 @@ void
gtk_progress_bar_set_discrete_blocks (GtkProgressBar *pbar,
guint blocks)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
g_return_if_fail (blocks > 1);
@ -1102,7 +1090,6 @@ void
gtk_progress_bar_set_activity_step (GtkProgressBar *pbar,
guint step)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
if (pbar->activity_step != step)
@ -1116,7 +1103,6 @@ void
gtk_progress_bar_set_activity_blocks (GtkProgressBar *pbar,
guint blocks)
{
g_return_if_fail (pbar != NULL);
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
g_return_if_fail (blocks > 1);

5
gtk/gtkradiobutton.c
View File

@ -160,7 +160,6 @@ void
gtk_radio_button_set_group (GtkRadioButton *radio_button,
GSList *group)
{
g_return_if_fail (radio_button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (radio_button));
g_return_if_fail (!g_slist_find (group, radio_button));
@ -302,7 +301,6 @@ gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *group,
GSList*
gtk_radio_button_get_group (GtkRadioButton *radio_button)
{
g_return_val_if_fail (radio_button != NULL, NULL);
g_return_val_if_fail (GTK_IS_RADIO_BUTTON (radio_button), NULL);
return radio_button->group;
@ -316,7 +314,6 @@ gtk_radio_button_destroy (GtkObject *object)
GtkRadioButton *tmp_button;
GSList *tmp_list;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (object));
radio_button = GTK_RADIO_BUTTON (object);
@ -346,7 +343,6 @@ gtk_radio_button_clicked (GtkButton *button)
GSList *tmp_list;
gint toggled;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (button));
radio_button = GTK_RADIO_BUTTON (button);
@ -428,7 +424,6 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button,
gint x, y;
gint indicator_size, indicator_spacing;
g_return_if_fail (check_button != NULL);
g_return_if_fail (GTK_IS_RADIO_BUTTON (check_button));
if (GTK_WIDGET_VISIBLE (check_button) && GTK_WIDGET_MAPPED (check_button))

5
gtk/gtkradiomenuitem.c
View File

@ -78,7 +78,6 @@ void
gtk_radio_menu_item_set_group (GtkRadioMenuItem *radio_menu_item,
GSList *group)
{
g_return_if_fail (radio_menu_item != NULL);
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item));
g_return_if_fail (!g_slist_find (group, radio_menu_item));
@ -172,7 +171,6 @@ gtk_radio_menu_item_new_with_mnemonic (GSList *group,
GSList*
gtk_radio_menu_item_group (GtkRadioMenuItem *radio_menu_item)
{
g_return_val_if_fail (radio_menu_item != NULL, NULL);
g_return_val_if_fail (GTK_IS_RADIO_MENU_ITEM (radio_menu_item), NULL);
return radio_menu_item->group;
@ -212,7 +210,6 @@ gtk_radio_menu_item_destroy (GtkObject *object)
GtkRadioMenuItem *tmp_menu_item;
GSList *tmp_list;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (object));
radio_menu_item = GTK_RADIO_MENU_ITEM (object);
@ -242,7 +239,6 @@ gtk_radio_menu_item_activate (GtkMenuItem *menu_item)
GSList *tmp_list;
gint toggled;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (menu_item));
radio_menu_item = GTK_RADIO_MENU_ITEM (menu_item);
@ -305,7 +301,6 @@ gtk_radio_menu_item_draw_indicator (GtkCheckMenuItem *check_menu_item,
gint width, height;
gint x, y;
g_return_if_fail (check_menu_item != NULL);
g_return_if_fail (GTK_IS_RADIO_MENU_ITEM (check_menu_item));
if (GTK_WIDGET_DRAWABLE (check_menu_item))

6
gtk/gtkrange.c
View File

@ -397,7 +397,6 @@ gtk_range_init (GtkRange *range)
GtkAdjustment*
gtk_range_get_adjustment (GtkRange *range)
{
g_return_val_if_fail (range != NULL, NULL);
g_return_val_if_fail (GTK_IS_RANGE (range), NULL);
if (!range->adjustment)
@ -425,7 +424,6 @@ void
gtk_range_set_update_policy (GtkRange *range,
GtkUpdateType policy)
{
g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range));
if (range->update_policy != policy)
@ -469,7 +467,6 @@ void
gtk_range_set_adjustment (GtkRange *range,
GtkAdjustment *adjustment)
{
g_return_if_fail (range != NULL);
g_return_if_fail (GTK_IS_RANGE (range));
if (!adjustment)
@ -772,7 +769,6 @@ gtk_range_unrealize (GtkWidget *widget)
{
GtkRange *range;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_RANGE (widget));
range = GTK_RANGE (widget);
@ -832,7 +828,6 @@ gtk_range_expose (GtkWidget *widget,
GtkStateType state;
GdkRectangle area;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_RANGE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1409,7 +1404,6 @@ gtk_range_style_set (GtkWidget *widget,
{
GtkRange *range;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_RANGE (widget));
range = GTK_RANGE (widget);

8
gtk/gtkruler.c
View File

@ -230,7 +230,6 @@ void
gtk_ruler_set_metric (GtkRuler *ruler,
GtkMetricType metric)
{
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_RULER (ruler));
ruler->metric = (GtkRulerMetric *) &ruler_metrics[metric];
@ -270,7 +269,6 @@ gtk_ruler_set_range (GtkRuler *ruler,
gdouble position,
gdouble max_size)
{
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_RULER (ruler));
if (ruler->lower != lower)
@ -332,7 +330,6 @@ gtk_ruler_get_range (GtkRuler *ruler,
void
gtk_ruler_draw_ticks (GtkRuler *ruler)
{
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_RULER (ruler));
if (GTK_RULER_GET_CLASS (ruler)->draw_ticks)
@ -342,7 +339,6 @@ gtk_ruler_draw_ticks (GtkRuler *ruler)
void
gtk_ruler_draw_pos (GtkRuler *ruler)
{
g_return_if_fail (ruler != NULL);
g_return_if_fail (GTK_IS_RULER (ruler));
if (GTK_RULER_GET_CLASS (ruler)->draw_pos)
@ -357,7 +353,6 @@ gtk_ruler_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_RULER (widget));
ruler = GTK_RULER (widget);
@ -392,7 +387,6 @@ gtk_ruler_unrealize (GtkWidget *widget)
{
GtkRuler *ruler;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_RULER (widget));
ruler = GTK_RULER (widget);
@ -415,7 +409,6 @@ gtk_ruler_size_allocate (GtkWidget *widget,
{
GtkRuler *ruler;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_RULER (widget));
ruler = GTK_RULER (widget);
@ -437,7 +430,6 @@ gtk_ruler_expose (GtkWidget *widget,
{
GtkRuler *ruler;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_RULER (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);

2
gtk/gtkscale.c
View File

@ -416,7 +416,6 @@ void
gtk_scale_set_draw_value (GtkScale *scale,
gboolean draw_value)
{
g_return_if_fail (scale != NULL);
g_return_if_fail (GTK_IS_SCALE (scale));
draw_value = draw_value != FALSE;
@ -513,7 +512,6 @@ _gtk_scale_get_value_size (GtkScale *scale,
{
GtkRange *range;
g_return_if_fail (scale != NULL);
g_return_if_fail (GTK_IS_SCALE (scale));
if (scale->draw_value)

16
gtk/gtkscrolledwindow.c
View File

@ -315,7 +315,6 @@ gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window,
{
GtkBin *bin;
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
if (hadjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (hadjustment));
@ -368,7 +367,6 @@ gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window,
{
GtkBin *bin;
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
if (vadjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (vadjustment));
@ -418,7 +416,6 @@ gtk_scrolled_window_set_vadjustment (GtkScrolledWindow *scrolled_window,
GtkAdjustment*
gtk_scrolled_window_get_hadjustment (GtkScrolledWindow *scrolled_window)
{
g_return_val_if_fail (scrolled_window != NULL, NULL);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
return (scrolled_window->hscrollbar ?
@ -429,7 +426,6 @@ gtk_scrolled_window_get_hadjustment (GtkScrolledWindow *scrolled_window)
GtkAdjustment*
gtk_scrolled_window_get_vadjustment (GtkScrolledWindow *scrolled_window)
{
g_return_val_if_fail (scrolled_window != NULL, NULL);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), NULL);
return (scrolled_window->vscrollbar ?
@ -442,7 +438,6 @@ gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window,
GtkPolicyType hscrollbar_policy,
GtkPolicyType vscrollbar_policy)
{
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
if ((scrolled_window->hscrollbar_policy != hscrollbar_policy) ||
@ -481,7 +476,6 @@ void
gtk_scrolled_window_set_placement (GtkScrolledWindow *scrolled_window,
GtkCornerType window_placement)
{
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
if (scrolled_window->window_placement != window_placement)
@ -558,7 +552,6 @@ gtk_scrolled_window_destroy (GtkObject *object)
{
GtkScrolledWindow *scrolled_window;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (object));
scrolled_window = GTK_SCROLLED_WINDOW (object);
@ -587,7 +580,6 @@ gtk_scrolled_window_map (GtkWidget *widget)
{
GtkScrolledWindow *scrolled_window;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
scrolled_window = GTK_SCROLLED_WINDOW (widget);
@ -609,7 +601,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget)
{
GtkScrolledWindow *scrolled_window;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
scrolled_window = GTK_SCROLLED_WINDOW (widget);
@ -670,7 +661,6 @@ gtk_scrolled_window_forall (GtkContainer *container,
GtkCallback callback,
gpointer callback_data)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
g_return_if_fail (callback != NULL);
@ -703,7 +693,6 @@ gtk_scrolled_window_size_request (GtkWidget *widget,
GtkRequisition vscrollbar_requisition;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
g_return_if_fail (requisition != NULL);
@ -845,7 +834,6 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
GtkAllocation relative_allocation;
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (widget));
g_return_if_fail (allocation != NULL);
@ -986,7 +974,6 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
{
GtkWidget *range;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1093,7 +1080,6 @@ static void
gtk_scrolled_window_remove (GtkContainer *container,
GtkWidget *child)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (container));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_BIN (container)->child == child);
@ -1111,9 +1097,7 @@ gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
GtkBin *bin;
GtkWidget *viewport;
g_return_if_fail (scrolled_window != NULL);
g_return_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == NULL);

2
gtk/gtksocket.c
View File

@ -292,7 +292,6 @@ gtk_socket_realize (GtkWidget *widget)
gint attributes_mask;
XWindowAttributes xattrs;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SOCKET (widget));
socket = GTK_SOCKET (widget);
@ -435,7 +434,6 @@ gtk_socket_size_allocate (GtkWidget *widget,
{
GtkSocket *socket;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SOCKET (widget));
g_return_if_fail (allocation != NULL);

20
gtk/gtkspinbutton.c
View File

@ -430,7 +430,6 @@ gtk_spin_button_finalize (GObject *object)
static void
gtk_spin_button_map (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
@ -443,7 +442,6 @@ gtk_spin_button_map (GtkWidget *widget)
static void
gtk_spin_button_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
if (GTK_WIDGET_MAPPED (widget))
@ -462,7 +460,6 @@ gtk_spin_button_realize (GtkWidget *widget)
guint real_width;
gint return_val;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
spin_button = GTK_SPIN_BUTTON (widget);
@ -511,7 +508,6 @@ gtk_spin_button_unrealize (GtkWidget *widget)
{
GtkSpinButton *spin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
spin = GTK_SPIN_BUTTON (widget);
@ -556,7 +552,6 @@ gtk_spin_button_size_request (GtkWidget *widget,
GtkEntry *entry;
GtkSpinButton *spin_button;
g_return_if_fail (widget != NULL);
g_return_if_fail (requisition != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
@ -604,7 +599,6 @@ gtk_spin_button_size_allocate (GtkWidget *widget,
{
GtkAllocation child_allocation;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));
g_return_if_fail (allocation != NULL);
@ -646,7 +640,6 @@ gtk_spin_button_expose (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -696,7 +689,6 @@ gtk_spin_button_draw_arrow (GtkSpinButton *spin_button,
gint x;
gint y;
g_return_if_fail (spin_button != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
widget = GTK_WIDGET (spin_button);
@ -779,7 +771,6 @@ gtk_spin_button_enter_notify (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -814,7 +805,6 @@ gtk_spin_button_leave_notify (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -840,7 +830,6 @@ static gint
gtk_spin_button_focus_out (GtkWidget *widget,
GdkEventFocus *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -856,7 +845,6 @@ gtk_spin_button_scroll (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -886,7 +874,6 @@ gtk_spin_button_button_press (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -980,7 +967,6 @@ gtk_spin_button_button_release (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1043,7 +1029,6 @@ gtk_spin_button_motion_notify (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1129,7 +1114,6 @@ gtk_spin_button_value_changed (GtkAdjustment *adjustment,
{
gint return_val;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
return_val = FALSE;
@ -1156,7 +1140,6 @@ gtk_spin_button_key_press (GtkWidget *widget,
gboolean key_repeat = FALSE;
gboolean retval = FALSE;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1279,7 +1262,6 @@ gtk_spin_button_key_release (GtkWidget *widget,
{
GtkSpinButton *spin;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), FALSE);
spin = GTK_SPIN_BUTTON (widget);
@ -1409,7 +1391,6 @@ gtk_spin_button_real_spin (GtkSpinButton *spin_button,
GtkAdjustment *adj;
gdouble new_value = 0.0;
g_return_if_fail (spin_button != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
adj = spin_button->adjustment;
@ -1483,7 +1464,6 @@ gtk_spin_button_configure (GtkSpinButton *spin_button,
gdouble climb_rate,
guint digits)
{
g_return_if_fail (spin_button != NULL);
g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
if (adjustment)

6
gtk/gtkstatusbar.c
View File

@ -207,7 +207,6 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
guint context_id,
const gchar *text)
{
g_return_if_fail (statusbar != NULL);
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
if (!text)
@ -223,7 +222,6 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
gchar *string;
guint *id;
g_return_val_if_fail (statusbar != NULL, 0);
g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
g_return_val_if_fail (context_description != NULL, 0);
@ -252,7 +250,6 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
GtkStatusbarMsg *msg;
GtkStatusbarClass *class;
g_return_val_if_fail (statusbar != NULL, 0);
g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
g_return_val_if_fail (text != NULL, 0);
@ -278,7 +275,6 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
{
GtkStatusbarMsg *msg;
g_return_if_fail (statusbar != NULL);
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
if (statusbar->messages)
@ -320,7 +316,6 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
{
GtkStatusbarMsg *msg;
g_return_if_fail (statusbar != NULL);
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
g_return_if_fail (message_id > 0);
@ -396,7 +391,6 @@ gtk_statusbar_destroy (GtkObject *object)
GtkStatusbarClass *class;
GSList *list;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_STATUSBAR (object));
statusbar = GTK_STATUSBAR (object);

14
gtk/gtktable.c
View File

@ -577,9 +577,7 @@ gtk_table_attach (GtkTable *table,
{
GtkTableChild *table_child;
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == NULL);
@ -646,7 +644,6 @@ gtk_table_set_row_spacing (GtkTable *table,
guint row,
guint spacing)
{
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (row < table->nrows);
@ -686,7 +683,6 @@ gtk_table_set_col_spacing (GtkTable *table,
guint column,
guint spacing)
{
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (column < table->ncols);
@ -727,7 +723,6 @@ gtk_table_set_row_spacings (GtkTable *table,
{
guint row;
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
table->row_spacing = spacing;
@ -762,7 +757,6 @@ gtk_table_set_col_spacings (GtkTable *table,
{
guint col;
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
table->column_spacing = spacing;
@ -795,7 +789,6 @@ void
gtk_table_set_homogeneous (GtkTable *table,
gboolean homogeneous)
{
g_return_if_fail (table != NULL);
g_return_if_fail (GTK_IS_TABLE (table));
homogeneous = (homogeneous != 0);
@ -847,7 +840,6 @@ gtk_table_map (GtkWidget *widget)
GtkTableChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TABLE (widget));
table = GTK_TABLE (widget);
@ -872,7 +864,6 @@ gtk_table_unmap (GtkWidget *widget)
GtkTableChild *child;
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TABLE (widget));
table = GTK_TABLE (widget);
@ -897,7 +888,6 @@ gtk_table_size_request (GtkWidget *widget,
GtkTable *table;
gint row, col;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TABLE (widget));
g_return_if_fail (requisition != NULL);
@ -932,7 +922,6 @@ gtk_table_size_allocate (GtkWidget *widget,
{
GtkTable *table;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TABLE (widget));
g_return_if_fail (allocation != NULL);
@ -948,7 +937,6 @@ static void
gtk_table_add (GtkContainer *container,
GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TABLE (container));
g_return_if_fail (widget != NULL);
@ -963,7 +951,6 @@ gtk_table_remove (GtkContainer *container,
GtkTableChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TABLE (container));
g_return_if_fail (widget != NULL);
@ -1001,7 +988,6 @@ gtk_table_forall (GtkContainer *container,
GtkTableChild *child;
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TABLE (container));
g_return_if_fail (callback != NULL);

3
gtk/gtktearoffmenuitem.c
View File

@ -131,7 +131,6 @@ gtk_tearoff_menu_item_paint (GtkWidget *widget,
gint x, y;
gint right_max;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEAROFF_MENU_ITEM (widget));
if (GTK_WIDGET_DRAWABLE (widget))
@ -195,7 +194,6 @@ static gint
gtk_tearoff_menu_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEAROFF_MENU_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -216,7 +214,6 @@ gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item)
{
GtkTearoffMenuItem *tearoff_menu_item;
g_return_if_fail (menu_item != NULL);
g_return_if_fail (GTK_IS_TEAROFF_MENU_ITEM (menu_item));
tearoff_menu_item = GTK_TEAROFF_MENU_ITEM (menu_item);

30
gtk/gtktext.c
View File

@ -769,7 +769,6 @@ void
gtk_text_set_word_wrap (GtkText *text,
gboolean word_wrap)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->word_wrap = (word_wrap != FALSE);
@ -787,7 +786,6 @@ void
gtk_text_set_line_wrap (GtkText *text,
gboolean line_wrap)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->line_wrap = (line_wrap != FALSE);
@ -805,7 +803,6 @@ void
gtk_text_set_editable (GtkText *text,
gboolean is_editable)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
gtk_editable_set_editable (GTK_EDITABLE (text), is_editable);
@ -817,7 +814,6 @@ gtk_text_real_set_editable (GtkOldEditable *old_editable,
{
GtkText *text;
g_return_if_fail (old_editable != NULL);
g_return_if_fail (GTK_IS_TEXT (old_editable));
text = GTK_TEXT (old_editable);
@ -835,7 +831,6 @@ gtk_text_set_adjustments (GtkText *text,
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (hadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
@ -903,7 +898,6 @@ void
gtk_text_set_point (GtkText *text,
guint index)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
g_return_if_fail (index <= TEXT_LENGTH (text));
@ -913,7 +907,6 @@ gtk_text_set_point (GtkText *text,
guint
gtk_text_get_point (GtkText *text)
{
g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (GTK_IS_TEXT (text), 0);
return text->point.index;
@ -922,7 +915,6 @@ gtk_text_get_point (GtkText *text)
guint
gtk_text_get_length (GtkText *text)
{
g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (GTK_IS_TEXT (text), 0);
return TEXT_LENGTH (text);
@ -931,7 +923,6 @@ gtk_text_get_length (GtkText *text)
void
gtk_text_freeze (GtkText *text)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->freeze_count++;
@ -940,7 +931,6 @@ gtk_text_freeze (GtkText *text)
void
gtk_text_thaw (GtkText *text)
{
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (text->freeze_count)
@ -968,7 +958,6 @@ gtk_text_insert (GtkText *text,
guint i;
gint numwcs;
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (nchars < 0)
@ -1081,7 +1070,6 @@ gboolean
gtk_text_backward_delete (GtkText *text,
guint nchars)
{
g_return_val_if_fail (text != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (text), FALSE);
if (nchars > text->point.index || nchars <= 0)
@ -1100,7 +1088,6 @@ gtk_text_forward_delete (GtkText *text,
GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
g_return_val_if_fail (text != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (text), FALSE);
if (text->point.index + nchars > TEXT_LENGTH (text) || nchars <= 0)
@ -1189,7 +1176,6 @@ gtk_text_get_chars (GtkOldEditable *old_editable,
gchar *retval;
g_return_val_if_fail (old_editable != NULL, NULL);
g_return_val_if_fail (GTK_IS_TEXT (old_editable), NULL);
text = GTK_TEXT (old_editable);
@ -1308,7 +1294,6 @@ gtk_text_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
text = GTK_TEXT (widget);
@ -1428,7 +1413,6 @@ gtk_text_unrealize (GtkWidget *widget)
{
GtkText *text;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
text = GTK_TEXT (widget);
@ -1495,7 +1479,6 @@ gtk_text_draw_focus (GtkWidget *widget)
gint width, height;
gint x, y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
text = GTK_TEXT (widget);
@ -1566,7 +1549,6 @@ gtk_text_size_request (GtkWidget *widget,
gint char_height;
gint char_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
g_return_if_fail (requisition != NULL);
@ -1592,7 +1574,6 @@ gtk_text_size_allocate (GtkWidget *widget,
GtkText *text;
GtkOldEditable *old_editable;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
g_return_if_fail (allocation != NULL);
@ -1622,7 +1603,6 @@ static gint
gtk_text_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1677,7 +1657,6 @@ gtk_text_button_press (GtkWidget *widget,
GtkText *text;
GtkOldEditable *old_editable;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1768,7 +1747,6 @@ gtk_text_button_release (GtkWidget *widget,
{
GtkText *text;
GtkOldEditable *old_editable;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1832,7 +1810,6 @@ gtk_text_motion_notify (GtkWidget *widget,
gint height;
GdkModifierType mask;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -1933,7 +1910,6 @@ gtk_text_key_press (GtkWidget *widget,
gint return_val;
gint position;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -2180,7 +2156,6 @@ static gint
gtk_text_focus_in (GtkWidget *widget,
GdkEventFocus *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -2193,7 +2168,6 @@ static gint
gtk_text_focus_out (GtkWidget *widget,
GdkEventFocus *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -2206,9 +2180,7 @@ static void
gtk_text_adjustment (GtkAdjustment *adjustment,
GtkText *text)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
/* Just ignore it if we haven't been size-allocated and realized yet */
@ -2243,9 +2215,7 @@ static void
gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
GtkText *text)
{
g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (adjustment == text->hadj)

8
gtk/gtktextlayout.c
View File

@ -762,7 +762,6 @@ gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
gboolean
gtk_text_layout_is_valid (GtkTextLayout *layout)
{
g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
return _gtk_text_btree_is_valid (_gtk_text_buffer_get_btree (layout->buffer),
@ -806,7 +805,6 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
gint first_line_y = 0; /* Quiet GCC */
gint last_line_y = 0; /* Quiet GCC */
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
if (y0 > 0)
@ -907,7 +905,6 @@ gtk_text_layout_validate (GtkTextLayout *layout,
{
gint y, old_height, new_height;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
while (max_pixels > 0 &&
@ -2521,7 +2518,6 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
GtkTextIter orig;
gboolean update_byte = FALSE;
g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
@ -2640,7 +2636,6 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
gboolean found_after = FALSE;
gboolean first = TRUE;
g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
@ -2713,7 +2708,6 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
GSList *tmp_list;
GtkTextIter orig;
g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
@ -2771,7 +2765,6 @@ gtk_text_layout_iter_starts_line (GtkTextLayout *layout,
gint line_byte;
GSList *tmp_list;
g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
@ -2836,7 +2829,6 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
gint line_byte;
PangoLayoutIter *layout_iter;
g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (iter != NULL);

4
gtk/gtktextview.c
View File

@ -1698,7 +1698,6 @@ gtk_text_view_get_visible_rect (GtkTextView *text_view,
{
GtkWidget *widget;
g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
widget = GTK_WIDGET (text_view);
@ -1729,7 +1728,6 @@ void
gtk_text_view_set_wrap_mode (GtkTextView *text_view,
GtkWrapMode wrap_mode)
{
g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
if (text_view->wrap_mode != wrap_mode)
@ -1757,7 +1755,6 @@ gtk_text_view_set_wrap_mode (GtkTextView *text_view,
GtkWrapMode
gtk_text_view_get_wrap_mode (GtkTextView *text_view)
{
g_return_val_if_fail (text_view != NULL, GTK_WRAP_NONE);
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAP_NONE);
return text_view->wrap_mode;
@ -4920,7 +4917,6 @@ gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
{
gboolean need_adjust = FALSE;
g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
if (hadj)

9
gtk/gtktipsquery.c
View File

@ -248,7 +248,6 @@ gtk_tips_query_destroy (GtkObject *object)
{
GtkTipsQuery *tips_query;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (object));
tips_query = GTK_TIPS_QUERY (object);
@ -284,7 +283,6 @@ gtk_tips_query_set_labels (GtkTipsQuery *tips_query,
{
gchar *old;
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
g_return_if_fail (label_inactive != NULL);
g_return_if_fail (label_no_tip != NULL);
@ -301,7 +299,6 @@ void
gtk_tips_query_set_caller (GtkTipsQuery *tips_query,
GtkWidget *caller)
{
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
g_return_if_fail (tips_query->in_query == FALSE);
if (caller)
@ -319,7 +316,6 @@ gtk_tips_query_set_caller (GtkTipsQuery *tips_query,
void
gtk_tips_query_start_query (GtkTipsQuery *tips_query)
{
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
g_return_if_fail (tips_query->in_query == FALSE);
g_return_if_fail (GTK_WIDGET_REALIZED (tips_query));
@ -331,7 +327,6 @@ gtk_tips_query_start_query (GtkTipsQuery *tips_query)
void
gtk_tips_query_stop_query (GtkTipsQuery *tips_query)
{
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
g_return_if_fail (tips_query->in_query == TRUE);
@ -344,7 +339,6 @@ gtk_tips_query_real_start_query (GtkTipsQuery *tips_query)
{
gint failure;
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
tips_query->query_cursor = gdk_cursor_new (GDK_QUESTION_ARROW);
@ -366,7 +360,6 @@ gtk_tips_query_real_start_query (GtkTipsQuery *tips_query)
static void
gtk_tips_query_real_stop_query (GtkTipsQuery *tips_query)
{
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
gtk_grab_remove (GTK_WIDGET (tips_query));
@ -391,7 +384,6 @@ gtk_tips_query_widget_entered (GtkTipsQuery *tips_query,
const gchar *tip_text,
const gchar *tip_private)
{
g_return_if_fail (tips_query != NULL);
g_return_if_fail (GTK_IS_TIPS_QUERY (tips_query));
if (!tip_text)
@ -448,7 +440,6 @@ gtk_tips_query_event (GtkWidget *widget,
GtkWidget *event_widget;
gboolean event_handled;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TIPS_QUERY (widget), FALSE);
tips_query = GTK_TIPS_QUERY (widget);

13
gtk/gtktogglebutton.c
View File

@ -287,7 +287,6 @@ gtk_toggle_button_set_mode (GtkToggleButton *toggle_button,
{
GtkWidget *widget;
g_return_if_fail (toggle_button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
widget = GTK_WIDGET (toggle_button);
@ -355,7 +354,6 @@ void
gtk_toggle_button_set_active (GtkToggleButton *toggle_button,
gboolean is_active)
{
g_return_if_fail (toggle_button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
is_active = is_active != FALSE;
@ -368,7 +366,6 @@ gtk_toggle_button_set_active (GtkToggleButton *toggle_button,
gboolean
gtk_toggle_button_get_active (GtkToggleButton *toggle_button)
{
g_return_val_if_fail (toggle_button != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button), FALSE);
return (toggle_button->active) ? TRUE : FALSE;
@ -378,7 +375,6 @@ gtk_toggle_button_get_active (GtkToggleButton *toggle_button)
void
gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
{
g_return_if_fail (toggle_button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
gtk_signal_emit (GTK_OBJECT (toggle_button), toggle_button_signals[TOGGLED]);
@ -564,7 +560,6 @@ gtk_toggle_button_pressed (GtkButton *button)
GtkToggleButton *toggle_button;
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
toggle_button = GTK_TOGGLE_BUTTON (button);
@ -586,7 +581,6 @@ gtk_toggle_button_released (GtkButton *button)
GtkToggleButton *toggle_button;
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
if (button->button_down)
@ -618,7 +612,6 @@ gtk_toggle_button_clicked (GtkButton *button)
GtkToggleButton *toggle_button;
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
toggle_button = GTK_TOGGLE_BUTTON (button);
@ -645,7 +638,6 @@ gtk_toggle_button_enter (GtkButton *button)
GtkToggleButton *toggle_button;
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
toggle_button = GTK_TOGGLE_BUTTON (button);
@ -665,7 +657,6 @@ gtk_toggle_button_leave (GtkButton *button)
GtkToggleButton *toggle_button;
GtkStateType new_state;
g_return_if_fail (button != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
toggle_button = GTK_TOGGLE_BUTTON (button);
@ -684,7 +675,6 @@ gtk_toggle_button_realize (GtkWidget *widget)
gint attributes_mask;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
toggle_button = GTK_TOGGLE_BUTTON (widget);
@ -738,7 +728,6 @@ gtk_toggle_button_unrealize (GtkWidget *widget)
{
GtkToggleButton *toggle_button;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
toggle_button = GTK_TOGGLE_BUTTON (widget);
@ -757,7 +746,6 @@ gtk_toggle_button_unrealize (GtkWidget *widget)
static void
gtk_toggle_button_map (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
if (GTK_WIDGET_NO_WINDOW (widget))
@ -769,7 +757,6 @@ gtk_toggle_button_map (GtkWidget *widget)
static void
gtk_toggle_button_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));
if (GTK_WIDGET_NO_WINDOW (widget))

19
gtk/gtktoolbar.c
View File

@ -440,7 +440,6 @@ gtk_toolbar_destroy (GtkObject *object)
GtkToolbar *toolbar;
GList *children;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (object));
toolbar = GTK_TOOLBAR (object);
@ -480,7 +479,6 @@ gtk_toolbar_map (GtkWidget *widget)
GList *children;
GtkToolbarChild *child;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (widget));
toolbar = GTK_TOOLBAR (widget);
@ -503,7 +501,6 @@ gtk_toolbar_unmap (GtkWidget *widget)
GList *children;
GtkToolbarChild *child;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (widget));
toolbar = GTK_TOOLBAR (widget);
@ -528,7 +525,6 @@ gtk_toolbar_paint_space_line (GtkWidget *widget,
GtkToolbarChildSpace *child_space;
gint space_size;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (widget));
g_return_if_fail (child != NULL);
g_return_if_fail (child->type == GTK_TOOLBAR_CHILD_SPACE);
@ -571,7 +567,6 @@ gtk_toolbar_expose (GtkWidget *widget,
GtkToolbarChild *child;
gint border_width;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TOOLBAR (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -628,7 +623,6 @@ gtk_toolbar_size_request (GtkWidget *widget,
gint space_size;
gint ipadding;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (widget));
g_return_if_fail (requisition != NULL);
@ -728,7 +722,6 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
gint space_size;
gint ipadding;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (widget));
g_return_if_fail (allocation != NULL);
@ -868,7 +861,6 @@ static void
gtk_toolbar_add (GtkContainer *container,
GtkWidget *widget)
{
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (container));
g_return_if_fail (widget != NULL);
@ -883,7 +875,6 @@ gtk_toolbar_remove (GtkContainer *container,
GList *children;
GtkToolbarChild *child;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (container));
g_return_if_fail (widget != NULL);
@ -923,7 +914,6 @@ gtk_toolbar_forall (GtkContainer *container,
GList *children;
GtkToolbarChild *child;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (container));
g_return_if_fail (callback != NULL);
@ -1023,7 +1013,6 @@ gtk_toolbar_set_icon_size (GtkToolbar *toolbar,
GtkImage *image;
gchar *stock_id;
g_return_if_fail (toolbar != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
toolbar->icon_size_set = TRUE;
@ -1310,11 +1299,9 @@ gtk_toolbar_insert_element (GtkToolbar *toolbar,
gpointer user_data,
gint position)
{
g_return_val_if_fail (toolbar != NULL, NULL);
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
if (type == GTK_TOOLBAR_CHILD_WIDGET)
{
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
}
else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
@ -1342,11 +1329,9 @@ gtk_toolbar_internal_insert_element (GtkToolbar *toolbar,
GtkToolbarChild *child;
GtkWidget *box;
g_return_val_if_fail (toolbar != NULL, NULL);
g_return_val_if_fail (GTK_IS_TOOLBAR (toolbar), NULL);
if (type == GTK_TOOLBAR_CHILD_WIDGET)
{
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
}
else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
@ -1556,7 +1541,6 @@ void
gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
gboolean enable)
{
g_return_if_fail (toolbar != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
if (enable)
@ -1589,7 +1573,6 @@ gtk_toolbar_update_button_relief (GtkToolbar *toolbar)
GtkToolbarChild *child;
GtkReliefStyle relief;
g_return_if_fail (toolbar != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
relief = get_button_relief (toolbar);
@ -1608,7 +1591,6 @@ static void
gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar,
GtkOrientation orientation)
{
g_return_if_fail (toolbar != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
if (toolbar->orientation != orientation)
@ -1627,7 +1609,6 @@ gtk_real_toolbar_style_changed (GtkToolbar *toolbar,
GtkToolbarChild *child;
GtkWidget* box = NULL;
g_return_if_fail (toolbar != NULL);
g_return_if_fail (GTK_IS_TOOLBAR (toolbar));
if (toolbar->style != style)

2
gtk/gtktooltips.c
View File

@ -167,7 +167,6 @@ gtk_tooltips_destroy (GtkObject *object)
void
gtk_tooltips_force_window (GtkTooltips *tooltips)
{
g_return_if_fail (tooltips != NULL);
g_return_if_fail (GTK_IS_TOOLTIPS (tooltips));
if (!tooltips->tip_window)
@ -240,7 +239,6 @@ gtk_tooltips_set_tip (GtkTooltips *tooltips,
{
GtkTooltipsData *tooltipsdata;
g_return_if_fail (tooltips != NULL);
g_return_if_fail (GTK_IS_TOOLTIPS (tooltips));
g_return_if_fail (widget != NULL);

33
gtk/gtktree.c
View File

@ -191,9 +191,7 @@ void
gtk_tree_append (GtkTree *tree,
GtkWidget *tree_item)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_tree_insert (tree, tree_item, -1);
@ -203,9 +201,7 @@ void
gtk_tree_prepend (GtkTree *tree,
GtkWidget *tree_item)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_tree_insert (tree, tree_item, 0);
@ -218,9 +214,7 @@ gtk_tree_insert (GtkTree *tree,
{
gint nchildren;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
nchildren = g_list_length (tree->children);
@ -253,7 +247,6 @@ gtk_tree_add (GtkContainer *container,
{
GtkTree *tree;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE (container));
g_return_if_fail (GTK_IS_TREE_ITEM (child));
@ -285,7 +278,6 @@ gtk_tree_button_press (GtkWidget *widget,
GtkTree *tree;
GtkWidget *item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -321,7 +313,6 @@ gtk_tree_button_release (GtkWidget *widget,
GtkTree *tree;
GtkWidget *item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -339,7 +330,6 @@ gtk_tree_child_position (GtkTree *tree,
gint pos;
g_return_val_if_fail (tree != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE (tree), -1);
g_return_val_if_fail (child != NULL, -1);
@ -370,7 +360,6 @@ gtk_tree_clear_items (GtkTree *tree,
guint nchildren;
guint index;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
nchildren = g_list_length (tree->children);
@ -406,7 +395,6 @@ gtk_tree_destroy (GtkObject *object)
GtkWidget *child;
GList *children;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TREE (object));
tree = GTK_TREE (object);
@ -450,7 +438,6 @@ gtk_tree_forall (GtkContainer *container,
GList *children;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE (container));
g_return_if_fail (callback != NULL);
@ -569,7 +556,6 @@ static gint
gtk_tree_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -587,7 +573,6 @@ gtk_tree_realize (GtkWidget *widget)
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@ -618,7 +603,6 @@ gtk_tree_remove_item (GtkTree *container,
{
GList *item_list;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE (container));
g_return_if_fail (widget != NULL);
g_return_if_fail (container == GTK_TREE (widget->parent));
@ -655,7 +639,6 @@ gtk_tree_remove_items (GtkTree *tree,
GtkTree *real_tree;
GtkTree *root_tree;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
#ifdef TREE_DEBUG
@ -845,9 +828,7 @@ void
gtk_tree_select_child (GtkTree *tree,
GtkWidget *tree_item)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_signal_emit (GTK_OBJECT (tree), tree_signals[SELECT_CHILD], tree_item);
@ -859,7 +840,6 @@ gtk_tree_select_item (GtkTree *tree,
{
GList *tmp_list;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
tmp_list = g_list_nth (tree->children, item);
@ -878,7 +858,6 @@ gtk_tree_size_allocate (GtkWidget *widget,
GList *children;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE (widget));
g_return_if_fail (allocation != NULL);
@ -937,7 +916,6 @@ gtk_tree_size_request (GtkWidget *widget,
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE (widget));
g_return_if_fail (requisition != NULL);
@ -983,7 +961,6 @@ static void
gtk_tree_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -995,9 +972,7 @@ void
gtk_tree_unselect_child (GtkTree *tree,
GtkWidget *tree_item)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_signal_emit (GTK_OBJECT (tree), tree_signals[UNSELECT_CHILD], tree_item);
@ -1009,7 +984,6 @@ gtk_tree_unselect_item (GtkTree *tree,
{
GList *tmp_list;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
tmp_list = g_list_nth (tree->children, item);
@ -1026,9 +1000,7 @@ gtk_real_tree_select_child (GtkTree *tree,
GList *tmp_list;
GtkWidget *tmp_item;
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (child));
root_selection = tree->root_tree->selection;
@ -1146,9 +1118,7 @@ static void
gtk_real_tree_unselect_child (GtkTree *tree,
GtkWidget *child)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
g_return_if_fail (child != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (child));
switch (tree->selection_mode)
@ -1176,7 +1146,6 @@ void
gtk_tree_set_selection_mode (GtkTree *tree,
GtkSelectionMode mode)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
tree->selection_mode = mode;
@ -1186,7 +1155,6 @@ void
gtk_tree_set_view_mode (GtkTree *tree,
GtkTreeViewMode mode)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
tree->view_mode = mode;
@ -1196,7 +1164,6 @@ void
gtk_tree_set_view_lines (GtkTree *tree,
gboolean flag)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TREE (tree));
tree->view_line = flag;

28
gtk/gtktreeitem.c
View File

@ -177,7 +177,6 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
{
GtkTreeItem* item;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
@ -196,7 +195,6 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
static void
gtk_tree_item_subtree_button_changed_state (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_EVENT_BOX (widget));
if (GTK_WIDGET_VISIBLE (widget))
@ -218,7 +216,6 @@ gtk_tree_item_init (GtkTreeItem *tree_item)
{
GtkWidget *eventbox, *pixmapwid;
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
tree_item->expanded = FALSE;
@ -293,9 +290,7 @@ void
gtk_tree_item_set_subtree (GtkTreeItem *tree_item,
GtkWidget *subtree)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
g_return_if_fail (subtree != NULL);
g_return_if_fail (GTK_IS_TREE (subtree));
if (tree_item->subtree)
@ -333,7 +328,6 @@ gtk_tree_item_set_subtree (GtkTreeItem *tree_item,
void
gtk_tree_item_select (GtkTreeItem *tree_item)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_item_select (GTK_ITEM (tree_item));
@ -342,7 +336,6 @@ gtk_tree_item_select (GtkTreeItem *tree_item)
void
gtk_tree_item_deselect (GtkTreeItem *tree_item)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_item_deselect (GTK_ITEM (tree_item));
@ -351,7 +344,6 @@ gtk_tree_item_deselect (GtkTreeItem *tree_item)
void
gtk_tree_item_expand (GtkTreeItem *tree_item)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_signal_emit (GTK_OBJECT (tree_item), tree_item_signals[EXPAND_TREE], NULL);
@ -360,7 +352,6 @@ gtk_tree_item_expand (GtkTreeItem *tree_item)
void
gtk_tree_item_collapse (GtkTreeItem *tree_item)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
gtk_signal_emit (GTK_OBJECT (tree_item), tree_item_signals[COLLAPSE_TREE], NULL);
@ -373,7 +364,6 @@ gtk_tree_item_add_pixmaps (GtkTreeItem *tree_item)
GdkColormap *colormap;
GtkTreePixmaps *pixmap_node = NULL;
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
if (tree_item->pixmaps)
@ -432,7 +422,6 @@ gtk_tree_item_add_pixmaps (GtkTreeItem *tree_item)
static void
gtk_tree_item_remove_pixmaps (GtkTreeItem *tree_item)
{
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
if (tree_item->pixmaps)
@ -461,7 +450,6 @@ gtk_tree_item_remove_pixmaps (GtkTreeItem *tree_item)
static void
gtk_tree_item_realize (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
if (GTK_WIDGET_CLASS (parent_class)->realize)
@ -481,7 +469,6 @@ gtk_tree_item_size_request (GtkWidget *widget,
GtkTreeItem* item;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
g_return_if_fail (requisition != NULL);
@ -520,7 +507,6 @@ gtk_tree_item_size_allocate (GtkWidget *widget,
gint border_width;
int temp;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
g_return_if_fail (allocation != NULL);
@ -568,7 +554,6 @@ gtk_tree_item_draw_lines (GtkWidget *widget)
guint lx1, ly1, lx2, ly2;
GdkGC* gc;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
item = GTK_TREE_ITEM(widget);
@ -636,7 +621,6 @@ gtk_tree_item_paint (GtkWidget *widget,
GdkRectangle child_area, item_area;
GtkTreeItem* tree_item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
g_return_if_fail (area != NULL);
@ -704,7 +688,6 @@ gtk_tree_item_button_press (GtkWidget *widget,
GdkEventButton *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -720,7 +703,6 @@ static gint
gtk_tree_item_expose (GtkWidget *widget,
GdkEventExpose *event)
{
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -740,7 +722,6 @@ gtk_real_tree_item_select (GtkItem *item)
GtkTreeItem *tree_item;
GtkWidget *widget;
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (item));
tree_item = GTK_TREE_ITEM (item);
@ -758,7 +739,6 @@ gtk_real_tree_item_deselect (GtkItem *item)
GtkTreeItem *tree_item;
GtkWidget *widget;
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (item));
tree_item = GTK_TREE_ITEM (item);
@ -773,7 +753,6 @@ gtk_real_tree_item_deselect (GtkItem *item)
static void
gtk_real_tree_item_toggle (GtkItem *item)
{
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (item));
if(!GTK_WIDGET_IS_SENSITIVE(item))
@ -801,7 +780,6 @@ gtk_real_tree_item_expand (GtkTreeItem *tree_item)
{
GtkTree* tree;
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
if (tree_item->subtree && !tree_item->expanded)
@ -830,7 +808,6 @@ gtk_real_tree_item_collapse (GtkTreeItem *tree_item)
{
GtkTree* tree;
g_return_if_fail (tree_item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (tree_item));
if (tree_item->subtree && tree_item->expanded)
@ -860,7 +837,6 @@ gtk_tree_item_destroy (GtkObject *object)
GtkTreeItem* item;
GtkWidget* child;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (object));
#ifdef TREE_DEBUG
@ -923,7 +899,6 @@ gtk_tree_item_destroy (GtkObject *object)
void
gtk_tree_item_remove_subtree (GtkTreeItem* item)
{
g_return_if_fail (item != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM(item));
g_return_if_fail (item->subtree != NULL);
@ -966,7 +941,6 @@ gtk_tree_item_map (GtkWidget *widget)
GtkBin *bin;
GtkTreeItem* item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
bin = GTK_BIN (widget);
@ -993,7 +967,6 @@ gtk_tree_item_unmap (GtkWidget *widget)
GtkBin *bin;
GtkTreeItem* item;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -1022,7 +995,6 @@ gtk_tree_item_forall (GtkContainer *container,
GtkBin *bin;
GtkTreeItem *tree_item;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_TREE_ITEM (container));
g_return_if_fail (callback != NULL);

5
gtk/gtktreemodel.c
View File

@ -584,7 +584,6 @@ gtk_tree_iter_free (GtkTreeIter *iter)
GtkTreeModelFlags
gtk_tree_model_get_flags (GtkTreeModel *tree_model)
{
g_return_val_if_fail (tree_model != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), 0);
if (GTK_TREE_MODEL_GET_IFACE (tree_model)->get_flags)
@ -765,7 +764,6 @@ gtk_tree_model_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent)
{
g_return_val_if_fail (tree_model != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_children != NULL, FALSE);
@ -807,7 +805,6 @@ gint
gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
g_return_val_if_fail (tree_model != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), 0);
g_return_val_if_fail (GTK_TREE_MODEL_GET_IFACE (tree_model)->iter_n_children != NULL, 0);
@ -891,7 +888,6 @@ void
gtk_tree_model_ref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
g_return_if_fail (tree_model != NULL);
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
if (GTK_TREE_MODEL_GET_IFACE (tree_model)->ref_node)
@ -1383,7 +1379,6 @@ GtkTreeRowReference *
gtk_tree_row_reference_new (GtkTreeModel *model,
GtkTreePath *path)
{
g_return_val_if_fail (model != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
g_return_val_if_fail (path != NULL, NULL);

5
gtk/gtktreemodelsort.c
View File

@ -255,7 +255,6 @@ void
gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
GtkTreeModel *child_model)
{
g_return_if_fail (tree_model_sort != NULL);
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort));
if (child_model)
@ -356,7 +355,6 @@ GtkTreePath *
gtk_tree_model_sort_convert_path (GtkTreeModelSort *tree_model_sort,
GtkTreePath *child_path)
{
g_return_val_if_fail (tree_model_sort != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort), NULL);
g_return_val_if_fail (child_path != NULL, NULL);
@ -919,7 +917,6 @@ gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
g_return_val_if_fail (sortable != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (sortable), FALSE);
if (tree_model_sort->sort_column_id == -1)
@ -941,7 +938,6 @@ gtk_tree_model_sort_set_sort_column_id (GtkTreeSortable *sortable,
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
for (list = tree_model_sort->sort_list; list; list = list->next)
@ -977,7 +973,6 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable *sortable,
GtkTreeDataSortHeader *header = NULL;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
g_return_if_fail (func != NULL);

14
gtk/gtktreeselection.c
View File

@ -133,7 +133,6 @@ _gtk_tree_selection_new_with_tree_view (GtkTreeView *tree_view)
{
GtkTreeSelection *selection;
g_return_val_if_fail (tree_view != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
selection = _gtk_tree_selection_new ();
@ -154,7 +153,6 @@ void
_gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
GtkTreeView *tree_view)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
if (tree_view != NULL)
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
@ -175,7 +173,6 @@ void
gtk_tree_selection_set_mode (GtkTreeSelection *selection,
GtkTreeSelectionMode type)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
if (selection->type == type)
@ -251,7 +248,6 @@ gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
gpointer data,
GtkDestroyNotify destroy)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (func != NULL);
@ -271,7 +267,6 @@ gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
gpointer
gtk_tree_selection_get_user_data (GtkTreeSelection *selection)
{
g_return_val_if_fail (selection != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
return selection->user_data;
@ -309,7 +304,6 @@ gtk_tree_selection_get_selected (GtkTreeSelection *selection,
GtkTreePath *anchor_path;
gboolean retval;
g_return_val_if_fail (selection != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
g_return_val_if_fail (selection->type == GTK_TREE_SELECTION_SINGLE, FALSE);
g_return_val_if_fail (selection->tree_view != NULL, FALSE);
@ -374,7 +368,6 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection,
GtkRBNode *node;
GtkTreeIter iter;
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (selection->tree_view->priv->model != NULL);
@ -484,7 +477,6 @@ gtk_tree_selection_select_path (GtkTreeSelection *selection,
GtkRBTree *tree;
GdkModifierType state = 0;
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (path != NULL);
@ -521,7 +513,6 @@ gtk_tree_selection_unselect_path (GtkTreeSelection *selection,
GtkRBNode *node;
GtkRBTree *tree;
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (path != NULL);
@ -554,7 +545,6 @@ gtk_tree_selection_select_iter (GtkTreeSelection *selection,
{
GtkTreePath *path;
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (selection->tree_view->priv->model != NULL);
@ -584,7 +574,6 @@ gtk_tree_selection_unselect_iter (GtkTreeSelection *selection,
{
GtkTreePath *path;
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (selection->tree_view->priv->model != NULL);
@ -666,7 +655,6 @@ gtk_tree_selection_real_select_all (GtkTreeSelection *selection)
void
gtk_tree_selection_select_all (GtkTreeSelection *selection)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (selection->tree_view->priv->tree != NULL);
@ -766,7 +754,6 @@ gtk_tree_selection_real_unselect_all (GtkTreeSelection *selection)
void
gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);
g_return_if_fail (selection->tree_view->priv->tree != NULL);
@ -880,7 +867,6 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection,
GtkTreePath *start_path,
GtkTreePath *end_path)
{
g_return_if_fail (selection != NULL);
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (selection->tree_view != NULL);

3
gtk/gtktreesortable.c
View File

@ -83,7 +83,6 @@ gtk_tree_sortable_get_sort_column_id (GtkTreeSortable *sortable,
{
GtkTreeSortableIface *iface;
g_return_val_if_fail (sortable != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_SORTABLE (sortable), FALSE);
iface = GTK_TREE_SORTABLE_GET_IFACE (sortable);
@ -101,7 +100,6 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable,
{
GtkTreeSortableIface *iface;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_SORTABLE (sortable));
iface = GTK_TREE_SORTABLE_GET_IFACE (sortable);
@ -122,7 +120,6 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
{
GtkTreeSortableIface *iface;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_SORTABLE (sortable));
iface = GTK_TREE_SORTABLE_GET_IFACE (sortable);

10
gtk/gtktreestore.c
View File

@ -334,7 +334,6 @@ gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
{
GType *new_columns;
g_return_if_fail (tree_store != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
if (tree_store->n_columns == n_columns)
@ -378,7 +377,6 @@ gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
gint column,
GType type)
{
g_return_if_fail (tree_store != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (column >=0 && column < tree_store->n_columns);
if (!_gtk_tree_data_list_check_type (type))
@ -464,7 +462,6 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model,
GNode *tmp_node;
gint i = 0;
g_return_val_if_fail (tree_model != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
g_return_val_if_fail (iter->user_data != NULL, NULL);
@ -532,7 +529,6 @@ gtk_tree_store_get_value (GtkTreeModel *tree_model,
GtkTreeDataList *list;
gint tmp_column = column;
g_return_if_fail (tree_model != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_model));
g_return_if_fail (iter != NULL);
g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns);
@ -598,7 +594,6 @@ static gboolean
gtk_tree_store_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
g_return_val_if_fail (tree_model != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
@ -613,7 +608,6 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model,
GNode *node;
gint i = 0;
g_return_val_if_fail (tree_model != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
@ -641,7 +635,6 @@ gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model,
GNode *parent_node;
GNode *child;
g_return_val_if_fail (tree_model != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
@ -1785,7 +1778,6 @@ gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable,
{
GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
g_return_val_if_fail (sortable != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
if (tree_store->sort_column_id == -1)
@ -1807,7 +1799,6 @@ gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable,
GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (sortable));
for (list = tree_store->sort_list; list; list = list->next)
@ -1842,7 +1833,6 @@ gtk_tree_store_set_sort_func (GtkTreeSortable *sortable,
GtkTreeDataSortHeader *header = NULL;
GList *list;
g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (sortable));
g_return_if_fail (func != NULL);

1
gtk/gtktreeview.c
View File

@ -1091,7 +1091,6 @@ gtk_tree_view_realize (GtkWidget *widget)
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
tree_view = GTK_TREE_VIEW (widget);

17
gtk/gtktreeviewcolumn.c
View File

@ -491,7 +491,6 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
tree_view = (GtkTreeView *) tree_column->tree_view;
g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (tree_column->button == NULL);
@ -885,7 +884,6 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
tree_view = (GtkTreeView *)column->tree_view;
g_return_if_fail (tree_view != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (GTK_WIDGET_REALIZED (tree_view));
g_return_if_fail (tree_view->priv->header_window != NULL);
@ -1193,7 +1191,6 @@ gtk_tree_view_column_add_attribute (GtkTreeViewColumn *tree_column,
{
GtkTreeViewColumnCellInfo *info;
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
info = gtk_tree_view_column_get_cell_info (tree_column, cell_renderer);
g_return_if_fail (info != NULL);
@ -1418,7 +1415,6 @@ gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
gboolean
gtk_tree_view_column_get_visible (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), FALSE);
return tree_column->visible;
@ -1435,7 +1431,6 @@ void
gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnSizing type)
{
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
if (type == tree_column->column_type)
@ -1465,7 +1460,6 @@ gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnSizing
gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
return tree_column->column_type;
@ -1482,7 +1476,6 @@ gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
gint
gtk_tree_view_column_get_size (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
return tree_column->width;
@ -1502,7 +1495,6 @@ void
gtk_tree_view_column_set_width (GtkTreeViewColumn *tree_column,
gint width)
{
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (width > 0);
@ -1543,7 +1535,6 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
{
gint real_min_width;
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (min_width >= -1);
@ -1592,7 +1583,6 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
gint
gtk_tree_view_column_get_min_width (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
return tree_column->min_width;
@ -1612,7 +1602,6 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
{
gint real_max_width;
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (max_width >= -1);
@ -1654,7 +1643,6 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
gint
gtk_tree_view_column_get_max_width (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, -1);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
return tree_column->max_width;
@ -1690,7 +1678,6 @@ void
gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
const gchar *title)
{
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_free (tree_column->title);
@ -1714,7 +1701,6 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
G_CONST_RETURN gchar *
gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
return tree_column->title;
@ -1800,7 +1786,6 @@ gtk_tree_view_column_set_widget (GtkTreeViewColumn *tree_column,
GtkWidget *
gtk_tree_view_column_get_widget (GtkTreeViewColumn *tree_column)
{
g_return_val_if_fail (tree_column != NULL, NULL);
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL);
return tree_column->child;
@ -1817,7 +1802,6 @@ void
gtk_tree_view_column_set_alignment (GtkTreeViewColumn *tree_column,
gfloat xalign)
{
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
if (tree_column->xalign == xalign)
@ -2050,7 +2034,6 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
GValue value = { 0, };
GList *cell_list;
g_return_if_fail (tree_column != NULL);
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
g_return_if_fail (tree_column->cell_list != NULL);

2
gtk/gtkvbox.c
View File

@ -102,7 +102,6 @@ gtk_vbox_size_request (GtkWidget *widget,
gint nvis_children;
gint height;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VBOX (widget));
g_return_if_fail (requisition != NULL);
@ -163,7 +162,6 @@ gtk_vbox_size_allocate (GtkWidget *widget,
gint extra;
gint y;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VBOX (widget));
g_return_if_fail (allocation != NULL);

16
gtk/gtkviewport.c
View File

@ -269,7 +269,6 @@ gtk_viewport_destroy (GtkObject *object)
GtkAdjustment*
gtk_viewport_get_hadjustment (GtkViewport *viewport)
{
g_return_val_if_fail (viewport != NULL, NULL);
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
if (!viewport->hadjustment)
@ -281,7 +280,6 @@ gtk_viewport_get_hadjustment (GtkViewport *viewport)
GtkAdjustment*
gtk_viewport_get_vadjustment (GtkViewport *viewport)
{
g_return_val_if_fail (viewport != NULL, NULL);
g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL);
if (!viewport->vadjustment)
@ -294,7 +292,6 @@ void
gtk_viewport_set_hadjustment (GtkViewport *viewport,
GtkAdjustment *adjustment)
{
g_return_if_fail (viewport != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@ -333,7 +330,6 @@ void
gtk_viewport_set_vadjustment (GtkViewport *viewport,
GtkAdjustment *adjustment)
{
g_return_if_fail (viewport != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
if (adjustment)
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
@ -383,7 +379,6 @@ void
gtk_viewport_set_shadow_type (GtkViewport *viewport,
GtkShadowType type)
{
g_return_if_fail (viewport != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (viewport));
if ((GtkShadowType) viewport->shadow_type != type)
@ -422,7 +417,6 @@ gtk_viewport_map (GtkWidget *widget)
{
GtkBin *bin;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
@ -439,7 +433,6 @@ gtk_viewport_map (GtkWidget *widget)
static void
gtk_viewport_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
@ -457,7 +450,6 @@ gtk_viewport_realize (GtkWidget *widget)
gint event_mask;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
border_width = GTK_CONTAINER (widget)->border_width;
@ -539,7 +531,6 @@ gtk_viewport_unrealize (GtkWidget *widget)
{
GtkViewport *viewport;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
viewport = GTK_VIEWPORT (widget);
@ -562,7 +553,6 @@ gtk_viewport_paint (GtkWidget *widget,
{
GtkViewport *viewport;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
g_return_if_fail (area != NULL);
@ -584,7 +574,6 @@ gtk_viewport_expose (GtkWidget *widget,
GtkBin *bin;
GdkEventExpose child_event;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_VIEWPORT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@ -619,7 +608,6 @@ gtk_viewport_add (GtkContainer *container,
{
GtkBin *bin;
g_return_if_fail (container != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (container));
g_return_if_fail (child != NULL);
@ -639,7 +627,6 @@ gtk_viewport_size_request (GtkWidget *widget,
GtkBin *bin;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
g_return_if_fail (requisition != NULL);
@ -670,7 +657,6 @@ gtk_viewport_size_allocate (GtkWidget *widget,
gint hval, vval;
gint border_width;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (widget));
g_return_if_fail (allocation != NULL);
@ -785,7 +771,6 @@ gtk_viewport_adjustment_changed (GtkAdjustment *adjustment,
GtkViewport *viewport;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (data != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (data));
viewport = GTK_VIEWPORT (data);
@ -800,7 +785,6 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
GtkAllocation child_allocation;
g_return_if_fail (adjustment != NULL);
g_return_if_fail (data != NULL);
g_return_if_fail (GTK_IS_VIEWPORT (data));
viewport = GTK_VIEWPORT (data);

Some files were not shown because too many files have changed in this diff Show More