GNOME.org
 

gtk+ r19491 - in trunk: . gtk

Author: mitch
Date: Thu Feb  7 15:50:39 2008
New Revision: 19491
URL: http://svn.gnome.org/viewvc/gtk+?rev=19491&view=rev

Log:
2008-02-07  Michael Natterer  <mitch imendio com>

	* gtk/gtkaction.c
	* gtk/gtkassistant.c
	* gtk/gtkbin.c
	* gtk/gtkbox.c
	* gtk/gtkcalendar.c
	* gtk/gtkcellrenderercombo.c
	* gtk/gtkcombobox.c
	* gtk/gtkcombo.c
	* gtk/gtkdrawingarea.c
	* gtk/gtkentrycompletion.c
	* gtk/gtkfixed.h
	* gtk/gtkgamma.c
	* gtk/gtkhpaned.c
	* gtk/gtkiconview.c
	* gtk/gtkitem.c
	* gtk/gtkitemfactory.c: remove g_return_if_fail() from private
	functions and virtual function implementations.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkaction.c
   trunk/gtk/gtkassistant.c
   trunk/gtk/gtkbin.c
   trunk/gtk/gtkbox.c
   trunk/gtk/gtkcalendar.c
   trunk/gtk/gtkcellrenderercombo.c
   trunk/gtk/gtkcombo.c
   trunk/gtk/gtkcombobox.c
   trunk/gtk/gtkdrawingarea.c
   trunk/gtk/gtkentrycompletion.c
   trunk/gtk/gtkfixed.c
   trunk/gtk/gtkgamma.c
   trunk/gtk/gtkhpaned.c
   trunk/gtk/gtkiconview.c
   trunk/gtk/gtkitem.c
   trunk/gtk/gtkitemfactory.c

