gnucash maint: Multiple changes pushed

Geert Janssens gjanssens at code.gnucash.org
Tue Sep 22 05:40:09 EDT 2015


Updated	 via  https://github.com/Gnucash/gnucash/commit/4d72dd72 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3a99ca67 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5ffe52a0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ce3e36a7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/abd1684c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fe214982 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9ade0510 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/861bfa9f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4a07162c (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6846ee84 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b182f2f2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8825d3fe (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8d1b4522 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b4323565 (commit)



commit 4d72dd727c0d91b97529de0c74c1f4f9634fc340
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Fri Sep 4 11:50:09 2015 +0200

    Gtk code cleanups: setting a default color map is deprecated

diff --git a/src/gnome-utils/gnc-gnome-utils.c b/src/gnome-utils/gnc-gnome-utils.c
index d0e5b9f..49da53e 100644
--- a/src/gnome-utils/gnc-gnome-utils.c
+++ b/src/gnome-utils/gnc-gnome-utils.c
@@ -676,9 +676,6 @@ gnc_gui_init(void)
     g_list_foreach(icons, (GFunc)g_object_unref, NULL);
     g_list_free(icons);
 
-    /* initialization required for gtkhtml (is it also needed for webkit?) */
-    gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
     g_set_application_name(PACKAGE_NAME);
 
     gnc_prefs_init();

commit 3a99ca67912282fbbc46839a5794db72d8c2eda7
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Thu Sep 3 15:45:46 2015 +0200

    Gtk code cleanups: Convert dense-cal from gdk_gc_* to cairo

diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c
index 88d894c..abd6cd1 100644
--- a/src/gnome-utils/gnc-dense-cal.c
+++ b/src/gnome-utils/gnc-dense-cal.c
@@ -657,10 +657,10 @@ gnc_dense_cal_dispose (GObject *object)
         dcal->transPopup = NULL;
     }
 
-    if (dcal->drawbuf)
+    if (dcal->surface)
     {
-        g_object_unref(dcal->drawbuf);
-        dcal->drawbuf = NULL;
+        cairo_surface_destroy (dcal->surface);
+        dcal->surface = NULL;
     }
 
     /* FIXME: we have a bunch of cleanup to do, here. */
@@ -720,13 +720,15 @@ gdc_reconfig(GncDenseCal *dcal)
     GdkWindow *window;
     GtkAllocation alloc;
 
-    if (dcal->drawbuf)
-        g_object_unref(dcal->drawbuf);
+    if (dcal->surface)
+        cairo_surface_destroy (dcal->surface);
 
     widget = GTK_WIDGET(dcal->cal_drawing_area);
     window = gtk_widget_get_window (widget);
     gtk_widget_get_allocation (widget, &alloc);
-    dcal->drawbuf = gdk_pixmap_new(window, alloc.width, alloc.height, -1);
+    dcal->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                                alloc.width,
+                                                alloc.height);
     gnc_dense_cal_draw_to_buffer(dcal);
 }
 
@@ -868,7 +870,7 @@ gnc_dense_cal_expose(GtkWidget *widget,
                      gpointer user_data)
 {
     GncDenseCal *dcal;
-    GdkGC *gc;
+    cairo_t *cr;
 
     g_return_val_if_fail(widget != NULL, FALSE);
     g_return_val_if_fail(GNC_IS_DENSE_CAL(user_data), FALSE);
@@ -878,10 +880,10 @@ gnc_dense_cal_expose(GtkWidget *widget,
         return FALSE;
 
     dcal = GNC_DENSE_CAL(user_data);
-    gc = gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state(widget)];
-    gdk_draw_drawable(GDK_DRAWABLE(gtk_widget_get_window (GTK_WIDGET(dcal->cal_drawing_area))),
-                      gc, GDK_DRAWABLE(dcal->drawbuf),
-                      0, 0, 0, 0, -1, -1);
+    cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET(dcal->cal_drawing_area)));
+    cairo_set_source_surface (cr, dcal->surface, 0, 0);
+    cairo_paint (cr);
+    cairo_destroy (cr);
 
     return TRUE;
 }
@@ -893,40 +895,41 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
 {
     GtkWidget *widget;
     GtkAllocation alloc;
+    GdkColor color;
     gint i;
     int maxWidth;
     PangoLayout *layout;
     GTimer *timer;
+    cairo_t *cr;
 
     timer = g_timer_new();
     g_debug("drawing");
     widget = GTK_WIDGET(dcal);
 
-    if (!dcal->drawbuf)
+    if (!dcal->surface)
         return;
 
     g_timer_start(timer);
+    cr = cairo_create (dcal->surface);
     layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
     LOG_AND_RESET(timer, "create_pango_layout");
 
     gtk_widget_get_allocation (GTK_WIDGET(dcal->cal_drawing_area), &alloc);
-    gdk_draw_rectangle(dcal->drawbuf,
-                       gtk_widget_get_style (widget)->white_gc,
-                       TRUE,
-                       0, 0,
-                       alloc.width,
-                       alloc.height);
+    color = gtk_widget_get_style (widget)->white;
+    cairo_set_source_rgb (cr, color.red   / 65535.0,
+                              color.green / 65535.0,
+                              color.blue  / 65535.0);
+    cairo_rectangle (cr, 0, 0,
+                     cairo_image_surface_get_width (dcal->surface),
+                     cairo_image_surface_get_height (dcal->surface));
+    cairo_fill (cr);
 
     /* Fill in alternating month colors. */
     {
         gint i;
-        GdkGC *gc;
         GdkRectangle *rect;
         GList *mcList, *mcListIter;
 
-        gc = gdk_gc_new(gtk_widget_get_window (GTK_WIDGET(dcal)));
-        gdk_gc_copy(gc, gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state(widget)]);
-
         /* reset all of the month position offsets. */
         for (i = 0; i < 12; i++)
         {
@@ -936,26 +939,26 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         /* Paint the weeks for the upcoming N months. */
         for (i = 0; i < dcal->numMonths; i++)
         {
-            gdk_gc_set_foreground(gc, &dcal->weekColors[ i % 2 ]);
-
             mcList = NULL;
             month_coords(dcal, i, &mcList);
             dcal->monthPositions[i].x
             = floor(i / dcal->monthsPerCol)
               * (col_width(dcal) + COL_BORDER_SIZE);
-            dcal->monthPositions[i].y = ((GdkRectangle*)mcList->next->next->data)->y;
+            dcal->monthPositions[i].y = ((GdkRectangle*)mcList->next->next->next->data)->y;
             for (mcListIter = mcList; mcListIter != NULL; mcListIter = mcListIter->next)
             {
                 rect = (GdkRectangle*)mcListIter->data;
-                gdk_draw_rectangle(dcal->drawbuf, gc,
-                                   TRUE, rect->x, rect->y,
-                                   rect->width, rect->height);
+                color = dcal->weekColors[ i % 2 ];
+                cairo_set_source_rgb (cr, color.red   / 65535.0,
+                              color.green / 65535.0,
+                              color.blue  / 65535.0);
+                cairo_rectangle (cr, rect->x, rect->y,
+                                     rect->width, rect->height);
+                cairo_fill (cr);
             }
             g_list_foreach(mcList, free_rect, NULL);
             g_list_free(mcList);
         }
-
-        g_object_unref(gc);
     }
     LOG_AND_RESET(timer, "alternating month colors");
 
@@ -963,49 +966,28 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
     {
         int i;
         int x1, x2, y1, y2;
-        GdkColor markColor;
-        GdkGCValues current_values;
 
-        gdk_gc_get_values(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &current_values);
+        gdk_color_parse(MARK_COLOR, &color);
+        gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, TRUE, TRUE);
+        cairo_set_source_rgb (cr, color.red   / 65535.0,
+                                  color.green / 65535.0,
+                                  color.blue  / 65535.0);
 
-        gdk_color_parse(MARK_COLOR, &markColor);
-        gdk_colormap_alloc_color(gdk_colormap_get_system(), &markColor, TRUE, TRUE);
-
-        gdk_gc_set_foreground(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &markColor);
         for (i = 0; i < dcal->numMarks; i++)
         {
             if (dcal->marks[i] != NULL)
             {
-                int w, h, x_offset, y_offset, circle_delta;
+                int center_x, center_y, radius;
 
                 doc_coords(dcal, i, &x1, &y1, &x2, &y2);
-                w = x2 - x1;
-                h = y2 - y1;
-
-                x_offset = x1;
-                y_offset = y1;
-
-                circle_delta = ABS(w - h) / 2;
-                if (w < h)
-                {
-                    y_offset += circle_delta;
-                }
-                else
-                {
-                    x_offset += circle_delta;
-                }
-
-                gdk_draw_arc(dcal->drawbuf,
-                             gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                             TRUE,
-                             x_offset, y_offset, MIN(w, h), MIN(w, h),
-                             0 * 64,
-                             360 * 64);
+                center_x = (x1 + x2 ) / 2;
+                center_y = (y1 + y2 ) / 2;
+                radius = MIN((x2 - x1), (y2 - y1)) * .75;
+
+                cairo_arc (cr, center_x, center_y, radius, 0.0, 2 * M_PI);
+                cairo_fill (cr);
             }
         }
-
-        // reset to the previous foreground color.
-        gdk_gc_set_foreground(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &current_values.foreground);
     }
     LOG_AND_RESET(timer, "marked days");
 
@@ -1025,27 +1007,30 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         h = col_height(dcal);
 
         /* draw the outside border [inside the month labels] */
-        gdk_draw_rectangle(dcal->drawbuf,
-                           gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                           FALSE, x, y, w, h);
+        color = gtk_widget_get_style (widget)->fg[gtk_widget_get_state (widget)];
+        cairo_set_line_width (cr, 1);
+        cairo_set_source_rgb (cr, color.red   / 65535.0,
+                                  color.green / 65535.0,
+                                  color.blue  / 65535.0);
+        cairo_rectangle (cr, x + 0.5, y + 0.5, w, h);
+        cairo_stroke (cr);
+
         /* draw the week seperations */
         for (j = 0; j < num_weeks_per_col(dcal); j++)
         {
             gint wy = y + (j * week_height(dcal));
-            gdk_draw_line(dcal->drawbuf,
-                          gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                          x,     wy,
-                          x + w, wy);
+            cairo_move_to (cr, x, wy + 0.5);
+            cairo_line_to (cr, x + w, wy + 0.5);
+            cairo_stroke (cr);
         }
 
         /* draw the day seperations */
         for (j = 1; j < 7; j++)
         {
             gint dx = x + (j * day_width(dcal));
-            gdk_draw_line(dcal->drawbuf,
-                          gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                          dx, y,
-                          dx, y + col_height(dcal));
+            cairo_move_to (cr, dx + 0.5, y);
+            cairo_line_to (cr, dx + 0.5, y + col_height(dcal));
+            cairo_stroke (cr);
         }
 
         /* draw the day labels */
@@ -1070,10 +1055,12 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
                                  - (day_label_width / 2);
                 label_y_offset = y - dcal->dayLabelHeight;
                 pango_layout_set_text(layout, day_label_str, -1);
-                gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf), gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                                label_x_offset, label_y_offset,
-                                layout);
-
+                color = gtk_widget_get_style (widget)->text[gtk_widget_get_state (widget)];
+                cairo_set_source_rgb (cr, color.red   / 65535.0,
+                                          color.green / 65535.0,
+                                          color.blue  / 65535.0);
+                cairo_move_to (cr, label_x_offset, label_y_offset);
+                pango_cairo_show_layout (cr, layout);
             }
         }
     }
@@ -1082,11 +1069,6 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
     /* Month labels. */
     {
         gint i;
-        PangoMatrix matrix = PANGO_MATRIX_INIT;
-
-        pango_matrix_rotate(&matrix, 90.);
-        pango_context_set_matrix(gtk_widget_get_pango_context(GTK_WIDGET(dcal)), &matrix);
-
         for (i = 0; i < 12; i++)
         {
             guint idx;
@@ -1095,16 +1077,15 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
                 break;
             idx = (dcal->month - 1 + i) % 12;
             pango_layout_set_text(layout, month_name(idx), -1);
-            gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
-                            gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                            dcal->leftPadding + dcal->monthPositions[i].x,
-                            dcal->monthPositions[i].y,
-                            layout);
-        }
 
-        // reset rotation
-        pango_matrix_rotate(&matrix, -90.);
-        pango_context_set_matrix(gtk_widget_get_pango_context(GTK_WIDGET(dcal)), &matrix);
+            cairo_save (cr);
+            cairo_translate (cr, dcal->leftPadding + dcal->monthPositions[i].x,
+                               dcal->monthPositions[i].y);
+            cairo_move_to (cr, 0, 0);
+            cairo_rotate (cr, -G_PI / 2.);
+            pango_cairo_show_layout (cr, layout);
+            cairo_restore (cr);
+        }
     }
     LOG_AND_RESET(timer, "month labels");
 
@@ -1128,11 +1109,9 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
             pango_layout_get_pixel_size(layout, &numW, &numH);
             w = (x2 - x1) + 1;
             h = (y2 - y1) + 1;
-            gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
-                            gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-                            x1 + (w / 2) - (numW / 2),
-                            y1 + (h / 2) - (numH / 2),
-                            layout);
+            cairo_move_to (cr, x1 + (w / 2) - (numW / 2),
+                               y1 + (h / 2) - (numH / 2));
+            pango_cairo_show_layout (cr, layout);
         }
     }
     LOG_AND_RESET(timer, "dates");
@@ -1147,6 +1126,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
     LOG_AND_RESET(timer, "queue draw");
 
     g_object_unref(layout);
+    cairo_destroy (cr);
 
     g_timer_destroy(timer);
 }
diff --git a/src/gnome-utils/gnc-dense-cal.h b/src/gnome-utils/gnc-dense-cal.h
index d13c53c..c193327 100644
--- a/src/gnome-utils/gnc-dense-cal.h
+++ b/src/gnome-utils/gnc-dense-cal.h
@@ -58,7 +58,7 @@ struct _GncDenseCal
     GtkComboBox *view_options;
     GtkDrawingArea *cal_drawing_area;
 
-    GdkPixmap *drawbuf;
+    cairo_surface_t *surface;
 
     gboolean initialized;
 
diff --git a/src/gnome/gnc-plugin-page-sx-list.c b/src/gnome/gnc-plugin-page-sx-list.c
index 3d547b9..c97da44 100644
--- a/src/gnome/gnc-plugin-page-sx-list.c
+++ b/src/gnome/gnc-plugin-page-sx-list.c
@@ -261,8 +261,6 @@ gnc_plugin_page_sx_list_init (GncPluginPageSxList *plugin_page)
                                  gnc_plugin_page_sx_list_n_actions,
                                  plugin_page);
     /* gnc_plugin_init_short_names (action_group, toolbar_labels); */
-	gnc_gobject_tracking_remember (G_OBJECT (plugin_page),
-				       G_OBJECT_CLASS (klass));
 }
 
 
@@ -301,7 +299,6 @@ gnc_plugin_page_sx_list_finalize (GObject *object)
     g_return_if_fail(GNC_IS_PLUGIN_PAGE_SX_LIST (page));
     priv = GNC_PLUGIN_PAGE_SX_LIST_GET_PRIVATE(page);
     g_return_if_fail(priv != NULL);
-    gnc_gobject_tracking_forget (G_OBJECT (page));
 
     G_OBJECT_CLASS (parent_class)->finalize (object);
 }

commit 5ffe52a03ee8ad4262aa154c6f00d228c225e7bd
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Aug 22 11:52:23 2015 +0200

    Gtk code cleanups: Use accessor functions on GtkWidget instead of deprecated direct access

diff --git a/src/business/business-gnome/dialog-billterms.c b/src/business/business-gnome/dialog-billterms.c
index 839edd1..c7e3b3f 100644
--- a/src/business/business-gnome/dialog-billterms.c
+++ b/src/business/business-gnome/dialog-billterms.c
@@ -107,8 +107,8 @@ read_widget (GtkBuilder *builder, char *name, gboolean read_only)
         GtkAdjustment *adj;
         gtk_editable_set_editable (GTK_EDITABLE (widget), FALSE);
         adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
-        adj->step_increment = 0.0;
-        adj->page_increment = 0.0;
+        gtk_adjustment_set_step_increment (adj, 0.0);
+        gtk_adjustment_set_page_increment (adj, 0.0);
         gtk_adjustment_changed (adj);
     }
 
diff --git a/src/business/business-gnome/dialog-date-close.c b/src/business/business-gnome/dialog-date-close.c
index 8b4a6a7..e8a0ffe 100644
--- a/src/business/business-gnome/dialog-date-close.c
+++ b/src/business/business-gnome/dialog-date-close.c
@@ -261,7 +261,7 @@ gnc_dialog_dates_acct_question_parented (GtkWidget *parent, const char *message,
 
     if (question_check_message)
     {
-        gtk_label_set_text(GTK_LABEL(GTK_BIN(ddc->question_check)->child), question_check_message);
+        gtk_label_set_text(GTK_LABEL(gtk_bin_get_child (GTK_BIN(ddc->question_check))), question_check_message);
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ddc->question_check), *answer);
     }
     else
diff --git a/src/gnome-search/dialog-search.c b/src/gnome-search/dialog-search.c
index 87e911b..b8c425a 100644
--- a/src/gnome-search/dialog-search.c
+++ b/src/gnome-search/dialog-search.c
@@ -973,7 +973,7 @@ gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
         data = g_object_get_data (G_OBJECT (w), "data");
         sw->crit_list = g_list_append (sw->crit_list, data);
 
-        rows = GTK_TABLE (sw->criteria_table)->nrows;
+        gtk_table_get_size (GTK_TABLE (sw->criteria_table), &rows, NULL);
         gtk_table_resize (GTK_TABLE (sw->criteria_table), rows + 1, 2);
         attach_element (w, sw, rows);
 
diff --git a/src/gnome-search/search-account.c b/src/gnome-search/search-account.c
index d54a10e..b149507 100644
--- a/src/gnome-search/search-account.c
+++ b/src/gnome-search/search-account.c
@@ -263,9 +263,9 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi)
                    NULL));
 
     /* Put the dialog together */
-    gtk_box_pack_start ((GtkBox *)dialog->vbox, label,
+    gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area (dialog), label,
                         FALSE, FALSE, 3);
