[gnumeric] Compilation: cleanup.



commit cd54ec63334048ac1bdfc6a33bb3571dd7d2fd44
Author: Morten Welinder <terra gnome org>
Date:   Wed Apr 24 20:54:35 2013 -0400

    Compilation: cleanup.
    
    Gtk+ 3.2 has the GtkTreeView fix we need.

 src/dialogs/ChangeLog               |    3 +++
 src/dialogs/dialog-stf-fixed-page.c |   23 +----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index f3699a0..b7a7e4b 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,8 @@
 2013-04-24  Morten Welinder  <terra gnome org>
 
+       * dialog-stf-fixed-page.c (stf_dialog_fixed_page_init): Cleanup.
+       Gtk+ 3.2 has the required fix.
+
        * dialog-function-select.c (dialog_function_select_init): Style
        links.
 
diff --git a/src/dialogs/dialog-stf-fixed-page.c b/src/dialogs/dialog-stf-fixed-page.c
index 8b2b9be..f42b910 100644
--- a/src/dialogs/dialog-stf-fixed-page.c
+++ b/src/dialogs/dialog-stf-fixed-page.c
@@ -570,21 +570,6 @@ cb_treeview_draw (GtkWidget *widget,
        return FALSE;
 }
 
-static gboolean
-cb_treeview_draw_2 (GtkWidget *widget,
-                   cairo_t *cr,
-                   StfDialogData *pagedata)
-{
-  /* Manually call default handler */
-  GTK_WIDGET_GET_CLASS (widget)->draw (widget, cr);
-
-  /* Call the would-be connect_after handler.  */
-  cb_treeview_draw (widget, cr, pagedata);
-
-  /* Abort emmission.  */
-  return TRUE;
-}
-
 /*************************************************************************************************
  * FIXED EXPORTED FUNCTIONS
  *************************************************************************************************/
@@ -635,14 +620,8 @@ stf_dialog_fixed_page_init (GtkBuilder *gui, StfDialogData *pagedata)
        g_signal_connect (G_OBJECT (renderdata->tree_view),
                "motion_notify_event",
                 G_CALLBACK (cb_treeview_motion), pagedata);
-#if 0
-       /* Needs GtkTreeView bugfix in gtk+ of 20110914.  */
+
        g_signal_connect_after (G_OBJECT (renderdata->tree_view),
                "draw",
                 G_CALLBACK (cb_treeview_draw), pagedata);
-#else
-       g_signal_connect (G_OBJECT (renderdata->tree_view),
-               "draw",
-                G_CALLBACK (cb_treeview_draw_2), pagedata);
-#endif
 }


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