xti fixes

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

diff --git a/wxPython/wxPython/lib/calendar.py b/wxPython/wxPython/lib/calendar.py
index b523932d01e51df02fc2d8634113d2a0a8630197..f5247dc2be3b015d85b8f15b3cfe2676c25f9675 100644 (file)
--- a/wxPython/wxPython/lib/calendar.py
+++ b/wxPython/wxPython/lib/calendar.py
@@ -5,20 +5,19 @@
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
 # Created:
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
 # Created:

-# Version       0.85
-# Date:         June 20, 2001
+# Version       0.92
+# Date:         Nov 26, 2001

 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 from wxPython.wx import *
 
 from CDate import *
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 from wxPython.wx import *
 
 from CDate import *

-import string, time

 
 
 CalDays = [6, 0, 1, 2, 3, 4, 5]
 AbrWeekday = {6:"Sun", 0:"Mon", 1:"Tue", 2:"Wed", 3:"Thu", 4:"Fri", 5:"Sat"}
 
 
 CalDays = [6, 0, 1, 2, 3, 4, 5]
 AbrWeekday = {6:"Sun", 0:"Mon", 1:"Tue", 2:"Wed", 3:"Thu", 4:"Fri", 5:"Sat"}

-_MIDSIZE = 160
+_MIDSIZE = 180

 
 BusCalDays = [0, 1, 2, 3, 4, 5, 6]
 
 
 BusCalDays = [0, 1, 2, 3, 4, 5, 6]
 


@@ -44,6 +43,19 @@ class CalDraw:
         self.DefParms()
 
     def DefParms(self):
         self.DefParms()
 
     def DefParms(self):

+        self.num_auto = True       # auto scale of the cal number day size
+        self.num_size = 12          # default size of calendar if no auto size
+        self.max_num_size = 12     # maximum size for calendar number
+
+        self.num_align_horz = wxALIGN_CENTRE    # alignment of numbers
+        self.num_align_vert = wxALIGN_CENTRE
+        self.num_indent_horz = 0     # points indent from position, used to offset if not centered
+        self.num_indent_vert = 0
+
+        self.week_auto = True       # auto scale of week font text
+        self.week_size = 10
+        self.max_week_size = 12
+

         self.grid_color = 'BLACK'       # grid and selection colors
         self.back_color = 'WHITE'
         self.sel_color = 'RED'
         self.grid_color = 'BLACK'       # grid and selection colors
         self.back_color = 'WHITE'
         self.sel_color = 'RED'


@@ -58,13 +70,13 @@ class CalDraw:
         self.font = wxSWISS
         self.bold = wxNORMAL
 
         self.font = wxSWISS
         self.bold = wxNORMAL
 

-        self.hide_title = FALSE
-        self.hide_grid = FALSE
-        self.outer_border = TRUE
+        self.hide_title = False
+        self.hide_grid = False
+        self.outer_border = True

 
         self.title_offset = 0
         self.cal_week_scale = 0.7
 
         self.title_offset = 0
         self.cal_week_scale = 0.7

-        self.show_weekend = FALSE
+        self.show_weekend = False

         self.cal_type = "NORMAL"
 
     def SetWeekColor(self, font_color, week_color):     # set font and background color for week title
         self.cal_type = "NORMAL"
 
     def SetWeekColor(self, font_color, week_color):     # set font and background color for week title


@@ -110,7 +122,7 @@ class CalDraw:
         self.InitScale()
 
         self.DrawBorder()
         self.InitScale()
 
         self.DrawBorder()

-        if self.hide_title is FALSE:
+        if self.hide_title is False:

             self.DrawMonth()
 
         self.Center()
             self.DrawMonth()
 
         self.Center()


@@ -118,7 +130,7 @@ class CalDraw:
         self.DrawGrid()
         self.GetRect()
 
         self.DrawGrid()
         self.GetRect()
 

-        if self.show_weekend is TRUE:       # highlight weekend dates
+        if self.show_weekend is True:       # highlight weekend dates

             self.SetWeekEnd()
 
         self.AddSelect(sel_lst)     # overrides the weekend highlight
             self.SetWeekEnd()
 
         self.AddSelect(sel_lst)     # overrides the weekend highlight


@@ -141,7 +153,7 @@ class CalDraw:
         self.DC.SetBrush(brush)
         self.DC.SetPen(wxPen(wxNamedColour(self.border_color), 1))
 
         self.DC.SetBrush(brush)
         self.DC.SetPen(wxPen(wxNamedColour(self.border_color), 1))
 

