diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
| commit | 06dfaa02d7a80bcdff717d579a48f81643f53f31 (patch) | |
| tree | 49b8e67ad9051f1507b0959cac986383ab4001e2 /src/ink-action.cpp | |
| parent | Fix rendering of control points (diff) | |
| parent | fix bug 796451: Measure tools should support rotation constraint (diff) | |
| download | inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.tar.gz inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.zip | |
Merge from trunk
(bzr r9508.1.89)
Diffstat (limited to 'src/ink-action.cpp')
| -rw-r--r-- | src/ink-action.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/ink-action.cpp b/src/ink-action.cpp index 587efdff0..d26b038f8 100644 --- a/src/ink-action.cpp +++ b/src/ink-action.cpp @@ -2,12 +2,7 @@ #include <glib/gi18n.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtktoolitem.h> -#include <gtk/gtktoggletoolbutton.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkimagemenuitem.h> +#include <gtk/gtk.h> #include "icon-size.h" #include "ink-action.h" @@ -183,7 +178,7 @@ void ink_action_set_property( GObject* obj, guint propId, const GValue *value, G } } -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> static GtkWidget* ink_action_create_menu_item( GtkAction* action ) { |