AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix 307689

Browse Source
This commit is contained in:
Matthias Clasen 2005-06-15 03:54:10 +00:00
parent cd3c641ce4
commit eee3d97477
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-06-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcalendar.c: Update num_marked_dates as we
used to do. (#307689, Thorsten Schoenfeld)
2005-06-14 Federico Mena Quintero <federico@ximian.com> 2005-06-14 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6: Merged from gtk-2-6:

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-06-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcalendar.c: Update num_marked_dates as we
used to do. (#307689, Thorsten Schoenfeld)
2005-06-14 Federico Mena Quintero <federico@ximian.com> 2005-06-14 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6: Merged from gtk-2-6:

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-06-14 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcalendar.c: Update num_marked_dates as we
used to do. (#307689, Thorsten Schoenfeld)
2005-06-14 Federico Mena Quintero <federico@ximian.com> 2005-06-14 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-6: Merged from gtk-2-6:

5
gtk/gtkcalendar.c
View File

@ -599,6 +599,7 @@ gtk_calendar_init (GtkCalendar *calendar)
for (i=0;i<31;i++) for (i=0;i<31;i++)
calendar->marked_date[i] = FALSE; calendar->marked_date[i] = FALSE;
calendar->num_marked_dates = 0;
calendar->selected_day = tm->tm_mday; calendar->selected_day = tm->tm_mday;
calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING | calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING |
@ -3316,6 +3317,8 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
calendar->marked_date[day] = FALSE; calendar->marked_date[day] = FALSE;
} }
calendar->num_marked_dates = 0;
gtk_widget_queue_draw (GTK_WIDGET (calendar)); gtk_widget_queue_draw (GTK_WIDGET (calendar));
} }
@ -3337,6 +3340,7 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE) if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
{ {
calendar->marked_date[day - 1] = TRUE; calendar->marked_date[day - 1] = TRUE;
calendar->num_marked_dates++;
calendar_invalidate_day_num (calendar, day); calendar_invalidate_day_num (calendar, day);
} }
@ -3361,6 +3365,7 @@ gtk_calendar_unmark_day (GtkCalendar *calendar,
if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE) if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
{ {
calendar->marked_date[day - 1] = FALSE; calendar->marked_date[day - 1] = FALSE;
calendar->num_marked_dates--;
calendar_invalidate_day_num (calendar, day); calendar_invalidate_day_num (calendar, day);
} }