[graph-gtk] Replace direct access with accessor functions.

[Clayton Walker <claytonw src gnome org>]

commit 97f445c15d7faa4a7a7f7777573de3aa42bbb105
Author: Clayton Walker <clayton m walker gmail com>
Date:   Mon Jun 3 03:11:33 2013 +0200

    Replace direct access with accessor functions.

 graph-gtk/graph-gtk-view.c |   14 +++++++++-----
 tests/simple_container.c   |    8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/graph-gtk/graph-gtk-view.c b/graph-gtk/graph-gtk-view.c
index dd465d3..92806d7 100644
--- a/graph-gtk/graph-gtk-view.c
+++ b/graph-gtk/graph-gtk-view.c
@@ -164,11 +164,13 @@ graph_gtk_view_finalize (GObject *object)
 static gboolean
 graph_gtk_view_expose (GtkWidget *widget, GdkEventExpose *event)
 {
-  cairo_t *cr = gdk_cairo_create(widget->window);
+  cairo_t *cr = gdk_cairo_create (event->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
 
-  graph_gtk_view_draw(widget, cr);
+  graph_gtk_view_draw (widget, cr);
 
-  cairo_destroy(cr);
+  cairo_destroy (cr);
 
   return FALSE;
 }
@@ -189,8 +191,10 @@ graph_gtk_view_draw(GtkWidget *widget, cairo_t* cr)
 
       if(bg_w > 0 && bg_h > 0)
        {
-         gint width = gdk_window_get_width(widget->window);
-         gint height = gdk_window_get_height(widget->window);
+         gint width =
+            gdk_window_get_width (gtk_widget_get_window (widget));
+         gint height =
+           gdk_window_get_height (gtk_widget_get_window (widget));
 
          cairo_pattern_t *pattern = cairo_pattern_create_for_surface(view->bg);
          cairo_matrix_t transform;
diff --git a/tests/simple_container.c b/tests/simple_container.c
index 45d2a90..2babbc1 100644
--- a/tests/simple_container.c
+++ b/tests/simple_container.c
@@ -92,18 +92,18 @@ static void menu_item_activated (GtkMenuItem* menu_item, gpointer data)
       gtk_box_pack_start(GTK_BOX(vbox), columns, TRUE, TRUE, 0);
 
       GtkWidget* left_column = gtk_vbox_new(FALSE, 0);
-      gtk_box_pack_start_defaults(GTK_BOX(columns), left_column);
+      gtk_box_pack_start(GTK_BOX(columns), left_column, TRUE, TRUE, 0);
       gtk_box_pack_start(GTK_BOX(left_column), gtk_label_new("Inputs"), FALSE, FALSE, 0);
 
       GtkWidget* right_column = gtk_vbox_new(FALSE, 0);
-      gtk_box_pack_start_defaults(GTK_BOX(columns), right_column);
+      gtk_box_pack_start(GTK_BOX(columns), right_column, TRUE, TRUE, 0);
       gtk_box_pack_start(GTK_BOX(right_column), gtk_label_new("Outputs"), FALSE, FALSE, 0);
 
       GtkWidget* inputs = gtk_vbox_new(FALSE, 0);
-      gtk_box_pack_start_defaults(GTK_BOX(left_column), inputs);
+      gtk_box_pack_start(GTK_BOX(left_column), inputs, TRUE, TRUE, 0);
 
       GtkWidget* outputs = gtk_vbox_new(FALSE, 0);
-      gtk_box_pack_start_defaults(GTK_BOX(right_column), outputs);
+      gtk_box_pack_start(GTK_BOX(right_column), outputs, TRUE, TRUE, 0);
 
       GtkWidget* add_input = gtk_button_new_with_label("Add");
       g_signal_connect(add_input, "clicked", (GCallback)button_clicked, inputs);