-        if self.outer_border is TRUE:
+        if self.outer_border is True:

             rect = wxRect(self.cx_st, self.cy_st, self.sizew, self.sizeh)  # full display window area
             self.DC.DrawRectangle(rect.x, rect.y, rect.width, rect.height)
 
             rect = wxRect(self.cx_st, self.cy_st, self.sizew, self.sizeh)  # full display window area
             self.DC.DrawRectangle(rect.x, rect.y, rect.width, rect.height)
 


@@ -227,20 +239,29 @@ class CalDraw:
         self.DC.DrawText(year, self.cx_st + adjust, self.cy_st + th)
 
     def DrawWeek(self):     # draw the week days
         self.DC.DrawText(year, self.cx_st + adjust, self.cy_st + th)
 
     def DrawWeek(self):     # draw the week days

-        sizef = 8
-        if self.sizeh < _MIDSIZE:
-            sizef = 7
+        width = self.gridx[1]-self.gridx[0]
+        height = self.gridy[1] - self.gridy[0]
+        rect_w = self.gridx[7]-self.gridx[0]
+
+        f = wxFont(10, self.font, wxNORMAL, self.bold)      # initial font setting
+        if self.week_auto == True:
+            test_size = self.max_week_size      # max size
+            test_day = ' Sun '
+            while test_size > 2:
+                f.SetPointSize(test_size)
+                self.DC.SetFont(f)
+                tw,th = self.DC.GetTextExtent(test_day)
+                if tw < width and th < height:
+                    break
+                test_size = test_size - 1
+        else:
+            f.SetPointSize(self.week_size)   # set fixed size
+            self.DC.SetFont(f)

 
 

-        f = wxFont(sizef, self.font, wxNORMAL, self.bold)
-        self.DC.SetFont(f)

         self.DC.SetTextForeground(wxNamedColour(self.week_font_color))
 
         cnt_x = 0
         cnt_y = 0
         self.DC.SetTextForeground(wxNamedColour(self.week_font_color))
 
         cnt_x = 0
         cnt_y = 0

-        width = self.gridx[1]-self.gridx[0]
-        height = self.gridy[1] - self.gridy[0]
-
-        rect_w = self.gridx[7]-self.gridx[0]

 
         brush = wxBrush(wxNamedColour(self.week_color), wxSOLID)
         self.DC.SetBrush(brush)
 
         brush = wxBrush(wxNamedColour(self.week_color), wxSOLID)
         self.DC.SetBrush(brush)


@@ -265,12 +286,22 @@ class CalDraw:
             self.DC.DrawText(day, x+diffx, y+diffy)
             cnt_x = cnt_x + 1
 
             self.DC.DrawText(day, x+diffx, y+diffy)
             cnt_x = cnt_x + 1
 

-

     def DrawNum(self):      # draw the day numbers
     def DrawNum(self):      # draw the day numbers

-        sizef = 10
-        if self.sizeh < _MIDSIZE:
-            sizef = 8
-        f = wxFont(sizef, self.font, wxNORMAL, self.bold)
+        f = wxFont(10, self.font, wxNORMAL, self.bold)      # initial font setting
+        if self.num_auto == True:
+            test_size = self.max_num_size      # max size
+            test_day = ' 99 '
+            while test_size > 2:
+                f.SetPointSize(test_size)
+                self.DC.SetFont(f)
+                tw,th = self.DC.GetTextExtent(test_day)
+                if tw < self.dl_w and th < self.dl_h:
+                    sizef = test_size
+                    break
+                test_size = test_size - 1
+        else:
+            f.SetPointSize(self.num_size)   # set fixed size
+            self.DC.SetFont(f)

 
         cnt_x = 0
         cnt_y = 1
 
         cnt_x = 0
         cnt_y = 1


@@ -287,7 +318,26 @@ class CalDraw:
             self.DC.SetTextForeground(wxNamedColour(num_color))
             self.DC.SetFont(f)
 
             self.DC.SetTextForeground(wxNamedColour(num_color))
             self.DC.SetFont(f)
 

-            self.DC.DrawText(val, x+5, y+5)
+            tw,th = self.DC.GetTextExtent(val)
+            if self.num_align_horz == wxALIGN_CENTRE:
+                adj_h = (self.dl_w - tw)/2
+            elif self.num_align_horz == wxALIGN_RIGHT:
+                adj_h = self.dl_w - tw
+            else:
+                adj_h = 0   # left alignment
+
+            adj_h = adj_h + self.num_indent_horz
+
+            if self.num_align_vert == wxALIGN_CENTRE:
+                adj_v = (self.dl_h - th)/2
+            elif self.num_align_horz == wxALIGN_RIGHT:
+                adj_v = self.dl_h - th
+            else:
+                adj_v = 0   # left alignment
+
+            adj_v = adj_v + self.num_indent_vert
+
+            self.DC.DrawText(val, x+adj_h, y+adj_v)

             if cnt_x < 6:
                 cnt_x = cnt_x + 1
             else:
             if cnt_x < 6:
                 cnt_x = cnt_x + 1
             else:


