[gnumeric] Code cleanup.

[Morten Welinder <mortenw src gnome org>]

commit f200ec267a7237793ae35bdee3fca9cc22abe422
Author: Morten Welinder <terra gnome org>
Date:   Mon Jan 9 19:54:57 2012 -0500

    Code cleanup.

 ChangeLog     |    3 +++
 src/wbc-gtk.c |   16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 61097b3..e9f99e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* src/wbc-gtk.c (wbc_gtk_init): No need to load the file history
 	here.  We will do that in wbc_gtk_new.
+	(wbcg_get_screen): New function.
+	(wbcg_get_gtk_settings, show_gui, wbcg_find_for_workbook): Use
+	wbcg_get_screen.
 
 2012-01-09  Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 84b082a..6139329 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -2422,11 +2422,16 @@ cb_desktop_font_changed (GtkSettings *settings, GParamSpec *pspec,
 			       (GtkCallback)cb_update_item_bar_font, NULL);
 }
 
+static GdkScreen *
+wbcg_get_screen (WBCGtk *wbcg)
+{
+	return gtk_widget_get_screen (wbcg->everything);
+}
+
 static GtkSettings *
 wbcg_get_gtk_settings (WBCGtk *wbcg)
 {
-	GdkScreen *screen = gtk_widget_get_screen (wbcg->table);
-	return gtk_settings_get_for_screen (screen);
+	return gtk_settings_get_for_screen (wbcg_get_screen (wbcg));
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2442,8 +2447,7 @@ show_gui (WBCGtk *wbcg)
 
 	/* In a Xinerama setup, we want the geometry of the actual display
 	 * unit, if available. See bug 59902.  */
-	gdk_screen_get_monitor_geometry
-		(gtk_window_get_screen (wbcg_toplevel (wbcg)), 0, &rect);
+	gdk_screen_get_monitor_geometry (wbcg_get_screen (wbcg), 0, &rect);
 	sx = MAX (rect.width, 600);
 	sy = MAX (rect.height, 200);
 
@@ -6041,7 +6045,7 @@ wbcg_find_for_workbook (Workbook *wb,
 		return candidate;
 
 	if (!pref_screen && candidate)
-		pref_screen = gtk_widget_get_screen (GTK_WIDGET (wbcg_toplevel (candidate)));
+		pref_screen = wbcg_get_screen (candidate);
 
 	if (!pref_display && pref_screen)
 		pref_display = gdk_screen_get_display (pref_screen);
@@ -6052,7 +6056,7 @@ wbcg_find_for_workbook (Workbook *wb,
 	WORKBOOK_FOREACH_CONTROL(wb, wbv, wbc, {
 		if (IS_WBC_GTK (wbc)) {
 			WBCGtk *wbcg = WBC_GTK (wbc);
-			GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wbcg_toplevel (wbcg)));
+			GdkScreen *screen = wbcg_get_screen (wbcg);
 			GdkDisplay *display = gdk_screen_get_display (screen);
 
 			if (pref_screen == screen && !has_screen) {