summaryrefslogtreecommitdiffstats
path: root/src/ink-action.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-06-04 04:10:51 +0000
committerJon A. Cruz <jon@joncruz.org>2011-06-04 04:10:51 +0000
commitb8eae5e18faedb60d4ff012cfc3e5f429fc1b1fc (patch)
treef6f0f4a6d73e4e1fe37eede5cecd47b984fa55df /src/ink-action.cpp
parentRemoved outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of SP_ROOT()... (diff)
parentUse generic headers in preparation for GTK+ 3 transition (diff)
downloadinkscape-b8eae5e18faedb60d4ff012cfc3e5f429fc1b1fc.tar.gz
inkscape-b8eae5e18faedb60d4ff012cfc3e5f429fc1b1fc.zip
Merge gtk header cleanup by Alex Valavanis. Fixes bug #709847, bug #747512, bug #792263.
Fixed bugs: - https://launchpad.net/bugs/709847 - https://launchpad.net/bugs/747512 - https://launchpad.net/bugs/792263 (bzr r10255)
Diffstat (limited to 'src/ink-action.cpp')
-rw-r--r--src/ink-action.cpp9
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 )
{