@@ -311,7 +361,7 @@ class CalDraw:
             brush = wxBrush(wxNamedColour(sel_color), wxSOLID)
             self.DC.SetBrush(brush)
 
             brush = wxBrush(wxNamedColour(sel_color), wxSOLID)
             self.DC.SetBrush(brush)
 

-            if self.hide_grid is FALSE:
+            if self.hide_grid is False:

                 self.DC.SetPen(wxPen(wxNamedColour(self.grid_color), 0))
             else:
                 self.DC.SetPen(wxPen(wxNamedColour(self.back_color), 0))
                 self.DC.SetPen(wxPen(wxNamedColour(self.grid_color), 0))
             else:
                 self.DC.SetPen(wxPen(wxNamedColour(self.back_color), 0))


@@ -333,7 +383,7 @@ class CalDraw:
 
         y2 = y1 + self.cheight
         for i in range(8):
 
         y2 = y1 + self.cheight
         for i in range(8):

-            if self.hide_grid is FALSE:
+            if self.hide_grid is False:

                 self.DC.DrawLine(x1, y1, x1, y2)
             self.gridx.append(x1)
             x1 = x1 + self.dl_w
                 self.DC.DrawLine(x1, y1, x1, y2)
             self.gridx.append(x1)
             x1 = x1 + self.dl_w


@@ -343,7 +393,7 @@ class CalDraw:
 
         x2 = x1 + self.cwidth
         for i in range(8):
 
         x2 = x1 + self.cwidth
         for i in range(8):

-            if self.hide_grid is FALSE:
+            if self.hide_grid is False:

                 self.DC.DrawLine(x1, y1, x2, y1)
             self.gridy.append(y1)
             if i == 0:
                 self.DC.DrawLine(x1, y1, x2, y1)
             self.gridy.append(y1)
             if i == 0:


@@ -378,10 +428,10 @@ class wxCalendar(wxWindow):
 
         self.grid_color = 'BLACK'
         self.back_color = 'WHITE'
 
         self.grid_color = 'BLACK'
         self.back_color = 'WHITE'

-        self.hide_grid = FALSE
+        self.hide_grid = False

         self.sel_color = 'RED'
         self.sel_color = 'RED'

-        self.hide_title = FALSE
-        self.show_weekend = FALSE
+        self.hide_title = False
+        self.show_weekend = False

         self.cal_type = "NORMAL"
 
         self.week_color = 'LIGHT GREY'
         self.cal_type = "NORMAL"
 
         self.week_color = 'LIGHT GREY'


@@ -404,15 +454,15 @@ class wxCalendar(wxWindow):
         self.set_day = None
 
         EVT_PAINT(self, self.OnPaint)
         self.set_day = None
 
         EVT_PAINT(self, self.OnPaint)

-
+        EVT_SIZE(self, self.OnSize)

 
 # control some of the main calendar attributes
 
     def HideTitle(self):
 
 # control some of the main calendar attributes
 
     def HideTitle(self):

-        self.hide_title = TRUE
+        self.hide_title = True

 
     def HideGrid(self):
 
     def HideGrid(self):

-        self.hide_grid = TRUE
+        self.hide_grid = True

 
 # determine the calendar rectangle click area and draw a selection
 
 
 # determine the calendar rectangle click area and draw a selection
 


@@ -425,6 +475,8 @@ class wxCalendar(wxWindow):
 
     def OnLeftEvent(self, event):
         self.click = 'LEFT'
 
     def OnLeftEvent(self, event):
         self.click = 'LEFT'

+        self.shiftkey = event.ShiftDown()
+        self.ctrlkey = event.ControlDown()

         self.ProcessClick(event)
 
     def OnLeftDEvent(self, event):
         self.ProcessClick(event)
 
     def OnLeftDEvent(self, event):


@@ -524,6 +576,8 @@ class wxCalendar(wxWindow):
         else:
             evt = wxPyCommandEvent(2100, self.GetId())
             evt.click, evt.day, evt.month, evt.year = self.click, self.day, self.month, self.year
         else:
             evt = wxPyCommandEvent(2100, self.GetId())
             evt.click, evt.day, evt.month, evt.year = self.click, self.day, self.month, self.year

