Get rid of gtkmm top-level header usage - not required by API

(bzr r10940)

14 files changed, 34 insertions, 13 deletions

diff --git a/src/ui/widget/button.h b/src/ui/widget/button.h
index a7d7dfb95..362cdf8ff 100644
--- a/src/ui/widget/button.h
+++ b/src/ui/widget/button.h
@@ -10,7 +10,7 @@
 #ifndef INKSCAPE_UI_WIDGET_BUTTON_H
 #define INKSCAPE_UI_WIDGET_BUTTON_H
 
-#include <gtkmm.h>
+#include <gtkmm/checkbutton.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index f2d67c341..9dad40031 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -14,8 +14,9 @@
 #define __COLOR_PICKER_H__
 
 #include <stddef.h>
+#include <gtkmm/button.h>
+#include <gtkmm/dialog.h>
 #include <sigc++/sigc++.h>
-#include <gtkmm.h>
 #include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
 //#include "ui/dialog/dialog.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 093a456d7..b9467475a 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -8,7 +8,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <gtkmm.h>
 
 #include "dock-item.h"
 #include "desktop.h"
@@ -17,6 +16,9 @@
 #include "ui/widget/dock.h"
 #include "widgets/icon.h"
 
+#include <gtkmm/icontheme.h>
+#include <gtkmm/stockitem.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/entry.h b/src/ui/widget/entry.h
index 98c861272..d332dde1b 100644
--- a/src/ui/widget/entry.h
+++ b/src/ui/widget/entry.h
@@ -10,9 +10,10 @@
 #ifndef INKSCAPE_UI_WIDGET_ENTRY__H
 #define INKSCAPE_UI_WIDGET_ENTRY__H
 
-#include <gtkmm.h>
 #include "labelled.h"
 
+#include <gtkmm/entry.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/labelled.h b/src/ui/widget/labelled.h
index b0e6b6d4d..9f6f855cb 100644
--- a/src/ui/widget/labelled.h
+++ b/src/ui/widget/labelled.h
@@ -11,7 +11,8 @@
 #ifndef INKSCAPE_UI_WIDGET_LABELLED_H
 #define INKSCAPE_UI_WIDGET_LABELLED_H
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index e3dbddd43..a14a23253 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -22,7 +22,6 @@
 #endif
 
 #include <cmath>
-#include <gtkmm.h>
 #include <string>
 #include <string.h>
 #include <vector>
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 61fb425bc..0c814590d 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -10,7 +10,6 @@
 #ifndef INKSCAPE_UI_WIDGET_PAGE_SIZER_H
 #define INKSCAPE_UI_WIDGET_PAGE_SIZER_H
 
-#include <gtkmm.h>
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
@@ -19,6 +18,12 @@
 #include "ui/widget/registered-widget.h"
 #include "xml/node.h"
 
+#include <gtkmm/alignment.h>
+#include <gtkmm/expander.h>
+#include <gtkmm/frame.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/table.h>
+
 namespace Inkscape {    
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 4942d4bde..0871fbffd 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -18,6 +18,7 @@
 #include <glibmm/i18n.h>
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
+#include <gtkmm/menu.h>
 #include <gtkmm/stock.h>
 
 #include <gtk/gtk.h>
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index c8006dc1d..64efa8837 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -14,12 +14,19 @@
 #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H
 
 #include <vector>
-#include <gtkmm.h>
 
 #include "inkscape.h"
 #include "selection.h"
 #include "ui/previewfillable.h"
 
+#include <gtkmm/arrow.h>
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/buttonbox.h>
+#include <gtkmm/checkmenuitem.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/menuitem.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index fd68247cf..f5c7c8c56 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -21,6 +21,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/alignment.h>
 #include <gtkmm/box.h>
+#include <gtkmm/stock.h>
 
 #include "preferences.h"
 #include "ui/widget/preferences-widget.h"
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 8ddf8b596..6d4b5c553 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -17,11 +17,15 @@
 
 #include <iostream>
 #include <vector>
-#include <gtkmm.h>
 #include "ui/widget/spinbutton.h"
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/drawingarea.h>
+#include <gtkmm/filechooserbutton.h>
+#include <gtkmm/scale.h>
+#include <gtkmm/table.h>
 
 #include "ui/widget/color-picker.h"
 #include "ui/widget/unit-menu.h"
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index c9d37d037..80acb98e6 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -12,7 +12,6 @@
 #ifndef INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 #define INKSCAPE_UI_WIDGET_REGISTERED_WIDGET__H_
 
-#include <gtkmm.h>
 #include <2geom/affine.h>
 #include "xml/node.h"
 #include "registry.h"
diff --git a/src/ui/widget/rendering-options.h b/src/ui/widget/rendering-options.h
index b29c4bfae..74c56591f 100644
--- a/src/ui/widget/rendering-options.h
+++ b/src/ui/widget/rendering-options.h
@@ -11,9 +11,11 @@
 #ifndef INKSCAPE_UI_WIDGET_RENDERING_OPTIONS_H
 #define INKSCAPE_UI_WIDGET_RENDERING_OPTIONS_H
 
-#include <gtkmm.h>
 #include "scalar.h"
 
+#include <gtkmm/frame.h>
+#include <gtkmm/radiobutton.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h
index e3bd385cc..790ed0e74 100644
--- a/src/ui/widget/tolerance-slider.h
+++ b/src/ui/widget/tolerance-slider.h
@@ -10,8 +10,6 @@
 #ifndef INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 #define INKSCAPE_UI_WIDGET_TOLERANCE_SLIDER__H_
 
-#include <gtkmm.h>
-
 namespace Inkscape {
 namespace UI {
 namespace Widget {