From 16502247dfe1bc30c9b7b2e21ffca6ecb5c3b41e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 3 Dec 1999 20:15:32 +0000 Subject: [PATCH] New function, long needed. Fri Dec 3 14:09:50 1999 Owen Taylor * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): New function, long needed. Wed Dec 1 22:35:43 1999 Owen Taylor * gdk/gdkproperty.h x11/gdkproperty.c: Change only_if_exists argument of gdk_atom_intern to bool. --- ChangeLog | 21 +++++++++++---------- ChangeLog.pre-2-0 | 21 +++++++++++---------- ChangeLog.pre-2-10 | 21 +++++++++++---------- ChangeLog.pre-2-2 | 21 +++++++++++---------- ChangeLog.pre-2-4 | 21 +++++++++++---------- ChangeLog.pre-2-6 | 21 +++++++++++---------- ChangeLog.pre-2-8 | 21 +++++++++++---------- gtk/gtkoptionmenu.c | 15 +++++++++++++++ gtk/gtkoptionmenu.h | 1 + 9 files changed, 93 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f84fcd01..44c242f0f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Fri Dec 3 14:09:50 1999 Owen Taylor + + * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history): + New function, long needed. + +Wed Dec 1 22:35:43 1999 Owen Taylor + + * gdk/gdkproperty.h x11/gdkproperty.c: Change + only_if_exists argument of gdk_atom_intern to + bool. + 1999-11-25 Tor Lillqvist * gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): @@ -26,16 +37,6 @@ Fri Nov 19 10:34:41 1999 Owen Taylor * gtk/gtkgamma.h: Adapt cast macros to standard. -Wed Nov 17 18:36:05 1999 Owen Taylor - - * gdk/gdkrectangle.c (gdk_rectangle_union gdk_rectangle_intersect): - Fixes so that it is safe to have dest the same as - src1 or src2. - -Wed Nov 17 15:58:44 1999 Owen Taylor - - * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix. - [ Merges from 1.2 ] Tue Nov 16 10:15:54 1999 Owen Taylor diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index f0ce53d69..c4d4009e0 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -244,6 +244,21 @@ gtk_option_menu_set_history (GtkOptionMenu *option_menu, } } +gint +gtk_option_menu_get_history (GtkOptionMenu *option_menu) +{ + GtkWidget *active_widget; + + g_return_val_if_fail (GTK_IS_OPTION_MENU (option_menu), -1); + + active_widget = gtk_menu_get_active (GTK_MENU (option_menu->menu)); + + if (active_widget) + return g_list_index (GTK_MENU_SHELL (option_menu->menu)->children, + active_widget); + else + return -1; +} static void gtk_option_menu_destroy (GtkObject *object) diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h index 84ac0ede8..bdd84bc0b 100644 --- a/gtk/gtkoptionmenu.h +++ b/gtk/gtkoptionmenu.h @@ -70,6 +70,7 @@ GtkWidget* gtk_option_menu_get_menu (GtkOptionMenu *option_menu); void gtk_option_menu_set_menu (GtkOptionMenu *option_menu, GtkWidget *menu); void gtk_option_menu_remove_menu (GtkOptionMenu *option_menu); +gint gtk_option_menu_get_history (GtkOptionMenu *option_menu); void gtk_option_menu_set_history (GtkOptionMenu *option_menu, guint index); -- 2.43.2