[gnumeric] GUI: No more update policy for scrollbars.



commit cbd9a9ce02504db68cd97339ef908f758368cb69
Author: Morten Welinder <terra gnome org>
Date:   Mon Mar 11 18:58:41 2013 -0400

    GUI: No more update policy for scrollbars.
    
    GTK3 removed it.  We need to move on.

 schemas/.gitignore                           |    3 --
 schemas/Makefile.am                          |    2 +-
 schemas/org.gnome.gnumeric.gschema.xml.in.in |    5 ----
 src/dialogs/dialog-preferences.c             |    5 ----
 src/gnumeric-conf.c                          |   29 --------------------------
 src/gnumeric-conf.h                          |    4 ---
 src/sheet-control-gui.c                      |   12 ----------
 7 files changed, 1 insertions(+), 59 deletions(-)
---
diff --git a/schemas/.gitignore b/schemas/.gitignore
index 978d173..04dee06 100644
--- a/schemas/.gitignore
+++ b/schemas/.gitignore
@@ -1,9 +1,6 @@
 Makefile.in
 Makefile
 .deps
-gnumeric-dialogs.schemas
-gnumeric-general.schemas
-gnumeric-plugins.schemas
 *.reg
 org.gnome.gnumeric*.gschema.xml.in
 org.gnome.gnumeric*.gschema.xml
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 02ec7a5..0686400 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,4 +1,4 @@
-SUFFIXES = .schemas.in .reg .hkcu.reg .xml.in .xml.in.in .gschema.xml.in
+SUFFIXES = .reg .hkcu.reg .xml.in .xml.in.in .gschema.xml.in
 
 gschema_inin_files = \
        org.gnome.gnumeric.gschema.xml.in.in    \
diff --git a/schemas/org.gnome.gnumeric.gschema.xml.in.in b/schemas/org.gnome.gnumeric.gschema.xml.in.in
index 030a2ab..bbdedf2 100644
--- a/schemas/org.gnome.gnumeric.gschema.xml.in.in
+++ b/schemas/org.gnome.gnumeric.gschema.xml.in.in
@@ -182,11 +182,6 @@
       <_summary>Enter Direction</_summary>
       <_description>Which direction pressing Enter will move the edit position.</_description>
     </key>
-    <key name="livescrolling" type="b">
-      <default>true</default>
-      <_summary>Live Scrolling</_summary>
-      <_description>This variable determines whether live (versus delayed) scrolling is 
performed.</_description>
-    </key>
     <key name="recalclag" type="i">
       <default>200</default>
       <_summary>Auto Expression Recalculation Lag</_summary>
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index de141fe..0c0c388 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -842,11 +842,6 @@ pref_window_page_initializer (PrefState *state,
                                    _("Default Number of Columns in a Sheet"));
        power_of_2_handlers (w);
 
-       bool_pref_create_widget (gnm_conf_get_core_gui_editing_livescrolling_node (),
-                                 page, row++,
-                                gnm_conf_set_core_gui_editing_livescrolling,
-                                gnm_conf_get_core_gui_editing_livescrolling,
-                                _("Live Scrolling"));
        bool_pref_create_widget (gnm_conf_get_core_gui_cells_function_markers_node (),
                                 page, row++,
                                 gnm_conf_set_core_gui_cells_function_markers,
diff --git a/src/gnumeric-conf.c b/src/gnumeric-conf.c
index 5132576..7822939 100644
--- a/src/gnumeric-conf.c
+++ b/src/gnumeric-conf.c
@@ -1402,35 +1402,6 @@ gnm_conf_get_core_gui_editing_function_name_tooltips_node (void)
        return get_watch_node (&watch_core_gui_editing_function_name_tooltips);
 }
 
