More GSEAL fixes

(bzr r10845)

4 files changed, 41 insertions, 30 deletions

diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 1360e0a30..ecc9405d9 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -122,6 +122,7 @@ static void
 sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition)
 {
 	GtkWidget *child;
+	GtkStyle  *style = gtk_widget_get_style (widget);
 
 	child = gtk_bin_get_child (GTK_BIN (widget));
 	if (child) {
@@ -131,8 +132,8 @@ sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition)
 		requisition->height = 0;
 	}
 
-	requisition->width += 2 + 2 * MAX (2, widget->style->xthickness);
-	requisition->height += 2 + 2 * MAX (2, widget->style->ythickness);
+	requisition->width += 2 + 2 * MAX (2, style->xthickness);
+	requisition->height += 2 + 2 * MAX (2, style->ythickness);
 }
 
 static void
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index d867647ed..36281f4d8 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -217,36 +217,40 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
 
     if ( gtk_widget_is_drawable( widget ) ) {
         GtkStyle* style = gtk_widget_get_style( widget );
+	GtkAllocation allocation;
 
         if ( insetX > 0 || insetY > 0 ) {
+	    gtk_widget_get_allocation (widget, &allocation);
+
             gtk_paint_flat_box( style,
-                                widget->window,
+                                gtk_widget_get_window (widget),
                                 (GtkStateType)gtk_widget_get_state(widget),
                                 GTK_SHADOW_NONE,
                                 NULL,
                                 widget,
                                 NULL,
                                 0, 0,
-                                widget->allocation.width, widget->allocation.height);
+                                allocation.width, allocation.height);
         }
 
-        GdkGC *gc = gdk_gc_new( widget->window );
+        GdkGC *gc = gdk_gc_new( gtk_widget_get_window (widget) );
         EekPreview* preview = EEK_PREVIEW(widget);
         GdkColor fg = {0, preview->_r, preview->_g, preview->_b};
 
         gdk_colormap_alloc_color( gdk_colormap_get_system(), &fg, FALSE, TRUE );
 
         gdk_gc_set_foreground( gc, &fg );
+	gtk_widget_get_allocation (widget, &allocation);
 
