Avoid including gtkmm.h

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4354 a436a847-0d15-0410-975c-d299462d15a1

30 files changed, 99 insertions, 27 deletions

diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index becc309c..f9f47ddf 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -20,6 +20,7 @@
 #include <utility>
 
 #include <gtk/gtkwindow.h>
+#include <gtkmm/stock.h>
 
 #include "ganv/Edge.hpp"
 #include "ingen/EngineBase.hpp"
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 2a9897a5..7969982c 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -22,7 +22,9 @@
 #include <map>
 #include <utility>
 
-#include <gtkmm.h>
+#include <gtkmm/aboutdialog.h>
+#include <gtkmm/main.h>
+#include <gtkmm/window.h>
 
 #include "ingen/Status.hpp"
 #include "ingen/shared/World.hpp"
diff --git a/src/gui/BreadCrumbs.hpp b/src/gui/BreadCrumbs.hpp
index 0a0ca55b..43c7f011 100644
--- a/src/gui/BreadCrumbs.hpp
+++ b/src/gui/BreadCrumbs.hpp
@@ -19,7 +19,9 @@
 
 #include <list>
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/togglebutton.h>
 
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 2e7cc2e0..42bfcd92 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -17,6 +17,8 @@
 #include <stdlib.h>
 #include <string>
 
+#include <gtkmm/stock.h>
+
 #include "raul/Process.hpp"
 #include "raul/log.hpp"
 
diff --git a/src/gui/ConnectWindow.hpp b/src/gui/ConnectWindow.hpp
index e19b91cc..fa678049 100644
--- a/src/gui/ConnectWindow.hpp
+++ b/src/gui/ConnectWindow.hpp
@@ -17,7 +17,14 @@
 #ifndef INGEN_GUI_CONNECTWINDOW_HPP
 #define INGEN_GUI_CONNECTWINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/image.h>
+#include <gtkmm/label.h>
+#include <gtkmm/progressbar.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/spinbutton.h>
 
 #include "lilv/lilv.h"
 #include "raul/SharedPtr.hpp"
diff --git a/src/gui/LoadPatchWindow.hpp b/src/gui/LoadPatchWindow.hpp
index 25194309..a919a648 100644
--- a/src/gui/LoadPatchWindow.hpp
+++ b/src/gui/LoadPatchWindow.hpp
@@ -17,7 +17,13 @@
 #ifndef INGEN_GUI_LOADSUBPATCHWINDOW_HPP
 #define INGEN_GUI_LOADSUBPATCHWINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/filechooserdialog.h>
+#include <gtkmm/label.h>
+#include <gtkmm/radiobutton.h>
+#include <gtkmm/spinbutton.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/LoadPluginWindow.hpp b/src/gui/LoadPluginWindow.hpp
index 31710d96..26de89d7 100644
--- a/src/gui/LoadPluginWindow.hpp
+++ b/src/gui/LoadPluginWindow.hpp
@@ -20,7 +20,11 @@
 #include <map>
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treeview.h>
 
 #include "raul/SharedPtr.hpp"
 #include "raul/Table.hpp"
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index 35ec7da6..ad3f92a1 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -19,7 +19,9 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/textview.h>
 
 #include "Window.hpp"
 
diff --git a/src/gui/NewSubpatchWindow.hpp b/src/gui/NewSubpatchWindow.hpp
index c74b5fe2..20a27dc6 100644
--- a/src/gui/NewSubpatchWindow.hpp
+++ b/src/gui/NewSubpatchWindow.hpp
@@ -17,7 +17,11 @@
 #ifndef INGEN_GUI_NEWSUBPATCHWINDOW_HPP
 #define INGEN_GUI_NEWSUBPATCHWINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/NodeMenu.cpp b/src/gui/NodeMenu.cpp
index ed9b0fbf..afa877b7 100644
--- a/src/gui/NodeMenu.cpp
+++ b/src/gui/NodeMenu.cpp
@@ -16,7 +16,8 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/image.h>
+#include <gtkmm/stock.h>
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/NodeModel.hpp"
diff --git a/src/gui/NodeMenu.hpp b/src/gui/NodeMenu.hpp
index e6c7e175..07a25367 100644
--- a/src/gui/NodeMenu.hpp
+++ b/src/gui/NodeMenu.hpp
@@ -18,10 +18,14 @@
 #define INGEN_GUI_NODEMENU_HPP
 
 #include <string>
