Create an examples subdirectory.

diff --git a/Makefile.am b/Makefile.am
index 5fdd371dcf2efd9e325b9eec7bd252a908883252..9bed3950d4d6eb86d8598e3ee73e43e0cc32daee 100644 (file)
--- 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 9eae19ef03213650c585ff8b1673bcc8a6984bc5..d411b667d6548a328c3186e94910ccd2afc5ccd4 100644 (file)
--- 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 (file)
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 (file)
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 947ac9b79c91dc119d85566e9c1b6eebbac0c0d4..d7aeddd4befd38f0ba7a1b2c7dba2109370e77b7 100644 (file)
--- 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();