Implement num_marked_dates, and don't emit mutiple day_selected signals on

Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>

        * gtk/gtkcalendar.c: Implement num_marked_dates,
          and don't emit mutiple day_selected signals on
          month_prev.

8 files changed, 58 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7ac84f476..0f9b405b2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Feb 24 16:12:27 GMT 2000  Tony Gale <gale@gtk.org>
+
+	* gtk/gtkcalendar.c: Implement num_marked_dates,
+	  and don't emit mutiple day_selected signals on
+	  month_prev.
+ 
 Wed Feb 23 10:54:14 GMT 2000  Tony Gale <gale@gtk.org>
 
 	* docs/gtk_tut.sgml: New section on GtkCalendar
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 778760ab5..0d6996165 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
@@ -453,6 +453,7 @@ gtk_calendar_init (GtkCalendar *calendar)
   
   for (i=0;i<31;i++)
     calendar->marked_date[i] = FALSE;
+  calendar->num_marked_dates = 0;
   calendar->selected_day = 1;
   
   calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING | 
@@ -661,11 +662,9 @@ gtk_calendar_set_month_prev (GtkCalendar *calendar)
     {
       if (calendar->selected_day < 0)
 	calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
-      else
-	gtk_calendar_select_day (calendar, calendar->selected_day);
+      gtk_calendar_select_day (calendar, calendar->selected_day);
     }
   
-  gtk_calendar_select_day (calendar, calendar->selected_day);
   gtk_calendar_paint (GTK_WIDGET (calendar), NULL);
   gtk_calendar_thaw (calendar);
 }
@@ -2220,7 +2219,9 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
     {
       calendar->marked_date[day] = FALSE;
     }
-  
+ 
+  calendar->num_marked_dates = 0;
+ 
   if (GTK_WIDGET_DRAWABLE (calendar))
     {
       gtk_calendar_paint_main (GTK_WIDGET (calendar));
@@ -2234,9 +2235,11 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
   g_return_val_if_fail (calendar != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
   
-  if (day >= 1 && day <= 31)
-    calendar->marked_date[day - 1] = TRUE;
-  
+  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
+    {
+      calendar->marked_date[day - 1] = TRUE;
+      calendar->num_marked_dates++;
+    }
   if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
     {
       gtk_calendar_paint_main (GTK_WIDGET (calendar));
@@ -2252,8 +2255,11 @@ gtk_calendar_unmark_day (GtkCalendar *calendar,
   g_return_val_if_fail (calendar != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_CALENDAR (calendar), FALSE);
   
-  if (day >= 1 && day <= 31)
-    calendar->marked_date[day - 1] = FALSE;
+  if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
+    {
+      calendar->marked_date[day - 1] = FALSE;
+      calendar->num_marked_dates--;
+    }
   
   if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
     {