diff options
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/gncal-todo.c | 6 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 5 | ||||
| -rw-r--r-- | calendar/gui/goto.c | 11 |
4 files changed, 24 insertions, 7 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 491b63dd06..5be56a4130 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2000-04-08 Seth Alves <alves@hungry.com> + + * gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead + of a window, now. + + * gui/gnome-cal.c (gnome_calendar_new): same + + * gui/goto.c (goto_dialog): same + 2000-04-06 Seth Alves <alves@hungry.com> * gui/calendar-commands.c (calendar_control_activate): removed diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c index 8b249c3fb7..7c7752d127 100644 --- a/calendar/gui/gncal-todo.c +++ b/calendar/gui/gncal-todo.c @@ -139,10 +139,12 @@ simple_todo_editor (GncalTodo *todo, iCalObject *ico) GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL); - gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (todo->calendar)); + gnome_dialog_set_parent (GNOME_DIALOG (dialog), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (todo->calendar)))); hbox = gtk_hbox_new (FALSE, 4); gtk_container_border_width (GTK_CONTAINER (hbox), 4); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 775762ca85..7b784fc613 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -241,7 +241,10 @@ gnome_calendar_new (char *title) app->prefix = g_strconcat ("/", app->name, "/", NULL); */ - /* gtk_window_set_title(GTK_WINDOW(retval), title); */ + /* + gtk_window_set_title (GTK_WINDOW (gtk_widget_get_toplevel (retval)), + title); + */ gcal->current_display = time_day_begin (time (NULL)); gcal->client = cal_client_new (); diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c index 0acc19a331..c6399aabb3 100644 --- a/calendar/gui/goto.c +++ b/calendar/gui/goto.c @@ -264,7 +264,9 @@ goto_dialog (GnomeCalendar *gcal) goto_win = gnome_dialog_new (_("Go to date"), GNOME_STOCK_BUTTON_CANCEL, NULL); - gnome_dialog_set_parent (GNOME_DIALOG (goto_win), GTK_WINDOW (gcal)); + gnome_dialog_set_parent (GNOME_DIALOG (goto_win), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal)))); + vbox = GNOME_DIALOG (goto_win)->vbox; @@ -278,8 +280,8 @@ goto_dialog (GnomeCalendar *gcal) gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); gtk_widget_show (w); - /* Create month item before creating the year controls, since the latter ones need the - * month_item to be created. + /* Create month item before creating the year controls, since the + * latter ones need the month_item to be created. */ days = create_days (tm.tm_mday, tm.tm_mon, tm.tm_year + 1900); @@ -318,6 +320,7 @@ goto_dialog (GnomeCalendar *gcal) gtk_window_set_modal (GTK_WINDOW (goto_win), TRUE); gnome_dialog_set_close (GNOME_DIALOG (goto_win), TRUE); - gnome_dialog_set_parent (GNOME_DIALOG (goto_win), GTK_WINDOW (gnome_calendar)); + gnome_dialog_set_parent (GNOME_DIALOG (goto_win), + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gnome_calendar)))); gtk_widget_show (goto_win); } |