diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-20 22:21:45 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-20 22:21:45 +0000 |
| commit | f1e0309a7ffe42441f86def97f54aa57d86f1624 (patch) | |
| tree | 7226490a904223b0fd208c488ae157d9a92bc819 /src/ui/widget | |
| parent | Progress Bar workinggit add .git add . (diff) | |
| parent | Merge branch 'smartpointer_refactor' of gitlab.com:jali/inkscape (diff) | |
| download | inkscape-f1e0309a7ffe42441f86def97f54aa57d86f1624.tar.gz inkscape-f1e0309a7ffe42441f86def97f54aa57d86f1624.zip | |
Merge branch 'master' into SymbolsSearch
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/makefile.in | 17 | ||||
| -rw-r--r-- | src/ui/widget/panel.cpp | 1 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 3 |
3 files changed, 1 insertions, 20 deletions
diff --git a/src/ui/widget/makefile.in b/src/ui/widget/makefile.in deleted file mode 100644 index e479d7031..000000000 --- a/src/ui/widget/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) ui/widget/all - -clean %.a %.$(OBJEXT): - cd ../.. && $(MAKE) ui/widget/$@ - -.PHONY: all clean - -.SUFFIXES: -.SUFFIXES: .a .$(OBJEXT) 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/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 5d911e9d2..d9b93f6db 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -107,8 +107,7 @@ static const GtkTargetEntry ui_drop_target_entries [] = { {"application/x-color", 0, APP_X_COLOR} }; -#define ENTRIES_SIZE(n) sizeof(n)/sizeof(n[0]) -static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries); +static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries); /* convenience function */ static Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop); |