diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-26 00:32:53 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-26 00:32:53 +0000 |
| commit | 3b3b093c2e1d5c102aecd6033d47544db21789b3 (patch) | |
| tree | c790691ee37067f4eaee1c50fa80614fabca23a3 /src/ui/widget | |
| parent | ADD POTFILES skip (diff) | |
| parent | Drop unnecessary (and broken with Gtk+ 3) check for Gtk+ backend (diff) | |
| download | inkscape-3b3b093c2e1d5c102aecd6033d47544db21789b3.tar.gz inkscape-3b3b093c2e1d5c102aecd6033d47544db21789b3.zip | |
Update to trunk
(bzr r11950.1.75)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/imageicon.h | 3 | ||||
| -rw-r--r-- | src/ui/widget/imagetoggler.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/panel.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/point.h | 2 | ||||
| -rw-r--r-- | src/ui/widget/rendering-options.cpp | 5 | ||||
| -rw-r--r-- | src/ui/widget/spin-scale.cpp | 3 | ||||
| -rw-r--r-- | src/ui/widget/spin-slider.cpp | 5 |
7 files changed, 10 insertions, 14 deletions
diff --git a/src/ui/widget/imageicon.h b/src/ui/widget/imageicon.h index 803b2f53f..2ea8b8533 100644 --- a/src/ui/widget/imageicon.h +++ b/src/ui/widget/imageicon.h @@ -12,9 +12,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glibmm/ustring.h> #include <gtkmm/box.h> - +#include <glibmm/ustring.h> class SPDocument; diff --git a/src/ui/widget/imagetoggler.h b/src/ui/widget/imagetoggler.h index ca1bfd69d..7b02fa4dc 100644 --- a/src/ui/widget/imagetoggler.h +++ b/src/ui/widget/imagetoggler.h @@ -14,9 +14,9 @@ #include "config.h" #endif -#include <glibmm/property.h> #include <gtkmm/cellrendererpixbuf.h> #include <gtkmm/widget.h> +#include <glibmm/property.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 48749fda2..7eb114d0a 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -15,8 +15,6 @@ # include <config.h> #endif -#include <glibmm/i18n.h> - #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <gtkmm/menu.h> #include <gtkmm/stock.h> @@ -24,6 +22,8 @@ #include <gtkmm/radiomenuitem.h> #include <gtkmm/separatormenuitem.h> +#include <glibmm/i18n.h> + #include <gtk/gtk.h> #include "panel.h" diff --git a/src/ui/widget/point.h b/src/ui/widget/point.h index 15f1a80fb..17078df8f 100644 --- a/src/ui/widget/point.h +++ b/src/ui/widget/point.h @@ -13,8 +13,8 @@ #ifndef INKSCAPE_UI_WIDGET_POINT_H #define INKSCAPE_UI_WIDGET_POINT_H -#include <2geom/point.h> #include "ui/widget/labelled.h" +#include <2geom/point.h> #include "ui/widget/scalar.h" namespace Gtk { diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp index 7655f25e3..f26e71553 100644 --- a/src/ui/widget/rendering-options.cpp +++ b/src/ui/widget/rendering-options.cpp @@ -12,10 +12,9 @@ # include <config.h> #endif -#include <glibmm/i18n.h> - -#include "unit-constants.h" #include "rendering-options.h" +#include "unit-constants.h" +#include <glibmm/i18n.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp index 8aab57a34..548e9a6a6 100644 --- a/src/ui/widget/spin-scale.cpp +++ b/src/ui/widget/spin-scale.cpp @@ -6,10 +6,9 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#include <glib.h> +#include <gtkmm/adjustment.h> #include <glibmm/i18n.h> #include <glibmm/stringutils.h> -#include <gtkmm/adjustment.h> #include "spin-scale.h" #include "ui/widget/gimpspinscale.h" diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index facbf704c..1cb59a7b3 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -8,12 +8,11 @@ * Released under GNU GPL. Read the file 'COPYING' for more information. */ -#include <glib.h> +#include "spin-slider.h" + #include <glibmm/i18n.h> #include <glibmm/stringutils.h> -#include "spin-slider.h" - namespace Inkscape { namespace UI { namespace Widget { |