diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-06-04 04:10:51 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-06-04 04:10:51 +0000 |
| commit | b8eae5e18faedb60d4ff012cfc3e5f429fc1b1fc (patch) | |
| tree | f6f0f4a6d73e4e1fe37eede5cecd47b984fa55df /src/extension | |
| parent | Removed outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of SP_ROOT()... (diff) | |
| parent | Use generic headers in preparation for GTK+ 3 transition (diff) | |
| download | inkscape-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/extension')
| -rw-r--r-- | src/extension/effect.h | 2 | ||||
| -rw-r--r-- | src/extension/implementation/implementation.h | 2 | ||||
| -rw-r--r-- | src/extension/input.h | 2 | ||||
| -rw-r--r-- | src/extension/internal/emf-win32-print.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/pdfinput/pdf-input.cpp | 2 | ||||
| -rw-r--r-- | src/extension/output.h | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/src/extension/effect.h b/src/extension/effect.h index c02ce542b..28ebc5d96 100644 --- a/src/extension/effect.h +++ b/src/extension/effect.h @@ -15,7 +15,7 @@ #include <glibmm/i18n.h> #include <gtkmm/dialog.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "verbs.h" #include "prefdialog.h" diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index bf584b401..b9e417feb 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -12,7 +12,7 @@ #ifndef __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <gdkmm/types.h> #include <gtkmm/widget.h> diff --git a/src/extension/input.h b/src/extension/input.h index 24cbc4896..8b198495e 100644 --- a/src/extension/input.h +++ b/src/extension/input.h @@ -16,7 +16,7 @@ #include "extension.h" #include "xml/repr.h" #include "document.h" -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> namespace Inkscape { namespace Extension { diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp index 503a13d09..9662881fe 100644 --- a/src/extension/internal/emf-win32-print.cpp +++ b/src/extension/internal/emf-win32-print.cpp @@ -42,9 +42,7 @@ #include "sp-item.h" //#include "glib.h" -//#include "gtk/gtkdialog.h" -//#include "gtk/gtkbox.h" -//#include "gtk/gtkstock.h" +//#include "gtk/gtk.h" //#include "glibmm/i18n.h" //#include "enums.h" diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index fc2db7e69..186f337c4 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -40,7 +40,7 @@ #include "inkscape.h" #include "dialogs/dialog-events.h" -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "ui/widget/spinbutton.h" namespace Inkscape { diff --git a/src/extension/output.h b/src/extension/output.h index 584fafda8..5f6785b8b 100644 --- a/src/extension/output.h +++ b/src/extension/output.h @@ -13,7 +13,7 @@ #ifndef INKSCAPE_EXTENSION_OUTPUT_H__ #define INKSCAPE_EXTENSION_OUTPUT_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "extension.h" struct SPDocument; |