From bbda4fee7164bffd88a627c8ed4c60c22f0fad5c Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Sun, 15 Mar 2009 15:36:27 -0400
Subject: [PATCH] Create an examples subdirectory.

---
 Makefile.am                        |  2 ++
 configure.ac                       |  5 ++++-
 examples/.gitignore                |  1 +
 examples/Makefile.am               |  6 ++++++
 main.c => examples/simplebuttons.c | 22 +++++++++++++++++-----
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 examples/.gitignore
 create mode 100644 examples/Makefile.am
 rename main.c => examples/simplebuttons.c (58%)

diff --git a/Makefile.am b/Makefile.am
index 5fdd371..9bed395 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = . examples
+
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libaspectbin.la
 
diff --git a/configure.ac b/configure.ac
index 9eae19e..d411b66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,5 +21,8 @@ AC_SUBST(GLADEUI_CFLAGS)
 
 AM_CONDITIONAL([BUILD_GLADE], [test x"$have_glade" = x"yes"])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	examples/Makefile
+	])
 AC_OUTPUT
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..6598898
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1 @@
+simplebuttons
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..4667bbd
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,6 @@
+bin_PROGRAMS = simplebuttons
+
+simplebuttons_SOURCES = simplebuttons.c
+simplebuttons_CFLAGS  = $(GTK_CFLAGS)
+simplebuttons_LDFLAGS = $(GTK_LIBS)
+simplebuttons_LDADD   = $(top_builddir)/libaspectbin.la
diff --git a/main.c b/examples/simplebuttons.c
similarity index 58%
rename from main.c
rename to examples/simplebuttons.c
index 947ac9b..d7aeddd 100644
--- a/main.c
+++ b/examples/simplebuttons.c
@@ -1,5 +1,11 @@
+#include <stdlib.h>
 #include <gtk/gtk.h>
-#include "aspectbin.h"
+#include <aspectbin.h>
+
+void quit()
+{
+	exit(0);
+}
 
 int main(int argc, char **argv)
 {
@@ -17,14 +23,20 @@ int main(int argc, char **argv)
 	button1 = gtk_button_new_with_label("Square");
 	button2 = gtk_button_new_with_label("Rectangle");
 
-	aspect_bin_set_body(ASPECT_BIN(aspectbin), button1, 1);
-	aspect_bin_set_side(ASPECT_BIN(aspectbin), button2);
+	gtk_container_add(GTK_CONTAINER(aspectbin), button1);
+	gtk_container_add(GTK_CONTAINER(aspectbin), button2);
 
-	ASPECT_BIN(aspectbin)->constrain = TRUE;
-	ASPECT_BIN(aspectbin)->align     = 0.5;
+	g_object_set(G_OBJECT(aspectbin),
+		"constrain", TRUE,
+		NULL);
+	gtk_container_child_set(GTK_CONTAINER(aspectbin), button1,
+		"align", 0.5,
+		NULL);
 
 	gtk_container_add(GTK_CONTAINER(window), aspectbin);
 
+	g_signal_connect (G_OBJECT(window), "destroy", G_CALLBACK(quit), NULL);
+
 	gtk_widget_show_all(window);
 	gtk_main();
 
-- 
2.43.0