[gimp] Exterminate GimpDockSeparator
- From: Martin Nordholts <martinn src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Exterminate GimpDockSeparator
- Date: Wed, 2 Dec 2009 19:40:28 +0000 (UTC)
commit 4ccb6504353a8c875080c130d21d71d40fb89c3a
Author: Martin Nordholts <martinn src gnome org>
Date: Wed Dec 2 20:40:39 2009 +0100
Exterminate GimpDockSeparator
Remove all GimpDockSeparator-related code. Seems pointless to keep
even the stuff in gtkrc.
app/widgets/Makefile.am | 2 -
app/widgets/gimpdock.c | 1 -
app/widgets/gimpdockcolumns.c | 1 -
app/widgets/gimpdockseparator.c | 294 ---------------------------------------
app/widgets/gimpdockseparator.h | 65 ---------
app/widgets/gimptoolbox.c | 17 ---
app/widgets/widgets-types.h | 1 -
etc/gtkrc | 11 --
themes/Default/gtkrc | 1 -
themes/Small/gtkrc | 1 -
10 files changed, 0 insertions(+), 394 deletions(-)
---
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index ead3c35..4b4e81b 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -134,8 +134,6 @@ libappwidgets_a_sources = \
gimpdockbook.h \
gimpdocked.c \
gimpdocked.h \
- gimpdockseparator.c \
- gimpdockseparator.h \
gimpdockwindow.c \
gimpdockwindow.h \
gimpdocumentview.c \
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index 9539db6..08b9397 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -34,7 +34,6 @@
#include "gimpdock.h"
#include "gimpdockable.h"
#include "gimpdockbook.h"
-#include "gimpdockseparator.h"
#include "gimppanedbox.h"
#include "gimpuimanager.h"
#include "gimpwidgets-utils.h"
diff --git a/app/widgets/gimpdockcolumns.c b/app/widgets/gimpdockcolumns.c
index 72286b7..19375ff 100644
--- a/app/widgets/gimpdockcolumns.c
+++ b/app/widgets/gimpdockcolumns.c
@@ -35,7 +35,6 @@
#include "gimpdockable.h"
#include "gimpdockbook.h"
#include "gimpdockcolumns.h"
-#include "gimpdockseparator.h"
#include "gimpmenudock.h"
#include "gimppanedbox.h"
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index 571c0fe..00cca63 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -40,7 +40,6 @@
#include "gimpcairo-wilber.h"
#include "gimpdevices.h"
#include "gimpdialogfactory.h"
-#include "gimpdockseparator.h"
#include "gimpdockwindow.h"
#include "gimphelp-ids.h"
#include "gimptoolbox.h"
@@ -105,8 +104,6 @@ static void gimp_toolbox_book_added (GimpDock *dock,
static void gimp_toolbox_book_removed (GimpDock *dock,
GimpDockbook *dockbook);
-static void toolbox_separator_expand (GimpToolbox *toolbox);
-static void toolbox_separator_collapse (GimpToolbox *toolbox);
static void toolbox_create_tools (GimpToolbox *toolbox,
GimpContext *context);
static GtkWidget * toolbox_create_color_area (GimpToolbox *toolbox,
@@ -330,8 +327,6 @@ gimp_toolbox_constructor (GType type,
gimp_toolbox_style_set (GTK_WIDGET (toolbox),
gtk_widget_get_style (GTK_WIDGET (toolbox)));
- toolbox_separator_expand (toolbox);
-
return object;
}
@@ -571,7 +566,6 @@ gimp_toolbox_book_added (GimpDock *dock,
if (g_list_length (gimp_dock_get_dockbooks (dock)) == 1)
{
gimp_dock_invalidate_geometry (dock);
- toolbox_separator_collapse (GIMP_TOOLBOX (dock));
}
}
@@ -583,7 +577,6 @@ gimp_toolbox_book_removed (GimpDock *dock,
! (GTK_OBJECT_FLAGS (dock) & GTK_IN_DESTRUCTION))
{
gimp_dock_invalidate_geometry (dock);
- toolbox_separator_expand (GIMP_TOOLBOX (dock));
}
}
@@ -666,16 +659,6 @@ gimp_toolbox_get_vbox (GimpToolbox *toolbox)
/* private functions */
static void
-toolbox_separator_expand (GimpToolbox *toolbox)
-{
-}
-
-static void
-toolbox_separator_collapse (GimpToolbox *toolbox)
-{
-}
-
-static void
toolbox_create_tools (GimpToolbox *toolbox,
GimpContext *context)
{
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index 9c4c817..cf3fb20 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -38,7 +38,6 @@ typedef struct _GimpControllerWheel GimpControllerWheel;
typedef struct _GimpDock GimpDock;
typedef struct _GimpDockColumns GimpDockColumns;
-typedef struct _GimpDockSeparator GimpDockSeparator; /* not a dock */
typedef struct _GimpDockWindow GimpDockWindow;
typedef struct _GimpMenuDock GimpMenuDock;
typedef struct _GimpToolbox GimpToolbox;
diff --git a/etc/gtkrc b/etc/gtkrc
index 5d5cf78..f4efa07 100644
--- a/etc/gtkrc
+++ b/etc/gtkrc
@@ -22,14 +22,3 @@ style "gimp-large-preview"
}
# class "GimpPreview" style "gimp-large-preview"
-
-
-#
-# Change the dock separator DND highlight color:
-#
-style "gimp-red-separator-style"
-{
- bg[SELECTED] = "#aa2448"
-}
-
-# widget "*gimp-dock-separator*" style "gimp-red-separator-style"
diff --git a/themes/Default/gtkrc b/themes/Default/gtkrc
index f24c74f..246b331 100644
--- a/themes/Default/gtkrc
+++ b/themes/Default/gtkrc
@@ -39,7 +39,6 @@ style "gimp-default-style"
GtkPaned::handle-size = 6
GimpDockWindow::default-height = 300
GimpDockWindow::font-scale = 0.8333
- GimpDockSeparator::height = 6
GimpMenuDock::minimal-width = 200
GimpMenuDock::menu-preview-size = button
GimpToolbox::tool-icon-size = button
diff --git a/themes/Small/gtkrc b/themes/Small/gtkrc
index e21b33e..ff9819a 100644
--- a/themes/Small/gtkrc
+++ b/themes/Small/gtkrc
@@ -46,7 +46,6 @@ style "gimp-default-style"
GtkPaned::handle-size = 5
GimpDockWindow::default-height = 240
GimpDockWindow::font-scale = 0.8333
- GimpDockSeparator::height = 5
GimpMenuDock::minimal-width = 200
GimpMenuDock::menu-preview-size = small-toolbar
GimpToolbox::tool-icon-size = menu
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]