-        gdk_draw_rectangle( widget->window,
+        gdk_draw_rectangle( gtk_widget_get_window (widget),
                             gc,
                             TRUE,
                             insetX, insetY,
-                            widget->allocation.width - (insetX * 2), widget->allocation.height - (insetY * 2) );
+                            allocation.width - (insetX * 2), allocation.height - (insetY * 2) );
 
         if ( preview->_previewPixbuf ) {
             GtkDrawingArea* da = &(preview->drawing);
-            GdkDrawable* drawable = (GdkDrawable*) (((GtkWidget*)da)->window);
+            GdkDrawable* drawable = (GdkDrawable*) gtk_widget_get_window(GTK_WIDGET(da));
             gint w = 0;
             gint h = 0;
             gdk_drawable_get_size(drawable, &w, &h);
@@ -265,8 +269,10 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
 
 
         if ( preview->_linked ) {
+	    gtk_widget_get_allocation (widget, &allocation);
+
             /* Draw arrow */
-            GdkRectangle possible = {insetX, insetY, (widget->allocation.width - (insetX * 2)), (widget->allocation.height - (insetY * 2)) };
+            GdkRectangle possible = {insetX, insetY, (allocation.width - (insetX * 2)), (allocation.height - (insetY * 2)) };
             GdkRectangle area = {possible.x, possible.y, possible.width / 2, possible.height / 2 };
 
             /* Make it square */
@@ -284,8 +290,8 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
 
             if ( preview->_linked & PREVIEW_LINK_IN ) {
                 gtk_paint_arrow( style,
-                                 widget->window,
-                                 (GtkStateType)widget->state,
+                                 gtk_widget_get_window (widget),
+                                 gtk_widget_get_state (widget),
                                  GTK_SHADOW_ETCHED_IN,
                                  NULL, /* clip area.  &area, */
                                  widget, /* may be NULL */
@@ -304,8 +310,8 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
                 }
 
                 gtk_paint_arrow( style,
-                                 widget->window,
-                                 (GtkStateType)widget->state,
+                                 gtk_widget_get_window (widget),
+                                 gtk_widget_get_state (widget),
                                  GTK_SHADOW_ETCHED_OUT,
                                  NULL, /* clip area.  &area, */
                                  widget, /* may be NULL */
@@ -324,8 +330,8 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
                 }
 
                 gtk_paint_arrow( style,
-                                 widget->window,
-                                 (GtkStateType)widget->state,
+                                 gtk_widget_get_window (widget),
+                                 gtk_widget_get_state (widget),
                                  GTK_SHADOW_ETCHED_OUT,
                                  NULL, /* clip area.  &area, */
                                  widget, /* may be NULL */
@@ -346,8 +352,8 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
                     otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
                 }
                 gtk_paint_check( style,
-                                 widget->window,
-                                 (GtkStateType)widget->state,
+                                 gtk_widget_get_window (widget),
+                                 gtk_widget_get_state (widget),
                                  GTK_SHADOW_ETCHED_OUT,
                                  NULL,
                                  widget,
@@ -364,8 +370,8 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
                     otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
                 }
                 gtk_paint_diamond( style,
-                                   widget->window,
-                                   (GtkStateType)widget->state,
+                                   gtk_widget_get_window (widget),
+                                   gtk_widget_get_state (widget),
                                    GTK_SHADOW_ETCHED_OUT,
                                    NULL,
                                    widget,
@@ -377,14 +383,16 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
 
 
         if ( gtk_widget_has_focus(widget) ) {
+            gtk_widget_get_allocation (widget, &allocation);
+
             gtk_paint_focus( style,
-                             widget->window,
+                             gtk_widget_get_window (widget),
                              GTK_STATE_NORMAL,
                              NULL, /* GdkRectangle *area, */
                              widget,
                              NULL,
                              0 + 1, 0 + 1,
-                             widget->allocation.width - 2, widget->allocation.height - 2 );
+                             allocation.width - 2, allocation.height - 2 );
         }
     }
 
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 3e5f15499..09a06370d 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -113,15 +113,17 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio
 static gint
 sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event)
 {
+	GtkAllocation allocation;
 	SPGradientImage *image = SP_GRADIENT_IMAGE (widget);
 	SPGradient *gr = image->gradient;
 
-    cairo_t *ct = gdk_cairo_create(widget->window);
+    cairo_t *ct = gdk_cairo_create(gtk_widget_get_window (widget));
     
     cairo_rectangle(ct, event->area.x, event->area.y,
         event->area.width, event->area.height);
     cairo_clip(ct);
-    cairo_translate(ct, widget->allocation.x, widget->allocation.y);
+    gtk_widget_get_allocation (widget, &allocation);
+    cairo_translate(ct, allocation.x, allocation.y);
     
     cairo_pattern_t *check = ink_cairo_pattern_create_checkerboard();
     cairo_set_source(ct, check);
@@ -129,7 +131,7 @@ sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event)
     cairo_pattern_destroy(check);
 
 	if (gr) {
-        cairo_pattern_t *p = sp_gradient_create_preview_pattern(gr, widget->allocation.width);
+        cairo_pattern_t *p = sp_gradient_create_preview_pattern(gr, allocation.width);
         cairo_set_source(ct, p);
         cairo_paint(ct);
         cairo_pattern_destroy(p);
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 8c39b52dd..8d05de101 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -616,19 +616,19 @@ static void sp_grad_edit_select(GtkOptionMenu *mnu, GtkWidget *tbl)
     SPStop *prev = NULL;
     prev = stop->getPrevStop();
     if (prev != NULL )  {
-        adj->lower = prev->offset;
+        gtk_adjustment_set_lower (adj, prev->offset);
     } else {
         isEndStop = true;
-        adj->lower = 0;
+        gtk_adjustment_set_lower (adj, 0);
     }
 
     SPStop *next = NULL;
     next = stop->getNextStop();
     if (next != NULL ) {
-        adj->upper = next->offset;
+        gtk_adjustment_set_upper (adj, next->offset);
     } else {
         isEndStop = true;
-        adj->upper = 1.0;
+        gtk_adjustment_set_upper (adj, 1.0);
     }
 
     //fixme: does this work on all possible input gradients?
@@ -659,7 +659,7 @@ static void offadjustmentChanged( GtkAdjustment *adjustment, GtkWidget *vb)
         if ( g_object_get_data(G_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(mnu)))), "stop") ) {
             SPStop *stop = SP_STOP(g_object_get_data(G_OBJECT(gtk_menu_get_active(GTK_MENU(gtk_option_menu_get_menu(mnu)))), "stop"));
 
-            stop->offset = adjustment->value;
+            stop->offset = gtk_adjustment_get_value (adjustment);
             sp_repr_set_css_double(stop->getRepr(), "offset", stop->offset);
 
             DocumentUndo::maybeDone(stop->document, "gradient:stop:offset", SP_VERB_CONTEXT_GRADIENT,
@@ -949,7 +949,7 @@ GtkWidget * sp_gradient_vector_editor_new(SPGradient *gradient, SPStop *stop)
         GdkEventAny event;
         GtkWidget *widget = static_cast<GtkWidget *>(dlg);
         event.type = GDK_DELETE;
-        event.window = widget->window;
+        event.window = gtk_widget_get_window (widget);
         event.send_event = TRUE;
         g_object_ref(G_OBJECT(event.window));
         gtk_main_do_event(reinterpret_cast<GdkEvent*>(&event));