From 1413a31aa7c4e539f2bea87204b1fb4f108bca6f Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Sat, 20 Aug 2011 11:36:29 -0400
Subject: [PATCH] Create wrapper function for gtk_container_add()

I don't want to have to keep typing out the conversion macros, so this
function puts them all in one place.
---
 gui/button.cpp        | 2 +-
 gui/gtk.cpp           | 5 +++++
 gui/window.cpp        | 3 ++-
 include/ocarina/gtk.h | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gui/button.cpp b/gui/button.cpp
index f52c4a0c..b6c3dd32 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -7,7 +7,7 @@ GtkWidget *make_button(const gchar *stockid, GtkIconSize size)
 	GtkWidget *box    = gtk_hbox_new(FALSE, 0);
 	GtkWidget *image  = gtk_image_new_from_stock(stockid, size);
 	box_pack_start(box, image, FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(button), box);
+	container_add(button, box);
 	gtk_widget_show_all(button);
 	return button;
 }
diff --git a/gui/gtk.cpp b/gui/gtk.cpp
index 9b282114..4de673ff 100644
--- a/gui/gtk.cpp
+++ b/gui/gtk.cpp
@@ -6,3 +6,8 @@ void box_pack_start(GtkWidget *box, GtkWidget *child, gboolean expand,
 {
 	gtk_box_pack_start(GTK_BOX(box), child, expand, fill, padding);
 }
+
+void container_add(GtkWidget *container, GtkWidget *widget)
+{
+	gtk_container_add(GTK_CONTAINER(container), widget);
+}
diff --git a/gui/window.cpp b/gui/window.cpp
index 5dd7ceda..1ebe858a 100644
--- a/gui/window.cpp
+++ b/gui/window.cpp
@@ -1,4 +1,5 @@
 
+#include <ocarina/gtk.h>
 #include <ocarina/ocarina.h>
 #include <ocarina/window.h>
 
@@ -24,5 +25,5 @@ void window_init()
 
 void window_add(GtkWidget *widget)
 {
-	gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(widget));
+	container_add(window, widget);
 }
diff --git a/include/ocarina/gtk.h b/include/ocarina/gtk.h
index 951db71c..b677c4a7 100644
--- a/include/ocarina/gtk.h
+++ b/include/ocarina/gtk.h
@@ -6,5 +6,6 @@ extern "C" {
 }
 
 void box_pack_start(GtkWidget *, GtkWidget *, gboolean, gboolean, guint);
+void container_add(GtkWidget *, GtkWidget *);
 
 #endif