[gimp] app: remove gimp_dock_temp_add() and _temp_remove()



commit 1de4e8a697b74d19982a61c9411f94f9338d4e6c
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jun 8 01:41:44 2018 +0200

    app: remove gimp_dock_temp_add() and _temp_remove()
    
    and some leftover CSS prider cruft.

 app/widgets/gimpdock.c | 60 ++++----------------------------------------------
 app/widgets/gimpdock.h |  4 ----
 2 files changed, 4 insertions(+), 60 deletions(-)
---
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index 41179a761e..b410a79eaf 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -57,14 +57,12 @@ enum
 
 struct _GimpDockPrivate
 {
-  GtkWidget         *temp_vbox;
-  GtkWidget         *main_vbox;
-  GtkWidget         *paned_vbox;
+  GtkWidget *main_vbox;
+  GtkWidget *paned_vbox;
 
-  GList             *dockbooks;
+  GList     *dockbooks;
 
-  gint               ID;
-  GtkCssProvider    *css_provider;
+  gint       ID;
 };
 
 
@@ -166,10 +164,6 @@ gimp_dock_init (GimpDock *dock)
   gtk_widget_set_name (GTK_WIDGET (dock), name);
   g_free (name);
 
-  dock->p->temp_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_box_pack_start (GTK_BOX (dock), dock->p->temp_vbox, FALSE, FALSE, 0);
-  /* Never show it */
-
   dock->p->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (dock), dock->p->main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (dock->p->main_vbox);
@@ -198,16 +192,6 @@ gimp_dock_dispose (GObject *object)
       g_object_unref (dockbook);
     }
 
-  if (dock->p->css_provider)
-    {
-      GtkWidget *widget = GTK_WIDGET (object);
-
-      gtk_style_context_remove_provider_for_screen (gtk_widget_get_screen (widget),
-                                                    GTK_STYLE_PROVIDER (dock->p->css_provider));
-      g_object_unref (dock->p->css_provider);
-      dock->p->css_provider = NULL;
-    }
-
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -683,39 +667,3 @@ gimp_dock_remove_book (GimpDock     *dock,
 
   g_object_unref (dockbook);
 }
-
-/**
- * gimp_dock_temp_add:
- * @dock:
- * @widget:
- *
- * Method to temporarily add a widget to the dock, for example to make
- * font-scale style property to be applied temporarily to the
- * child.
- **/
-void
-gimp_dock_temp_add (GimpDock  *dock,
-                    GtkWidget *child)
-{
-  g_return_if_fail (GIMP_IS_DOCK (dock));
-  g_return_if_fail (GTK_IS_WIDGET (child));
-
-  gtk_box_pack_start (GTK_BOX (dock->p->temp_vbox), child, FALSE, FALSE, 0);
-}
-
-/**
- * gimp_dock_temp_remove:
- * @dock:
- * @child:
- *
- * Removes a temporary child added with gimp_dock_temp_add().
- **/
-void
-gimp_dock_temp_remove (GimpDock  *dock,
-                       GtkWidget *child)
-{
-  g_return_if_fail (GIMP_IS_DOCK (dock));
-  g_return_if_fail (GTK_IS_WIDGET (child));
-
-  gtk_container_remove (GTK_CONTAINER (dock->p->temp_vbox), child);
-}
diff --git a/app/widgets/gimpdock.h b/app/widgets/gimpdock.h
index 47a2546072..6d26b150df 100644
--- a/app/widgets/gimpdock.h
+++ b/app/widgets/gimpdock.h
@@ -111,10 +111,6 @@ void                gimp_dock_add_book                (GimpDock       *dock,
                                                        gint            index);
 void                gimp_dock_remove_book             (GimpDock       *dock,
                                                        GimpDockbook   *dockbook);
-void                gimp_dock_temp_add                (GimpDock       *dock,
-                                                       GtkWidget      *widget);
-void                gimp_dock_temp_remove             (GimpDock       *dock,
-                                                       GtkWidget      *widget);
 
 
 #endif /* __GIMP_DOCK_H__ */


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