From 0f5303503c24d6f31022b897023502b218ea9fd4 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sat, 20 Aug 2011 11:08:42 -0400
Subject: [PATCH] Improve play button creation

I made a function to create a play button.  I suspect that
pre-configured buttons will be easier to use than having to build them
up every time.
---
 gui/button.cpp           | 5 +++++
 gui/ocarina.cpp          | 6 +-----
 include/ocarina/button.h | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gui/button.cpp b/gui/button.cpp
index 373a86c7..c28ff8a3 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -11,3 +11,8 @@ GtkWidget *make_button(const gchar *stockid, GtkIconSize size)
 	gtk_widget_show_all(button);
 	return button;
 }
+
+GtkWidget *make_play_button(GtkIconSize size)
+{
+	return make_button(GTK_STOCK_MEDIA_PLAY, size);
+}
diff --git a/gui/ocarina.cpp b/gui/ocarina.cpp
index 5bce9bb8..522b4b6e 100644
--- a/gui/ocarina.cpp
+++ b/gui/ocarina.cpp
@@ -1,7 +1,4 @@
 
-#include <iostream>
-using namespace std;
-
 #include <ocarina/button.h>
 #include <ocarina/window.h>
 #include <libsaria/libsaria.h>
@@ -9,10 +6,9 @@ using namespace std;
 void ocarina_init(int argc, char **argv)
 {
 	GtkWidget *button;
-	const gchar *play = GTK_STOCK_MEDIA_PLAY;
 	gtk_init(&argc, &argv);
 	window_init();
-	button = make_button(play, GTK_ICON_SIZE_MENU);
+	button = make_play_button(GTK_ICON_SIZE_MENU);
 	window_add(button);
 	gtk_main();
 }
diff --git a/include/ocarina/button.h b/include/ocarina/button.h
index ed4a0647..8767b2a5 100644
--- a/include/ocarina/button.h
+++ b/include/ocarina/button.h
@@ -7,5 +7,6 @@ using namespace std;
 #include <ocarina/gtk.h>
 
 GtkWidget *make_button(const gchar *, GtkIconSize);
+GtkWidget *make_play_button(GtkIconSize);
 
 #endif /* OCARINA_BUTTON_H */