-    gtk_box_pack_start ((GtkBox *)dialog->vbox, accounts_scroller,
+    gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area (dialog), accounts_scroller,
                         TRUE, TRUE, 3);
 
     gtk_widget_show_all (GTK_WIDGET (dialog));
@@ -280,7 +280,7 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi)
             gnc_tree_view_account_get_selected_accounts (GNC_TREE_VIEW_ACCOUNT (account_tree));
 
         desc = describe_button (fi);
-        gtk_label_set_text (GTK_LABEL (GTK_BIN (button)->child), desc);
+        gtk_label_set_text (GTK_LABEL (gtk_bin_get_child (GTK_BIN (button))), desc);
     }
 
     gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/src/gnome-utils/cursors.c b/src/gnome-utils/cursors.c
index bfb033e..d05bd1c 100644
--- a/src/gnome-utils/cursors.c
+++ b/src/gnome-utils/cursors.c
@@ -88,7 +88,7 @@ gnc_set_busy_cursor (GtkWidget *w, gboolean update_now)
         {
             w = node->data;
 
-            if (!w || !GTK_IS_WIDGET (w) || !w->window)
+            if (!w || !GTK_IS_WIDGET (w) || !gtk_widget_get_has_window(w))
                 continue;
 
             gnc_ui_set_cursor (gtk_widget_get_window(w), GNC_CURSOR_BUSY, update_now);
diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c
index 6e6a9aa..2e55136 100644
--- a/src/gnome-utils/dialog-account.c
+++ b/src/gnome-utils/dialog-account.c
@@ -666,7 +666,7 @@ verify_children_compatible (AccountWindow *aw)
         gint size;
         PangoFontDescription *font_desc;
 
-        size = pango_font_description_get_size (label->style->font_desc);
+        size = pango_font_description_get_size (gtk_widget_get_style (label)->font_desc);
         font_desc = pango_font_description_new ();
         pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
         pango_font_description_set_size (font_desc, size * PANGO_SCALE_LARGE);
@@ -695,16 +695,16 @@ verify_children_compatible (AccountWindow *aw)
 
     gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
 
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox,
                         TRUE, TRUE, 0);
 
     /* spacings */
     gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-    gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 14);
+    gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
     gtk_container_set_border_width (
-        GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 5);
-    gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 6);
+        GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 5);
+    gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 6);
 
     gtk_widget_show_all (hbox);
 
diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c
index 83db9ef..d7ce77e 100644
--- a/src/gnome-utils/dialog-transfer.c
+++ b/src/gnome-utils/dialog-transfer.c
@@ -2035,12 +2035,12 @@ gnc_xfer_dialog_create(GtkWidget *parent, XferDialog *xferData)
 
         if (use_accounting_labels)
         {
-            gtk_label_set_text(GTK_LABEL(GTK_BIN(xferData->amount_radio)->child),
+            gtk_label_set_text(GTK_LABEL(gtk_bin_get_child (GTK_BIN(xferData->amount_radio))),
                                _("Debit Amount:"));
         }
         else
         {
-            gtk_label_set_text(GTK_LABEL(GTK_BIN(xferData->amount_radio)->child),
+            gtk_label_set_text(GTK_LABEL(gtk_bin_get_child (GTK_BIN(xferData->amount_radio))),
                                _("To Amount:"));
         }
     }
diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index 88c18a5..40959c9 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -217,7 +217,7 @@ gnc_window_adjust_for_screen(GtkWindow * window)
         return;
 
     g_return_if_fail(GTK_IS_WINDOW(window));
-    if (GTK_WIDGET(window)->window == NULL)
+    if (gtk_widget_get_window (GTK_WIDGET(window)) == NULL)
         return;
 
     screen_width = gdk_screen_width();
@@ -234,7 +234,7 @@ gnc_window_adjust_for_screen(GtkWindow * window)
     height = MIN(height, screen_height - 10);
     height = MAX(height, 0);
 
-    gdk_window_resize(GTK_WIDGET(window)->window, width, height);
+    gdk_window_resize(gtk_widget_get_window (GTK_WIDGET(window)), width, height);
     gtk_widget_queue_resize(GTK_WIDGET(window));
 }
 
@@ -552,8 +552,8 @@ gnc_dialog_run (GtkDialog *dialog, const gchar *pref_name)
             : _("Don't tell me again this _session."));
     gtk_widget_show(perm);
     gtk_widget_show(temp);
-    gtk_box_pack_start(GTK_BOX(dialog->vbox), perm, TRUE, TRUE, 0);
-    gtk_box_pack_start(GTK_BOX(dialog->vbox), temp, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (dialog)), perm, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (dialog)), temp, TRUE, TRUE, 0);
     g_signal_connect(perm, "clicked", G_CALLBACK(gnc_perm_button_cb), temp);
 
     /* OK. Present the dialog. */
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index 4a62bd1..f2421b0 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -230,7 +230,7 @@ gpw_key_press_event (GtkWidget   *box,
     /* Hackish :/ Synthesize a key press event for the entry. */
     memcpy (&tmp_event, key_event, sizeof (GdkEventKey));
 
-    tmp_event.key.window = widget->entry->window;
+    tmp_event.key.window = gtk_widget_get_window (widget->entry);
     tmp_event.key.send_event = TRUE;
 
     gtk_widget_event (widget->entry, &tmp_event);
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.c b/src/gnome-utils/gnc-cell-renderer-popup.c
index 7449440..19386d5 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup.c
@@ -255,7 +255,7 @@ gcrp_show_popup (GncCellRendererPopup *cell,
 	gtk_window_move (GTK_WINDOW (cell->popup_window), -500, -500);
 	gtk_widget_show (cell->popup_window);
 
-	alloc = cell->popup_window->allocation;
+	gtk_widget_get_allocation (cell->popup_window, &alloc);
 
 	x = x2;
 	y = y2;
@@ -298,7 +298,7 @@ gcrp_show_popup (GncCellRendererPopup *cell,
 
 	gtk_widget_grab_focus (cell->focus_window);
 
-	gcrp_grab_on_window (cell->popup_window->window,
+	gcrp_grab_on_window (gtk_widget_get_window (cell->popup_window),
 			     gtk_get_current_event_time ());
 }
 
@@ -345,16 +345,16 @@ gcrp_arrow_clicked (GtkCellEditable     *entry,
 	 * events generated when the window is mapped, such as enter
 	 * notify events on subwidgets. If the grab fails, bail out.
 	 */
-	if (!gcrp_grab_on_window (GTK_WIDGET (entry)->window,
+	if (!gcrp_grab_on_window (gtk_widget_get_window (GTK_WIDGET (entry)),
 				  gtk_get_current_event_time ())) {
 		return;
 	}
 	
 	gtk_editable_select_region (GTK_EDITABLE (GNC_POPUP_ENTRY (entry)->entry), 0, 0);
 
-	gdk_window_get_origin (GTK_WIDGET (entry)->window, &x, &y);
+	gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (entry)), &x, &y);
 	
-	alloc = GTK_WIDGET (entry)->allocation;
+	gtk_widget_get_allocation (GTK_WIDGET (entry), &alloc);
 
 	g_signal_emit (cell, signals[SHOW_POPUP], 0,
 		       path, 
@@ -376,17 +376,19 @@ gcrp_start_editing (GtkCellRenderer      *cell,
 	GncCellRendererPopup *popup;
 	GtkWidget           *editable;
 	gchar               *text;
+        gboolean             iseditable;
 	
 	popup = GNC_CELL_RENDERER_POPUP (cell);
 
+        g_object_get (G_OBJECT (popup), "editable", &iseditable, NULL);
 	/* If the cell isn't editable we return NULL. */
-	if (GTK_CELL_RENDERER_TEXT (popup)->editable == FALSE) {
+	if (iseditable == FALSE) {
 		return NULL;
 	}
 	
 	editable = g_object_new (GNC_TYPE_POPUP_ENTRY, NULL);
 
-	text = GTK_CELL_RENDERER_TEXT (cell)->text;
+	g_object_get (G_OBJECT (cell), "text", &text, NULL);
         popup->cell_text = text;
 
 	gnc_popup_entry_set_text (GNC_POPUP_ENTRY (editable), text ? text : "");
@@ -506,14 +508,15 @@ gcrp_button_press_event (GtkWidget           *widget,
 	x = event->x_root;
 	y = event->y_root;
 
-	gdk_window_get_root_origin (widget->window,
+	gdk_window_get_root_origin (gtk_widget_get_window (widget),
 				    &xoffset,
 				    &yoffset);
 
-	xoffset += widget->allocation.x;
-	yoffset += widget->allocation.y;
+        gtk_widget_get_allocation (widget, &alloc);
+	xoffset += alloc.x;
+	yoffset += alloc.y;
 	
-	alloc = popup->popup_window->allocation;
+	gtk_widget_get_allocation (popup->popup_window, &alloc);
 	x1 = alloc.x + xoffset;
 	y1 = alloc.y + yoffset;
 	x2 = x1 + alloc.width;
diff --git a/src/gnome-utils/gnc-combott.c b/src/gnome-utils/gnc-combott.c
index 87ec6e0..6519112 100644
--- a/src/gnome-utils/gnc-combott.c
+++ b/src/gnome-utils/gnc-combott.c
@@ -469,27 +469,32 @@ gctt_combott_menu_position (GtkMenu  *menu,
     gint sx, sy;
     GtkWidget *child;
     GtkRequisition req;
+    GtkAllocation alloc;
 
-    child = GTK_BIN (priv->button)->child;
+    child = gtk_bin_get_child (GTK_BIN (priv->button));
 
     sx = sy = 0;
 
     if (!gtk_widget_get_has_window (child))
     {
-        sx += child->allocation.x;
-        sy += child->allocation.y;
+        gtk_widget_get_allocation (child, &alloc);
+        sx += alloc.x;
+        sy += alloc.y;
     }
 
-    gdk_window_get_root_coords (child->window, sx, sy, &sx, &sy);
+    gdk_window_get_root_coords (gtk_widget_get_window (child), sx, sy, &sx, &sy);
 
-    sx -= GTK_WIDGET (priv->button)->style->xthickness;
+    sx -= gtk_widget_get_style (GTK_WIDGET (priv->button))->xthickness;
 
     gtk_widget_size_request (GTK_WIDGET (menu), &req);
 
     if (gtk_widget_get_direction (GTK_WIDGET (priv->button)) == GTK_TEXT_DIR_LTR)
         *x = sx;
     else
-        *x = sx + child->allocation.width - req.width;
+    {
+        gtk_widget_get_allocation (child, &alloc);
+        *x = sx + alloc.width - req.width;
+    }
 
     if(priv->active == -1 || priv->active == 0)
         *y = sy;
diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c
index 5d91f96..ba11733 100644
--- a/src/gnome-utils/gnc-date-edit.c
+++ b/src/gnome-utils/gnc-date-edit.c
@@ -215,15 +215,17 @@ position_popup (GNCDateEdit *gde)
     gint x, y;
     gint bwidth, bheight;
     GtkRequisition req;
+    GtkAllocation alloc;
 
     gtk_widget_size_request (gde->cal_popup, &req);
 
-    gdk_window_get_origin (gde->date_button->window, &x, &y);
+    gdk_window_get_origin (gtk_widget_get_window (gde->date_button), &x, &y);
 
-    x += gde->date_button->allocation.x;
-    y += gde->date_button->allocation.y;
-    bwidth = gde->date_button->allocation.width;
-    bheight = gde->date_button->allocation.height;
+    gtk_widget_get_allocation (gde->date_button, &alloc);
+    x += alloc.x;
+    y += alloc.y;
+    bwidth = alloc.width;
+    bheight = alloc.height;
 
     x += bwidth - req.width;
     y += bheight;
@@ -322,7 +324,7 @@ gnc_date_edit_popup (GNCDateEdit *gde)
     if (!gtk_widget_has_focus (gde->calendar))
         gtk_widget_grab_focus (gde->calendar);
 
-    if (!popup_grab_on_window ((GTK_WIDGET(gde->cal_popup))->window,
+    if (!popup_grab_on_window (gtk_widget_get_window ((GTK_WIDGET(gde->cal_popup))),
                                GDK_CURRENT_TIME, TRUE))
     {
         gtk_widget_hide (gde->cal_popup);
diff --git a/src/gnome-utils/gnc-dense-cal.c b/src/gnome-utils/gnc-dense-cal.c
index 70a8ec2..88d894c 100644
--- a/src/gnome-utils/gnc-dense-cal.c
+++ b/src/gnome-utils/gnc-dense-cal.c
@@ -708,18 +708,25 @@ gnc_dense_cal_realize (GtkWidget *widget, gpointer user_data)
     recompute_x_y_scales(dcal);
     gdc_reconfig(dcal);
 
-    gtk_style_set_background(widget->style, widget->window, GTK_STATE_ACTIVE);
+    gtk_style_set_background(gtk_widget_get_style (widget),
+                             gtk_widget_get_window (widget),
+                             GTK_STATE_ACTIVE);
 }
 
 static void
 gdc_reconfig(GncDenseCal *dcal)
 {
+    GtkWidget *widget;
+    GdkWindow *window;
+    GtkAllocation alloc;
+
     if (dcal->drawbuf)
         g_object_unref(dcal->drawbuf);
-    dcal->drawbuf = gdk_pixmap_new(GTK_WIDGET(dcal->cal_drawing_area)->window,
-                                   GTK_WIDGET(dcal->cal_drawing_area)->allocation.width,
-                                   GTK_WIDGET(dcal->cal_drawing_area)->allocation.height,
-                                   -1);
+
+    widget = GTK_WIDGET(dcal->cal_drawing_area);
+    window = gtk_widget_get_window (widget);
+    gtk_widget_get_allocation (widget, &alloc);
+    dcal->drawbuf = gdk_pixmap_new(window, alloc.width, alloc.height, -1);
     gnc_dense_cal_draw_to_buffer(dcal);
 }
 
@@ -756,8 +763,10 @@ recompute_x_y_scales(GncDenseCal *dcal)
     height = DENSE_CAL_DEFAULT_HEIGHT;
     if (dcal->initialized)
     {
-        width  = GTK_WIDGET(dcal->cal_drawing_area)->allocation.width;
-        height = GTK_WIDGET(dcal->cal_drawing_area)->allocation.height;
+        GtkAllocation alloc;
+        gtk_widget_get_allocation (GTK_WIDGET(dcal->cal_drawing_area), &alloc);
+        width  = alloc.width;
+        height = alloc.height;
     }
 
     /* FIXME: there's something slightly wrong in the x_scale computation that
@@ -869,8 +878,8 @@ gnc_dense_cal_expose(GtkWidget *widget,
         return FALSE;
 
     dcal = GNC_DENSE_CAL(user_data);
-    gc = widget->style->fg_gc[gtk_widget_get_state(widget)];
-    gdk_draw_drawable(GDK_DRAWABLE(GTK_WIDGET(dcal->cal_drawing_area)->window),
+    gc = gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state(widget)];
+    gdk_draw_drawable(GDK_DRAWABLE(gtk_widget_get_window (GTK_WIDGET(dcal->cal_drawing_area))),
                       gc, GDK_DRAWABLE(dcal->drawbuf),
                       0, 0, 0, 0, -1, -1);
 
@@ -883,6 +892,7 @@ static void
 gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
 {
     GtkWidget *widget;
+    GtkAllocation alloc;
     gint i;
     int maxWidth;
     PangoLayout *layout;
@@ -899,12 +909,13 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
     layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
     LOG_AND_RESET(timer, "create_pango_layout");
 
+    gtk_widget_get_allocation (GTK_WIDGET(dcal->cal_drawing_area), &alloc);
     gdk_draw_rectangle(dcal->drawbuf,
-                       widget->style->white_gc,
+                       gtk_widget_get_style (widget)->white_gc,
                        TRUE,
                        0, 0,
-                       GTK_WIDGET(dcal->cal_drawing_area)->allocation.width,
-                       GTK_WIDGET(dcal->cal_drawing_area)->allocation.height);
+                       alloc.width,
+                       alloc.height);
 
     /* Fill in alternating month colors. */
     {
@@ -913,8 +924,8 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         GdkRectangle *rect;
         GList *mcList, *mcListIter;
 
-        gc = gdk_gc_new(GTK_WIDGET(dcal)->window);
-        gdk_gc_copy(gc, widget->style->fg_gc[gtk_widget_get_state(widget)]);
+        gc = gdk_gc_new(gtk_widget_get_window (GTK_WIDGET(dcal)));
+        gdk_gc_copy(gc, gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state(widget)]);
 
         /* reset all of the month position offsets. */
         for (i = 0; i < 12; i++)
@@ -955,12 +966,12 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         GdkColor markColor;
         GdkGCValues current_values;
 
-        gdk_gc_get_values(widget->style->fg_gc[widget->state], &current_values);
+        gdk_gc_get_values(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &current_values);
 
         gdk_color_parse(MARK_COLOR, &markColor);
         gdk_colormap_alloc_color(gdk_colormap_get_system(), &markColor, TRUE, TRUE);
 
-        gdk_gc_set_foreground(widget->style->fg_gc[widget->state], &markColor);
+        gdk_gc_set_foreground(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &markColor);
         for (i = 0; i < dcal->numMarks; i++)
         {
             if (dcal->marks[i] != NULL)
@@ -985,7 +996,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
                 }
 
                 gdk_draw_arc(dcal->drawbuf,
-                             widget->style->fg_gc[widget->state],
+                             gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                              TRUE,
                              x_offset, y_offset, MIN(w, h), MIN(w, h),
                              0 * 64,
@@ -994,7 +1005,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         }
 
         // reset to the previous foreground color.
-        gdk_gc_set_foreground(widget->style->fg_gc[widget->state], &current_values.foreground);
+        gdk_gc_set_foreground(gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)], &current_values.foreground);
     }
     LOG_AND_RESET(timer, "marked days");
 
@@ -1015,14 +1026,14 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
 
         /* draw the outside border [inside the month labels] */
         gdk_draw_rectangle(dcal->drawbuf,
-                           widget->style->fg_gc[widget->state],
+                           gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                            FALSE, x, y, w, h);
         /* draw the week seperations */
         for (j = 0; j < num_weeks_per_col(dcal); j++)
         {
             gint wy = y + (j * week_height(dcal));
             gdk_draw_line(dcal->drawbuf,
-                          widget->style->fg_gc[widget->state],
+                          gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                           x,     wy,
                           x + w, wy);
         }
@@ -1032,7 +1043,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
         {
             gint dx = x + (j * day_width(dcal));
             gdk_draw_line(dcal->drawbuf,
-                          widget->style->fg_gc[widget->state],
+                          gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                           dx, y,
                           dx, y + col_height(dcal));
         }
@@ -1059,7 +1070,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
                                  - (day_label_width / 2);
                 label_y_offset = y - dcal->dayLabelHeight;
                 pango_layout_set_text(layout, day_label_str, -1);
-                gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf), widget->style->fg_gc[widget->state],
+                gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf), gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                                 label_x_offset, label_y_offset,
                                 layout);
 
@@ -1085,7 +1096,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
             idx = (dcal->month - 1 + i) % 12;
             pango_layout_set_text(layout, month_name(idx), -1);
             gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
-                            widget->style->fg_gc[widget->state],
+                            gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                             dcal->leftPadding + dcal->monthPositions[i].x,
                             dcal->monthPositions[i].y,
                             layout);
@@ -1118,7 +1129,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
             w = (x2 - x1) + 1;
             h = (y2 - y1) + 1;
             gdk_draw_layout(GDK_DRAWABLE(dcal->drawbuf),
-                            widget->style->fg_gc[widget->state],
+                            gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
                             x1 + (w / 2) - (numW / 2),
                             y1 + (h / 2) - (numH / 2),
                             layout);
@@ -1126,11 +1137,12 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
     }
     LOG_AND_RESET(timer, "dates");
 
+    gtk_widget_get_allocation (widget, &alloc);
     gtk_widget_queue_draw_area(GTK_WIDGET(dcal),
-                               widget->allocation.x,
-                               widget->allocation.y,
-                               widget->allocation.width,
-                               widget->allocation.height);
+                               alloc.x,
+                               alloc.y,
+                               alloc.width,
+                               alloc.height);
 
     LOG_AND_RESET(timer, "queue draw");
 
@@ -1231,7 +1243,7 @@ gnc_dense_cal_motion_notify(GtkWidget *widget,
     /* As per http://www.gtk.org/tutorial/sec-eventhandling.html */
     if (event->is_hint)
         gdk_window_get_pointer(event->window, &unused, &unused, &unused2);
-    gdk_window_move(GTK_WIDGET(dcal->transPopup)->window,
+    gdk_window_move(gtk_widget_get_window (GTK_WIDGET(dcal->transPopup)),
                     x_root_offset + 5, y_root_offset + 5);
     doc = wheres_this(dcal, event->x, event->y);
     if (doc >= 0)
@@ -1609,6 +1621,7 @@ wheres_this(GncDenseCal *dcal, int x, int y)
 {
     gint colNum, weekRow, dayCol, dayOfCal;
     GDate d, startD;
+    GtkAllocation alloc;
 
     x -= dcal->leftPadding;
     y -= dcal->topPadding;
@@ -1617,8 +1630,9 @@ wheres_this(GncDenseCal *dcal, int x, int y)
     {
         return -1;
     }
-    if ((x >= GTK_WIDGET(dcal)->allocation.width)
-            || (y >= GTK_WIDGET(dcal)->allocation.height))
+    gtk_widget_get_allocation (GTK_WIDGET(dcal), &alloc);
+    if ((x >= alloc.width)
+            || (y >= alloc.height))
     {
         return -1;
     }
diff --git a/src/gnome-utils/gnc-gui-query.c b/src/gnome-utils/gnc-gui-query.c
index 52d2ced..8a9e6b7 100644
--- a/src/gnome-utils/gnc-gui-query.c
+++ b/src/gnome-utils/gnc-gui-query.c
@@ -350,7 +350,7 @@ gnc_choose_radio_option_dialog(GtkWidget *parent,
     /* default to ok */
     gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
-    dvbox = GTK_DIALOG(dialog)->vbox;
+    dvbox = gtk_dialog_get_content_area (GTK_DIALOG(dialog));
 
     gtk_box_pack_start(GTK_BOX(dvbox), main_vbox, TRUE, TRUE, 0);
 
diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
index 474fad0..4c7913c 100644
--- a/src/gnome-utils/gnc-main-window.c
+++ b/src/gnome-utils/gnc-main-window.c
@@ -1037,7 +1037,7 @@ gnc_main_window_save_window (GncMainWindow *window, GncMainWindowSaveData *data)
     /* Save the window coordinates, etc. */
     gtk_window_get_position(GTK_WINDOW(window), &coords[0], &coords[1]);
     gtk_window_get_size(GTK_WINDOW(window), &coords[2], &coords[3]);
-    maximized = (gdk_window_get_state((GTK_WIDGET(window))->window)
+    maximized = (gdk_window_get_state(gtk_widget_get_window ((GTK_WIDGET(window))))
                  & GDK_WINDOW_STATE_MAXIMIZED) != 0;
     g_key_file_set_integer_list(data->key_file, window_group,
                                 WINDOW_POSITION, &coords[0], 2);
@@ -2670,7 +2670,7 @@ gnc_main_window_new (void)
         gint width, height;
         gtk_window_get_size (GTK_WINDOW (old_window), &width, &height);
         gtk_window_resize (GTK_WINDOW (window), width, height);
-        if ((gdk_window_get_state((GTK_WIDGET(old_window))->window)
+        if ((gdk_window_get_state((gtk_widget_get_window (GTK_WIDGET(old_window))))
                 & GDK_WINDOW_STATE_MAXIMIZED) != 0)
         {
             gtk_window_maximize (GTK_WINDOW (window));
diff --git a/src/gnome/gnc-plugin-budget.c b/src/gnome/gnc-plugin-budget.c
index 35f50cc..049ee4a 100644
--- a/src/gnome/gnc-plugin-budget.c
+++ b/src/gnome/gnc-plugin-budget.c
@@ -295,7 +295,7 @@ gnc_budget_gui_select_budget(QofBook *book)
     tm = gnc_tree_model_budget_new(book);
     gnc_tree_view_budget_set_model(tv, tm);
     g_object_unref(tm);
-    gtk_container_add(GTK_CONTAINER(dlg->vbox), GTK_WIDGET(tv));
+    gtk_container_add(GTK_CONTAINER (gtk_dialog_get_content_area (dlg)), GTK_WIDGET(tv));
     gtk_widget_show_all(GTK_WIDGET(dlg));
 
     bgt = NULL;
diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c
index 8af0e96..0ffb765 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/src/gnome/gnc-split-reg.c
@@ -1103,7 +1103,7 @@ gsr_default_associate_handler_location( GNCSplitReg *gsr, gpointer data )
                                      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                      NULL);
 
-    content_area = GTK_DIALOG (dialog)->vbox;
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
     // add a label
     label = gtk_label_new ("Please enter URL:");
@@ -1472,8 +1472,8 @@ gsr_default_expand_handler( GNCSplitReg *gsr, gpointer data )
 
     /* These should all be in agreement. */
     activeCount =
-        ( ( GTK_CHECK_MENU_ITEM(gsr->split_menu_check)->active ? 1 : -1 )
-          + ( GTK_CHECK_MENU_ITEM(gsr->split_popup_check)->active ? 1 : -1 )
+        ( ( gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(gsr->split_menu_check)) ? 1 : -1 )
+          + ( gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(gsr->split_popup_check)) ? 1 : -1 )
           + ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(gsr->split_button) )
               ? 1 : -1 ) );
 
@@ -1699,7 +1699,7 @@ gnc_split_reg_style_ledger_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM(w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(w)))
         return;
 
     gnc_split_reg_change_style (gsr, REG_STYLE_LEDGER);
@@ -1710,7 +1710,7 @@ gnc_split_reg_style_auto_ledger_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM(w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(w)))
         return;
 
     gnc_split_reg_change_style (gsr, REG_STYLE_AUTO_LEDGER);
@@ -1721,7 +1721,7 @@ gnc_split_reg_style_journal_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM(w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(w)))
         return;
 
     gnc_split_reg_change_style (gsr, REG_STYLE_JOURNAL);
@@ -1734,7 +1734,7 @@ gnc_split_reg_double_line_cb (GtkWidget *w, gpointer data)
     SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
     gboolean use_double_line;
 
-    use_double_line = GTK_CHECK_MENU_ITEM(w)->active;
+    use_double_line = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(w));
     if ( use_double_line == reg->use_double_line )
         return;
 
diff --git a/src/gnome/gnc-split-reg2.c b/src/gnome/gnc-split-reg2.c
index 8cf4c2a..a27bf2b 100644
--- a/src/gnome/gnc-split-reg2.c
+++ b/src/gnome/gnc-split-reg2.c
@@ -843,7 +843,7 @@ gnc_split_reg2_style_ledger_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg2 *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM (w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w)))
         return;
 
     gnc_split_reg2_change_style (gsr, REG2_STYLE_LEDGER);
@@ -854,7 +854,7 @@ gnc_split_reg2_style_auto_ledger_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg2 *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM (w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w)))
         return;
 
     gnc_split_reg2_change_style (gsr, REG2_STYLE_AUTO_LEDGER);
