diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-15 11:19:00 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-15 11:19:00 +0000 |
| commit | 9b9816178f8c606724d7f8ee45c70aff9aa9b055 (patch) | |
| tree | 759d0cc9498468201dc74f60b96ba513624e31b2 /src/ui | |
| parent | fix build after r10963 (diff) | |
| download | inkscape-9b9816178f8c606724d7f8ee45c70aff9aa9b055.tar.gz inkscape-9b9816178f8c606724d7f8ee45c70aff9aa9b055.zip | |
Move gtkmm headers that internally re-enable deprecated gtk symbols to top. Hides many GTK deprecation errors that we can't fix in Inkscape
(bzr r10982)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/print.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/print.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-picker.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/combo-enums.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp index a91ccf196..e940a3f55 100644 --- a/src/ui/dialog/print.cpp +++ b/src/ui/dialog/print.cpp @@ -18,8 +18,8 @@ #include <windows.h> #endif -#include <gtkmm/stock.h> #include "print.h" +#include <gtkmm/stock.h> #include "extension/internal/cairo-render-context.h" #include "extension/internal/cairo-renderer.h" diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h index bfa6bbe97..f81829d86 100644 --- a/src/ui/dialog/print.h +++ b/src/ui/dialog/print.h @@ -11,12 +11,12 @@ #ifndef INKSCAPE_UI_DIALOG_PRINT_H #define INKSCAPE_UI_DIALOG_PRINT_H +#include "ui/widget/rendering-options.h" #include <gtkmm/printoperation.h> // GtkMM class SPItem; class SPDocument; -#include "ui/widget/rendering-options.h" /* * gtk 2.12.0 has a bug (http://bugzilla.gnome.org/show_bug.cgi?id=482089) diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h index cece8a361..e20212615 100644 --- a/src/ui/widget/color-picker.h +++ b/src/ui/widget/color-picker.h @@ -14,8 +14,8 @@ #define __COLOR_PICKER_H__ #include <stddef.h> -#include <gtkmm/button.h> #include <gtkmm/dialog.h> +#include <gtkmm/button.h> #include <sigc++/sigc++.h> #include "ui/widget/color-preview.h" diff --git a/src/ui/widget/combo-enums.h b/src/ui/widget/combo-enums.h index d2f6fc43b..4678ab83b 100644 --- a/src/ui/widget/combo-enums.h +++ b/src/ui/widget/combo-enums.h @@ -11,9 +11,9 @@ #ifndef INKSCAPE_UI_WIDGET_COMBO_ENUMS_H #define INKSCAPE_UI_WIDGET_COMBO_ENUMS_H +#include "ui/widget/labelled.h" #include <gtkmm/combobox.h> #include <gtkmm/liststore.h> -#include "ui/widget/labelled.h" #include "attr-widget.h" #include "util/enums.h" |