Working with widjets

(bzr r11950.1.56)

6 files changed, 11 insertions, 11 deletions

diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp
index 64d28119a..173e014d9 100644
--- a/src/ui/widget/entry.cpp
+++ b/src/ui/widget/entry.cpp
@@ -13,8 +13,6 @@
 
 #include "entry.h"
 
-#include <gtkmm/entry.h>
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h
index de5cceadd..53b848fc9 100644
--- a/src/ui/widget/entry.h
+++ b/src/ui/widget/entry.h
@@ -11,10 +11,10 @@
 #define INKSCAPE_UI_WIDGET_ENTRY__H
 
 #include "labelled.h"
+#include <gtkmm.h>
 
-namespace Gtk {
-class Entry;
-}
+#include <gtkmm/entry.h>
+#include <gtkmm/comboboxtext.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/frame.h b/src/ui/widget/frame.h
index a04666651..cf736d8a1 100644
--- a/src/ui/widget/frame.h
+++ b/src/ui/widget/frame.h
@@ -10,9 +10,11 @@
 #ifndef INKSCAPE_UI_WIDGET_FRAME_H
 #define INKSCAPE_UI_WIDGET_FRAME_H
 
-#include <gtkmm/alignment.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/label.h>
+#include <gtkmm.h>
+
+namespace Gtk {
+class Frame;
+}
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index fa35b815e..2a7843a51 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -32,7 +32,7 @@
 
 #include <gtkmm/checkbutton.h>
 
-struct SPUnit;
+class SPUnit;
 class SPDocument;
 
 namespace Gtk {
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index 9b78cb17f..6d5222429 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -40,7 +40,7 @@
 #include "helper/units.h"
 
 class SPDesktop;
-struct SPUnit;
+class SPUnit;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index d7bab3732..2b9c32b2e 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -26,7 +26,7 @@
 #include "button.h"
 #include "preferences.h"
 
-struct SPUnit;
+class SPUnit;
 struct SPStyle;
 class SPCSSAttr;