@@ -865,7 +865,7 @@ gnc_split_reg2_style_journal_cb (GtkWidget *w, gpointer data)
 {
     GNCSplitReg2 *gsr = data;
 
-    if (!GTK_CHECK_MENU_ITEM (w)->active)
+    if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w)))
         return;
 
     gnc_split_reg2_change_style (gsr, REG2_STYLE_JOURNAL);
@@ -878,7 +878,7 @@ gnc_split_reg2_double_line_cb (GtkWidget *w, gpointer data)
     GncTreeModelSplitReg *model = gnc_ledger_display2_get_split_model_register (gsr->ledger);
     gboolean use_double_line;
 
-    use_double_line = GTK_CHECK_MENU_ITEM (w)->active;
+    use_double_line = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (w));
     if (use_double_line == model->use_double_line)
         return;
 
diff --git a/src/import-export/aqb/gnc-gwen-gui.c b/src/import-export/aqb/gnc-gwen-gui.c
index 9cf6481..1bfc956 100644
--- a/src/import-export/aqb/gnc-gwen-gui.c
+++ b/src/import-export/aqb/gnc-gwen-gui.c
@@ -1126,7 +1126,7 @@ messagebox_cb(GWEN_GUI *gwen_gui, guint32 flags, const gchar *title,
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
     gtk_container_add(GTK_CONTAINER(vbox), label);
     gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG(dialog))), vbox);
     gtk_widget_show_all(dialog);
 
     result = gtk_dialog_run(GTK_DIALOG(dialog));
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.c b/src/import-export/csv-imp/assistant-csv-trans-import.c
index 9b7eb5f..96fac06 100644
--- a/src/import-export/csv-imp/assistant-csv-trans-import.c
+++ b/src/import-export/csv-imp/assistant-csv-trans-import.c
@@ -962,8 +962,12 @@ static void header_button_press_handler (GtkWidget* button, GdkEventButton* even
 {
     /* col is the number of the column that was clicked, and offset is
        to correct for the indentation of button. */
-    int i, col = 0, offset = GTK_BIN(button)->child->allocation.x - button->allocation.x,
-           ncols = info->parse_data->column_types->len;
+    int i, offset;
+    GtkAllocation alloc;
+    int col = 0, ncols = info->parse_data->column_types->len;
+
+    gtk_widget_get_allocation (gtk_bin_get_child (GTK_BIN(button)), &alloc);
+    offset = alloc.x - alloc.x;
     /* Find the column that was clicked. */
     for (i = 0; i < ncols; i++)
     {
diff --git a/src/import-export/qif-imp/dialog-account-picker.c b/src/import-export/qif-imp/dialog-account-picker.c
index d213dde..162c983 100644
--- a/src/import-export/qif-imp/dialog-account-picker.c
+++ b/src/import-export/qif-imp/dialog-account-picker.c
@@ -222,7 +222,7 @@ gnc_ui_qif_account_picker_new_cb(GtkButton * w, gpointer user_data)
     gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
     gtk_entry_set_max_length(GTK_ENTRY(entry), 250);
     gtk_widget_show(entry);
-    gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dlg)->vbox), entry);
+    gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG(dlg))), entry);
 
     /* Run the dialog to get the new account name. */
     response = gtk_dialog_run(GTK_DIALOG(dlg));
diff --git a/src/plugins/bi_import/dialog-bi-import-gui.c b/src/plugins/bi_import/dialog-bi-import-gui.c
index 6c3c772..c9a3b8f 100644
--- a/src/plugins/bi_import/dialog-bi-import-gui.c
+++ b/src/plugins/bi_import/dialog-bi-import-gui.c
@@ -400,11 +400,7 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const
                                           GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
                                           NULL);
-#ifdef HAVE_GTK_2_14
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
-    content_area = GTK_DIALOG (dialog)->vbox;
-#endif
 
     // add a label
     label = gtk_label_new (msg);
@@ -461,11 +457,7 @@ gnc_info2_dialog (GtkWidget *parent, const gchar *title, const gchar *msg)
                                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                                           NULL);
-#ifdef HAVE_GTK_2_14
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
-    content_area = GTK_DIALOG (dialog)->vbox;
-#endif
 
     // add a scroll area
     scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
diff --git a/src/plugins/customer_import/dialog-customer-import-gui.c b/src/plugins/customer_import/dialog-customer-import-gui.c
index 0f5ab50..15d9ef3 100644
--- a/src/plugins/customer_import/dialog-customer-import-gui.c
+++ b/src/plugins/customer_import/dialog-customer-import-gui.c
@@ -379,11 +379,7 @@ gnc_input_dialog (GtkWidget *parent, const gchar *title, const gchar *msg, const
                                           GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                                           GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
                                           NULL);
-#ifdef HAVE_GTK_2_14
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
-    content_area = GTK_DIALOG (dialog)->vbox;
-#endif
 
     // add a label
     label = gtk_label_new (msg);
@@ -439,11 +435,7 @@ gnc_info2_dialog (GtkWidget *parent, const gchar *title, const gchar *msg)
                                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                                           NULL);
-#ifdef HAVE_GTK_2_14
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-#else
-    content_area = GTK_DIALOG (dialog)->vbox;
-#endif
 
     // add a scroll area
     scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
diff --git a/src/register/register-gnome/combocell-gnome.c b/src/register/register-gnome/combocell-gnome.c
index ecdbd5e..6899ebf 100644
--- a/src/register/register-gnome/combocell-gnome.c
+++ b/src/register/register-gnome/combocell-gnome.c
@@ -833,7 +833,9 @@ static int
 popup_get_width (GnomeCanvasItem *item,
                  gpointer user_data)
 {
-    return GTK_WIDGET (GNC_ITEM_LIST (item)->tree_view)->allocation.width;
+    GtkAllocation alloc;
+    gtk_widget_get_allocation (GTK_WIDGET (GNC_ITEM_LIST (item)->tree_view), &alloc);
+    return alloc.width;
 }
 
 static gboolean
diff --git a/src/register/register-gnome/gnucash-cursor.c b/src/register/register-gnome/gnucash-cursor.c
index a53e92f..96b41cd 100644
--- a/src/register/register-gnome/gnucash-cursor.c
+++ b/src/register/register-gnome/gnucash-cursor.c
@@ -372,7 +372,7 @@ gnucash_cursor_realize (GnomeCanvasItem *item)
         (*GNOME_CANVAS_ITEM_CLASS
          (gnucash_cursor_parent_class)->realize)(item);
 
-    window = GTK_WIDGET (item->canvas)->window;
+    window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
 
     cursor->gc = gdk_gc_new (window);
 }
diff --git a/src/register/register-gnome/gnucash-grid.c b/src/register/register-gnome/gnucash-grid.c
index f032a9c..efeb984 100644
--- a/src/register/register-gnome/gnucash-grid.c
+++ b/src/register/register-gnome/gnucash-grid.c
@@ -90,7 +90,7 @@ gnucash_grid_realize (GnomeCanvasItem *item)
          (gnucash_grid_parent_class)->realize)(item);
 
     gnucash_grid = GNUCASH_GRID (item);
-    window = GTK_WIDGET (item->canvas)->window;
+    window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
 
     /* Configure the default grid gc */
     gnucash_grid->grid_gc = gc = gdk_gc_new (window);
diff --git a/src/register/register-gnome/gnucash-header.c b/src/register/register-gnome/gnucash-header.c
index dab6873..dacb8db 100644
--- a/src/register/register-gnome/gnucash-header.c
+++ b/src/register/register-gnome/gnucash-header.c
@@ -249,7 +249,7 @@ gnc_header_realize (GnomeCanvasItem *item)
     if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
         GNOME_CANVAS_ITEM_CLASS (parent_class)->realize (item);
 
-    window = GTK_WIDGET (item->canvas)->window;
+    window = gtk_widget_get_window (GTK_WIDGET (item->canvas));
 
     header->gc = gdk_gc_new (window);
 }
@@ -488,10 +488,10 @@ gnc_header_event (GnomeCanvasItem *item, GdkEvent *event)
 
         if (pointer_on_resize_line(header, x, y, &col) &&
                 gnucash_style_col_is_resizable (header->style, col))
-            gdk_window_set_cursor (GTK_WIDGET(canvas)->window,
+            gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET(canvas)),
                                    header->resize_cursor);
         else
-            gdk_window_set_cursor (GTK_WIDGET(canvas)->window,
+            gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET(canvas)),
                                    header->normal_cursor);
         break;
 
@@ -747,7 +747,7 @@ gnc_header_get_type (void)
 static void
 gnc_header_realized (GtkWidget *widget, gpointer data)
 {
-    gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
+    gdk_window_set_back_pixmap (gtk_layout_get_bin_window (GTK_LAYOUT (widget)),
                                 NULL, FALSE);
 }
 
diff --git a/src/register/register-gnome/gnucash-item-edit.c b/src/register/register-gnome/gnucash-item-edit.c
index fb25ee2..ed7ad2b 100644
--- a/src/register/register-gnome/gnucash-item-edit.c
+++ b/src/register/register-gnome/gnucash-item-edit.c
@@ -468,7 +468,7 @@ gnc_item_edit_realize (GnomeCanvasItem *item)
          (gnc_item_edit_parent_class)->realize) (item);
 
     item_edit = GNC_ITEM_EDIT (item);
