ensure that the MasedEditMixin's version of IsEmpty is the one used.

[wxWidgets.git] / wxPython / wx / lib / calendar.py

diff --git a/wxPython/wx/lib/calendar.py b/wxPython/wx/lib/calendar.py
index 78071e666b6517489d400cac9a2094be52e861ee..38342c115f12fc59629c9524dfc62a6a972b380a 100644 (file)
--- a/wxPython/wx/lib/calendar.py
+++ b/wxPython/wx/lib/calendar.py
@@ -71,6 +71,9 @@
 #   behaviour.
 # o If no date has been clicked clicked, OnOk set the result to calend's date,
 #   important if keyboard only navigation is used.
 #   behaviour.
 # o If no date has been clicked clicked, OnOk set the result to calend's date,
 #   important if keyboard only navigation is used.

+#
+# 12/10/2006 - Walter Barnes walter_barnes05@yahoo.com
+# o Fixed CalDraw to properly render months that start on a Sunday.

 
 
 import wx
 
 
 import wx


@@ -289,6 +292,9 @@ class CalDraw:
         else:
             start_pos = dow
 
         else:
             start_pos = dow
 

+        if start_pos > 6:
+            start_pos = 0
+

         self.st_pos = start_pos
 
         self.cal_days = []
         self.st_pos = start_pos
 
         self.cal_days = []


@@ -311,6 +317,9 @@ class CalDraw:
             self.SetColor(COLOR_WEEKEND_BACKGROUND, MakeColor(backgrd))
 
         date = 6 - int(self.dow)     # start day of first saturday
             self.SetColor(COLOR_WEEKEND_BACKGROUND, MakeColor(backgrd))
 
         date = 6 - int(self.dow)     # start day of first saturday

+        if date == 0:                #...unless we start on Sunday
+            self.cal_sel[1] = (self.GetColor(COLOR_WEEKEND_FONT), self.GetColor(COLOR_WEEKEND_BACKGROUND))
+            date = 7

 
         while date <= self.dim:
             self.cal_sel[date] = (self.GetColor(COLOR_WEEKEND_FONT), self.GetColor(COLOR_WEEKEND_BACKGROUND))  # Saturday
 
         while date <= self.dim:
             self.cal_sel[date] = (self.GetColor(COLOR_WEEKEND_FONT), self.GetColor(COLOR_WEEKEND_BACKGROUND))  # Saturday


@@ -771,7 +780,7 @@ class Calendar( wx.PyControl ):
             event.Skip()
             return
         
             event.Skip()
             return
         

-        key_code = event.KeyCode()
+        key_code = event.GetKeyCode()

         
         if key_code == wx.WXK_TAB:
             forward = not event.ShiftDown()
         
         if key_code == wx.WXK_TAB:
             forward = not event.ShiftDown()