diff --git a/include/GToolkit.h b/include/GToolkit.h index b8d89e2..35c06c0 100644 --- a/include/GToolkit.h +++ b/include/GToolkit.h @@ -1,4 +1,4 @@ -/* GToolkit.h */ +/* $Id$ */ @@ -8,6 +8,7 @@ # include "GToolkit/GWindow.h" +/* GToolkit */ /* functions */ int g_init(void); int g_quit(void); diff --git a/include/GToolkit/GWidget.h b/include/GToolkit/GWidget.h index dcaf859..92d8bbd 100644 --- a/include/GToolkit/GWidget.h +++ b/include/GToolkit/GWidget.h @@ -1,4 +1,4 @@ -/* GToolkit/GWidget.h */ +/* $Id$ */ @@ -6,6 +6,7 @@ # define GTOOLKIT_GWIDGET_H +/* GWidget */ /* types */ typedef struct _GWidget GWidget; diff --git a/include/GToolkit/GWindow.h b/include/GToolkit/GWindow.h index e331e1e..ec94248 100644 --- a/include/GToolkit/GWindow.h +++ b/include/GToolkit/GWindow.h @@ -1,4 +1,4 @@ -/* GToolkit/GWindow.h */ +/* $Id$ */ @@ -6,11 +6,15 @@ # define GTOOLKIT_GWINDOW_H +/* GWindow */ /* types */ typedef struct _GWindow GWindow; /* functions */ -GWindow * gwindow_new(); +GWindow * gwindow_new(void); + +/* useful */ +void gwindow_show(GWindow * gwindow); #endif /* !GTOOLKIT_GWINDOW_H */ diff --git a/src/gtoolkit.c b/src/gtoolkit.c index e98663f..8b6094d 100644 --- a/src/gtoolkit.c +++ b/src/gtoolkit.c @@ -7,10 +7,19 @@ #include "common.h" +/* GToolkit */ +/* private */ +/* variables */ static int _gt_init = 0; /* FIXME pointer(s) to function(s) instead? */ + + +/* protected */ +/* variables */ GToolkit gt; +/* public */ +/* functions */ /* g_init */ int g_init(void) { diff --git a/src/gwindow.c b/src/gwindow.c index 95df359..cf6e251 100644 --- a/src/gwindow.c +++ b/src/gwindow.c @@ -8,6 +8,8 @@ #include "GToolkit/GWindow.h" +/* GWindow */ +/* private */ /* types */ struct _GWindow { @@ -19,6 +21,7 @@ struct _GWindow }; +/* public */ /* functions */ /* gwindow_new */ GWindow * gwindow_new(void) @@ -45,6 +48,7 @@ GWindow * gwindow_new(void) } +/* gwindow_delete */ void gwindow_delete(GWindow * gwindow) { if(g_alloced(gwindow) != gwindow) @@ -55,8 +59,9 @@ void gwindow_delete(GWindow * gwindow) /* useful */ +/* gwindow_show */ void gwindow_show(GWindow * gwindow) - /* FIXME generic widget_show() instead */ + /* FIXME accept flags (focus...) */ { XMapRaised(gt.display, gwindow->window); glXMakeCurrent(gt.display, gwindow->window, gwindow->context);