summaryrefslogtreecommitdiffstats
path: root/src/libgdl
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2011-06-03 10:44:52 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2011-06-03 10:44:52 +0000
commitf3756ff85a32f4b2a0771d0ac3bd78a69535395f (patch)
treecb659f62f9ec83041a538dcd862d52829495c14f /src/libgdl
parentadd multiple glyph layers at once (from characters found in user input string) (diff)
downloadinkscape-f3756ff85a32f4b2a0771d0ac3bd78a69535395f.tar.gz
inkscape-f3756ff85a32f4b2a0771d0ac3bd78a69535395f.zip
Use generic headers in preparation for GTK+ 3 transition
Fixed bugs: - https://launchpad.net/bugs/792263 (bzr r10252.1.1)
Diffstat (limited to 'src/libgdl')
-rw-r--r--src/libgdl/gdl-dock-bar.h2
-rw-r--r--src/libgdl/gdl-dock-item-grip.c4
-rw-r--r--src/libgdl/gdl-dock-item-grip.h2
-rw-r--r--src/libgdl/gdl-dock-master.h2
-rw-r--r--src/libgdl/gdl-dock-object.h2
-rw-r--r--src/libgdl/gdl-dock-paned.c3
-rw-r--r--src/libgdl/gdl-stock.c1
-rw-r--r--src/libgdl/gdl-switcher.c4
-rw-r--r--src/libgdl/gdl-switcher.h2
-rw-r--r--src/libgdl/gdl-tools.h2
10 files changed, 8 insertions, 16 deletions
diff --git a/src/libgdl/gdl-dock-bar.h b/src/libgdl/gdl-dock-bar.h
index 22b99edd4..c6697a47c 100644
--- a/src/libgdl/gdl-dock-bar.h
+++ b/src/libgdl/gdl-dock-bar.h
@@ -22,7 +22,7 @@
#ifndef __GDL_DOCK_BAR_H__
#define __GDL_DOCK_BAR_H__
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
#include "libgdl/gdl-dock.h"
G_BEGIN_DECLS
diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c
index 86e7bc14c..6457016de 100644
--- a/src/libgdl/gdl-dock-item-grip.c
+++ b/src/libgdl/gdl-dock-item-grip.c
@@ -17,9 +17,7 @@
#include "gdl-i18n.h"
#include <string.h>
#include <glib-object.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
#include "gdl-dock-item.h"
#include "gdl-dock-item-grip.h"
#include "gdl-stock.h"
diff --git a/src/libgdl/gdl-dock-item-grip.h b/src/libgdl/gdl-dock-item-grip.h
index 377ea1470..495e9381d 100644
--- a/src/libgdl/gdl-dock-item-grip.h
+++ b/src/libgdl/gdl-dock-item-grip.h
@@ -13,7 +13,7 @@
#ifndef _GDL_DOCK_ITEM_GRIP_H_
#define _GDL_DOCK_ITEM_GRIP_H_
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
#include "libgdl/gdl-dock-item.h"
G_BEGIN_DECLS
diff --git a/src/libgdl/gdl-dock-master.h b/src/libgdl/gdl-dock-master.h
index 72697b484..1a10405b6 100644
--- a/src/libgdl/gdl-dock-master.h
+++ b/src/libgdl/gdl-dock-master.h
@@ -25,7 +25,7 @@
#define __GDL_DOCK_MASTER_H__
#include <glib-object.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
#include "libgdl/gdl-dock-object.h"
diff --git a/src/libgdl/gdl-dock-object.h b/src/libgdl/gdl-dock-object.h
index 84e5eb9a7..684bd043f 100644
--- a/src/libgdl/gdl-dock-object.h
+++ b/src/libgdl/gdl-dock-object.h
@@ -24,7 +24,7 @@
#ifndef __GDL_DOCK_OBJECT_H__
#define __GDL_DOCK_OBJECT_H__
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/libgdl/gdl-dock-paned.c b/src/libgdl/gdl-dock-paned.c
index 268a9f673..70273c886 100644
--- a/src/libgdl/gdl-dock-paned.c
+++ b/src/libgdl/gdl-dock-paned.c
@@ -27,8 +27,7 @@
#include "gdl-i18n.h"
#include <string.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
#include "gdl-tools.h"
#include "gdl-dock-paned.h"
diff --git a/src/libgdl/gdl-stock.c b/src/libgdl/gdl-stock.c
index 94f825678..dc86e523b 100644
--- a/src/libgdl/gdl-stock.c
+++ b/src/libgdl/gdl-stock.c
@@ -24,7 +24,6 @@
#endif
#include <gtk/gtk.h>
-#include <gtk/gtkiconfactory.h>
#include "gdl-stock.h"
#include "gdl-stock-icons.h"
diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c
index 43768bbdf..c5e139e70 100644
--- a/src/libgdl/gdl-switcher.c
+++ b/src/libgdl/gdl-switcher.c
@@ -35,10 +35,6 @@
#include "libgdltypebuiltins.h"
#include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
#if HAVE_GNOME
#include <gconf/gconf-client.h>
diff --git a/src/libgdl/gdl-switcher.h b/src/libgdl/gdl-switcher.h
index be4b179bf..9c33f8bbf 100644
--- a/src/libgdl/gdl-switcher.h
+++ b/src/libgdl/gdl-switcher.h
@@ -25,7 +25,7 @@
#ifndef _GDL_SWITCHER_H_
#define _GDL_SWITCHER_H_
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/libgdl/gdl-tools.h b/src/libgdl/gdl-tools.h
index 32c2e4a41..0cfc9fb95 100644
--- a/src/libgdl/gdl-tools.h
+++ b/src/libgdl/gdl-tools.h
@@ -25,7 +25,7 @@
#define __GDL_TOOLS_H__
#include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
/* FIXME: Toggle this */