-    window = GTK_WIDGET (canvas)->window;
+    window = gtk_widget_get_window (GTK_WIDGET (canvas));
 
     item_edit->gc = gdk_gc_new (window);
 }
@@ -491,7 +491,7 @@ gnc_item_edit_focus_in (GncItemEdit *item_edit)
     g_return_if_fail (GNC_IS_ITEM_EDIT(item_edit));
 
     ev.type = GDK_FOCUS_CHANGE;
-    ev.window = GTK_WIDGET (item_edit->sheet)->window;
+    ev.window = gtk_widget_get_window (GTK_WIDGET (item_edit->sheet));
     ev.in = TRUE;
     gtk_widget_event (item_edit->editor, (GdkEvent*) &ev);
     queue_sync(item_edit);
@@ -506,7 +506,7 @@ gnc_item_edit_focus_out (GncItemEdit *item_edit)
     g_return_if_fail (GNC_IS_ITEM_EDIT(item_edit));
 
     ev.type = GDK_FOCUS_CHANGE;
-    ev.window = GTK_WIDGET (item_edit->sheet)->window;
+    ev.window = gtk_widget_get_window (GTK_WIDGET (item_edit->sheet));
     ev.in = FALSE;
     gtk_widget_event (item_edit->editor, (GdkEvent*) &ev);
     queue_sync(item_edit);