-#include <gtkmm.h>
-#include "raul/SharedPtr.hpp"
-#include "ingen/client/NodeModel.hpp"
+
+#include <gtkmm/builder.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menushell.h>
+
 #include "ObjectMenu.hpp"
+#include "ingen/client/NodeModel.hpp"
+#include "raul/SharedPtr.hpp"
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/gui/NodeModule.cpp b/src/gui/NodeModule.cpp
index 6a7a424a..03a56df1 100644
--- a/src/gui/NodeModule.cpp
+++ b/src/gui/NodeModule.cpp
@@ -17,6 +17,8 @@
 #include <cassert>
 #include <string>
 
+#include <gtkmm/eventbox.h>
+
 #include "ingen/Interface.hpp"
 #include "ingen/client/NodeModel.hpp"
 #include "ingen/client/PatchModel.hpp"
diff --git a/src/gui/ObjectMenu.cpp b/src/gui/ObjectMenu.cpp
index 3b8ac66f..5698bd7f 100644
--- a/src/gui/ObjectMenu.cpp
+++ b/src/gui/ObjectMenu.cpp
@@ -16,8 +16,6 @@
 
 #include <utility>
 
-#include <gtkmm.h>
-
 #include "ingen/Interface.hpp"
 #include "ingen/client/ObjectModel.hpp"
 
diff --git a/src/gui/ObjectMenu.hpp b/src/gui/ObjectMenu.hpp
index 9bab5945..9c720a4a 100644
--- a/src/gui/ObjectMenu.hpp
+++ b/src/gui/ObjectMenu.hpp
@@ -19,7 +19,10 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/checkmenuitem.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/PatchBox.cpp b/src/gui/PatchBox.cpp
index d9e14373..ce2d23db 100644
--- a/src/gui/PatchBox.cpp
+++ b/src/gui/PatchBox.cpp
@@ -21,6 +21,7 @@
 #include <boost/format.hpp>
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
+#include <gtkmm/stock.h>
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/ClientStore.hpp"
diff --git a/src/gui/PatchBox.hpp b/src/gui/PatchBox.hpp
index 3df24cf9..f69f98b7 100644
--- a/src/gui/PatchBox.hpp
+++ b/src/gui/PatchBox.hpp
@@ -19,7 +19,14 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/menushell.h>
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/statusbar.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/PatchCanvas.cpp b/src/gui/PatchCanvas.cpp
index 1f02371c..3562a007 100644
--- a/src/gui/PatchCanvas.cpp
+++ b/src/gui/PatchCanvas.cpp
@@ -20,6 +20,7 @@
 #include <string>
 
 #include <boost/format.hpp>
+#include <gtkmm/stock.h>
 
 #include "ganv/Canvas.hpp"
 #include "ganv/Circle.hpp"
diff --git a/src/gui/PatchTreeWindow.hpp b/src/gui/PatchTreeWindow.hpp
index d82624b8..8321644f 100644
--- a/src/gui/PatchTreeWindow.hpp
+++ b/src/gui/PatchTreeWindow.hpp
@@ -17,7 +17,10 @@
 #ifndef INGEN_GUI_PATCHTREEWINDOW_HPP
 #define INGEN_GUI_PATCHTREEWINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+#include <gtkmm/treeview.h>
 
 #include "Window.hpp"
 
diff --git a/src/gui/PatchView.hpp b/src/gui/PatchView.hpp
index a3c0c473..6782d311 100644
--- a/src/gui/PatchView.hpp
+++ b/src/gui/PatchView.hpp
@@ -19,7 +19,14 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/box.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/toggletoolbutton.h>
+#include <gtkmm/toolbar.h>
+#include <gtkmm/toolitem.h>
+#include <gtkmm/toolitem.h>
 
 #include "raul/SharedPtr.hpp"
 #include "raul/URI.hpp"
diff --git a/src/gui/PatchWindow.hpp b/src/gui/PatchWindow.hpp
index ba4b372f..b3213327 100644
--- a/src/gui/PatchWindow.hpp
+++ b/src/gui/PatchWindow.hpp
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/PortMenu.cpp b/src/gui/PortMenu.cpp
index 378e48cc..0e3e215c 100644
--- a/src/gui/PortMenu.cpp
+++ b/src/gui/PortMenu.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <math.h>
-#include <gtkmm.h>
 
 #include "ingen/Interface.hpp"
 #include "ingen/client/PatchModel.hpp"
