[gnumeric] Reverted the previous change and remove the frame surrounding a list



commit d335df01678a6dc5936e4a72fd1333283bb464fe
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Mar 27 17:47:05 2013 +0100

    Reverted the previous change and remove the frame surrounding a list

 ChangeLog                 |    4 ++--
 src/sheet-object-widget.c |   14 +++-----------
 2 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 91f467d..2550022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2013-03-27  Jean Brefort  <jean brefort normalesup org>
 
-       * src/sheet-object-widget.c (sheet_widget_list_create_widget),
-       (sheet_widget_combo_create_widget): add an event box.
+       * src/sheet-object-widget.c (sheet_widget_list_create_widget): remove the
+       frame.
 
 2013-03-26  Morten Welinder  <terra gnome org>
 
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 82e12b8..8da3128 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -3324,8 +3324,6 @@ sheet_widget_list_create_widget (SheetObjectWidget *sow)
        SheetWidgetListBase *swl = GNM_SOW_LIST_BASE (sow);
        GtkTreeSelection *selection;
        GtkTreeIter iter;
-       GtkWidget *widget = gtk_event_box_new ();
-       GtkWidget *frame = g_object_new (GTK_TYPE_FRAME, NULL);
        GtkWidget *list = gtk_tree_view_new_with_model (swl->model);
        GtkWidget *sw = gtk_scrolled_window_new (
                gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (list)),
@@ -3340,9 +3338,6 @@ sheet_widget_list_create_widget (SheetObjectWidget *sow)
                        NULL));
 
        gtk_container_add (GTK_CONTAINER (sw), list);
-       gtk_container_add (GTK_CONTAINER (frame), sw);
-       gtk_container_add (GTK_CONTAINER (widget), frame);
-       gtk_event_box_set_visible_window (GTK_EVENT_BOX (widget), FALSE);
 
        g_signal_connect_object (G_OBJECT (swl), "model-changed",
                G_CALLBACK (cb_list_model_changed), list, 0);
@@ -3355,7 +3350,7 @@ sheet_widget_list_create_widget (SheetObjectWidget *sow)
                G_CALLBACK (cb_list_selection_changed), selection, 0);
        g_signal_connect (selection, "changed",
                G_CALLBACK (cb_selection_changed), swl);
-       return widget;
+       return sw;
 }
 
 static void
@@ -3413,9 +3408,8 @@ static GtkWidget *
 sheet_widget_combo_create_widget (SheetObjectWidget *sow)
 {
        SheetWidgetListBase *swl = GNM_SOW_LIST_BASE (sow);
-       GtkWidget *widget = gtk_event_box_new (), *combo;
+       GtkWidget *combo = gtk_combo_box_new_with_entry ();
 
-       combo = gtk_combo_box_new_with_entry ();
        gtk_widget_set_can_focus (gtk_bin_get_child (GTK_BIN (combo)),
                                  FALSE);
        if (swl->model != NULL)
@@ -3432,9 +3426,7 @@ sheet_widget_combo_create_widget (SheetObjectWidget *sow)
        g_signal_connect (G_OBJECT (combo), "changed",
                G_CALLBACK (cb_combo_changed), swl);
 
-       gtk_container_add (GTK_CONTAINER (widget), combo);
-       gtk_event_box_set_visible_window (GTK_EVENT_BOX (widget), FALSE);
-       return widget;
+       return combo;
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]