diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:45:52 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-10-20 18:45:52 +0000 |
| commit | 10af9131e03df0227458285b59ed1425d15b52b5 (patch) | |
| tree | 835b89f653c157ba1f176e7b02aabeb0498d49f2 /src/widgets | |
| parent | Removed author on request (diff) | |
| parent | Drop obsolete wrapper around Glib::file_open_tmp (diff) | |
| download | inkscape-10af9131e03df0227458285b59ed1425d15b52b5.tar.gz inkscape-10af9131e03df0227458285b59ed1425d15b52b5.zip | |
Merge branch 'cleanups' of gitlab.com:stfacc/inkscape
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/button.h | 1 | ||||
| -rw-r--r-- | src/widgets/ege-adjustment-action.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/ink-action.h | 1 | ||||
| -rw-r--r-- | src/widgets/ink-toggle-action.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/ink-toggle-action.h | 1 | ||||
| -rw-r--r-- | src/widgets/makefile.in | 17 | ||||
| -rw-r--r-- | src/widgets/toolbox.h | 1 |
7 files changed, 2 insertions, 24 deletions
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/makefile.in b/src/widgets/makefile.in deleted file mode 100644 index 5b756ebf3..000000000 --- a/src/widgets/makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -# Convenience stub makefile to call the real Makefile. - -@SET_MAKE@ - -OBJEXT = @OBJEXT@ - -# Explicit so that it's the default rule. -all: - cd .. && $(MAKE) widgets/all - -clean %.a %.$(OBJEXT): - cd .. && $(MAKE) widgets/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) 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" |