@@ -1280,6 +1280,7 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
 {
     GtkToggleButton *toggle;
     GtkAnchorType popup_anchor;
+    GtkAllocation alloc;
     GnucashSheet *sheet;
     gint x, y, w, h;
     gint y_offset;
@@ -1300,8 +1301,9 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
 
     sheet = item_edit->sheet;
 
-    view_height = GTK_WIDGET (sheet)->allocation.height;
-    view_width  = GTK_WIDGET (sheet)->allocation.width;
+    gtk_widget_get_allocation (GTK_WIDGET (sheet), &alloc);
+    view_height = alloc.height;
+    view_width  = alloc.width;
 
     gnome_canvas_get_scroll_offsets (GNOME_CANVAS(sheet), NULL, &y_offset);
     gnc_item_edit_get_pixel_coords (item_edit, &x, &y, &w, &h);
diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c
index 1a65d17..c884fdc 100644
--- a/src/register/register-gnome/gnucash-sheet.c
+++ b/src/register/register-gnome/gnucash-sheet.c
@@ -389,6 +389,7 @@ void
 gnucash_sheet_compute_visible_range (GnucashSheet *sheet)
 {
     VirtualCellLocation vcell_loc;
+    GtkAllocation alloc;
     gint height;
     gint cy;
     gint old_visible_blocks, old_visible_rows;
@@ -396,7 +397,8 @@ gnucash_sheet_compute_visible_range (GnucashSheet *sheet)
     g_return_if_fail (sheet != NULL);
     g_return_if_fail (GNUCASH_IS_SHEET (sheet));
 
-    height = GTK_WIDGET(sheet)->allocation.height;
+    gtk_widget_get_allocation (GTK_WIDGET(sheet), &alloc);
+    height = alloc.height;
 
     gnome_canvas_get_scroll_offsets (GNOME_CANVAS(sheet), NULL, &cy);
 
@@ -449,6 +451,7 @@ gnucash_sheet_show_row (GnucashSheet *sheet, gint virt_row)
 {
     VirtualCellLocation vcell_loc = { virt_row, 0 };
     SheetBlock *block;
+    GtkAllocation alloc;
     gint block_height;
     gint height;
     gint cx, cy;
@@ -465,7 +468,8 @@ gnucash_sheet_show_row (GnucashSheet *sheet, gint virt_row)
     gnome_canvas_get_scroll_offsets (GNOME_CANVAS(sheet), &cx, &cy);
     x = cx;
 
-    height = GTK_WIDGET(sheet)->allocation.height;
+    gtk_widget_get_allocation (GTK_WIDGET(sheet), &alloc);
+    height = alloc.height;
 
     block = gnucash_sheet_get_block (sheet, vcell_loc);
 
@@ -519,6 +523,7 @@ gnucash_sheet_show_range (GnucashSheet *sheet,
 {
     SheetBlock *start_block;
     SheetBlock *end_block;
+    GtkAllocation alloc;
     gint block_height;
     gint height;
     gint cx, cy;
@@ -538,7 +543,8 @@ gnucash_sheet_show_range (GnucashSheet *sheet,
     gnome_canvas_get_scroll_offsets (GNOME_CANVAS(sheet), &cx, &cy);
     x = cx;
 
-    height = GTK_WIDGET(sheet)->allocation.height;
+    gtk_widget_get_allocation (GTK_WIDGET(sheet), &alloc);
+    height = alloc.height;
 
     start_block = gnucash_sheet_get_block (sheet, start_loc);
     end_block = gnucash_sheet_get_block (sheet, end_loc);
@@ -584,10 +590,10 @@ gnucash_sheet_update_adjustments (GnucashSheet *sheet)
     vadj = sheet->vadj;
 
     if (sheet->num_visible_blocks > 0)
-        vadj->step_increment =
-            vadj->page_size / sheet->num_visible_blocks;
+        gtk_adjustment_set_step_increment (vadj,
+            gtk_adjustment_get_page_size (vadj) / sheet->num_visible_blocks);
     else
-        vadj->step_increment = 0;
+        gtk_adjustment_set_step_increment (vadj, 0);
 
     gtk_adjustment_changed(vadj);
 }
@@ -612,7 +618,8 @@ gnucash_sheet_hadjustment_changed (GtkAdjustment *adj,
     reg = GNUCASH_REGISTER(sheet->reg);
     g_return_if_fail (reg != NULL);
 
-    if (adj->upper - adj->lower > adj->page_size)
+    if (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj)
+        > gtk_adjustment_get_page_size (adj))
     {
         if (!reg->hscrollbar_visible)
         {
@@ -658,6 +665,7 @@ gnucash_sheet_redraw_block (GnucashSheet *sheet, VirtualCellLocation vcell_loc)
     gint x, y, w, h;
     GnomeCanvas *canvas;
     SheetBlock *block;
+    GtkAllocation alloc;
 
     g_return_if_fail (sheet != NULL);
     g_return_if_fail (GNUCASH_IS_SHEET(sheet));
@@ -671,9 +679,10 @@ gnucash_sheet_redraw_block (GnucashSheet *sheet, VirtualCellLocation vcell_loc)
     x = block->origin_x;
     y = block->origin_y;
 
+    gtk_widget_get_allocation (GTK_WIDGET(sheet), &alloc);
     h = block->style->dimensions->height;
     w = MIN(block->style->dimensions->width,
-            GTK_WIDGET(sheet)->allocation.width);
+            alloc.width);
 
     gnome_canvas_request_redraw (canvas, x, y, x + w + 1, y + h + 1);
 }
@@ -714,8 +723,8 @@ gnucash_sheet_realize (GtkWidget *widget)
     if (GTK_WIDGET_CLASS (sheet_parent_class)->realize)
         (*GTK_WIDGET_CLASS (sheet_parent_class)->realize)(widget);
 
-    window = widget->window;
-    gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
+    window = gtk_widget_get_window (widget);
+    gdk_window_set_back_pixmap (gtk_layout_get_bin_window (GTK_LAYOUT (widget)),
                                 NULL, FALSE);
     gtk_im_context_set_client_window( GNUCASH_SHEET (widget)->im_context,
                                       window);
@@ -1326,21 +1335,21 @@ gnucash_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 
     sheet = GNUCASH_SHEET (widget);
     vadj = sheet->vadj;
-    v_value = vadj->value;
+    v_value = gtk_adjustment_get_value (vadj);
 
     switch (event->direction)
     {
     case GDK_SCROLL_UP:
-        v_value -= vadj->step_increment;
+        v_value -= gtk_adjustment_get_step_increment (vadj);
         break;
     case GDK_SCROLL_DOWN:
-        v_value += vadj->step_increment;
+        v_value += gtk_adjustment_get_step_increment (vadj);
         break;
     default:
         return FALSE;
     }
 
-    v_value = CLAMP(v_value, vadj->lower, vadj->upper - vadj->page_size);
+    v_value = CLAMP(v_value, gtk_adjustment_get_lower (vadj), gtk_adjustment_get_upper (vadj) - gtk_adjustment_get_page_size (vadj));
 
     gtk_adjustment_set_value(vadj, v_value);
 
@@ -1358,7 +1367,7 @@ gnucash_sheet_check_grab (GnucashSheet *sheet)
 
     device = gdk_device_get_core_pointer ();
 
-    gdk_device_get_state (device, GTK_WIDGET(sheet)->window,
+    gdk_device_get_state (device, gtk_widget_get_window (GTK_WIDGET(sheet)),
                           0, &mods);
 
     if (!(mods & GDK_BUTTON1_MASK))
@@ -2419,6 +2428,7 @@ gnucash_sheet_set_scroll_region (GnucashSheet *sheet)
 {
     int height, width;
     GtkWidget *widget;
+    GtkAllocation alloc;
     double x, y;
 
     if (!sheet)
@@ -2432,8 +2442,9 @@ gnucash_sheet_set_scroll_region (GnucashSheet *sheet)
     gnome_canvas_get_scroll_region (GNOME_CANVAS(sheet),
                                     NULL, NULL, &x, &y);
 
-    height = MAX (sheet->height, widget->allocation.height);
-    width  = MAX (sheet->width, widget->allocation.width);
+    gtk_widget_get_allocation (GTK_WIDGET(sheet), &alloc);
+    height = MAX (sheet->height, alloc.height);
+    width  = MAX (sheet->width, alloc.width);
 
     if (width != (int)x || height != (int)y)
         gnome_canvas_set_scroll_region (GNOME_CANVAS(sheet),

commit ce3e36a7a558bce252f17e043980d0d3d113ba5c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Aug 25 14:16:03 2015 +0200

    Gtk code cleanups: drop use of deprecated GTK_CALENDAR_WEEK_START_ON_MONDAY
    
    It has been deprecated as of gtk 2.4 and ignored ever since.

diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c
index 1b50069..5d91f96 100644
--- a/src/gnome-utils/gnc-date-edit.c
+++ b/src/gnome-utils/gnc-date-edit.c
@@ -937,9 +937,7 @@ create_children (GNCDateEdit *gde)
     gtk_calendar_set_display_options
     (GTK_CALENDAR (gde->calendar),
      (GTK_CALENDAR_SHOW_DAY_NAMES
-      | GTK_CALENDAR_SHOW_HEADING
-      | ((gde->flags & GNC_DATE_EDIT_WEEK_STARTS_ON_MONDAY)
-         ? GTK_CALENDAR_WEEK_START_MONDAY : 0)));
+      | GTK_CALENDAR_SHOW_HEADING));
     g_signal_connect (gde->calendar, "button-release-event",
                       G_CALLBACK(gnc_date_edit_button_released), gde);
     g_signal_connect (G_OBJECT (gde->calendar), "day-selected",
@@ -1212,20 +1210,6 @@ gnc_date_edit_set_flags (GNCDateEdit *gde, GNCDateEditFlags flags)
         /* This will destroy the old menu properly */
         fill_time_combo (NULL, gde);
 
-    if ((flags & GNC_DATE_EDIT_WEEK_STARTS_ON_MONDAY)
-            != (old_flags & GNC_DATE_EDIT_WEEK_STARTS_ON_MONDAY))
-    {
-        if (flags & GNC_DATE_EDIT_WEEK_STARTS_ON_MONDAY)
-            gtk_calendar_set_display_options
-            (GTK_CALENDAR (gde->calendar),
-             (GTK_CALENDAR (gde->calendar)->display_flags
-              | GTK_CALENDAR_WEEK_START_MONDAY));
-        else
-            gtk_calendar_set_display_options
-            (GTK_CALENDAR (gde->calendar),
-             (GTK_CALENDAR (gde->calendar)->display_flags
-              & ~GTK_CALENDAR_WEEK_START_MONDAY));
-    }
 }
 
 /**
diff --git a/src/gnome-utils/gnc-date-edit.h b/src/gnome-utils/gnc-date-edit.h
index 7d5e48f..b34e774 100644
--- a/src/gnome-utils/gnc-date-edit.h
+++ b/src/gnome-utils/gnc-date-edit.h
@@ -39,7 +39,6 @@ typedef enum
 {
     GNC_DATE_EDIT_SHOW_TIME             = 1 << 0,
     GNC_DATE_EDIT_24_HR                 = 1 << 1,
-    GNC_DATE_EDIT_WEEK_STARTS_ON_MONDAY = 1 << 2,
 } GNCDateEditFlags;
 
 #define GNC_TYPE_DATE_EDIT          (gnc_date_edit_get_type ())

commit abd1684cc4b0ba2113e60fd3677d82cbec68ddd5
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Aug 25 13:52:56 2015 +0200

    Gtk code cleanups: replace deprecated gdk_drawable_get_display with gdk_window_get_display

diff --git a/src/gnome-utils/gnc-date-edit.c b/src/gnome-utils/gnc-date-edit.c
index cb59030..1b50069 100644
--- a/src/gnome-utils/gnc-date-edit.c
+++ b/src/gnome-utils/gnc-date-edit.c
@@ -254,7 +254,7 @@ popup_grab_on_window (GdkWindow *window,
             return TRUE;
         else
         {
-            gdk_display_pointer_ungrab (gdk_drawable_get_display (window),
+            gdk_display_pointer_ungrab (gdk_window_get_display (window),
                                         activate_time);
             return FALSE;
         }

commit fe2149825f0917db477a20e1de505453f5063c94
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Aug 25 12:01:00 2015 +0200

    Gtk code cleanups: drop custom arg type registration
    
    Appears not to be used anywhere.

diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index 97aa9f5..4a62bd1 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -49,12 +49,6 @@ enum
     LAST_SIGNAL
 };
 
-enum
-{
-    ARG_0,
-    ARG_EDITING_CANCELED
-};
-
 static GtkEventBoxClass *parent_class;
 static guint signals[LAST_SIGNAL];
 
@@ -135,8 +129,6 @@ gnc_popup_entry_class_init (GncPopupEntryClass *klass)
 
     widget_class->key_press_event = gpw_key_press_event;
 
-    gtk_object_add_arg_type ("GncPopupEntry::editing-canceled", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITING_CANCELED);
-
     parent_class = GTK_EVENT_BOX_CLASS (g_type_class_peek_parent (klass));
 
     signals[ARROW_CLICKED] = g_signal_new

commit 9ade051090c44f95df36582907ede1568c7f8379
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Tue Aug 25 11:39:46 2015 +0200

    Gtk code cleanups: GTK_WIDGET_SET_FLAGS is deprecated

diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index 0196f42..97aa9f5 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -123,7 +123,7 @@ gnc_popup_entry_init (GncPopupEntry *widget)
 
     gtk_container_add (GTK_CONTAINER (widget), widget->hbox);
 
-    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+    gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE);
     gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_PRESS_MASK);
     gtk_widget_add_events (GTK_WIDGET (widget), GDK_KEY_RELEASE_MASK);
 }

commit 861bfa9ff50840d0908f4008da345d1fa2adaf0b
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Aug 24 00:05:08 2015 +0200

    Gtk code cleanups: use G_TYPE_CHECK_* instead of obsolete GTK_CHECK_*

diff --git a/src/gnome-utils/gnc-cell-renderer-date.h b/src/gnome-utils/gnc-cell-renderer-date.h
index fe27daf..18d5d16 100644
--- a/src/gnome-utils/gnc-cell-renderer-date.h
+++ b/src/gnome-utils/gnc-cell-renderer-date.h
@@ -37,12 +37,12 @@
 #include "gnc-cell-renderer-popup.h"
 #include "gnc-cell-renderer-popup-entry.h"
 
-#define GNC_TYPE_CELL_RENDERER_DATE	       (gnc_cell_renderer_date_get_type ())
-#define GNC_CELL_RENDERER_DATE(obj)	       (GTK_CHECK_CAST ((obj), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDate))
-#define GNC_CELL_RENDERER_DATE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDateClass))
-#define GNC_IS_CELL_RENDERER_DATE(obj)	       (GTK_CHECK_TYPE ((obj), GNC_TYPE_CELL_RENDERER_DATE))
-#define GNC_IS_CELL_RENDERER_DATE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GNC_TYPE_CELL_RENDERER_DATE))
-#define GNC_CELL_RENDERER_DATE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDateClass))
+#define GNC_TYPE_CELL_RENDERER_DATE            (gnc_cell_renderer_date_get_type ())
+#define GNC_CELL_RENDERER_DATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDate))
+#define GNC_CELL_RENDERER_DATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDateClass))
+#define GNC_IS_CELL_RENDERER_DATE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_CELL_RENDERER_DATE))
+#define GNC_IS_CELL_RENDERER_DATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GNC_TYPE_CELL_RENDERER_DATE))
+#define GNC_CELL_RENDERER_DATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_CELL_RENDERER_DATE, GncCellRendererDateClass))
 
 typedef struct _GncCellRendererDate      GncCellRendererDate;
 typedef struct _GncCellRendererDateClass GncCellRendererDateClass;
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.h b/src/gnome-utils/gnc-cell-renderer-popup-entry.h
index bcc60be..141cfb9 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.h
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.h
@@ -33,12 +33,12 @@
 #include <pango/pango.h>
 #include <gtk/gtkeventbox.h>
 
-#define GNC_TYPE_POPUP_ENTRY		(gnc_popup_entry_get_type ())
-#define GNC_POPUP_ENTRY(obj)		(GTK_CHECK_CAST ((obj), GNC_TYPE_POPUP_ENTRY, GncPopupEntry))
-#define GNC_POPUP_ENTRY_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GNC_TYPE_POPUP_ENTRY, GncPopupEntryClass))
-#define GNC_IS_POPUP_ENTRY(obj)		(GTK_CHECK_TYPE ((obj), GNC_TYPE_POPUP_ENTRY))
-#define GNC_IS_POPUP_ENTRY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GNC_TYPE_POPUP_ENTRY))
-#define GNC_POPUP_ENTRY_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), GNC_TYPE_POPUP_ENTRY, GncPopupEntryClass))
+#define GNC_TYPE_POPUP_ENTRY            (gnc_popup_entry_get_type ())
+#define GNC_POPUP_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_POPUP_ENTRY, GncPopupEntry))
+#define GNC_POPUP_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_POPUP_ENTRY, GncPopupEntryClass))
+#define GNC_IS_POPUP_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_POPUP_ENTRY))
+#define GNC_IS_POPUP_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GNC_TYPE_POPUP_ENTRY))
+#define GNC_POPUP_ENTRY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_POPUP_ENTRY, GncPopupEntryClass))
 
 typedef struct _GncPopupEntry      GncPopupEntry;
 typedef struct _GncPopupEntryClass GncPopupEntryClass;
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.h b/src/gnome-utils/gnc-cell-renderer-popup.h
index 8017ed6..005dbb2 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup.h
+++ b/src/gnome-utils/gnc-cell-renderer-popup.h
@@ -33,12 +33,12 @@
 #include <pango/pango.h>
 #include <gtk/gtkcellrenderertext.h>
 
-#define GNC_TYPE_CELL_RENDERER_POPUP		(gnc_cell_renderer_popup_get_type ())
-#define GNC_CELL_RENDERER_POPUP(obj)		(GTK_CHECK_CAST ((obj), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopup))
-#define GNC_CELL_RENDERER_POPUP_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopupClass))
-#define GNC_IS_CELL_RENDERER_POPUP(obj)		(GTK_CHECK_TYPE ((obj), GNC_TYPE_CELL_RENDERER_POPUP))
-#define GNC_IS_CELL_RENDERER_POPUP_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), GNC_TYPE_CELL_RENDERER_POPUP))
-#define GNC_CELL_RENDERER_POPUP_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopupClass))
+#define GNC_TYPE_CELL_RENDERER_POPUP            (gnc_cell_renderer_popup_get_type ())
+#define GNC_CELL_RENDERER_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopup))
+#define GNC_CELL_RENDERER_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopupClass))
+#define GNC_IS_CELL_RENDERER_POPUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNC_TYPE_CELL_RENDERER_POPUP))
+#define GNC_IS_CELL_RENDERER_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GNC_TYPE_CELL_RENDERER_POPUP))
+#define GNC_CELL_RENDERER_POPUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GNC_TYPE_CELL_RENDERER_POPUP, GncCellRendererPopupClass))
 
 typedef struct _GncCellRendererPopup      GncCellRendererPopup;
 typedef struct _GncCellRendererPopupClass GncCellRendererPopupClass;

commit 4a07162ca15cff62ef5b3ba88e3de03c6719e83f
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sun Aug 23 22:11:38 2015 +0200

    Gtk code cleanups: use gdk_window_get_width/height functions

diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index d6df1d4..88c18a5 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -222,7 +222,8 @@ gnc_window_adjust_for_screen(GtkWindow * window)
 
     screen_width = gdk_screen_width();
     screen_height = gdk_screen_height();
-    gdk_drawable_get_size(GTK_WIDGET(window)->window, &width, &height);
+    width = gdk_window_get_width (gtk_widget_get_window (GTK_WIDGET(window)));
+    height = gdk_window_get_height (gtk_widget_get_window (GTK_WIDGET(window)));
 
     if ((width <= screen_width) && (height <= screen_height))
         return;

commit 6846ee842caf582d5e75fc1bbb142578e639d23b
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Aug 22 18:35:54 2015 +0200

    Gtk code cleanups: consistently use new style key codes

diff --git a/src/business/business-gnome/dialog-customer.c b/src/business/business-gnome/dialog-customer.c
index 0a2fef4..176f7f6 100644
--- a/src/business/business-gnome/dialog-customer.c
+++ b/src/business/business-gnome/dialog-customer.c
@@ -1271,8 +1271,8 @@ gnc_customer_common_key_press_cb( GtkEntry *entry,
      */
     switch ( event->keyval )
     {
-    case GDK_Tab:
-    case GDK_ISO_Left_Tab:
+    case GDK_KEY_Tab:
+    case GDK_KEY_ISO_Left_Tab:
         if ( !( event->state & GDK_SHIFT_MASK) )    /* Complete on Tab,
                                                   * but not Shift-Tab */
         {
diff --git a/src/gnome-utils/dialog-transfer.c b/src/gnome-utils/dialog-transfer.c
index 0c57cb3..83db9ef 100644
--- a/src/gnome-utils/dialog-transfer.c
+++ b/src/gnome-utils/dialog-transfer.c
@@ -364,7 +364,7 @@ gnc_xfer_dialog_key_press_cb (GtkWidget   *widget,
 {
     GtkWidget *toplevel;
 
-    if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter))
+    if ((event->keyval == GDK_KEY_Return) || (event->keyval == GDK_KEY_KP_Enter))
     {
         toplevel = gtk_widget_get_toplevel (widget);
         if (gtk_widget_is_toplevel(toplevel) && GTK_IS_WINDOW(toplevel))
@@ -920,14 +920,14 @@ gnc_xfer_description_key_press_cb( GtkEntry *entry,
     ENTER(" ");
     switch ( event->keyval )
     {
-        case GDK_Return:
-        case GDK_KP_Enter:
+        case GDK_KEY_Return:
+        case GDK_KEY_KP_Enter:
             gnc_xfer_dialog_quickfill( xferData );
             /* NOT done with input, activate the default button of the dialog. */
             break;
 
-        case GDK_Tab:
-        case GDK_ISO_Left_Tab:
+        case GDK_KEY_Tab:
+        case GDK_KEY_ISO_Left_Tab:
             if ( !( event->state & GDK_SHIFT_MASK) )    /* Complete on Tab,
                                                          * but not Shift-Tab */
             {
diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c
index 0fc9ee1..d6df1d4 100644
--- a/src/gnome-utils/dialog-utils.c
+++ b/src/gnome-utils/dialog-utils.c
@@ -269,9 +269,9 @@ gnc_handle_date_accelerator (GdkEventKey *event,
      */
     switch (event->keyval)
     {
-    case GDK_KP_Add:
-    case GDK_plus:
-    case GDK_equal:
+    case GDK_KEY_KP_Add:
+    case GDK_KEY_plus:
+    case GDK_KEY_equal:
         if (event->state & GDK_SHIFT_MASK)
             g_date_add_days (&gdate, 7);
         else if (event->state & GDK_MOD1_MASK)
@@ -283,9 +283,9 @@ gnc_handle_date_accelerator (GdkEventKey *event,
         g_date_to_struct_tm (&gdate, tm);
         return TRUE;
 
-    case GDK_minus:
-    case GDK_KP_Subtract:
-    case GDK_underscore:
+    case GDK_KEY_minus:
+    case GDK_KEY_KP_Subtract:
+    case GDK_KEY_underscore:
         if ((strlen (date_str) != 0) && (dateSeparator () == '-'))
         {
             const char *c;
@@ -333,41 +333,41 @@ gnc_handle_date_accelerator (GdkEventKey *event,
     /* Now check for the remaining keystrokes. */
     switch (event->keyval)
     {
-    case GDK_braceright:
-    case GDK_bracketright:
+    case GDK_KEY_braceright:
+    case GDK_KEY_bracketright:
         /* increment month */
         g_date_add_months (&gdate, 1);
         break;
 
-    case GDK_braceleft:
-    case GDK_bracketleft:
+    case GDK_KEY_braceleft:
+    case GDK_KEY_bracketleft:
         /* decrement month */
         g_date_subtract_months (&gdate, 1);
         break;
 
-    case GDK_M:
-    case GDK_m:
+    case GDK_KEY_M:
+    case GDK_KEY_m:
         /* beginning of month */
         g_date_set_day (&gdate, 1);
         break;
 
-    case GDK_H:
-    case GDK_h:
+    case GDK_KEY_H:
+    case GDK_KEY_h:
         /* end of month */
         g_date_set_day (&gdate, 1);
         g_date_add_months (&gdate, 1);
         g_date_subtract_days (&gdate, 1);
         break;
 
-    case GDK_Y:
-    case GDK_y:
+    case GDK_KEY_Y:
+    case GDK_KEY_y:
         /* beginning of year */
         g_date_set_day (&gdate, 1);
         g_date_set_month (&gdate, 1);
         break;
 
-    case GDK_R:
-    case GDK_r:
+    case GDK_KEY_R:
+    case GDK_KEY_r:
         /* end of year */
         g_date_set_day (&gdate, 1);
         g_date_set_month (&gdate, 1);
@@ -375,8 +375,8 @@ gnc_handle_date_accelerator (GdkEventKey *event,
         g_date_subtract_days (&gdate, 1);
         break;
 
-    case GDK_T:
-    case GDK_t:
+    case GDK_KEY_T:
+    case GDK_KEY_t:
         /* today */
         gnc_gdate_set_today (&gdate);
         break;
diff --git a/src/gnome-utils/gnc-amount-edit.c b/src/gnome-utils/gnc-amount-edit.c
index a724e25..bcb4166 100644
--- a/src/gnome-utils/gnc-amount-edit.c
+++ b/src/gnome-utils/gnc-amount-edit.c
@@ -158,11 +158,11 @@ gnc_amount_edit_key_press(GtkWidget *widget, GdkEventKey *event)
     gint result;
 
 #ifdef G_OS_WIN32
-    /* gdk never sends GDK_KP_Decimal on win32. See #486658 */
+    /* gdk never sends GDK_KEY_KP_Decimal on win32. See #486658 */
     if (event->hardware_keycode == VK_DECIMAL)
-        event->keyval = GDK_KP_Decimal;
+        event->keyval = GDK_KEY_KP_Decimal;
 #endif
-    if (event->keyval == GDK_KP_Decimal)
+    if (event->keyval == GDK_KEY_KP_Decimal)
     {
         if (gae->print_info.monetary)
         {
@@ -176,13 +176,13 @@ gnc_amount_edit_key_press(GtkWidget *widget, GdkEventKey *event)
 
     switch (event->keyval)
     {
-    case GDK_Return:
+    case GDK_KEY_Return:
         if (gae->evaluate_on_enter)
             break;
         if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_SHIFT_MASK))
             break;
         return result;
-    case GDK_KP_Enter:
+    case GDK_KEY_KP_Enter:
         break;
     default:
         return result;
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index e262580..0196f42 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -174,7 +174,7 @@ gtk_cell_editable_key_press_event (GtkEntry      *entry,
     gint year = 0, month = 0, day = 0;
     struct tm when;
 
-    if (key_event->keyval == GDK_Escape)
+    if (key_event->keyval == GDK_KEY_Escape)
     {
         widget->editing_canceled = TRUE;
 
@@ -213,7 +213,7 @@ gpw_key_press_event (GtkWidget   *box,
 
     gtk_widget_grab_focus (widget->entry);
 
-    if (key_event->keyval == GDK_Escape)
+    if (key_event->keyval == GDK_KEY_Escape)
     {
         widget->editing_canceled = TRUE;
 
@@ -223,13 +223,13 @@ gpw_key_press_event (GtkWidget   *box,
         return TRUE;
     }
 
-    if (key_event->keyval == GDK_Left)
+    if (key_event->keyval == GDK_KEY_Left)
     {
         gtk_editable_set_position (GTK_EDITABLE (widget->entry), 0);
         return TRUE;
     }
 
-    if (key_event->keyval == GDK_Right)
+    if (key_event->keyval == GDK_KEY_Right)
     {
         gtk_editable_set_position (GTK_EDITABLE (widget->entry), -1);
         return TRUE;
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.c b/src/gnome-utils/gnc-cell-renderer-popup.c
index 587c9c0..7449440 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup.c
@@ -467,14 +467,14 @@ gcrp_key_press_event (GtkWidget           *popup_window,
 		      GdkEventKey         *event,
 		      GncCellRendererPopup *cell)
 {
-	if (event->keyval != GDK_Escape &&
-	    event->keyval != GDK_Return &&
-	    event->keyval != GDK_KP_Enter &&
-	    event->keyval != GDK_ISO_Enter &&
-	    event->keyval != GDK_3270_Enter) {
+	if (event->keyval != GDK_KEY_Escape &&
+	    event->keyval != GDK_KEY_Return &&
+	    event->keyval != GDK_KEY_KP_Enter &&
+	    event->keyval != GDK_KEY_ISO_Enter &&
+	    event->keyval != GDK_KEY_3270_Enter) {
 		return FALSE;
 	}
-	if (event->keyval == GDK_Escape) {
+	if (event->keyval == GDK_KEY_Escape) {
 		cell->editing_canceled = TRUE;
 	} else {
 		cell->editing_canceled = FALSE;
diff --git a/src/gnome-utils/gnc-tree-view.c b/src/gnome-utils/gnc-tree-view.c
index 547d32d..6022d22 100644
--- a/src/gnome-utils/gnc-tree-view.c
+++ b/src/gnome-utils/gnc-tree-view.c
@@ -2093,9 +2093,9 @@ gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
 
     switch (event->keyval)
     {
-    case GDK_Tab:
-    case GDK_ISO_Left_Tab:
-    case GDK_KP_Tab:
+    case GDK_KEY_Tab:
+    case GDK_KEY_ISO_Left_Tab:
+    case GDK_KEY_KP_Tab:
         shifted = event->state & GDK_SHIFT_MASK;
         if (get_column_next_to(tv, col, shifted))
         {
@@ -2131,8 +2131,8 @@ gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
         }
         break;
 
-    case GDK_Return:
-    case GDK_KP_Enter:
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
         if (gtk_tree_view_row_expanded(tv, path))
         {
             gtk_tree_path_down(path);
diff --git a/src/gnome/gnc-budget-view.c b/src/gnome/gnc-budget-view.c
index e346b59..49305c3 100644
--- a/src/gnome/gnc-budget-view.c
+++ b/src/gnome/gnc-budget-view.c
@@ -572,11 +572,11 @@ gbv_key_press_cb(GtkWidget *treeview, GdkEventKey *event, gpointer userdata)
 
     switch (event->keyval)
     {
-    case GDK_Tab:
-    case GDK_ISO_Left_Tab:
-    case GDK_KP_Tab:
-    case GDK_Return:
-    case GDK_KP_Enter:
+    case GDK_KEY_Tab:
+    case GDK_KEY_ISO_Left_Tab:
+    case GDK_KEY_KP_Tab:
+    case GDK_KEY_Return:
+    case GDK_KEY_KP_Enter:
         gtk_tree_view_get_cursor(tv, &path, &col);
         if (!path) return TRUE;
         //finish_edit(col);
diff --git a/src/gnome/reconcile-view.c b/src/gnome/reconcile-view.c
index 60f5818..e8ea5b1 100644
--- a/src/gnome/reconcile-view.c
+++ b/src/gnome/reconcile-view.c
@@ -714,7 +714,7 @@ gnc_reconcile_view_key_press_cb (GtkWidget *widget, GdkEventKey *event,
 
     switch (event->keyval)
     {
-    case GDK_space:
+    case GDK_KEY_space:
         g_signal_stop_emission_by_name (widget, "key_press_event");
 
         toggle = gnc_reconcile_view_set_toggle (view);
diff --git a/src/gnome/window-reconcile.c b/src/gnome/window-reconcile.c
index cb9bf34..f29b5ad 100644
--- a/src/gnome/window-reconcile.c
+++ b/src/gnome/window-reconcile.c
@@ -1033,8 +1033,8 @@ gnc_reconcile_key_press_cb (GtkWidget *widget, GdkEventKey *event,
 
     switch (event->keyval)
     {
-    case GDK_Tab:
-    case GDK_ISO_Left_Tab:
+    case GDK_KEY_Tab:
+    case GDK_KEY_ISO_Left_Tab:
         break;
 
     default:
@@ -1951,7 +1951,7 @@ recn_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     RecnWindow *recnData = data;
 
-    if (event->keyval == GDK_Escape)
+    if (event->keyval == GDK_KEY_Escape)
     {
         recn_cancel(recnData);
         return TRUE;
diff --git a/src/gnome/window-reconcile2.c b/src/gnome/window-reconcile2.c
index 8cc42a4..4409b37 100644
--- a/src/gnome/window-reconcile2.c
+++ b/src/gnome/window-reconcile2.c
@@ -1033,8 +1033,8 @@ gnc_reconcile_key_press_cb (GtkWidget *widget, GdkEventKey *event,
 
     switch (event->keyval)
     {
-    case GDK_Tab:
-    case GDK_ISO_Left_Tab:
+    case GDK_KEY_Tab:
+    case GDK_KEY_ISO_Left_Tab:
         break;
 
     default:
@@ -1951,7 +1951,7 @@ recn_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     RecnWindow2 *recnData = data;
 
-    if (event->keyval == GDK_Escape)
+    if (event->keyval == GDK_KEY_Escape)
     {
         recn_cancel (recnData);
         return TRUE;
diff --git a/src/import-export/aqb/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c
index ba0c800..f2e6a44 100644
--- a/src/import-export/aqb/assistant-ab-initial.c
+++ b/src/import-export/aqb/assistant-ab-initial.c
@@ -150,7 +150,7 @@ enum account_list_cols
 gboolean
 aai_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
-    if (event->keyval == GDK_Escape)
+    if (event->keyval == GDK_KEY_Escape)
     {
         gtk_widget_destroy(widget);
         return TRUE;
diff --git a/src/register/register-gnome/formulacell-gnome.c b/src/register/register-gnome/formulacell-gnome.c
index 171518e..30e8368 100644
--- a/src/register/register-gnome/formulacell-gnome.c
+++ b/src/register/register-gnome/formulacell-gnome.c
@@ -66,15 +66,15 @@ gnc_formula_cell_direct_update( BasicCell *bcell,
 
     is_return = FALSE;
 
-    /* FIXME!! This code is almost identical (except for GDK_KP_Enter
+    /* FIXME!! This code is almost identical (except for GDK_KEY_KP_Enter
      * handling) to pricecell-gnome.c:gnc_price_cell_direct_update.  I write
      * this after fixing a bug where one copy was kept up to date, and the
      * other not.  So, fix this.
      */
 #ifdef G_OS_WIN32
-    /* gdk never sends GDK_KP_Decimal on win32. See #486658 */
+    /* gdk never sends GDK_KEY_KP_Decimal on win32. See #486658 */
     if (event->hardware_keycode == VK_DECIMAL)
-        event->keyval = GDK_KP_Decimal;
+        event->keyval = GDK_KEY_KP_Decimal;
 #endif
     switch (event->keyval)
     {
diff --git a/src/register/register-gnome/gnucash-sheet.c b/src/register/register-gnome/gnucash-sheet.c
index 5a12a06..1a65d17 100644
--- a/src/register/register-gnome/gnucash-sheet.c
+++ b/src/register/register-gnome/gnucash-sheet.c
@@ -1808,7 +1808,7 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event)
         case GDK_KEY_KP_Down:
         case GDK_KEY_Down:
         case GDK_KEY_Menu:
-            if (event->keyval == GDK_Menu ||
+            if (event->keyval == GDK_KEY_Menu ||
                     (event->state & GDK_CONTROL_MASK))
             {
                 GncItemEdit *item_edit;
@@ -1884,12 +1884,12 @@ gnucash_sheet_key_press_event (GtkWidget *widget, GdkEventKey *event)
     /* bug#60582 comment#27 2
            save shift state to enable <shift minus> and <shift equal>
        bug#618434
-           save keyval to handle GDK_KP_Decimal event
+           save keyval to handle GDK_KEY_KP_Decimal event
      */
 #ifdef G_OS_WIN32
-    /* gdk never sends GDK_KP_Decimal on win32. See #486658 */
+    /* gdk never sends GDK_KEY_KP_Decimal on win32. See #486658 */
     if (event->hardware_keycode == VK_DECIMAL)
-        event->keyval = GDK_KP_Decimal;
+        event->keyval = GDK_KEY_KP_Decimal;
 #endif
     if (sheet->preedit_length)
     {
diff --git a/src/register/register-gnome/pricecell-gnome.c b/src/register/register-gnome/pricecell-gnome.c
index f618655..8a5ec76 100644
--- a/src/register/register-gnome/pricecell-gnome.c
+++ b/src/register/register-gnome/pricecell-gnome.c
@@ -61,9 +61,9 @@ gnc_price_cell_direct_update (BasicCell *bcell,
     is_return = FALSE;
 
 #ifdef G_OS_WIN32
-    /* gdk never sends GDK_KP_Decimal on win32. See #486658 */
+    /* gdk never sends GDK_KEY_KP_Decimal on win32. See #486658 */
     if (event->hardware_keycode == VK_DECIMAL)
-        event->keyval = GDK_KP_Decimal;
+        event->keyval = GDK_KEY_KP_Decimal;
 #endif
     switch (event->keyval)
     {

commit b182f2f2e4e907cc65058b19db6b36c6e0fec764
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Aug 22 14:52:57 2015 +0200

    Gtk code cleanups: Avoid GtkObject where possible

diff --git a/src/gnome-search/search-core-type.c b/src/gnome-search/search-core-type.c
index 3d0313c..b9fbb31 100644
--- a/src/gnome-search/search-core-type.c
+++ b/src/gnome-search/search-core-type.c
@@ -58,7 +58,7 @@ struct _GNCSearchCoreTypePrivate
 #define _PRIVATE(o) \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_SEARCH_CORE_TYPE, GNCSearchCoreTypePrivate))
 
-static GtkObjectClass *parent_class;
+static GObjectClass *parent_class;
 
 static GHashTable *typeTable = NULL;
 
diff --git a/src/gnome-search/search-core-type.h b/src/gnome-search/search-core-type.h
index 87c0508..921bc3a 100644
--- a/src/gnome-search/search-core-type.h
+++ b/src/gnome-search/search-core-type.h
@@ -33,7 +33,7 @@
 
 typedef struct
 {
-    GtkObject parent;
+    GObject parent;
 
     /* This appears to be unused */
     GNCSearchParam *	param;
diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c
index 8e7bff3..6e6a9aa 100644
--- a/src/gnome-utils/dialog-account.c
+++ b/src/gnome-utils/dialog-account.c
@@ -146,7 +146,7 @@ void gnc_account_renumber_prefix_changed_cb (GtkEditable *editable, RenumberDial
 void gnc_account_renumber_interval_changed_cb (GtkSpinButton *spinbutton, RenumberDialog *data);
 void gnc_account_renumber_response_cb (GtkDialog *dialog, gint response, RenumberDialog *data);
 
-void gnc_account_window_destroy_cb (GtkObject *object, gpointer data);
+void gnc_account_window_destroy_cb (GtkWidget *object, gpointer data);
 void opening_equity_cb (GtkWidget *w, gpointer data);
 void gnc_account_name_changed_cb(GtkWidget *widget, gpointer data);
 void gnc_account_color_default_cb(GtkWidget *widget, gpointer data);
@@ -970,7 +970,7 @@ gnc_account_window_response_cb (GtkDialog *dialog,
 }
 
 void
-gnc_account_window_destroy_cb (GtkObject *object, gpointer data)
+gnc_account_window_destroy_cb (GtkWidget *object, gpointer data)
 {
     AccountWindow *aw = data;
     Account *account;
diff --git a/src/gnome-utils/dialog-book-close.c b/src/gnome-utils/dialog-book-close.c
index 6df1dd0..4b90bc8 100644
--- a/src/gnome-utils/dialog-book-close.c
+++ b/src/gnome-utils/dialog-book-close.c
@@ -254,7 +254,7 @@ static void close_handler(gpointer data)
     gtk_widget_destroy(dialog);
 }
 
-static void destroy_cb(GtkObject *object, gpointer data)
+static void destroy_cb(GObject *object, gpointer data)
 {
     struct CloseBookWindow *cbw;
 
diff --git a/src/gnome-utils/gnc-date-delta.c b/src/gnome-utils/gnc-date-delta.c
index d8614f7..7a13acf 100644
--- a/src/gnome-utils/gnc-date-delta.c
+++ b/src/gnome-utils/gnc-date-delta.c
@@ -254,9 +254,9 @@ fill_polarity_combo(GNCDateDelta *gdd)
 static void
 create_children (GNCDateDelta *gdd)
 {
-    GtkObject *adj;
+    GInitiallyUnowned *adj;
 
-    adj = gtk_adjustment_new(1.0, 1.0, 1000.0, 1.0, 5.0, 5.0);
+    adj = G_INITIALLY_UNOWNED (gtk_adjustment_new(1.0, 1.0, 1000.0, 1.0, 5.0, 5.0));
     gdd->value_spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0);
     gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gdd->value_spin), TRUE);
     gtk_box_pack_start(GTK_BOX(gdd), gdd->value_spin, FALSE, FALSE, 0);
diff --git a/src/gnome-utils/gnc-splash.c b/src/gnome-utils/gnc-splash.c
index f3bc4aa..f532674 100644
--- a/src/gnome-utils/gnc-splash.c
+++ b/src/gnome-utils/gnc-splash.c
@@ -38,7 +38,7 @@ static GtkWidget * progress = NULL;
 static GtkWidget * progress_bar = NULL;
 
 static void
-splash_destroy_cb (GtkObject *object, gpointer user_data)
+splash_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     splash = NULL;
 }
diff --git a/src/gnome-utils/gnc-tree-model-account.c b/src/gnome-utils/gnc-tree-model-account.c
index b37bd56..0cb4dbf 100644
--- a/src/gnome-utils/gnc-tree-model-account.c
+++ b/src/gnome-utils/gnc-tree-model-account.c
@@ -131,7 +131,7 @@ gnc_tree_model_account_update_color (gpointer gsettings, gchar *key, gpointer us
 /************************************************************/
 
 /** A pointer to the parent class of an account tree model. */
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 
 GType
 gnc_tree_model_account_get_type (void)
diff --git a/src/gnome-utils/gnc-tree-model-commodity.c b/src/gnome-utils/gnc-tree-model-commodity.c
index c11e7b1..5db3802 100644
--- a/src/gnome-utils/gnc-tree-model-commodity.c
+++ b/src/gnome-utils/gnc-tree-model-commodity.c
@@ -104,7 +104,7 @@ typedef struct GncTreeModelCommodityPrivate
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_MODEL_COMMODITY, GncTreeModelCommodityPrivate))
 
 /** A pointer to the parent class of a commodity tree model. */
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 
 GType
 gnc_tree_model_commodity_get_type (void)
diff --git a/src/gnome-utils/gnc-tree-model-owner.c b/src/gnome-utils/gnc-tree-model-owner.c
index e37df19..a94e276 100644
--- a/src/gnome-utils/gnc-tree-model-owner.c
+++ b/src/gnome-utils/gnc-tree-model-owner.c
@@ -130,7 +130,7 @@ gnc_tree_model_owner_update_color (gpointer gsettings, gchar *key, gpointer user
 /************************************************************/
 
 /** A pointer to the parent class of an owner tree model. */
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 
 GType
 gnc_tree_model_owner_get_type (void)
diff --git a/src/gnome-utils/gnc-tree-model-split-reg.c b/src/gnome-utils/gnc-tree-model-split-reg.c
index 0a8dc8e..3eeb881 100644
--- a/src/gnome-utils/gnc-tree-model-split-reg.c
+++ b/src/gnome-utils/gnc-tree-model-split-reg.c
@@ -227,7 +227,7 @@ gtm_sr_make_iter (GncTreeModelSplitReg *model, gint f, GList *tnode, GList *snod
 /************************************************************/
 
 /** A pointer to the parent class of the split register tree model. */
-static GtkObjectClass *parent_class = NULL;
+static GObjectClass *parent_class = NULL;
 
 GType
 gnc_tree_model_split_reg_get_type (void)
diff --git a/src/gnome/assistant-acct-period.c b/src/gnome/assistant-acct-period.c
index 354164c..ff6c163 100644
--- a/src/gnome/assistant-acct-period.c
+++ b/src/gnome/assistant-acct-period.c
@@ -199,7 +199,7 @@ get_close_status_str (AcctPeriodInfo *info)
 /* =============================================================== */
 
 static void
-ap_assistant_destroy_cb (GtkObject *object, gpointer data)
+ap_assistant_destroy_cb (GtkWidget *object, gpointer data)
 {
     AcctPeriodInfo *info = data;
 
diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c
index 055be17..7b8e641 100644
--- a/src/gnome/assistant-hierarchy.c
+++ b/src/gnome/assistant-hierarchy.c
@@ -135,7 +135,7 @@ destroy_hash_helper (gpointer key, gpointer value, gpointer user_data)
 }
 
 static void
-gnc_hierarchy_destroy_cb (GtkObject *obj,   hierarchy_data *data)
+gnc_hierarchy_destroy_cb (GtkWidget *obj,   hierarchy_data *data)
 {
     GHashTable *hash;
 
diff --git a/src/gnome/assistant-loan.c b/src/gnome/assistant-loan.c
index 887c5a4..d86bdee 100644
--- a/src/gnome/assistant-loan.c
+++ b/src/gnome/assistant-loan.c
@@ -306,7 +306,7 @@ typedef struct toCreateSX_
 
 /**************************************************************************/
 
-static void loan_assistant_window_destroy_cb( GtkObject *object, gpointer user_data );
+static void loan_assistant_window_destroy_cb( GtkWidget *object, gpointer user_data );
 static void loan_assistant_close_handler( gpointer user_data );
 static void loan_assistant_data_init( LoanAssistantData *ldd );
 
@@ -382,7 +382,7 @@ loan_assistant_close_handler( gpointer user_data )
 
 static
 void
-loan_assistant_window_destroy_cb( GtkObject *object, gpointer user_data )
+loan_assistant_window_destroy_cb( GtkWidget *object, gpointer user_data )
 {
     LoanAssistantData *ldd = user_data;
 
diff --git a/src/gnome/assistant-stock-split.c b/src/gnome/assistant-stock-split.c
index d4c9463..262df75 100644
--- a/src/gnome/assistant-stock-split.c
+++ b/src/gnome/assistant-stock-split.c
@@ -80,7 +80,7 @@ typedef struct
 
 
 /** declarations *******************************************************/
-void     gnc_stock_split_assistant_window_destroy_cb (GtkObject *object, gpointer user_data);
+void     gnc_stock_split_assistant_window_destroy_cb (GtkWidget *object, gpointer user_data);
 void     gnc_stock_split_assistant_prepare           (GtkAssistant  *assistant,
         GtkWidget *page,
         gpointer user_data);
@@ -97,7 +97,7 @@ void     gnc_stock_split_assistant_cancel            (GtkAssistant *gtkassistant
 
 /******* implementations ***********************************************/
 void
-gnc_stock_split_assistant_window_destroy_cb (GtkObject *object, gpointer user_data)
+gnc_stock_split_assistant_window_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     StockSplitInfo *info = user_data;
 
diff --git a/src/gnome/dialog-commodities.c b/src/gnome/dialog-commodities.c
index 3917f69..1a0e385 100644
--- a/src/gnome/dialog-commodities.c
+++ b/src/gnome/dialog-commodities.c
@@ -64,14 +64,14 @@ typedef struct
 } CommoditiesDialog;
 
 
-void gnc_commodities_window_destroy_cb (GtkObject *object, CommoditiesDialog *cd);
+void gnc_commodities_window_destroy_cb (GtkWidget *object, CommoditiesDialog *cd);
 void gnc_commodities_dialog_response (GtkDialog *dialog, gint response, CommoditiesDialog *cd);
 void gnc_commodities_show_currencies_toggled (GtkToggleButton *toggle, CommoditiesDialog *cd);
 
 
 
 void
-gnc_commodities_window_destroy_cb (GtkObject *object,   CommoditiesDialog *cd)
+gnc_commodities_window_destroy_cb (GtkWidget *object,   CommoditiesDialog *cd)
 {
     gnc_unregister_gui_component_by_data (DIALOG_COMMODITIES_CM_CLASS, cd);
 
diff --git a/src/gnome/dialog-fincalc.c b/src/gnome/dialog-fincalc.c
index 639a7a5..0dfa06a 100644
--- a/src/gnome/dialog-fincalc.c
+++ b/src/gnome/dialog-fincalc.c
@@ -243,7 +243,7 @@ fincalc_update_calc_button_cb(GtkWidget *unused, FinCalcDialog *fcd)
 
 /* Free the calc button list and free the FinCalcDialog structure. */
 static void
-fincalc_dialog_destroy(GtkObject *object, gpointer data)
+fincalc_dialog_destroy(GObject *object, gpointer data)
 {
     FinCalcDialog *fcd = data;
 
diff --git a/src/gnome/dialog-lot-viewer.c b/src/gnome/dialog-lot-viewer.c
index a2558be..b7f75a4 100644
--- a/src/gnome/dialog-lot-viewer.c
+++ b/src/gnome/dialog-lot-viewer.c
@@ -121,7 +121,7 @@ static void gnc_split_viewer_fill (GNCLotViewer *lv, GtkListStore *store, SplitL
 
 void lv_title_entry_changed_cb (GtkEntry *ent, gpointer user_data);
 void lv_response_cb (GtkDialog *dialog, gint response, gpointer data);
-void lv_window_destroy_cb (GtkObject *object, gpointer user_data);
+void lv_window_destroy_cb (GtkWidget *object, gpointer user_data);
 void lv_paned_notify_cb (GObject *gobject,
                          GParamSpec *pspec,
                          gpointer user_data);
@@ -659,7 +659,7 @@ lv_selection_changed_cb (GtkTreeSelection *selection,
 /* Lot viewer window closed */
 
 void
-lv_window_destroy_cb (GtkObject *object, gpointer user_data)
+lv_window_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     GNCLotViewer *lv = user_data;
     gnc_close_gui_component_by_data (LOT_VIEWER_CM_CLASS, lv);
diff --git a/src/gnome/dialog-price-edit-db.c b/src/gnome/dialog-price-edit-db.c
index 8eec4e8..c79504b 100644
--- a/src/gnome/dialog-price-edit-db.c
+++ b/src/gnome/dialog-price-edit-db.c
@@ -59,7 +59,7 @@
 static QofLogModule log_module = GNC_MOD_GUI;
 
 
-void gnc_prices_dialog_window_destroy_cb (GtkObject *object, gpointer data);
+void gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data);
 void gnc_prices_dialog_close_cb (GtkDialog *dialog, gpointer data);
 void gnc_prices_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
 void gnc_prices_dialog_edit_clicked (GtkWidget *widget, gpointer data);
@@ -84,7 +84,7 @@ typedef struct
 
 
 void
-gnc_prices_dialog_window_destroy_cb (GtkObject *object, gpointer data)
+gnc_prices_dialog_window_destroy_cb (GtkWidget *object, gpointer data)
 {
     PricesDialog *pdb_dialog = data;
 
diff --git a/src/gnome/dialog-progress.c b/src/gnome/dialog-progress.c
index bd4926c..181fa12 100644
--- a/src/gnome/dialog-progress.c
+++ b/src/gnome/dialog-progress.c
@@ -176,7 +176,7 @@ delete_cb(GtkWidget *widget, GdkEvent  *event, gpointer data)
 
 
 static void
-destroy_cb(GtkObject *object, gpointer data)
+destroy_cb(GtkWidget *object, gpointer data)
 {
     GNCProgressDialog *progress = data;
 
@@ -196,7 +196,6 @@ static void
 gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress)
 {
     GtkWidget *dialog;
-    GtkObject *tdo;
     GtkBuilder *builder;
 
     g_return_if_fail(progress);
@@ -207,15 +206,14 @@ gnc_progress_dialog_create(GtkWidget * parent, GNCProgressDialog *progress)
 
     dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Progress Dialog"));
     progress->dialog = dialog;
-    tdo = GTK_OBJECT(dialog);
 
     /* parent */
     if (parent != NULL)
         gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
 
-    g_signal_connect(tdo, "delete_event", G_CALLBACK(delete_cb), progress);
+    g_signal_connect(G_OBJECT(dialog), "delete_event", G_CALLBACK(delete_cb), progress);
 
-    g_signal_connect(tdo, "destroy", G_CALLBACK(destroy_cb), progress);
+    g_signal_connect(G_OBJECT(dialog), "destroy", G_CALLBACK(destroy_cb), progress);
 
     progress->primary_label = GTK_WIDGET(gtk_builder_get_object (builder, "primary_label"));
     gtk_widget_hide(progress->primary_label);
diff --git a/src/gnome/dialog-sx-editor.c b/src/gnome/dialog-sx-editor.c
index 76fe495..44496e8 100644
--- a/src/gnome/dialog-sx-editor.c
+++ b/src/gnome/dialog-sx-editor.c
@@ -153,7 +153,7 @@ static gboolean gnc_sxed_check_consistent( GncSxEditorDialog *sxed );
 static gboolean gnc_sxed_check_changed( GncSxEditorDialog *sxed );
 static void gnc_sxed_save_sx( GncSxEditorDialog *sxed );
 static void gnc_sxed_freq_changed( GncFrequency *gf, gpointer ud );
-static void sxed_excal_update_adapt_cb( GtkObject *o, gpointer ud );
+static void sxed_excal_update_adapt_cb( GtkWidget *o, gpointer ud );
 static void gnc_sxed_update_cal(GncSxEditorDialog *sxed);
 void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
 static void gnc_sxed_reg_check_close(GncSxEditorDialog *sxed);
@@ -1011,21 +1011,21 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
 
 
 static void
-enabled_toggled_cb( GtkObject *o, GncSxEditorDialog *sxed )
+enabled_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
 {
     return;
 }
 
 
 static void
-autocreate_toggled_cb( GtkObject *o, GncSxEditorDialog *sxed )
+autocreate_toggled_cb( GtkToggleButton *o, GncSxEditorDialog *sxed )
 {
-    if ( !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(o)) )
+    if ( !gtk_toggle_button_get_active (o) )
     {
         gtk_toggle_button_set_active( sxed->notifyOpt, FALSE );
     }
     gtk_widget_set_sensitive( GTK_WIDGET(sxed->notifyOpt),
-                              gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(o) ) );
+                              gtk_toggle_button_get_active (o) );
 }
 
 
@@ -1051,7 +1051,7 @@ remind_toggled_cb( GtkButton *o, GncSxEditorDialog *sxed )
 
 /* Local destruction of dialog */
 static void
-scheduledxaction_editor_dialog_destroy(GtkObject *object, gpointer data)
+scheduledxaction_editor_dialog_destroy(GtkWidget *object, gpointer data)
 {
     GncSxEditorDialog *sxed = data;
 
@@ -1662,7 +1662,7 @@ gnc_sxed_freq_changed(GncFrequency *gf, gpointer ud)
 
 
 static void
-sxed_excal_update_adapt_cb(GtkObject *o, gpointer ud)
+sxed_excal_update_adapt_cb(GtkWidget *o, gpointer ud)
 {
     gnc_sxed_update_cal((GncSxEditorDialog*)ud);
 }
diff --git a/src/gnome/dialog-sx-editor2.c b/src/gnome/dialog-sx-editor2.c
index c9de4dc..7ff7764 100644
--- a/src/gnome/dialog-sx-editor2.c
+++ b/src/gnome/dialog-sx-editor2.c
@@ -152,7 +152,7 @@ static gboolean gnc_sxed_check_consistent (GncSxEditorDialog2 *sxed);
 static gboolean gnc_sxed_check_changed (GncSxEditorDialog2 *sxed);
 static void gnc_sxed_save_sx (GncSxEditorDialog2 *sxed);
 static void gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud);
-static void sxed_excal_update_adapt_cb (GtkObject *o, gpointer ud);
+static void sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud);
 static void gnc_sxed_update_cal (GncSxEditorDialog2 *sxed);
 static void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
 //void on_sx_check_toggled_cb (GtkWidget *togglebutton, gpointer user_data);
@@ -1003,21 +1003,21 @@ gnc_sxed_save_sx (GncSxEditorDialog2 *sxed )
 
 
 static void
-enabled_toggled_cb (GtkObject *o, GncSxEditorDialog2 *sxed)
+enabled_toggled_cb (GtkToggleButton *o, GncSxEditorDialog2 *sxed)
 {
     return;
 }
 
 
 static void
-autocreate_toggled_cb (GtkObject *o, GncSxEditorDialog2 *sxed)
+autocreate_toggled_cb (GtkToggleButton *o, GncSxEditorDialog2 *sxed)
 {
-    if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(o)))
+    if ( !gtk_toggle_button_get_active (o))
     {
         gtk_toggle_button_set_active (sxed->notifyOpt, FALSE);
     }
     gtk_widget_set_sensitive (GTK_WIDGET (sxed->notifyOpt),
-                              gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(o)));
+                              gtk_toggle_button_get_active (o));
 }
 
 
@@ -1043,7 +1043,7 @@ remind_toggled_cb (GtkButton *o, GncSxEditorDialog2 *sxed)
 
 /* Local destruction of dialog */
 static void
-scheduledxaction_editor_dialog_destroy (GtkObject *object, gpointer data)
+scheduledxaction_editor_dialog_destroy (GtkWidget *object, gpointer data)
 {
     GncSxEditorDialog2 *sxed = data;
 
@@ -1645,7 +1645,7 @@ gnc_sxed_freq_changed (GncFrequency *gf, gpointer ud)
 
 
 static void
-sxed_excal_update_adapt_cb (GtkObject *o, gpointer ud)
+sxed_excal_update_adapt_cb (GtkWidget *o, gpointer ud)
 {
     gnc_sxed_update_cal ((GncSxEditorDialog2*)ud);
 }
diff --git a/src/gnome/dialog-sx-from-trans.c b/src/gnome/dialog-sx-from-trans.c
index 6065667..5fbeb98 100644
--- a/src/gnome/dialog-sx-from-trans.c
+++ b/src/gnome/dialog-sx-from-trans.c
@@ -139,7 +139,7 @@ sxfti_attach_callbacks(SXFromTransInfo *sxfti)
     {
         w = GTK_WIDGET(gtk_builder_get_object(sxfti->builder, callbacks[i].name));
 
-        g_signal_connect (GTK_OBJECT(w), callbacks[i].signal,
+        g_signal_connect (G_OBJECT(w), callbacks[i].signal,
                           G_CALLBACK(callbacks[i].handlerFn),
                           sxfti );
     }
@@ -433,7 +433,7 @@ sxftd_init( SXFromTransInfo *sxfti )
     start_tt = gnc_time64_get_day_start_gdate (&nextDate);
     gnc_date_edit_set_time( sxfti->startDateGDE, start_tt );
 
-    g_signal_connect( GTK_OBJECT(sxfti->name), "destroy",
+    g_signal_connect( G_OBJECT(sxfti->name), "destroy",
                       G_CALLBACK(sxftd_destroy),
                       sxfti );
 
diff --git a/src/gnome/dialog-sx-since-last-run.c b/src/gnome/dialog-sx-since-last-run.c
index ebf6387..3964e68 100644
--- a/src/gnome/dialog-sx-since-last-run.c
+++ b/src/gnome/dialog-sx-since-last-run.c
@@ -126,7 +126,7 @@ GtkTreeModel* gnc_sx_get_slr_state_model(void);
 static void _show_created_transactions(GncSxSinceLastRunDialog *app_dialog, GList *created_txn_guids);
 
 static void close_handler(gpointer user_data);
-static void dialog_destroy_cb(GtkObject *object, GncSxSinceLastRunDialog *app_dialog);
+static void dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog);
 static void dialog_response_cb(GtkDialog *dialog, gint response_id, GncSxSinceLastRunDialog *app_dialog);
 
 /* ------------------------------------------------------------ */
@@ -1064,7 +1064,7 @@ close_handler(gpointer user_data)
 }
 
 static void
-dialog_destroy_cb(GtkObject *object, GncSxSinceLastRunDialog *app_dialog)
+dialog_destroy_cb(GtkWidget *object, GncSxSinceLastRunDialog *app_dialog)
 {
     gnc_unregister_gui_component(app_dialog->component_id);
 
diff --git a/src/gnome/dialog-tax-info.c b/src/gnome/dialog-tax-info.c
index 98cb772..96338fd 100644
--- a/src/gnome/dialog-tax-info.c
+++ b/src/gnome/dialog-tax-info.c
@@ -741,7 +741,7 @@ identity_edit_destroy_cb (GtkDialog *dialog, gpointer data)
 }
 
 static void
-window_destroy_cb (GtkObject *object, gpointer data)
+window_destroy_cb (GtkWidget *object, gpointer data)
 {
     TaxInfoDialog *ti_dialog = data;
 
diff --git a/src/gnome/gnc-split-reg.c b/src/gnome/gnc-split-reg.c
index 6e71cbf..8af0e96 100644
--- a/src/gnome/gnc-split-reg.c
+++ b/src/gnome/gnc-split-reg.c
@@ -233,7 +233,7 @@ static void
 gnc_split_reg_class_init( GNCSplitRegClass *klass )
 {
     int i;
-    GtkObjectClass *object_class;
+    GObjectClass *object_class;
     static struct similar_signal_info
     {
         enum gnc_split_reg_signal_enum s;
@@ -264,7 +264,7 @@ gnc_split_reg_class_init( GNCSplitRegClass *klass )
         { LAST_SIGNAL, NULL, 0 }
     };
 
-    object_class = (GtkObjectClass*) klass;
+    object_class = (GObjectClass*) klass;
 
     for ( i = 0; signals[i].s != INCLUDE_DATE_SIGNAL; i++ )
     {
diff --git a/src/gnome/gnc-split-reg2.c b/src/gnome/gnc-split-reg2.c
index 429b983..8cf4c2a 100644
--- a/src/gnome/gnc-split-reg2.c
+++ b/src/gnome/gnc-split-reg2.c
@@ -140,9 +140,9 @@ static guint gnc_split_reg2_signals[LAST_SIGNAL] = { 0 };
 static void
 gnc_split_reg2_class_init (GNCSplitReg2Class *klass)
 {
-    GtkObjectClass *object_class;
+    GObjectClass *object_class;
 
-    object_class = (GtkObjectClass*) klass;
+    object_class = (GObjectClass*) klass;
 
     gnc_split_reg2_signals[HELP_CHANGED] =
         g_signal_new("help-changed",
diff --git a/src/import-export/aqb/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c
index cbe37ea..ba0c800 100644
--- a/src/import-export/aqb/assistant-ab-initial.c
+++ b/src/import-export/aqb/assistant-ab-initial.c
@@ -74,7 +74,7 @@ void aai_on_prepare (GtkAssistant  *assistant, GtkWidget *page,
 
 void aai_on_finish (GtkAssistant *gtkassistant, gpointer user_data);
 void aai_on_cancel (GtkAssistant *assistant, gpointer user_data);
-void aai_destroy_cb(GtkObject *object, gpointer user_data);
+void aai_destroy_cb(GtkWidget *object, gpointer user_data);
 
 gboolean aai_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data);
 
@@ -170,7 +170,7 @@ aai_on_cancel (GtkAssistant *gtkassistant, gpointer user_data)
 }
 
 void
-aai_destroy_cb(GtkObject *object, gpointer user_data)
+aai_destroy_cb(GtkWidget *object, gpointer user_data)
 {
     ABInitialInfo *info = user_data;
 
diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c
index b41344d..ac96230 100644
--- a/src/import-export/csv-exp/assistant-csv-export.c
+++ b/src/import-export/csv-exp/assistant-csv-export.c
@@ -773,7 +773,7 @@ csv_export_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
  * Assistant call back functions
  *******************************************************/
 static void
-csv_export_assistant_destroy_cb (GtkObject *object, gpointer user_data)
+csv_export_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     CsvExportInfo *info = user_data;
     gnc_unregister_gui_component_by_data (ASSISTANT_CSV_EXPORT_CM_CLASS, info);
diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c
index 3f0ee01..e3503e4 100644
--- a/src/import-export/csv-imp/assistant-csv-account-import.c
+++ b/src/import-export/csv-imp/assistant-csv-account-import.c
@@ -518,7 +518,7 @@ csv_import_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
  * Assistant call back functions
  *******************************************************/
 static void
-csv_import_assistant_destroy_cb (GtkObject *object, gpointer user_data)
+csv_import_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     CsvImportInfo *info = user_data;
     gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_CM_CLASS, info);
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.c b/src/import-export/csv-imp/assistant-csv-trans-import.c
index 33ccce1..9b7eb5f 100644
--- a/src/import-export/csv-imp/assistant-csv-trans-import.c
+++ b/src/import-export/csv-imp/assistant-csv-trans-import.c
@@ -1613,7 +1613,7 @@ csv_import_trans_assistant_prepare (GtkAssistant *assistant, GtkWidget *page,
  * Assistant call back functions
  *******************************************************/
 static void
-csv_import_trans_assistant_destroy_cb (GtkObject *object, gpointer user_data)
+csv_import_trans_assistant_destroy_cb (GtkWidget *object, gpointer user_data)
 {
     CsvImportTrans *info = user_data;
     gnc_unregister_gui_component_by_data (ASSISTANT_CSV_IMPORT_TRANS_CM_CLASS, info);
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c
index 3bdf62c..6f1982c 100644
--- a/src/import-export/qif-imp/assistant-qif-import.c
+++ b/src/import-export/qif-imp/assistant-qif-import.c
@@ -200,7 +200,7 @@ struct _qifassistantpage
 
 typedef struct _qifassistantpage QIFAssistantPage;
 
-static void gnc_ui_qif_import_assistant_destroy (GtkObject *object, gpointer user_data);
+static void gnc_ui_qif_import_assistant_destroy (GtkWidget *object, gpointer user_data);
 static void gnc_ui_qif_import_assistant_close_handler (gpointer user_data );
 
 void gnc_ui_qif_import_cancel_cb (GtkAssistant *gtkassistant, gpointer user_data);
@@ -421,7 +421,7 @@ gnc_ui_qif_import_commodity_destroy(QIFImportWindow * wind)
  * close the QIF Import assistant window
  **********************************************/
 static void
-gnc_ui_qif_import_assistant_destroy(GtkObject *object, gpointer user_data)
+gnc_ui_qif_import_assistant_destroy(GtkWidget *object, gpointer user_data)
 {
     QIFImportWindow * wind = user_data;
 
diff --git a/src/register/register-gnome/gnucash-date-picker.c b/src/register/register-gnome/gnucash-date-picker.c
index 498770b..0bad9d6 100644
--- a/src/register/register-gnome/gnucash-date-picker.c
+++ b/src/register/register-gnome/gnucash-date-picker.c
@@ -119,12 +119,12 @@ gnc_date_picker_key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 static void
 gnc_date_picker_class_init (GNCDatePickerClass *date_picker_class)
 {
-    GtkObjectClass  *object_class;
+    GObjectClass  *object_class;
 
     gnc_date_picker_parent_class =
         g_type_class_peek_parent (date_picker_class);
 
-    object_class = GTK_OBJECT_CLASS (date_picker_class);
+    object_class = G_OBJECT_CLASS (date_picker_class);
 
     gnc_date_picker_signals[DATE_SELECTED] =
         g_signal_new("date_selected",
diff --git a/src/register/register-gnome/gnucash-item-edit.c b/src/register/register-gnome/gnucash-item-edit.c
index 9b34102..fb25ee2 100644
--- a/src/register/register-gnome/gnucash-item-edit.c
+++ b/src/register/register-gnome/gnucash-item-edit.c
@@ -993,12 +993,12 @@ gnc_item_edit_popup_toggled (GtkToggleButton *button, gpointer data)
 static void
 block_toggle_signals(GncItemEdit *item_edit)
 {
-    GtkObject *obj;
+    GObject *obj;
 
     if (!item_edit->popup_toggle.signals_connected)
         return;
 
-    obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
+    obj = G_OBJECT (item_edit->popup_toggle.toggle_button);
 
     g_signal_handlers_block_matched (obj, G_SIGNAL_MATCH_DATA,
                                      0, 0, NULL, NULL, item_edit);
@@ -1008,12 +1008,12 @@ block_toggle_signals(GncItemEdit *item_edit)
 static void
 unblock_toggle_signals(GncItemEdit *item_edit)
 {
-    GtkObject *obj;
+    GObject *obj;
 
     if (!item_edit->popup_toggle.signals_connected)
         return;
 
-    obj = GTK_OBJECT (item_edit->popup_toggle.toggle_button);
+    obj = G_OBJECT (item_edit->popup_toggle.toggle_button);
 
     g_signal_handlers_unblock_matched (obj, G_SIGNAL_MATCH_DATA,
                                        0, 0, NULL, NULL, item_edit);
@@ -1023,14 +1023,14 @@ unblock_toggle_signals(GncItemEdit *item_edit)
 static void
 connect_popup_toggle_signals (GncItemEdit *item_edit)
 {
-    GtkObject *object;
+    GObject *object;
 
     g_return_if_fail(GNC_IS_ITEM_EDIT(item_edit));
 
     if (item_edit->popup_toggle.signals_connected)
         return;
 
-    object = GTK_OBJECT(item_edit->popup_toggle.toggle_button);
+    object = G_OBJECT(item_edit->popup_toggle.toggle_button);
 
     g_signal_connect (object, "toggled",
                       G_CALLBACK(gnc_item_edit_popup_toggled),

commit 8825d3feb7abda2650b0907d9eafa34927735267
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Aug 22 12:26:25 2015 +0200

    Gtk code cleanups: Fix obsolete use of GtkType type.

diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.c b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
index 137613b..e262580 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -58,10 +58,10 @@ enum
 static GtkEventBoxClass *parent_class;
 static guint signals[LAST_SIGNAL];
 
-GtkType
+GType
 gnc_popup_entry_get_type (void)
 {
-    static GtkType widget_type = 0;
+    static GType widget_type = 0;
 
     if (!widget_type)
     {
diff --git a/src/gnome-utils/gnc-cell-renderer-popup-entry.h b/src/gnome-utils/gnc-cell-renderer-popup-entry.h
index e3143c3..bcc60be 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup-entry.h
+++ b/src/gnome-utils/gnc-cell-renderer-popup-entry.h
@@ -59,7 +59,7 @@ struct _GncPopupEntryClass
     GtkEventBoxClass parent_class;
 };
 
-GtkType      gnc_popup_entry_get_type   (void) G_GNUC_CONST;
+GType        gnc_popup_entry_get_type   (void) G_GNUC_CONST;
 
 GtkWidget   *gnc_popup_entry_new        (void);
 
diff --git a/src/gnome-utils/gnc-cell-renderer-popup.h b/src/gnome-utils/gnc-cell-renderer-popup.h
index 82b446c..8017ed6 100644
--- a/src/gnome-utils/gnc-cell-renderer-popup.h
+++ b/src/gnome-utils/gnc-cell-renderer-popup.h
@@ -78,7 +78,7 @@ struct _GncCellRendererPopupClass
 	void   (* hide_popup) (GncCellRendererPopup *cell);
 };
 
-GtkType          gnc_cell_renderer_popup_get_type (void) G_GNUC_CONST;
+GType            gnc_cell_renderer_popup_get_type (void) G_GNUC_CONST;
 
 GtkCellRenderer *gnc_cell_renderer_popup_new      (void);
 

commit 8d1b45220176f4cfe8ce423f7b8fb634cce2f06c
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Sat Aug 22 10:50:35 2015 +0200

    Drop function gnc_assistant_set_colors
    
    It's not making any visual difference in current Gtk implementations.

diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 548a4e2..5eee396 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
 
 libgncmod_gnome_utils_la_SOURCES = \
   account-quickfill.c \
-  assistant-utils.c \
   assistant-xml-encoding.c \
   cursors.c \
   dialog-account.c \
@@ -112,7 +111,6 @@ libgncmod_gnome_utils_la_SOURCES = \
 gncincludedir = ${GNC_INCLUDE_DIR}
 gncinclude_HEADERS = \
   account-quickfill.h \
-  assistant-utils.h \
   assistant-xml-encoding.h \
   dialog-account.h \
   dialog-book-close.h \
diff --git a/src/gnome-utils/assistant-utils.c b/src/gnome-utils/assistant-utils.c
deleted file mode 100644
index 49a5faf..0000000
--- a/src/gnome-utils/assistant-utils.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************\
- * assistant-utils.c -- utility functions for creating assistants   *
- * Copyright (C) 2001 Jeremy Collins                                *
- * Copyright (C) 2001 Dave Peticolas <dave at krondo.com>              *
- * Copyright (C) 2010 Geert Janssens                                *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include "dialog-utils.h"
-#include "assistant-utils.h"
-#include "qof.h"
-#include "gnc-gnome-utils.h"
-
-void
-gnc_assistant_set_colors (GtkAssistant *assistant)
-{
-    GdkColor bluish;
-    GdkColor white;
-    GdkColormap *cm;
-
-    if (!assistant) return;
-
-    bluish.red =   (gushort) (.40 * 65535);
-    bluish.green = (gushort) (.40 * 65535);
-    bluish.blue =  (gushort) (.60 * 65535);
-
-    white.red =   65535;
-    white.green = 65535;
-    white.blue =  65535;
-
-    cm = gtk_widget_get_colormap (GTK_WIDGET (assistant));
-
-    gdk_colormap_alloc_color(cm, &bluish, FALSE, TRUE);
-    gdk_colormap_alloc_color(cm, &white, FALSE, TRUE);
-
-}
diff --git a/src/gnome-utils/assistant-utils.h b/src/gnome-utils/assistant-utils.h
deleted file mode 100644
index 3d3c247..0000000
--- a/src/gnome-utils/assistant-utils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************\
- * assistant-utils.h -- utility functions for creating assistants   *
- * Copyright (C) 2001 Jeremy Collins                                *
- * Copyright (C) 2010 Geert Janssens                                *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
- *                                                                  *
-\********************************************************************/
-
-#ifndef ASSISTANT_UTILS_H
-#define ASSISTANT_UTILS_H
-
-#include <gtk/gtk.h>
-
-void gnc_assistant_set_colors (GtkAssistant *assistant);
-
-#endif
diff --git a/src/gnome-utils/assistant-xml-encoding.c b/src/gnome-utils/assistant-xml-encoding.c
index 558e2e5..6179dfb 100644
--- a/src/gnome-utils/assistant-xml-encoding.c
+++ b/src/gnome-utils/assistant-xml-encoding.c
@@ -30,7 +30,6 @@
 #include "TransLog.h"
 #include "assistant-xml-encoding.h"
 #include "dialog-utils.h"
-#include "assistant-utils.h"
 #include "gnc-backend-xml.h"
 #include "gnc-component-manager.h"
 #include "gnc-uri-utils.h"
@@ -306,8 +305,6 @@ gnc_xml_convert_single_file (const gchar *filename)
         gnc_builder_add_from_file  (builder , "assistant-xml-encoding.glade", "assistant_xml_encoding");
         data->assistant = GTK_WIDGET(gtk_builder_get_object (builder, "assistant_xml_encoding"));
 
-        gnc_assistant_set_colors (GTK_ASSISTANT (data->assistant));
-
         /* Enable buttons on all pages. */
         gtk_assistant_set_page_complete (GTK_ASSISTANT (data->assistant),
                                          GTK_WIDGET(gtk_builder_get_object(builder, "start_page")),
diff --git a/src/gnome-utils/gnc-tree-view-owner.c b/src/gnome-utils/gnc-tree-view-owner.c
index 51d3cac..0969576 100644
--- a/src/gnome-utils/gnc-tree-view-owner.c
+++ b/src/gnome-utils/gnc-tree-view-owner.c
@@ -45,7 +45,6 @@
 #include "gnc-ui-balances.h"
 #include "dialog-utils.h"
 #include "window-main-summarybar.h"
-#include "assistant-utils.h"
 
 #define SAMPLE_OWNER_VALUE "$1,000,000.00"
 
diff --git a/src/gnome/assistant-acct-period.c b/src/gnome/assistant-acct-period.c
index e28a99c..354164c 100644
--- a/src/gnome/assistant-acct-period.c
+++ b/src/gnome/assistant-acct-period.c
@@ -43,7 +43,6 @@
 #include "Transaction.h"
 #include "dialog-utils.h"
 #include "assistant-acct-period.h"
-#include "assistant-utils.h"
 #include "gnc-component-manager.h"
 #include "qof.h"
 #include "gnc-file.h"
@@ -546,9 +545,6 @@ ap_assistant_create (AcctPeriodInfo *info)
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Account Period Assistant"));
     info->window = window;
 
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->window));
-
     /* Enable all pages except menu page. */
     gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
                                      GTK_WIDGET(gtk_builder_get_object(builder, "start_page")),
diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c
index da0d5af..055be17 100644
--- a/src/gnome/assistant-hierarchy.c
+++ b/src/gnome/assistant-hierarchy.c
@@ -37,7 +37,6 @@
 #include "dialog-utils.h"
 #include "dialog-file-access.h"
 #include "assistant-hierarchy.h"
-#include "assistant-utils.h"
 #include "gnc-amount-edit.h"
 #include "gnc-currency-edit.h"
 #include "gnc-exp-parser.h"
@@ -1170,8 +1169,6 @@ gnc_create_hierarchy_assistant (gboolean use_defaults, GncHierarchyAssistantFini
     if (when_completed != NULL)
         gtk_window_set_keep_above (GTK_WINDOW(data->dialog), TRUE);
 
-    gnc_assistant_set_colors (GTK_ASSISTANT (data->dialog));
-
     /* Enable buttons on first and last page. */
     gtk_assistant_set_page_complete (GTK_ASSISTANT (dialog),
                                      GTK_WIDGET(gtk_builder_get_object(builder, "intro_page_label")),
diff --git a/src/gnome/assistant-loan.c b/src/gnome/assistant-loan.c
index 8c986cd..887c5a4 100644
--- a/src/gnome/assistant-loan.c
+++ b/src/gnome/assistant-loan.c
@@ -33,7 +33,6 @@
 #include "SchedXaction.h"
 #include "SX-book.h"
 #include "SX-ttinfo.h"
-#include "assistant-utils.h"
 #include "gnc-amount-edit.h"
 #include "gnc-account-sel.h"
 #include "gnc-date.h"
@@ -465,10 +464,6 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Loan-Mortgage Assistant"));
     ldd->window = window;
 
-
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (ldd->window));
-
     /* Enable buttons on complete pages. */
     gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
                                      GTK_WIDGET(gtk_builder_get_object(builder, "loan_intro_page")),
diff --git a/src/gnome/assistant-stock-split.c b/src/gnome/assistant-stock-split.c
index f4b9cff..d4c9463 100644
--- a/src/gnome/assistant-stock-split.c
+++ b/src/gnome/assistant-stock-split.c
@@ -32,7 +32,6 @@
 #include "engine-helpers.h"
 #include "dialog-utils.h"
 #include "assistant-stock-split.h"
-#include "assistant-utils.h"
 #include "gnc-amount-edit.h"
 #include "gnc-component-manager.h"
 #include "gnc-currency-edit.h"
@@ -536,9 +535,6 @@ gnc_stock_split_assistant_create (StockSplitInfo *info)
     window = GTK_WIDGET(gtk_builder_get_object (builder, "Stock Split Assistant"));
     info->window = window;
 
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->window));
-
     /* Enable buttons on first, second, fourth and last page. */
     gtk_assistant_set_page_complete (GTK_ASSISTANT (window),
                                      GTK_WIDGET(gtk_builder_get_object(builder, "intro_page_label")),
diff --git a/src/import-export/aqb/assistant-ab-initial.c b/src/import-export/aqb/assistant-ab-initial.c
index d01b590..cbe37ea 100644
--- a/src/import-export/aqb/assistant-ab-initial.c
+++ b/src/import-export/aqb/assistant-ab-initial.c
@@ -44,7 +44,6 @@
 
 #include "dialog-utils.h"
 #include "assistant-ab-initial.h"
-#include "assistant-utils.h"
 #include "gnc-ab-kvp.h"
 #include "gnc-ab-utils.h"
 #include "gnc-component-manager.h"
@@ -855,8 +854,6 @@ gnc_ab_initial_assistant(void)
 
     info->window = GTK_WIDGET(gtk_builder_get_object (builder, "AqBanking Init Assistant"));
 
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->assistant));
-
     info->api = gnc_AB_BANKING_new();
     info->deferred_info = NULL;
     info->gnc_hash = NULL;
diff --git a/src/import-export/csv-exp/assistant-csv-export.c b/src/import-export/csv-exp/assistant-csv-export.c
index 25e74f2..b41344d 100644
--- a/src/import-export/csv-exp/assistant-csv-export.c
+++ b/src/import-export/csv-exp/assistant-csv-export.c
@@ -40,7 +40,6 @@
 #include "Query.h"
 #include "Transaction.h"
 
-#include "assistant-utils.h"
 #include "assistant-csv-export.h"
 #include "csv-tree-export.h"
 #include "csv-transactions-export.h"
@@ -836,9 +835,6 @@ csv_export_assistant_create (CsvExportInfo *info)
     window = GTK_WIDGET(gtk_builder_get_object (builder, "CSV Export Assistant"));
     info->window = window;
 
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->window));
-
     /* Load default settings */
     load_settings (info);
 
diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c
index 7c8c95d..3f0ee01 100644
--- a/src/import-export/csv-imp/assistant-csv-account-import.c
+++ b/src/import-export/csv-imp/assistant-csv-account-import.c
@@ -37,7 +37,6 @@
 
 #include "gnc-component-manager.h"
 
-#include "assistant-utils.h"
 #include "assistant-csv-account-import.h"
 #include "csv-account-import.h"
 
@@ -583,9 +582,6 @@ csv_import_assistant_create (CsvImportInfo *info)
     window = GTK_WIDGET(gtk_builder_get_object (builder, "CSV Account Import Assistant"));
     info->window = window;
 
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->window));
-
     /* Load default settings */
     load_settings (info);
 
diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.c b/src/import-export/csv-imp/assistant-csv-trans-import.c
index 0c1e8a4..33ccce1 100644
--- a/src/import-export/csv-imp/assistant-csv-trans-import.c
+++ b/src/import-export/csv-imp/assistant-csv-trans-import.c
@@ -38,7 +38,6 @@
 
 #include "gnc-component-manager.h"
 
-#include "assistant-utils.h"
 #include "assistant-csv-trans-import.h"
 
 #include "import-account-matcher.h"
@@ -1687,9 +1686,6 @@ csv_import_trans_assistant_create (CsvImportTrans *info)
     window = GTK_WIDGET(gtk_builder_get_object (builder, "CSV Transaction Assistant"));
     info->window = window;
 
-    /* Set the assistant colors */
-    gnc_assistant_set_colors (GTK_ASSISTANT (info->window));
-
     /* Load default settings */
     load_settings (info);
 
diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c
index 83b62bb..3bdf62c 100644
--- a/src/import-export/qif-imp/assistant-qif-import.c
+++ b/src/import-export/qif-imp/assistant-qif-import.c
@@ -40,7 +40,6 @@
 #include "dialog-utils.h"
 #include "dialog-file-access.h"
 #include "assistant-qif-import.h"
-#include "assistant-utils.h"
 #include "gnc-component-manager.h"
 #include "qof.h"
 #include "gnc-file.h"
@@ -3415,8 +3414,6 @@ get_assistant_widgets(QIFImportWindow *wind, GtkBuilder *builder)
         GTK_WIDGET(gtk_builder_get_object (builder, "new_transaction_view"));
     wind->old_transaction_view =
         GTK_WIDGET(gtk_builder_get_object (builder, "old_transaction_view"));
-
-    gnc_assistant_set_colors (GTK_ASSISTANT (wind->window));
 }
 
 



Summary of changes:
 src/business/business-gnome/dialog-billterms.c     |   4 +-
 src/business/business-gnome/dialog-customer.c      |   4 +-
 src/business/business-gnome/dialog-date-close.c    |   2 +-
 src/gnome-search/dialog-search.c                   |   2 +-
 src/gnome-search/search-account.c                  |   6 +-
 src/gnome-search/search-core-type.c                |   2 +-
 src/gnome-search/search-core-type.h                |   2 +-
 src/gnome-utils/Makefile.am                        |   2 -
 src/gnome-utils/assistant-utils.c                  |  57 ------
 src/gnome-utils/assistant-utils.h                  |  32 ---
 src/gnome-utils/assistant-xml-encoding.c           |   3 -
 src/gnome-utils/cursors.c                          |   2 +-
 src/gnome-utils/dialog-account.c                   |  14 +-
 src/gnome-utils/dialog-book-close.c                |   2 +-
 src/gnome-utils/dialog-transfer.c                  |  14 +-
 src/gnome-utils/dialog-utils.c                     |  51 ++---
 src/gnome-utils/gnc-amount-edit.c                  |  10 +-
 src/gnome-utils/gnc-cell-renderer-date.h           |  12 +-
 src/gnome-utils/gnc-cell-renderer-popup-entry.c    |  24 +--
 src/gnome-utils/gnc-cell-renderer-popup-entry.h    |  14 +-
 src/gnome-utils/gnc-cell-renderer-popup.c          |  37 ++--
 src/gnome-utils/gnc-cell-renderer-popup.h          |  14 +-
 src/gnome-utils/gnc-combott.c                      |  17 +-
 src/gnome-utils/gnc-date-delta.c                   |   4 +-
 src/gnome-utils/gnc-date-edit.c                    |  34 +---
 src/gnome-utils/gnc-date-edit.h                    |   1 -
 src/gnome-utils/gnc-dense-cal.c                    | 214 ++++++++++-----------
 src/gnome-utils/gnc-dense-cal.h                    |   2 +-
 src/gnome-utils/gnc-gnome-utils.c                  |   3 -
 src/gnome-utils/gnc-gui-query.c                    |   2 +-
 src/gnome-utils/gnc-main-window.c                  |   4 +-
 src/gnome-utils/gnc-splash.c                       |   2 +-
 src/gnome-utils/gnc-tree-model-account.c           |   2 +-
 src/gnome-utils/gnc-tree-model-commodity.c         |   2 +-
 src/gnome-utils/gnc-tree-model-owner.c             |   2 +-
 src/gnome-utils/gnc-tree-model-split-reg.c         |   2 +-
 src/gnome-utils/gnc-tree-view-owner.c              |   1 -
 src/gnome-utils/gnc-tree-view.c                    |  10 +-
 src/gnome/assistant-acct-period.c                  |   6 +-
 src/gnome/assistant-hierarchy.c                    |   5 +-
 src/gnome/assistant-loan.c                         |   9 +-
 src/gnome/assistant-stock-split.c                  |   8 +-
 src/gnome/dialog-commodities.c                     |   4 +-
 src/gnome/dialog-fincalc.c                         |   2 +-
 src/gnome/dialog-lot-viewer.c                      |   4 +-
 src/gnome/dialog-price-edit-db.c                   |   4 +-
 src/gnome/dialog-progress.c                        |   8 +-
 src/gnome/dialog-sx-editor.c                       |  14 +-
 src/gnome/dialog-sx-editor2.c                      |  14 +-
 src/gnome/dialog-sx-from-trans.c                   |   4 +-
 src/gnome/dialog-sx-since-last-run.c               |   4 +-
 src/gnome/dialog-tax-info.c                        |   2 +-
 src/gnome/gnc-budget-view.c                        |  10 +-
 src/gnome/gnc-plugin-budget.c                      |   2 +-
 src/gnome/gnc-plugin-page-sx-list.c                |   3 -
 src/gnome/gnc-split-reg.c                          |  18 +-
 src/gnome/gnc-split-reg2.c                         |  12 +-
 src/gnome/reconcile-view.c                         |   2 +-
 src/gnome/window-reconcile.c                       |   6 +-
 src/gnome/window-reconcile2.c                      |   6 +-
 src/import-export/aqb/assistant-ab-initial.c       |   9 +-
 src/import-export/aqb/gnc-gwen-gui.c               |   2 +-
 src/import-export/csv-exp/assistant-csv-export.c   |   6 +-
 .../csv-imp/assistant-csv-account-import.c         |   6 +-
 .../csv-imp/assistant-csv-trans-import.c           |  14 +-
 src/import-export/qif-imp/assistant-qif-import.c   |   7 +-
 src/import-export/qif-imp/dialog-account-picker.c  |   2 +-
 src/plugins/bi_import/dialog-bi-import-gui.c       |   8 -
 .../customer_import/dialog-customer-import-gui.c   |   8 -
 src/register/register-gnome/combocell-gnome.c      |   4 +-
 src/register/register-gnome/formulacell-gnome.c    |   6 +-
 src/register/register-gnome/gnucash-cursor.c       |   2 +-
 src/register/register-gnome/gnucash-date-picker.c  |   4 +-
 src/register/register-gnome/gnucash-grid.c         |   2 +-
 src/register/register-gnome/gnucash-header.c       |   8 +-
 src/register/register-gnome/gnucash-item-edit.c    |  24 +--
 src/register/register-gnome/gnucash-sheet.c        |  53 +++--
 src/register/register-gnome/pricecell-gnome.c      |   4 +-
 78 files changed, 387 insertions(+), 541 deletions(-)
 delete mode 100644 src/gnome-utils/assistant-utils.c
 delete mode 100644 src/gnome-utils/assistant-utils.h



More information about the gnucash-changes mailing list