New function, long needed.

Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
	New function, long needed.

Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkproperty.h x11/gdkproperty.c: Change
	only_if_exists argument of gdk_atom_intern to
	bool.

diff --git a/ChangeLog b/ChangeLog
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7f84fcd01832e30827968279df5cb6f244141595..44c242f0f279e11ddd0e1f0ff328a7293fc7c271 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Fri Dec  3 14:09:50 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkoptionmenu.[ch] (gtk_option_menu_get_history):
+       New function, long needed.
+
+Wed Dec  1 22:35:43 1999  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkproperty.h x11/gdkproperty.c: Change 
+       only_if_exists argument of gdk_atom_intern to
+       bool.
+
 1999-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * 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  <otaylor@redhat.com>
 
        * gtk/gtkgamma.h: Adapt cast macros to standard.
 
-Wed Nov 17 18:36:05 1999  Owen Taylor  <otaylor@redhat.com>
-
-       * 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  <otaylor@redhat.com>
-
-       * gdk/x11/gdkregion-x11.c (gdk_region_get_clipbox): Indentation fix.
-
 [ Merges from 1.2 ]
 
 Tue Nov 16 10:15:54 1999  Owen Taylor  <otaylor@redhat.com>

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index f0ce53d694b7462e8f921b6f5c3ffc560a7b9c7b..c4d4009e07b4c1026a0de1277e0ae7f0d56e94b8 100644 (file)
--- 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 84ac0ede841b3da79de60a9e26ba4999e0aa04c1..bdd84bc0bc7fe1526134b1dd931f05d6d8375b3f 100644 (file)
--- 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);