diff options
| author | Tim Janik <timj@gimp.org> | 1998-03-08 02:04:26 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-03-08 02:04:26 +0000 |
| commit | 76d01a826ca213bcd1b7ee71acdf687de9c9d7f0 (patch) | |
| tree | 541c170d68302211c261ca92fcaa7af7d0af557a /gtk | |
| parent | 2395ed082603df688b4cb06ac8c51a44148ff414 (diff) | |
| download | gtk+-76d01a826ca213bcd1b7ee71acdf687de9c9d7f0.tar.gz | |
define the version variables in config.h.
Sun Mar 8 03:00:17 1998 Tim Janik <timj@gimp.org>
* configure.in: define the version variables in config.h.
* gtk/gtkmain.h:
* gtk/gtkmain.c: added static version variables.
* gdk/gdkpixmap.c: fixed memory leaks (gtk-gronlund-980307-1.patch.gz)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmain.c | 5 | ||||
| -rw-r--r-- | gtk/gtkmain.h | 5 | ||||
| -rw-r--r-- | gtk/testgtk.c | 18 |
3 files changed, 28 insertions, 0 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 3dc5645cd4..25de9353f0 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -32,6 +32,7 @@ #include "gtkwidget.h" #include "gtkwindow.h" #include "gtkprivate.h" +#include "../config.h" /* Private type definitions @@ -119,6 +120,10 @@ static gint gtk_idle_compare (gpointer a, static gint gtk_timeout_compare (gpointer a, gpointer b); +const guint gtk_major_version = GTK_MAJOR_VERSION; +const guint gtk_minor_version = GTK_MINOR_VERSION; +const guint gtk_micro_version = GTK_MICRO_VERSION; + static gboolean iteration_done = FALSE; static guint main_level = 0; static gint initialized = FALSE; diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index ef8597c1d7..d87ff8030c 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -36,6 +36,11 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, GdkEventKey *event, gpointer func_data); +/* Gtk version. + */ +extern const guint gtk_major_version; +extern const guint gtk_minor_version; +extern const guint gtk_micro_version; /* Initialization, exit, mainloop and miscellaneous routines */ diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 4978c6d1e3..4859fcc595 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -5267,6 +5267,8 @@ create_main_window () GtkWidget *box2; GtkWidget *scrolled_window; GtkWidget *button; + GtkWidget *label; + gchar buffer[64]; GtkWidget *separator; int i; @@ -5286,6 +5288,22 @@ create_main_window () gtk_container_add (GTK_CONTAINER (window), box1); gtk_widget_show (box1); + if (gtk_micro_version > 0) + sprintf (buffer, + "Gtk+ v%d.%d.%d", + gtk_major_version, + gtk_minor_version, + gtk_micro_version); + else + sprintf (buffer, + "Gtk+ v%d.%d", + gtk_major_version, + gtk_minor_version); + + label = gtk_label_new (buffer); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_container_border_width (GTK_CONTAINER (scrolled_window), 10); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), |