# Use the cursor keys to navigate through the ages. :)
# The Home key function as go to today
# o select day is now a filled rect instead of just an outline
+#
+# 15/04/2005 - Joe "shmengie" Brown joebrown@podiatryfl.com
+# o Adjusted spin control size/placement (On Windows ctrls were overlapping).
+# o Set Ok/Cancel buttons to wx.ID_OK & wx.ID_CANCEL to provide default dialog
+# behaviour.
+# o If no date has been clicked clicked, OnOk set the result to calend's date,
+# important if keyboard only navigation is used.
+
import wx
self.cal_days.append(str(i))
i = i + 1
- self.end_pos = dow + dim
+ self.end_pos = start_pos + dim - 1
return start_pos
tw,th = DC.GetTextExtent(month)
adjust = self.cx_st + (self.sizew-tw)/2
- DC.DrawText(month, (adjust, self.cy_st + th))
+ DC.DrawText(month, adjust, self.cy_st + th)
year = str(self.year)
tw,th = DC.GetTextExtent(year)
f = wx.Font(sizef, self.font, wx.NORMAL, self.bold)
DC.SetFont(f)
- DC.DrawText(year, (self.cx_st + adjust, self.cy_st + th))
+ DC.DrawText(year, self.cx_st + adjust, self.cy_st + th)
def DrawWeek(self, DC): # draw the week days
# increase by 1 to include all gridlines
else:
pen = wx.Pen(MakeColor(self.GetColor(COLOR_BACKGROUND)), 1, wx.SOLID)
DC.SetPen(pen)
- DC.DrawRectangle( pointXY, pointWH)
+ DC.DrawRectanglePointSize( pointXY, pointWH)
old_pen = DC.GetPen()
# draw the horizontal hilight
startPoint = wx.Point(x + 1 , y + 1)
endPoint = wx.Point(x + width - 1, y + 1)
- DC.DrawLine(startPoint, endPoint )
+ DC.DrawLinePoint(startPoint, endPoint )
# draw the vertical hilight
startPoint = wx.Point(x + 1 , y + 1)
endPoint = wx.Point(x + 1, y + height - 2)
- DC.DrawLine(startPoint, endPoint )
+ DC.DrawLinePoint(startPoint, endPoint )
pen = wx.Pen(MakeColor(self.colors[COLOR_3D_DARK]), 1, wx.SOLID)
DC.SetPen(pen)
# draw the horizontal lowlight
startPoint = wx.Point(x + 1, y + height - 2)
endPoint = wx.Point(x + width - 1, y + height - 2)
- DC.DrawLine(startPoint, endPoint )
+ DC.DrawLinePoint(startPoint, endPoint )
# draw the vertical lowlight
startPoint = wx.Point(x + width - 2 , y + 2)
endPoint = wx.Point(x + width - 2, y + height - 2)
- DC.DrawLine(startPoint, endPoint )
+ DC.DrawLinePoint(startPoint, endPoint )
pen = wx.Pen(MakeColor(self.colors[COLOR_FONT]), 1, wx.SOLID)
DC.SetPen(pen)
point = (x+diffx, y+diffy)
- DC.DrawText(day, point)
+ DC.DrawTextPoint(day, point)
cnt_x = cnt_x + 1
def _CalcFontSize(self, DC, f):
adj_v = adj_v + self.num_indent_vert
- DC.DrawText(text, (x+adj_h, y+adj_v))
+ DC.DrawTextPoint(text, (x+adj_h, y+adj_v))
def DrawDayText(self, DC, key):
f = wx.Font(10, self.font, wx.NORMAL, self.bold) # initial font setting
nkey = key + self.st_pos -1
rect = self.rg[nkey]
- DC.DrawRectangle((rect.x, rect.y), (rect.width, rect.height))
+ DC.DrawRectangleRect(rect)
# calculate and draw the grid lines
def DrawGrid(self, DC):
x1 = x1 + self.restW
if self.hide_grid is False:
- DC.DrawLine((x1, y1), (x1, y2))
+ DC.DrawLinePoint((x1, y1), (x1, y2))
self.gridx.append(x1)
y1 = y1 + self.restH
if self.hide_grid is False:
- DC.DrawLine((x1, y1), (x2, y1))
+ DC.DrawLinePoint((x1, y1), (x2, y1))
self.gridy.append(y1)
DC.SetPen(wx.TRANSPARENT_PEN)
rect = self.rg[key]
- DC.DrawRectangle((rect.x+1, rect.y+1), (rect.width-2, rect.height-2))
+ DC.DrawRectangle(rect.x+1, rect.y+1, rect.width-2, rect.height-2)
self.caldraw.DrawDayText(DC,key)
DC.SetPen(wx.Pen(MakeColor(self.GetColor(COLOR_GRID_LINES)), width))
rect = self.rg[key]
- DC.DrawRectangle((rect.x, rect.y), (rect.width, rect.height))
+ DC.DrawRectangleRect(rect)
DC.EndDrawing()
self.DrawRect(self.sel_key, bgcolor,cfont, sel_size)
self.DrawRect(key, self.GetColor(COLOR_HIGHLIGHT_BACKGROUND), self.GetColor(COLOR_HIGHLIGHT_FONT), sel_size)
-
# store last used by
self.sel_key = key
- self.select_day = None
def ClearDsp(self):
self.Clear()
class CalenDlg(wx.Dialog):
def __init__(self, parent, month=None, day = None, year=None):
wx.Dialog.__init__(self, parent, -1, "Event Calendar", wx.DefaultPosition, (280, 360))
-
+ self.result = None
+
# set the calendar and attributes
self.calend = Calendar(self, -1, (20, 60), (240, 200))
# alternate spin button to control the month
h = self.date.GetSize().height
- self.m_spin = wx.SpinButton(self, -1, (130, 20), (h*2, h), wx.SP_VERTICAL)
+ self.m_spin = wx.SpinButton(self, -1, (115, 20), (h*1.5, h), wx.SP_VERTICAL)
self.m_spin.SetRange(1, 12)
self.m_spin.SetValue(start_month)
self.Bind(wx.EVT_SPIN, self.OnMonthSpin, self.m_spin)
self.dtext = wx.TextCtrl(self, -1, str(start_year), (160, 20), (60, -1))
h = self.dtext.GetSize().height
- self.y_spin = wx.SpinButton(self, -1, (220, 20), (h*2, h), wx.SP_VERTICAL)
+ self.y_spin = wx.SpinButton(self, -1, (225, 20), (h*1.5, h), wx.SP_VERTICAL)
self.y_spin.SetRange(1980, 2010)
self.y_spin.SetValue(start_year)
y_pos = 280
but_size = (60, 25)
- btn = wx.Button(self, -1, ' Ok ', (x_pos, y_pos), but_size)
+ btn = wx.Button(self, wx.ID_OK, ' Ok ', (x_pos, y_pos), but_size)
self.Bind(wx.EVT_BUTTON, self.OnOk, btn)
- btn = wx.Button(self, -1, ' Close ', (x_pos + 120, y_pos), but_size)
+ btn = wx.Button(self, wx.ID_CANCEL, ' Close ', (x_pos + 120, y_pos), but_size)
self.Bind(wx.EVT_BUTTON, self.OnCancel, btn)
- def OnOk(self, event):
+ def OnOk(self, evt):
+ self.result = ['None', str(self.calend.day), Month[self.calend.month], str(self.calend.year)]
self.EndModal(wx.ID_OK)
def OnCancel(self, event):
projects / wxWidgets.git / blobdiff