GtkStyle becomes a GObject, and xthickness/ythickness moved to instance structgdk-object

1 files changed, 18 insertions, 18 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 15c2499420..f0d73c75fc 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2051,7 +2051,7 @@ new_column_width (GtkCList *clist,
 		  gint      column,
 		  gint     *x)
 {
-  gint xthickness = GTK_WIDGET (clist)->style->klass->xthickness;
+  gint xthickness = GTK_WIDGET (clist)->style->xthickness;
   gint width;
   gint cx;
   gint dx;
@@ -4471,9 +4471,9 @@ gtk_clist_realize (GtkWidget *widget)
   
   /* clist-window */
   attributes.x = (clist->internal_allocation.x +
-		  widget->style->klass->xthickness);
+		  widget->style->xthickness);
   attributes.y = (clist->internal_allocation.y +
-		  widget->style->klass->ythickness +
+		  widget->style->ythickness +
 		  clist->column_title_area.height);
   attributes.width = clist->clist_window_width;
   attributes.height = clist->clist_window_height;
@@ -4761,9 +4761,9 @@ gtk_clist_draw (GtkWidget    *widget,
 		       GTK_STATE_NORMAL, clist->shadow_type,
 		       0, 0, 
 		       clist->clist_window_width +
-		       (2 * widget->style->klass->xthickness),
+		       (2 * widget->style->xthickness),
 		       clist->clist_window_height +
-		       (2 * widget->style->klass->ythickness) +
+		       (2 * widget->style->ythickness) +
 		       clist->column_title_area.height);
       
       gdk_window_clear_area (clist->clist_window, 0, 0, 0, 0);
@@ -4800,9 +4800,9 @@ gtk_clist_expose (GtkWidget      *widget,
 			 GTK_STATE_NORMAL, clist->shadow_type,
 			 0, 0,
 			 clist->clist_window_width +
-			 (2 * widget->style->klass->xthickness),
+			 (2 * widget->style->xthickness),
 			 clist->clist_window_height +
-			 (2 * widget->style->klass->ythickness) +
+			 (2 * widget->style->ythickness) +
 			 clist->column_title_area.height);
       
       /* exposure events on the list */
@@ -5409,10 +5409,10 @@ gtk_clist_size_request (GtkWidget      *widget,
 		 child_requisition.height);
 	}
   
-  requisition->width += (widget->style->klass->xthickness +
+  requisition->width += (widget->style->xthickness +
 			 GTK_CONTAINER (widget)->border_width) * 2;
   requisition->height += (clist->column_title_area.height +
-			  (widget->style->klass->ythickness +
+			  (widget->style->ythickness +
 			   GTK_CONTAINER (widget)->border_width) * 2);
   
   /* if (!clist->hadjustment) */
@@ -5458,14 +5458,14 @@ gtk_clist_size_allocate (GtkWidget     *widget,
   
   /* allocate clist window assuming no scrollbars */
   clist_allocation.x = (clist->internal_allocation.x +
-			widget->style->klass->xthickness);
+			widget->style->xthickness);
   clist_allocation.y = (clist->internal_allocation.y +
-			widget->style->klass->ythickness +
+			widget->style->ythickness +
 			clist->column_title_area.height);
   clist_allocation.width = MAX (1, (gint)clist->internal_allocation.width - 
-				(2 * (gint)widget->style->klass->xthickness));
+				(2 * (gint)widget->style->xthickness));
   clist_allocation.height = MAX (1, (gint)clist->internal_allocation.height -
-				 (2 * (gint)widget->style->klass->ythickness) -
+				 (2 * (gint)widget->style->ythickness) -
 				 (gint)clist->column_title_area.height);
   
   clist->clist_window_width = clist_allocation.width;
@@ -5481,8 +5481,8 @@ gtk_clist_size_allocate (GtkWidget     *widget,
     }
   
   /* position the window which holds the column title buttons */
-  clist->column_title_area.x = widget->style->klass->xthickness;
-  clist->column_title_area.y = widget->style->klass->ythickness;
+  clist->column_title_area.x = widget->style->xthickness;
+  clist->column_title_area.y = widget->style->ythickness;
   clist->column_title_area.width = clist_allocation.width;
   
   if (GTK_WIDGET_REALIZED (widget))
@@ -5982,7 +5982,7 @@ draw_xor_line (GtkCList *clist)
   
   gdk_draw_line (widget->window, clist->xor_gc,
                  clist->x_drag,
-		 widget->style->klass->ythickness,
+		 widget->style->ythickness,
                  clist->x_drag,
                  clist->column_title_area.height +
 		 clist->clist_window_height + 1);
@@ -7450,7 +7450,7 @@ drag_dest_cell (GtkCList         *clist,
   dest_info->insert_pos = GTK_CLIST_DRAG_NONE;
   
   y -= (GTK_CONTAINER (clist)->border_width +
-	widget->style->klass->ythickness +
+	widget->style->ythickness +
 	clist->column_title_area.height);
   
   dest_info->cell.row = ROW_FROM_YPIXEL (clist, y);
@@ -7462,7 +7462,7 @@ drag_dest_cell (GtkCList         *clist,
   if (dest_info->cell.row < -1)
     dest_info->cell.row = -1;
   
-  x -= GTK_CONTAINER (widget)->border_width + widget->style->klass->xthickness;
+  x -= GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
   dest_info->cell.column = COLUMN_FROM_XPIXEL (clist, x);
   
   if (dest_info->cell.row >= 0)