diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-07-03 01:02:04 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-07-03 01:02:04 +0000 |
| commit | 1f8942769b08a48c83cc748e52ae480f38045b4a (patch) | |
| tree | 92df4e1ed2c04d2dce09cc905b89e041865fa44e /gtk/gtkcalendar.c | |
| parent | 9e3f0c6f5f91ef034e41a6ca0c735daba1167f44 (diff) | |
| download | gtk+-1f8942769b08a48c83cc748e52ae480f38045b4a.tar.gz | |
Insert cast to fix warning. Assign something to old_value to quiet gcc
Thu Jul 3 03:13:20 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkpaned.c (gtk_paned_set_child_property): Insert cast to
fix warning. Assign something to old_value to quiet gcc
* gtk/gtkcalendar.c
(start_spinning): gtk_timeout_add->g_timeout_add
* gtk/gtkicontheme.c
(theme_lookup_icon): Make it compile (remove double semicolon)
* gtk/gtktoolbutton.c
(gtk_tool_button_class_init): Long comment about properties.
(gtk_tool_button_class_init): Improve text for "use_underline"
property
(gtk_tool_button_create_menu_proxy): Fix up to use_mnemonic based
on whether the passed-in label has use_mnemonic set
(gtk_tool_button_create_menu_proxy): Split image cloning out in
new function. Make that function also handle image with pixbuf
storage.
(gtk_tool_button_construct_contents): Use gtk_widget_destroy()
instead of gtk_container_remove().
(gtk_tool_button_construct_contents): Fix eliding bug
* gtk/gtktoolbar.c
(gtk_toolbar_finalize): New function. Unref tooltips, pointed out
by Morten Welinder
(gtk_toolbar_button_press): Make popup_context_menu signal provide
coordinates and button number
* tests/testtoolbar.c (main): Add new pixbuf toolbutton
* tests/apple-red.png: new file
Diffstat (limited to 'gtk/gtkcalendar.c')
| -rw-r--r-- | gtk/gtkcalendar.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 29a3d991a7..5faa39c3ef 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2496,9 +2496,10 @@ arrow_action (GtkCalendar *calendar, } } -static gint -calendar_timer (GtkCalendar *calendar) +static gboolean +calendar_timer (gpointer data) { + GtkCalendar *calendar = data; GtkCalendarPrivateData *private_data = GTK_CALENDAR_PRIVATE_DATA (calendar); gboolean retval = FALSE; @@ -2535,9 +2536,9 @@ start_spinning (GtkWidget *widget, if (!private_data->timer) { private_data->need_timer = TRUE; - private_data->timer = gtk_timeout_add (CALENDAR_INITIAL_TIMER_DELAY, - (GtkFunction) calendar_timer, - (gpointer) widget); + private_data->timer = g_timeout_add (CALENDAR_INITIAL_TIMER_DELAY, + calendar_timer, + (gpointer) widget); } } |