+            evt.shiftkey = self.shiftkey
+            evt.ctrlkey = self.ctrlkey

             self.GetEventHandler().ProcessEvent(evt)
 
             self.set_day = self.day
             self.GetEventHandler().ProcessEvent(evt)
 
             self.set_day = self.day


@@ -551,11 +605,15 @@ class wxCalendar(wxWindow):
         self.select_list.append(list_val)
 
     def ShowWeekEnd(self):
         self.select_list.append(list_val)
 
     def ShowWeekEnd(self):

-        self.show_weekend = TRUE    # highlight weekend
+        self.show_weekend = True    # highlight weekend

 
     def SetBusType(self):
         self.cal_type = "BUS"
 
 
     def SetBusType(self):
         self.cal_type = "BUS"
 

+    def OnSize(self, evt):
+        self.Refresh(False)
+        evt.Skip()
+

     def OnPaint(self, event):
         DC = wxPaintDC(self)
         self.DoDrawing(DC)
     def OnPaint(self, event):
         DC = wxPaintDC(self)
         self.DoDrawing(DC)


@@ -626,7 +684,7 @@ class wxCalendar(wxWindow):
     def SelectDay(self, key):
         sel_size = 1
         self.DrawRect(self.sel_key, self.back_color, sel_size)     # clear large selection
     def SelectDay(self, key):
         sel_size = 1
         self.DrawRect(self.sel_key, self.back_color, sel_size)     # clear large selection

-        if self.hide_grid is FALSE:
+        if self.hide_grid is False:

             self.DrawRect(self.sel_key, self.grid_color)
 
         self.DrawRect(key, self.sel_color, sel_size)
             self.DrawRect(self.sel_key, self.grid_color)
 
         self.DrawRect(key, self.sel_color, sel_size)


@@ -658,12 +716,12 @@ class CalenDlg(wxDialog):
         monthlist = GetMonthList()
 
     # select the month
         monthlist = GetMonthList()
 
     # select the month

-        mID = NewId()
+        mID = wxNewId()

         self.date = wxComboBox(self, mID, Month[start_month], wxPoint(20, 20), wxSize(90, -1), monthlist, wxCB_DROPDOWN)
         EVT_COMBOBOX(self, mID, self.EvtComboBox)
 
     # alternate spin button to control the month
         self.date = wxComboBox(self, mID, Month[start_month], wxPoint(20, 20), wxSize(90, -1), monthlist, wxCB_DROPDOWN)
         EVT_COMBOBOX(self, mID, self.EvtComboBox)
 
     # alternate spin button to control the month

-        mID = NewId()
+        mID = wxNewId()

         h = self.date.GetSize().height
         self.m_spin = wxSpinButton(self, mID, wxPoint(130, 20), wxSize(h*2, h), wxSP_VERTICAL)
         self.m_spin.SetRange(1, 12)
         h = self.date.GetSize().height
         self.m_spin = wxSpinButton(self, mID, wxPoint(130, 20), wxSize(h*2, h), wxSP_VERTICAL)
         self.m_spin.SetRange(1, 12)


@@ -672,7 +730,7 @@ class CalenDlg(wxDialog):
         EVT_SPIN(self, mID, self.OnMonthSpin)
 
     # spin button to control the year
         EVT_SPIN(self, mID, self.OnMonthSpin)
 
     # spin button to control the year

-        mID = NewId()
+        mID = wxNewId()

         self.dtext = wxTextCtrl(self, -1, str(start_year), wxPoint(160, 20), wxSize(60, -1))
         h = self.dtext.GetSize().height
 
         self.dtext = wxTextCtrl(self, -1, str(start_year), wxPoint(160, 20), wxSize(60, -1))
         h = self.dtext.GetSize().height
 


@@ -688,11 +746,11 @@ class CalenDlg(wxDialog):
         y_pos = 280
         but_size = wxSize(60, 25)
 
         y_pos = 280
         but_size = wxSize(60, 25)
 

-        mID = NewId()
+        mID = wxNewId()

         wxButton(self, mID, ' Ok ', wxPoint(x_pos, y_pos), but_size)
         EVT_BUTTON(self, mID, self.OnOk)
 
         wxButton(self, mID, ' Ok ', wxPoint(x_pos, y_pos), but_size)
         EVT_BUTTON(self, mID, self.OnOk)
 

-        mID = NewId()
+        mID = wxNewId()

         wxButton(self, mID, ' Close ', wxPoint(x_pos + 120, y_pos), but_size)
         EVT_BUTTON(self, mID, self.OnCancel)
 
         wxButton(self, mID, ' Close ', wxPoint(x_pos + 120, y_pos), but_size)
         EVT_BUTTON(self, mID, self.OnCancel)