diff --git a/src/gui/PortMenu.hpp b/src/gui/PortMenu.hpp
index 59a9888e..fc89703f 100644
--- a/src/gui/PortMenu.hpp
+++ b/src/gui/PortMenu.hpp
@@ -19,7 +19,9 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menushell.h>
 
 #include "ingen/client/PortModel.hpp"
 #include "raul/SharedPtr.hpp"
diff --git a/src/gui/PortPropertiesWindow.hpp b/src/gui/PortPropertiesWindow.hpp
index 97426b04..309f3968 100644
--- a/src/gui/PortPropertiesWindow.hpp
+++ b/src/gui/PortPropertiesWindow.hpp
@@ -19,7 +19,8 @@
 
 #include <list>
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/spinbutton.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/PropertiesWindow.cpp b/src/gui/PropertiesWindow.cpp
index d7f781a7..4c451978 100644
--- a/src/gui/PropertiesWindow.cpp
+++ b/src/gui/PropertiesWindow.cpp
@@ -18,6 +18,9 @@
 #include <cassert>
 #include <string>
 
+#include <gtkmm/label.h>
+#include <gtkmm/spinbutton.h>
+
 #include "raul/log.hpp"
 #include "ingen/shared/World.hpp"
 #include "ingen/client/NodeModel.hpp"
diff --git a/src/gui/PropertiesWindow.hpp b/src/gui/PropertiesWindow.hpp
index 62cf2264..31fd0388 100644
--- a/src/gui/PropertiesWindow.hpp
+++ b/src/gui/PropertiesWindow.hpp
@@ -19,7 +19,12 @@
 
 #include <map>
 
-#include <gtkmm.h>
+#include <gtkmm/alignment.h>
+#include <gtkmm/box.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/table.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/RenameWindow.hpp b/src/gui/RenameWindow.hpp
index 2fc782de..03d5e318 100644
--- a/src/gui/RenameWindow.hpp
+++ b/src/gui/RenameWindow.hpp
@@ -17,7 +17,10 @@
 #ifndef INGEN_GUI_RENAMEWINDOW_HPP
 #define INGEN_GUI_RENAMEWINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/button.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/label.h>
 
 #include "raul/SharedPtr.hpp"
 
diff --git a/src/gui/WidgetFactory.hpp b/src/gui/WidgetFactory.hpp
index 2a92cadb..7e9cf8f1 100644
--- a/src/gui/WidgetFactory.hpp
+++ b/src/gui/WidgetFactory.hpp
@@ -19,7 +19,8 @@
 
 #include <string>
 
-#include <gtkmm.h>
+#include <glibmm.h>
+#include <gtkmm/builder.h>
 
 namespace Ingen {
 namespace GUI {
diff --git a/src/gui/Window.cpp b/src/gui/Window.cpp
index 88ed531d..52df075e 100644
--- a/src/gui/Window.cpp
+++ b/src/gui/Window.cpp
@@ -14,6 +14,8 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <gdk/gdkkeysyms.h>
+
 #include "Window.hpp"
 
 namespace Ingen {
diff --git a/src/gui/Window.hpp b/src/gui/Window.hpp
index 6ce1a857..ca1d8828 100644
--- a/src/gui/Window.hpp
+++ b/src/gui/Window.hpp
@@ -17,7 +17,8 @@
 #ifndef INGEN_GUI_WINDOW_HPP
 #define INGEN_GUI_WINDOW_HPP
 
-#include <gtkmm.h>
+#include <gtkmm/dialog.h>
+#include <gtkmm/window.h>
 
 namespace Ingen {
 
diff --git a/src/gui/WindowFactory.hpp b/src/gui/WindowFactory.hpp
index c9d281c3..2bf36e85 100644
--- a/src/gui/WindowFactory.hpp
+++ b/src/gui/WindowFactory.hpp
@@ -19,8 +19,6 @@
 
 #include <map>
 
-#include <gtkmm.h>
-
 #include "ingen/GraphObject.hpp"
 #include "raul/SharedPtr.hpp"