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.
This commit is contained in:
Owen Taylor 1999-12-03 20:15:32 +00:00 committed by Owen Taylor
parent e5c1456525
commit 16502247df
9 changed files with 93 additions and 70 deletions

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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> 1999-11-25 Tor Lillqvist <tml@iki.fi>
* gdk/gdkgc.c (gdk_gc_set_ts_origin, gdk_gc_set_clip_origin): * 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. * 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 ] [ Merges from 1.2 ]
Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com> Tue Nov 16 10:15:54 1999 Owen Taylor <otaylor@redhat.com>

View File

@ -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 static void
gtk_option_menu_destroy (GtkObject *object) gtk_option_menu_destroy (GtkObject *object)

View File

@ -70,6 +70,7 @@ GtkWidget* gtk_option_menu_get_menu (GtkOptionMenu *option_menu);
void gtk_option_menu_set_menu (GtkOptionMenu *option_menu, void gtk_option_menu_set_menu (GtkOptionMenu *option_menu,
GtkWidget *menu); GtkWidget *menu);
void gtk_option_menu_remove_menu (GtkOptionMenu *option_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, void gtk_option_menu_set_history (GtkOptionMenu *option_menu,
guint index); guint index);