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/dialogs | |
| 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/dialogs')
| -rw-r--r-- | src/dialogs/clonetiler.h | 2 | ||||
| -rw-r--r-- | src/dialogs/dialog-events.h | 3 | ||||
| -rw-r--r-- | src/dialogs/find.h | 2 | ||||
| -rw-r--r-- | src/dialogs/item-properties.cpp | 9 | ||||
| -rw-r--r-- | src/dialogs/item-properties.h | 2 | ||||
| -rw-r--r-- | src/dialogs/object-attributes.h | 2 | ||||
| -rw-r--r-- | src/dialogs/spellcheck.h | 2 |
7 files changed, 6 insertions, 16 deletions
diff --git a/src/dialogs/clonetiler.h b/src/dialogs/clonetiler.h index bfb35cd96..899181346 100644 --- a/src/dialogs/clonetiler.h +++ b/src/dialogs/clonetiler.h @@ -12,7 +12,7 @@ #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> void clonetiler_dialog ( void ); diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h index 7b04d0f69..9c0a82f23 100644 --- a/src/dialogs/dialog-events.h +++ b/src/dialogs/dialog-events.h @@ -12,8 +12,7 @@ #ifndef __DIALOG_EVENTS_H__ #define __DIALOG_EVENTS_H__ -#include <gtk/gtkstyle.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <forward.h> /* diff --git a/src/dialogs/find.h b/src/dialogs/find.h index fe5861a73..219c36bf2 100644 --- a/src/dialogs/find.h +++ b/src/dialogs/find.h @@ -12,7 +12,7 @@ #ifndef SEEN_FIND_H #define SEEN_FIND_H -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> void sp_find_dialog(); diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp index 94b8b1e98..54707c0aa 100644 --- a/src/dialogs/item-properties.cpp +++ b/src/dialogs/item-properties.cpp @@ -16,16 +16,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtktable.h> -#include <gtk/gtkcheckbutton.h> #include <gtk/gtk.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkexpander.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktooltips.h> #include "../desktop-handles.h" #include "dialog-events.h" diff --git a/src/dialogs/item-properties.h b/src/dialogs/item-properties.h index bc04608bc..7d57ae5e8 100644 --- a/src/dialogs/item-properties.h +++ b/src/dialogs/item-properties.h @@ -12,7 +12,7 @@ #define SEEN_DIALOGS_ITEM_PROPERTIES_H #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "../forward.h" GtkWidget *sp_item_widget_new (void); diff --git a/src/dialogs/object-attributes.h b/src/dialogs/object-attributes.h index ef84708c0..b490ebfa1 100644 --- a/src/dialogs/object-attributes.h +++ b/src/dialogs/object-attributes.h @@ -13,7 +13,7 @@ #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "../forward.h" void sp_object_attributes_dialog (SPObject *object, const gchar *tag); diff --git a/src/dialogs/spellcheck.h b/src/dialogs/spellcheck.h index b941788ca..fe80be2cb 100644 --- a/src/dialogs/spellcheck.h +++ b/src/dialogs/spellcheck.h @@ -12,7 +12,7 @@ #ifndef SEEN_SPELLCHECK_H #define SEEN_SPELLCHECK_H -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> void sp_spellcheck_dialog(); |