diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-29 01:16:51 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-02-29 01:16:51 +0000 |
| commit | dfee660d61d18c55d5f0912b3a87958d631eb6fa (patch) | |
| tree | acdb49deedd5bb761f4642874d451d92bf81886b /src/widgets/icon.h | |
| parent | Dutch translation: minor update (diff) | |
| download | inkscape-dfee660d61d18c55d5f0912b3a87958d631eb6fa.tar.gz inkscape-dfee660d61d18c55d5f0912b3a87958d631eb6fa.zip | |
Header tidying, suppress all gdk deprecation errors in gtkmm
(bzr r11030)
Diffstat (limited to 'src/widgets/icon.h')
| -rw-r--r-- | src/widgets/icon.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/widgets/icon.h b/src/widgets/icon.h index f04d2f8da..3f6aa2455 100644 --- a/src/widgets/icon.h +++ b/src/widgets/icon.h @@ -14,15 +14,16 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <glib.h> - +#include <gtkmm/widget.h> #include "icon-size.h" #define SP_TYPE_ICON SPIcon::getType() #define SP_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_ICON, SPIcon)) #define SP_IS_ICON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_ICON)) -#include <gtk/gtk.h> +namespace Glib { +class ustring; +} struct SPIconClass { GtkWidgetClass parent_class; @@ -45,8 +46,6 @@ struct SPIcon { GtkWidget *sp_icon_new( Inkscape::IconSize size, const gchar *name ); -#include <glibmm/ustring.h> -#include <gtkmm/widget.h> // Might return a wrapped SPIcon, or Gtk::Image Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON ); |