From 0c8bcfa5526a13b3494a33fd8e0518cdad126ce4 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna@OcarinaProject.net>
Date: Sat, 26 Dec 2015 12:29:24 -0500
Subject: [PATCH] gui/window: Switch to C-style gtk widgets

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
---
 gui/ocarina.cpp       |  4 +++-
 gui/window.cpp        | 13 ++++---------
 include/gui/ocarina.h |  3 ---
 include/gui/window.h  | 10 ++++++++++
 4 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 include/gui/window.h

diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index b5557d99..14ca3bb5 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -10,6 +10,7 @@ extern "C" {
 }
 #include <gui/ocarina.h>
 #include <gui/tabs.h>
+#include <gui/window.h>
 
 
 static std::string ocarina_dir = "";
@@ -63,14 +64,15 @@ int main(int argc, char **argv)
 
 	core_init(&argc, &argv, &init_data);
 	gui_settings_init();
+	gui_window_init(gui :: share_file("ocarina.png").c_str());
 	gui_audio_init();
 
 	plist :: init();
 	manager :: init();
 	init_tabs();
-	window = window_init();
 	post_init_tabs();
 
+	window = Glib :: wrap(GTK_WINDOW(gui_builder_widget("o_window")), false);
 	ocarina_app->signal_window_removed().connect(sigc::ptr_fun(on_window_removed));
 	ocarina_app->run(*window, argc, argv);
 	core_deinit();
diff --git a/gui/window.cpp b/gui/window.cpp
index 64c7d259..b4ea391c 100644
--- a/gui/window.cpp
+++ b/gui/window.cpp
@@ -2,22 +2,17 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 extern "C" {
-#include <core/audio.h>
-#include <core/tempq.h>
 #include <core/version.h>
 #include <gui/builder.h>
 }
 #include <gui/ocarina.h>
-#include <gui/tabs.h>
 
 const std::string appname = "Ocarina ";
 
-Gtk::Window *window_init()
+void gui_window_init(const gchar *icon)
 {
-	Gtk::Window *window = Glib :: wrap(GTK_WINDOW(gui_builder_widget("o_window")), false);
+	GtkWindow *window = GTK_WINDOW(gui_builder_widget("o_window"));
 
-	window->set_title(appname + get_version());
-	window->set_icon_from_file(gui :: share_file("ocarina.png"));
-
-	return window;
+	gtk_window_set_title(window, (appname + get_version()).c_str());
+	gtk_window_set_icon_from_file(window, icon, NULL);
 }
diff --git a/include/gui/ocarina.h b/include/gui/ocarina.h
index dee417d2..ee440a17 100644
--- a/include/gui/ocarina.h
+++ b/include/gui/ocarina.h
@@ -37,7 +37,4 @@ namespace plist
 }
 
 
-/* window.cpp */
-Gtk::Window *window_init();
-
 #endif /* OCARINA_H */
diff --git a/include/gui/window.h b/include/gui/window.h
new file mode 100644
index 00000000..3d3ef879
--- /dev/null
+++ b/include/gui/window.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2015 (c) Anna Schumaker.
+ */
+#ifndef OCARINA_GUI_WINDOW_H
+#define OCARINA_GUI_WINDOW_H
+
+/* Called to initialize the main window. */
+void gui_window_init(const gchar *);
+
+#endif /* OCARINA_GUI_WINDOW_H */