-static struct cb_watch_bool watch_core_gui_editing_livescrolling = {
-       0, "core/gui/editing/livescrolling",
-       "Live Scrolling",
-       "This variable determines whether live (versus delayed) scrolling is performed.",
-       TRUE,
-};
-
-gboolean
-gnm_conf_get_core_gui_editing_livescrolling (void)
-{
-       if (!watch_core_gui_editing_livescrolling.handler)
-               watch_bool (&watch_core_gui_editing_livescrolling);
-       return watch_core_gui_editing_livescrolling.var;
-}
-
-void
-gnm_conf_set_core_gui_editing_livescrolling (gboolean x)
-{
-       if (!watch_core_gui_editing_livescrolling.handler)
-               watch_bool (&watch_core_gui_editing_livescrolling);
-       set_bool (&watch_core_gui_editing_livescrolling, x);
-}
-
-GOConfNode *
-gnm_conf_get_core_gui_editing_livescrolling_node (void)
-{
-       return get_watch_node (&watch_core_gui_editing_livescrolling);
-}
-
 static struct cb_watch_int watch_core_gui_editing_recalclag = {
        0, "core/gui/editing/recalclag",
        "Auto Expression Recalculation Lag",
diff --git a/src/gnumeric-conf.h b/src/gnumeric-conf.h
index 9d96efc..d686dd3 100644
--- a/src/gnumeric-conf.h
+++ b/src/gnumeric-conf.h
@@ -127,10 +127,6 @@ GOConfNode *gnm_conf_get_core_gui_editing_function_name_tooltips_node (void);
 gboolean gnm_conf_get_core_gui_editing_function_name_tooltips (void);
 void gnm_conf_set_core_gui_editing_function_name_tooltips (gboolean x);
 
-GOConfNode *gnm_conf_get_core_gui_editing_livescrolling_node (void);
-gboolean gnm_conf_get_core_gui_editing_livescrolling (void);
-void gnm_conf_set_core_gui_editing_livescrolling (gboolean x);
-
 GOConfNode *gnm_conf_get_core_gui_editing_recalclag_node (void);
 int gnm_conf_get_core_gui_editing_recalclag (void);
 void gnm_conf_set_core_gui_editing_recalclag (int x);
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 4d3d4b9..de1511d 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1539,7 +1539,6 @@ SheetControlGUI *
 sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
 {
        SheetControlGUI *scg;
-/*     GnmUpdateType scroll_update_policy; */ /* see warning below */
        Sheet *sheet;
        GocDirection direction;
        GdkRGBA cfore, cback;
@@ -1611,17 +1610,10 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
                g_signal_connect_after (G_OBJECT (scg->pane[0]->row.canvas), "size-allocate",
                        G_CALLBACK (cb_canvas_resize), scg);
 
-               /* Scroll bars and their adjustments */
-/*             scroll_update_policy = gnm_conf_get_core_gui_editing_livescrolling ()
-                       ? GNM_UPDATE_CONTINUOUS : GNM_UPDATE_DELAYED;*/ /* see below */
                scg->va = (GtkAdjustment *)gtk_adjustment_new (0., 0., 1, 1., 1., 1.);
                scg->vs = g_object_new (GTK_TYPE_SCROLLBAR,
                                "orientation", GTK_ORIENTATION_VERTICAL,
                                "adjustment",    scg->va,
-#warning GTK3: update-policy is gone from gtk, what should we do?
-#if 0
-                               "update-policy", scroll_update_policy,
-#endif
                                NULL);
                g_signal_connect (G_OBJECT (scg->vs),
                        "value_changed",
@@ -1633,10 +1625,6 @@ sheet_control_gui_new (SheetView *sv, WBCGtk *wbcg)
                scg->ha = (GtkAdjustment *)gtk_adjustment_new (0., 0., 1, 1., 1., 1.);
                scg->hs = g_object_new (GTK_TYPE_SCROLLBAR,
                                "adjustment", scg->ha,
-#warning GTK3: update-policy is gone from gtk, what should we do?
-#if 0
-                               "update-policy", scroll_update_policy,
-#endif
                                NULL);
                g_signal_connect (G_OBJECT (scg->hs),
                        "value_changed",


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