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/ui/widget | |
| 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/ui/widget')
| -rw-r--r-- | src/ui/widget/combo-text.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/panel.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/toolbox.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/widget/combo-text.cpp b/src/ui/widget/combo-text.cpp index 7706f7c29..43428adb8 100644 --- a/src/ui/widget/combo-text.cpp +++ b/src/ui/widget/combo-text.cpp @@ -23,7 +23,7 @@ #endif #include "combo-text.h" -#include <gtk/gtkcombobox.h> +#include <gtk/gtk.h> ComboText::ComboText() : Gtk::ComboBox() diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index b3c8ce376..3e0c27587 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -22,7 +22,7 @@ #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <gtkmm/stock.h> -#include <gtk/gtkiconfactory.h> +#include <gtk/gtk.h> #include "panel.h" #include "icon-size.h" diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 50476dc65..ae8cd564e 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -14,7 +14,7 @@ # include <config.h> #endif -#include <gtk/gtkdnd.h> +#include <gtk/gtk.h> #include "selected-style.h" diff --git a/src/ui/widget/toolbox.cpp b/src/ui/widget/toolbox.cpp index e90a58b6e..5e5f43263 100644 --- a/src/ui/widget/toolbox.cpp +++ b/src/ui/widget/toolbox.cpp @@ -14,7 +14,7 @@ #endif #include <gtkmm/radioaction.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include "ui/widget/toolbox.h" #include "path-prefix.h" |