summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/icon-size.h31
-rw-r--r--src/live_effects/parameter/originalitemarray.cpp1
-rw-r--r--src/live_effects/parameter/originalpatharray.cpp1
-rw-r--r--src/live_effects/parameter/togglebutton.h1
-rw-r--r--src/ui/widget/panel.cpp1
-rw-r--r--src/widgets/button.h1
-rw-r--r--src/widgets/ege-adjustment-action.cpp1
-rw-r--r--src/widgets/ink-action.h1
-rw-r--r--src/widgets/ink-toggle-action.cpp4
-rw-r--r--src/widgets/ink-toggle-action.h1
-rw-r--r--src/widgets/toolbox.h1
12 files changed, 2 insertions, 43 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09d6d25d4..72d984845 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -325,7 +325,6 @@ set(inkscape_SRC
guide-snapper.h
help.h
helper-fns.h
- icon-size.h
id-clash.h
inkscape-version.h
inkscape.h
diff --git a/src/icon-size.h b/src/icon-size.h
deleted file mode 100644
index 8058e8da8..000000000
--- a/src/icon-size.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef SEEN_ICON_SIZE_H
-#define SEEN_ICON_SIZE_H
-
-/*
- * Generic icon widget
- *
- * Author:
- * Lauris Kaplinski <lauris@kaplinski.com>
- *
- * Copyright (C) 2002 Lauris Kaplinski
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include <gtk/gtk.h>
-
-namespace Inkscape {
-
- enum IconSize {
- ICON_SIZE_INVALID = ::GTK_ICON_SIZE_INVALID,
- ICON_SIZE_MENU = ::GTK_ICON_SIZE_MENU,
- ICON_SIZE_SMALL_TOOLBAR = ::GTK_ICON_SIZE_SMALL_TOOLBAR,
- ICON_SIZE_LARGE_TOOLBAR = ::GTK_ICON_SIZE_LARGE_TOOLBAR,
- ICON_SIZE_BUTTON = ::GTK_ICON_SIZE_BUTTON,
- ICON_SIZE_DND = ::GTK_ICON_SIZE_DND,
- ICON_SIZE_DIALOG = ::GTK_ICON_SIZE_DIALOG,
- ICON_SIZE_DECORATION
- };
-} // namespace Inkscape
-
-#endif // SEEN_ICON_SIZE_H
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index 830d8aa90..f45de4ad8 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -19,7 +19,6 @@
#include <glibmm/i18n.h>
#include "inkscape.h"
-#include "icon-size.h"
#include "ui/clipboard.h"
#include "svg/svg.h"
#include "svg/stringstream.h"
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 4535b6aa5..a98c91770 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -23,7 +23,6 @@
#include <glibmm/i18n.h>
#include "inkscape.h"
-#include "icon-size.h"
#include "ui/clipboard.h"
#include "svg/svg.h"
#include "svg/stringstream.h"
diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h
index 4d043b340..c5f8a3c28 100644
--- a/src/live_effects/parameter/togglebutton.h
+++ b/src/live_effects/parameter/togglebutton.h
@@ -12,7 +12,6 @@
#include <sigc++/signal.h>
#include "live_effects/parameter/parameter.h"
-#include "icon-size.h"
#include "ui/widget/registered-widget.h"
namespace Inkscape {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 9332fe0f9..aea9b7e8e 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -24,7 +24,6 @@
#include <glibmm/i18n.h>
#include "panel.h"
-#include "icon-size.h"
#include "preferences.h"
#include "desktop.h"
diff --git a/src/widgets/button.h b/src/widgets/button.h
index 94a956de3..680ccb79d 100644
--- a/src/widgets/button.h
+++ b/src/widgets/button.h
@@ -18,7 +18,6 @@
#include <gtk/gtk.h>
#include <sigc++/connection.h>
-#include "icon-size.h"
struct SPAction;
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index fc72f00c7..597c697cb 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -48,7 +48,6 @@
#include <gtkmm/radiomenuitem.h>
#include <gdk/gdkkeysyms.h>
-#include "icon-size.h"
#include "widgets/ege-adjustment-action.h"
#include "gimp/gimpspinscale.h"
#include "ui/icon-names.h"
diff --git a/src/widgets/ink-action.h b/src/widgets/ink-action.h
index 99786c878..396e4838b 100644
--- a/src/widgets/ink-action.h
+++ b/src/widgets/ink-action.h
@@ -2,7 +2,6 @@
#define SEEN_INK_ACTION
#include <gtk/gtk.h>
-#include "icon-size.h"
#include "attributes.h"
/* Equivalent to GTK Actions of the same type, but can support Inkscape SVG icons */
diff --git a/src/widgets/ink-toggle-action.cpp b/src/widgets/ink-toggle-action.cpp
index c091a2e0d..200d0d558 100644
--- a/src/widgets/ink-toggle-action.cpp
+++ b/src/widgets/ink-toggle-action.cpp
@@ -51,9 +51,9 @@ static void ink_toggle_action_class_init( InkToggleActionClass* klass )
g_param_spec_int( "iconSize",
"Icon Size",
"The size the icon",
- (int)Inkscape::ICON_SIZE_MENU,
+ GTK_ICON_SIZE_MENU,
(int)99,
- (int)Inkscape::ICON_SIZE_SMALL_TOOLBAR,
+ GTK_ICON_SIZE_SMALL_TOOLBAR,
(GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
g_type_class_add_private( klass, sizeof(InkToggleActionClass) );
diff --git a/src/widgets/ink-toggle-action.h b/src/widgets/ink-toggle-action.h
index 9130b9f9f..f329f57a6 100644
--- a/src/widgets/ink-toggle-action.h
+++ b/src/widgets/ink-toggle-action.h
@@ -4,7 +4,6 @@
#include <gtk/gtk.h>
#include "attributes.h"
-#include "icon-size.h"
G_BEGIN_DECLS
#define INK_TOGGLE_ACTION_TYPE ( ink_toggle_action_get_type() )
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index 09178ec2f..afa382e5b 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -15,7 +15,6 @@
#include <glibmm/ustring.h>
-#include "icon-size.h"
#include "preferences.h"
#define TOOLBAR_SLIDER_HINT "full"