Modified: trunk/gtk/gtkaction.c
==============================================================================
--- trunk/gtk/gtkaction.c	(original)
+++ trunk/gtk/gtkaction.c	Thu Feb  7 15:50:39 2008
@@ -1639,8 +1639,6 @@
 gtk_action_set_action_group (GtkAction	    *action,
 			     GtkActionGroup *action_group)
 {
-  g_return_if_fail (GTK_IS_ACTION (action));
-
   if (action->private_data->action_group == NULL)
     g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
   else

Modified: trunk/gtk/gtkassistant.c
==============================================================================
--- trunk/gtk/gtkassistant.c	(original)
+++ trunk/gtk/gtkassistant.c	Thu Feb  7 15:50:39 2008
@@ -1380,8 +1380,6 @@
 gtk_assistant_add (GtkContainer *container,
 		   GtkWidget    *page)
 {
-  g_return_if_fail (GTK_IS_WIDGET (page));
-
   gtk_assistant_append_page (GTK_ASSISTANT (container), page);
 }
 
@@ -1389,11 +1387,9 @@
 gtk_assistant_remove (GtkContainer *container,
 		      GtkWidget    *page)
 {
-  GtkAssistant *assistant;
+  GtkAssistant *assistant = (GtkAssistant*) container;
   GList *element;
 
-  assistant = (GtkAssistant*) container;
-
   element = find_page (assistant, page);
 
   if (element)

Modified: trunk/gtk/gtkbin.c
==============================================================================
--- trunk/gtk/gtkbin.c	(original)
+++ trunk/gtk/gtkbin.c	Thu Feb  7 15:50:39 2008
@@ -79,8 +79,6 @@
 {
   GtkBin *bin = GTK_BIN (container);
 
-  g_return_if_fail (GTK_IS_WIDGET (child));
-
   if (bin->child != NULL)
     {
       g_warning ("Attempting to add a widget with type %s to a %s, "
@@ -104,7 +102,6 @@
   GtkBin *bin = GTK_BIN (container);
   gboolean widget_was_visible;
 
-  g_return_if_fail (GTK_IS_WIDGET (child));
   g_return_if_fail (bin->child == child);
 
   widget_was_visible = GTK_WIDGET_VISIBLE (child);
@@ -127,8 +124,6 @@
 {
   GtkBin *bin = GTK_BIN (container);
 
-  g_return_if_fail (callback != NULL);
-
   if (bin->child)
     (* callback) (bin->child, callback_data);
 }

Modified: trunk/gtk/gtkbox.c
==============================================================================
--- trunk/gtk/gtkbox.c	(original)
+++ trunk/gtk/gtkbox.c	Thu Feb  7 15:50:39 2008
@@ -740,12 +740,10 @@
 gtk_box_remove (GtkContainer *container,
 		GtkWidget    *widget)
 {
-  GtkBox *box;
+  GtkBox *box = GTK_BOX (container);
   GtkBoxChild *child;
   GList *children;
 
-  box = GTK_BOX (container);
-
   children = box->children;
   while (children)
     {
@@ -781,14 +779,10 @@
 		GtkCallback   callback,
 		gpointer      callback_data)
 {
-  GtkBox *box;
+  GtkBox *box = GTK_BOX (container);
   GtkBoxChild *child;
   GList *children;
 
-  g_return_if_fail (callback != NULL);
-
-  box = GTK_BOX (container);
-
   children = box->children;
   while (children)
     {

Modified: trunk/gtk/gtkcalendar.c
==============================================================================
--- trunk/gtk/gtkcalendar.c	(original)
+++ trunk/gtk/gtkcalendar.c	Thu Feb  7 15:50:39 2008
@@ -836,9 +836,7 @@
 calendar_set_month_next (GtkCalendar *calendar)
 {
   gint month_len;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
+
   if (calendar->display_flags & GTK_CALENDAR_NO_MONTH_CHANGE)
     return;
   
@@ -876,9 +874,7 @@
 calendar_set_year_prev (GtkCalendar *calendar)
 {
   gint month_len;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
+
   calendar->year--;
   calendar_compute_days (calendar);
   g_signal_emit (calendar,
@@ -905,9 +901,7 @@
 calendar_set_year_next (GtkCalendar *calendar)
 {
   gint month_len;
-  
-  g_return_if_fail (GTK_IS_WIDGET (calendar));
-  
+
   calendar->year++;
   calendar_compute_days (calendar);
   g_signal_emit (calendar,
@@ -943,8 +937,6 @@
   gint col;
   gint day;
 
-  g_return_if_fail (GTK_IS_CALENDAR (calendar));
-
   year = calendar->year;
   month = calendar->month + 1;
   

Modified: trunk/gtk/gtkcellrenderercombo.c
==============================================================================
--- trunk/gtk/gtkcellrenderercombo.c	(original)
+++ trunk/gtk/gtkcellrenderercombo.c	Thu Feb  7 15:50:39 2008
@@ -184,11 +184,7 @@
 				      GValue     *value,
 				      GParamSpec *pspec)
 {
-  GtkCellRendererCombo *cell;
- 
-  g_return_if_fail (GTK_IS_CELL_RENDERER_COMBO (object));
-
-  cell = GTK_CELL_RENDERER_COMBO (object);
+  GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
 
   switch (prop_id)
     {
@@ -213,11 +209,7 @@
 				      const GValue *value,
 				      GParamSpec   *pspec)
 {
-  GtkCellRendererCombo *cell;
-  
-  g_return_if_fail (GTK_IS_CELL_RENDERER_COMBO (object));
-
-  cell = GTK_CELL_RENDERER_COMBO (object);
+  GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
 
   switch (prop_id)
     {

Modified: trunk/gtk/gtkcombo.c
==============================================================================
--- trunk/gtk/gtkcombo.c	(original)
+++ trunk/gtk/gtkcombo.c	Thu Feb  7 15:50:39 2008
@@ -1132,14 +1132,9 @@
 gtk_combo_size_allocate (GtkWidget     *widget,
 			 GtkAllocation *allocation)
 {
-  GtkCombo *combo;
-
-  g_return_if_fail (GTK_IS_COMBO (widget));
-  g_return_if_fail (allocation != NULL);
+  GtkCombo *combo = GTK_COMBO (widget);
 
   GTK_WIDGET_CLASS (gtk_combo_parent_class)->size_allocate (widget, allocation);
-  
-  combo = GTK_COMBO (widget);
 
   if (combo->entry->allocation.height > combo->entry->requisition.height)
     {

Modified: trunk/gtk/gtkcombobox.c
==============================================================================
--- trunk/gtk/gtkcombobox.c	(original)
+++ trunk/gtk/gtkcombobox.c	Thu Feb  7 15:50:39 2008
@@ -4067,14 +4067,10 @@
                                       GtkCellRenderer *cell,
                                       gboolean         expand)
 {
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);;
   ComboCellInfo *info;
-  GtkComboBox *combo_box;
   GtkComboBoxPrivate *priv;
 
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
   priv = combo_box->priv;
 
   g_object_ref_sink (cell);
@@ -4125,14 +4121,10 @@
                                     GtkCellRenderer *cell,
                                     gboolean         expand)
 {
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
   ComboCellInfo *info;
-  GtkComboBox *combo_box;
   GtkComboBoxPrivate *priv;
 
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
   priv = combo_box->priv;
 
   g_object_ref_sink (cell);
@@ -4158,13 +4150,9 @@
 static GList *
 gtk_combo_box_cell_layout_get_cells (GtkCellLayout *layout)
 {
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
   GSList *list;
   GList *retval = NULL;
-  GtkComboBox *combo_box;
-
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (layout), NULL);
-
-  combo_box = GTK_COMBO_BOX (layout);
 
   for (list = combo_box->priv->cells; list; list = list->next)
     {
@@ -4255,13 +4243,8 @@
                                          const gchar     *attribute,
                                          gint             column)
 {
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
   ComboCellInfo *info;
-  GtkComboBox *combo_box;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
 
   info = gtk_combo_box_get_cell_info (combo_box, cell);
   g_return_if_fail (info != NULL);
@@ -4403,15 +4386,11 @@
 gtk_combo_box_cell_layout_clear_attributes (GtkCellLayout   *layout,
                                             GtkCellRenderer *cell)
 {
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
   GtkComboBoxPrivate *priv;
+  ComboCellInfo *info;
   GSList *list;
 
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
   priv = combo_box->priv;
 
   info = gtk_combo_box_get_cell_info (combo_box, cell);
@@ -4466,15 +4445,11 @@
                                    GtkCellRenderer *cell,
                                    gint             position)
 {
-  ComboCellInfo *info;
-  GtkComboBox *combo_box;
+  GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
   GtkComboBoxPrivate *priv;
+  ComboCellInfo *info;
   GSList *link;
 
-  g_return_if_fail (GTK_IS_COMBO_BOX (layout));
-  g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
-
-  combo_box = GTK_COMBO_BOX (layout);
   priv = combo_box->priv;
 
   info = gtk_combo_box_get_cell_info (combo_box, cell);

Modified: trunk/gtk/gtkdrawingarea.c
==============================================================================
--- trunk/gtk/gtkdrawingarea.c	(original)
+++ trunk/gtk/gtkdrawingarea.c	Thu Feb  7 15:50:39 2008
@@ -75,13 +75,10 @@
 static void
 gtk_drawing_area_realize (GtkWidget *widget)
 {
-  GtkDrawingArea *darea;
+  GtkDrawingArea *darea = GTK_DRAWING_AREA (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_DRAWING_AREA (widget));
-
-  darea = GTK_DRAWING_AREA (widget);
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
   attributes.window_type = GDK_WINDOW_CHILD;

Modified: trunk/gtk/gtkentrycompletion.c
==============================================================================
--- trunk/gtk/gtkentrycompletion.c	(original)
+++ trunk/gtk/gtkentrycompletion.c	Thu Feb  7 15:50:39 2008
@@ -670,8 +670,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_tree_view_column_pack_start (priv->column, cell, expand);
@@ -684,8 +682,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_tree_view_column_pack_end (priv->column, cell, expand);
@@ -696,8 +692,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_tree_view_column_clear (priv->column);
@@ -711,8 +705,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_tree_view_column_add_attribute (priv->column, cell, attribute, column);
@@ -727,8 +719,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (priv->column),
@@ -741,8 +731,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_tree_view_column_clear_attributes (priv->column, cell);
@@ -755,8 +743,6 @@
 {
   GtkEntryCompletionPrivate *priv;
 
-  g_return_if_fail (GTK_IS_ENTRY_COMPLETION (cell_layout));
-
   priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
 
   gtk_cell_layout_reorder (GTK_CELL_LAYOUT (priv->column), cell, position);

Modified: trunk/gtk/gtkfixed.c
==============================================================================
--- trunk/gtk/gtkfixed.c	(original)
+++ trunk/gtk/gtkfixed.c	Thu Feb  7 15:50:39 2008
@@ -436,14 +436,10 @@
 		  GtkCallback   callback,
 		  gpointer      callback_data)
 {
-  GtkFixed *fixed;
+  GtkFixed *fixed = GTK_FIXED (container);
   GtkFixedChild *child;
   GList *children;
 
-  g_return_if_fail (callback != NULL);
-
-  fixed = GTK_FIXED (container);
-
   children = fixed->children;
   while (children)
     {

Modified: trunk/gtk/gtkgamma.c
==============================================================================
--- trunk/gtk/gtkgamma.c	(original)
+++ trunk/gtk/gtkgamma.c	Thu Feb  7 15:50:39 2008
@@ -480,11 +480,7 @@
 static void
 gtk_gamma_curve_destroy (GtkObject *object)
 {
-  GtkGammaCurve *c;
-
-  g_return_if_fail (GTK_IS_GAMMA_CURVE (object));
-
-  c = GTK_GAMMA_CURVE (object);
+  GtkGammaCurve *c = GTK_GAMMA_CURVE (object);
 
   if (c->gamma_dialog)
     gtk_widget_destroy (c->gamma_dialog);

Modified: trunk/gtk/gtkhpaned.c
==============================================================================
--- trunk/gtk/gtkhpaned.c	(original)
+++ trunk/gtk/gtkhpaned.c	Thu Feb  7 15:50:39 2008
@@ -50,12 +50,8 @@
 static void
 gtk_hpaned_init (GtkHPaned *hpaned)
 {
-  GtkPaned *paned;
+  GtkPaned *paned = GTK_PANED (hpaned);
 
-  g_return_if_fail (GTK_IS_PANED (hpaned));
-
-  paned = GTK_PANED (hpaned);
-  
   paned->cursor_type = GDK_SB_H_DOUBLE_ARROW;
   paned->orientation = GTK_ORIENTATION_VERTICAL;
 }

Modified: trunk/gtk/gtkiconview.c
==============================================================================
--- trunk/gtk/gtkiconview.c	(original)
+++ trunk/gtk/gtkiconview.c	Thu Feb  7 15:50:39 2008
@@ -1250,11 +1250,7 @@
 gtk_icon_view_style_set (GtkWidget *widget,
 			 GtkStyle *previous_style)
 {
-  GtkIconView *icon_view;
-
-  g_return_if_fail (GTK_IS_ICON_VIEW (widget));
-
-  icon_view = GTK_ICON_VIEW (widget);
+  GtkIconView *icon_view = GTK_ICON_VIEW (widget);
 
   if (GTK_WIDGET_REALIZED (widget))
     {
@@ -1269,11 +1265,9 @@
 gtk_icon_view_size_request (GtkWidget      *widget,
 			    GtkRequisition *requisition)
 {
-  GtkIconView *icon_view;
+  GtkIconView *icon_view = GTK_ICON_VIEW (widget);
   GList *tmp_list;
 
-  icon_view = GTK_ICON_VIEW (widget);
-
   requisition->width = icon_view->priv->width;
   requisition->height = icon_view->priv->height;
 

Modified: trunk/gtk/gtkitem.c
==============================================================================
--- trunk/gtk/gtkitem.c	(original)
+++ trunk/gtk/gtkitem.c	Thu Feb  7 15:50:39 2008
@@ -125,8 +125,6 @@
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  g_return_if_fail (GTK_IS_ITEM (widget));
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
   attributes.x = widget->allocation.x;

Modified: trunk/gtk/gtkitemfactory.c
==============================================================================
--- trunk/gtk/gtkitemfactory.c	(original)
+++ trunk/gtk/gtkitemfactory.c	Thu Feb  7 15:50:39 2008
@@ -470,13 +470,9 @@
 static void
 gtk_item_factory_destroy (GtkObject *object)
 {
-  GtkItemFactory *ifactory;
+  GtkItemFactory *ifactory = (GtkItemFactory*) object;
   GSList *slist;
 
-  g_return_if_fail (GTK_IS_ITEM_FACTORY (object));
-
-  ifactory = (GtkItemFactory*) object;
-
   if (ifactory->widget)
     {
       GtkObject *dobj;
@@ -508,11 +504,7 @@
 static void
 gtk_item_factory_finalize (GObject *object)
 {
-  GtkItemFactory *ifactory;
-
-  g_return_if_fail (GTK_IS_ITEM_FACTORY (object));
-
-  ifactory = GTK_ITEM_FACTORY (object);
+  GtkItemFactory *ifactory = GTK_ITEM_FACTORY (object);
 
   if (ifactory->accel_group)
     g_object_unref (ifactory->accel_group);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]