reSWIGged

[wxWidgets.git] / wxPython / demo / wxCalendar.py

diff --git a/wxPython/demo/wxCalendar.py b/wxPython/demo/wxCalendar.py
index 5c14011608b4f15b27f0a3c1f4a650ae7ef5869e..45f0b6d892d5739aa82b8ec7ef135505d26d34ac 100644 (file)
--- a/wxPython/demo/wxCalendar.py
+++ b/wxPython/demo/wxCalendar.py
@@ -8,12 +8,43 @@
 # Date:         Feb 26, 2001
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 # Date:         Feb 26, 2001
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------

+# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# o Some updating of the library itself will be needed for this demo to work
+#   correctly.
+#
+# 11/26/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Problems have changed a little. The print dialog requires
+#   a wx.Size to work with the calendar library. wx.core doesn't
+#   approve, though, so we get deprecation warnings.
+# o Ugh. AFter updating to the Bind() method, things lock up
+#   on various control clicks. Will have to debug. Only seems
+#   to happen on windows with calendar controls, though. 
+#
+# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Lockup issue clarification: it appears that the spinner is
+#   the culprit.
+#
+# 12/01/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o New Bind() method now fully supported.
+#
+# 12/17/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxCalendar renamed to Calendar
+# o Got rid of unneeded IDs where Bind() could figure it
+#   out for itself.
+#
+
+import  os

 
 

-from wxPython.wx           import *
-from wxPython.lib.calendar import wxCalendar, Month, PrtCalDraw, CalenDlg
+import  wx
+import  wx.lib.calendar 

 
 

-import images
-import os
+import  images

 
 
 # highlighted days in month
 
 
 # highlighted days in month


@@ -35,21 +66,25 @@ test_days ={ 0: [],
 # test of full window calendar control functions
 
 def GetMonthList():
 # test of full window calendar control functions
 
 def GetMonthList():

+

     monthlist = []
     monthlist = []

+

     for i in range(13):
     for i in range(13):

-        name = Month[i]
+        name = wx.lib.calendar.Month[i]
+

         if name != None:
             monthlist.append(name)
         if name != None:
             monthlist.append(name)

+

     return monthlist
 
     return monthlist
 

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, log, frame):
     def __init__(self, parent, log, frame):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

 
         self.log = log
         self.frame = frame
 
 
         self.log = log
         self.frame = frame
 

-        self.calend = wxCalendar(self, -1, wxPoint(100, 50), wxSize(200, 180))
+        self.calend = wx.lib.calendar.Calendar(self, -1, (100, 50), (200, 180))

 
 #        start_month = 2        # preselect the date for calendar
 #        start_year = 2001
 
 #        start_month = 2        # preselect the date for calendar
 #        start_year = 2001


@@ -57,83 +92,77 @@ class TestPanel(wxPanel):
         start_month = self.calend.GetMonth()        # get the current month & year
         start_year = self.calend.GetYear()
 
         start_month = self.calend.GetMonth()        # get the current month & year
         start_year = self.calend.GetYear()
 

-# month list from DateTime module
+        # month list from DateTime module

 
         monthlist = GetMonthList()
 
 
         monthlist = GetMonthList()
 

-        mID = NewId()
-        self.date = wxComboBox(self, mID, "",
-                               wxPoint(100, 20), wxSize(90, -1),
-                               monthlist, wxCB_DROPDOWN)
+        self.date = wx.ComboBox(self, -1, "",
+                               (100, 20), (90, -1),
+                               monthlist, wx.CB_DROPDOWN)
+

         self.date.SetSelection(start_month-1)
         self.date.SetSelection(start_month-1)

-        EVT_COMBOBOX(self, mID, self.EvtComboBox)
+        self.Bind(wx.EVT_COMBOBOX, self.EvtComboBox, self.date)

 
 

-# set start month and year
+        # set start month and year

 
         self.calend.SetMonth(start_month)
         self.calend.SetYear(start_year)
 
 
         self.calend.SetMonth(start_month)
         self.calend.SetYear(start_year)
 

-# set attributes of calendar
+        # set attributes of calendar

 
         self.calend.hide_title = True
         self.calend.HideGrid()
         self.calend.SetWeekColor('WHITE', 'BLACK')
 
 
         self.calend.hide_title = True
         self.calend.HideGrid()
         self.calend.SetWeekColor('WHITE', 'BLACK')
 

-# display routine
+        # display routine

 
         self.ResetDisplay()
 
 
         self.ResetDisplay()
 

-# mouse click event
-
-        self.Connect(self.calend.GetId(), -1, 2100, self.MouseClick)
-
-# scroll bar for month selection
+        # mouse click event
+        self.Bind(wx.lib.calendar.EVT_CALENDAR, self.MouseClick, self.calend)

 
 

-        mID = NewId()
-        self.scroll = wxScrollBar(self, mID, wxPoint(100, 240), wxSize(200, 20), wxSB_HORIZONTAL)
+        # scroll bar for month selection
+        self.scroll = wx.ScrollBar(self, -1, (100, 240), (200, 20), wx.SB_HORIZONTAL)

         self.scroll.SetScrollbar(start_month-1, 1, 12, 1, True)
         self.scroll.SetScrollbar(start_month-1, 1, 12, 1, True)

-        EVT_COMMAND_SCROLL(self, mID, self.Scroll)
+        self.Bind(wx.EVT_COMMAND_SCROLL, self.Scroll, self.scroll)

 
 

-# spin control for year selection
+        # spin control for year selection

 
 

-        self.dtext = wxTextCtrl(self, -1, str(start_year), wxPoint(200, 20), wxSize(60, -1))
+        self.dtext = wx.TextCtrl(self, -1, str(start_year), (200, 20), (60, -1))

         h = self.dtext.GetSize().height
 
         h = self.dtext.GetSize().height
 

-        mID = NewId()
-        self.spin = wxSpinButton(self, mID, wxPoint(270, 20), wxSize(h*2, h))
+        self.spin = wx.SpinButton(self, -1, (270, 20), (h*2, h))

         self.spin.SetRange(1980, 2010)
         self.spin.SetValue(start_year)
         self.spin.SetRange(1980, 2010)
         self.spin.SetValue(start_year)

-        EVT_SPIN(self, mID, self.OnSpin)
+        self.Bind(wx.EVT_SPIN, self.OnSpin, self.spin)

 
 

-# button for calendar dialog test
+        # button for calendar dialog test

 
 

-        wxStaticText(self, -1, "Test Calendar Dialog", wxPoint(350, 50), wxSize(150, -1))
+        wx.StaticText(self, -1, "Test Calendar Dialog", (350, 50), (150, -1))

 
 

-        mID = NewId()

         bmp = images.getCalendarBitmap()
         bmp = images.getCalendarBitmap()

-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 80))#, wxSize(30, 30))
-        EVT_BUTTON(self, mID, self.TestDlg)
+        self.but1 = wx.BitmapButton(self, -1, bmp, (380, 80))
+        self.Bind(wx.EVT_BUTTON, self.TestDlg, self.but1)

 
 

-# button for calendar window test
+        # button for calendar window test

 
 

-        wxStaticText(self, -1, "Test Calendar Window", wxPoint(350, 150), wxSize(150, -1))
+        wx.StaticText(self, -1, "Test Calendar Window", (350, 150), (150, -1))

 
 

-        mID = NewId()
-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 180))#, wxSize(30, 30))
-        EVT_BUTTON(self, mID, self.TestFrame)
+        self.but2 = wx.BitmapButton(self, -1, bmp, (380, 180))
+        self.Bind(wx.EVT_BUTTON, self.TestFrame, self.but2)

 
 

-        wxStaticText(self, -1, "Test Calendar Print", wxPoint(350, 250), wxSize(150, -1))
+        wx.StaticText(self, -1, "Test Calendar Print", (350, 250), (150, -1))

 
 

-        mID = NewId()
-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 280))#, wxSize(30, 30))
-        EVT_BUTTON(self, mID, self.OnPreview)
+        self.but3 = wx.BitmapButton(self, -1, bmp, (380, 280))
+        self.Bind(wx.EVT_BUTTON, self.OnPreview, self.but3)

 
 

-# calendar dialog
+        # calendar dialog

 
     def TestDlg(self, event):       # test the date dialog
 
     def TestDlg(self, event):       # test the date dialog

-        dlg = CalenDlg(self)
+        dlg = wx.lib.calendar.CalenDlg(self)

         dlg.Centre()
         dlg.Centre()

-        if dlg.ShowModal() == wxID_OK:
+
+        if dlg.ShowModal() == wx.ID_OK:

             result = dlg.result
             day = result[1]
             month = result[2]
             result = dlg.result
             day = result[1]
             month = result[2]


@@ -143,14 +172,14 @@ class TestPanel(wxPanel):
         else:
             self.log.WriteText('No Date Selected')
 
         else:
             self.log.WriteText('No Date Selected')
 

-# calendar window test
+        # calendar window test

 
     def TestFrame(self, event):
         frame = CalendFrame(self, -1, "Test Calendar", self.log)
         frame.Show(True)
         return True
 
 
     def TestFrame(self, event):
         frame = CalendFrame(self, -1, "Test Calendar", self.log)
         frame.Show(True)
         return True
 

-# calendar print preview
+    # calendar print preview

 
     def OnPreview(self, event):
         month = self.calend.GetMonth()
 
     def OnPreview(self, event):
         month = self.calend.GetMonth()


@@ -159,7 +188,7 @@ class TestPanel(wxPanel):
         prt = PrintCalend(self.frame, month, year)
         prt.Preview()
 
         prt = PrintCalend(self.frame, month, year)
         prt.Preview()
 

-# month and year control events
+    # month and year control events

 
     def OnSpin(self, event):
         year = event.GetPosition()
 
     def OnSpin(self, event):
         year = event.GetPosition()


@@ -183,20 +212,21 @@ class TestPanel(wxPanel):
         self.ResetDisplay()
         self.log.WriteText('Month: %s\n' % value)
 
         self.ResetDisplay()
         self.log.WriteText('Month: %s\n' % value)
 

-        name = Month[monthval]
+        name = wx.lib.calendar.Month[monthval]

         self.date.SetValue(name)
 
         self.date.SetValue(name)
 

-# log mouse events
+    # log mouse events

 
     def MouseClick(self, evt):
         text = '%s CLICK   %02d/%02d/%d' % (evt.click, evt.day, evt.month, evt.year)  # format date
         self.log.WriteText('Date Selected: ' + text + '\n')
 
 
 
     def MouseClick(self, evt):
         text = '%s CLICK   %02d/%02d/%d' % (evt.click, evt.day, evt.month, evt.year)  # format date
         self.log.WriteText('Date Selected: ' + text + '\n')
 
 

-# set the highlighted days for the calendar
+    # set the highlighted days for the calendar

 
     def ResetDisplay(self):
         month = self.calend.GetMonth()
 
     def ResetDisplay(self):
         month = self.calend.GetMonth()

+

         try:
             set_days = test_days[month]
         except:
         try:
             set_days = test_days[month]
         except:


@@ -206,7 +236,7 @@ class TestPanel(wxPanel):
         self.calend.SetSelDay(set_days)
         self.calend.Refresh()
 
         self.calend.SetSelDay(set_days)
         self.calend.Refresh()
 

-# increment and decrement toolbar controls
+    # increment and decrement toolbar controls

 
     def OnIncYear(self, event):
         self.calend.IncYear()
 
     def OnIncYear(self, event):
         self.calend.IncYear()


@@ -230,16 +260,17 @@ class TestPanel(wxPanel):
 
 # test of full window calendar control functions
 
 
 # test of full window calendar control functions
 

-class CalendFrame(wxFrame):
+class CalendFrame(wx.Frame):

     def __init__(self, parent, id, title, log):
     def __init__(self, parent, id, title, log):

-        wxFrame.__init__(self, parent, id, title, size=wxSize(400, 400),
-                         style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
-        EVT_CLOSE(self, self.OnCloseWindow)
+        wx.Frame.__init__(self, parent, id, title, size=(400, 400),
+                         style=wx.DEFAULT_FRAME_STYLE|wx.NO_FULL_REPAINT_ON_RESIZE)
+
+        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)

 
         self.log = log
         self.CreateStatusBar()
 
         self.log = log
         self.CreateStatusBar()

-        self.mainmenu = wxMenuBar()
-        menu = wxMenu()
+        self.mainmenu = wx.MenuBar()
+        menu = wx.Menu()

 
         menu = self.MakeFileMenu()
         self.mainmenu.Append(menu, '&File')
 
         menu = self.MakeFileMenu()
         self.mainmenu.Append(menu, '&File')


@@ -247,7 +278,7 @@ class CalendFrame(wxFrame):
         self.MakeToolMenu()             # toolbar
 
         self.SetMenuBar(self.mainmenu)
         self.MakeToolMenu()             # toolbar
 
         self.SetMenuBar(self.mainmenu)

-        self.calend = wxCalendar(self, -1)
+        self.calend = wx.lib.calendar.Calendar(self, -1)

         self.calend.SetCurrentDay()
         self.calend.grid_color = 'BLUE'
         self.calend.SetBusType()
         self.calend.SetCurrentDay()
         self.calend.grid_color = 'BLUE'
         self.calend.SetBusType()


@@ -255,7 +286,7 @@ class CalendFrame(wxFrame):
 
         self.ResetDisplay()
 
 
         self.ResetDisplay()
 

-        self.Connect(self.calend.GetId(), -1, 2100, self.MouseClick)
+        self.Bind(wx.lib.calendar.EVT_CALENDAR, self.MouseClick, self.calend)

 
     def MouseClick(self, evt):
         text = '%s CLICK   %02d/%02d/%d' % (evt.click, evt.day, evt.month, evt.year)  # format date
 
     def MouseClick(self, evt):
         text = '%s CLICK   %02d/%02d/%d' % (evt.click, evt.day, evt.month, evt.year)  # format date


@@ -266,6 +297,7 @@ class CalendFrame(wxFrame):
 
     def ResetDisplay(self):
         month = self.calend.GetMonth()
 
     def ResetDisplay(self):
         month = self.calend.GetMonth()

+

         try:
             set_days = test_days[month]
         except:
         try:
             set_days = test_days[month]
         except:


@@ -297,46 +329,46 @@ class CalendFrame(wxFrame):
         self.ResetDisplay()
 
     def MakeFileMenu(self):
         self.ResetDisplay()
 
     def MakeFileMenu(self):

-        menu = wxMenu()
+        menu = wx.Menu()

 
 

-        mID = NewId()
+        mID = wx.NewId()

         menu.Append(mID, 'Decrement', 'Next')
         menu.Append(mID, 'Decrement', 'Next')

-        EVT_MENU(self, mID, self.OnDecMonth)
+        self.Bind(wx.EVT_MENU, self.OnDecMonth, id=mID)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         menu.Append(mID, 'Increment', 'Dec')
         menu.Append(mID, 'Increment', 'Dec')

-        EVT_MENU(self, mID, self.OnIncMonth)
+        self.Bind(wx.EVT_MENU, self.OnIncMonth, id=mID)

 
         menu.AppendSeparator()
 
 
         menu.AppendSeparator()
 

-        mID = NewId()
+        mID = wx.NewId()

         menu.Append(mID, 'E&xit', 'Exit')
         menu.Append(mID, 'E&xit', 'Exit')

-        EVT_MENU(self, mID, self.OnCloseWindow)
+        self.Bind(wx.EVT_MENU, self.OnCloseWindow, id=mID)

 
         return menu
 
     def MakeToolMenu(self):
 
         return menu
 
     def MakeToolMenu(self):

-        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
+        tb = self.CreateToolBar(wx.TB_HORIZONTAL|wx.NO_BORDER)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         SetToolPath(self, tb, mID, images.getDbDecBitmap(), 'Dec Year')
         SetToolPath(self, tb, mID, images.getDbDecBitmap(), 'Dec Year')

-        EVT_TOOL(self, mID, self.OnDecYear)
+        self.Bind(wx.EVT_TOOL, self.OnDecYear, id=mID)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         SetToolPath(self, tb, mID, images.getDecBitmap(), 'Dec Month')
         SetToolPath(self, tb, mID, images.getDecBitmap(), 'Dec Month')

-        EVT_TOOL(self, mID, self.OnDecMonth)
+        self.Bind(wx.EVT_TOOL, self.OnDecMonth, id=mID)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         SetToolPath(self, tb, mID, images.getPtBitmap(), 'Current Month')
         SetToolPath(self, tb, mID, images.getPtBitmap(), 'Current Month')

-        EVT_TOOL(self, mID, self.OnCurrent)
+        self.Bind(wx.EVT_TOOL, self.OnCurrent, id=mID)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         SetToolPath(self, tb, mID, images.getIncBitmap(), 'Inc Month')
         SetToolPath(self, tb, mID, images.getIncBitmap(), 'Inc Month')

-        EVT_TOOL(self, mID, self.OnIncMonth)
+        self.Bind(wx.EVT_TOOL, self.OnIncMonth, id=mID)

 
 

-        mID = NewId()
+        mID = wx.NewId()

         SetToolPath(self, tb, mID, images.getDbIncBitmap(), 'Inc Year')
         SetToolPath(self, tb, mID, images.getDbIncBitmap(), 'Inc Year')

-        EVT_TOOL(self, mID, self.OnIncYear)
+        self.Bind(wx.EVT_TOOL, self.OnIncYear, id=mID)

 
         tb.Realize()
 
 
         tb.Realize()
 


@@ -352,15 +384,15 @@ class PrintCalend:
 
         self.SetParms()
         self.SetCal()
 
         self.SetParms()
         self.SetCal()

-        self.printData = wxPrintData()
+        self.printData = wx.PrintData()

 
     def SetCal(self):
         self.grid_color = 'BLUE'
         self.back_color = 'WHITE'
         self.sel_color = 'RED'
         self.high_color = 'LIGHT BLUE'
 
     def SetCal(self):
         self.grid_color = 'BLUE'
         self.back_color = 'WHITE'
         self.sel_color = 'RED'
         self.high_color = 'LIGHT BLUE'

-        self.font = wxSWISS
-        self.bold = wxNORMAL
+        self.font = wx.SWISS
+        self.bold = wx.NORMAL

 
         self.sel_key = None      #  last used by
         self.sel_lst = []        # highlighted selected days
 
         self.sel_key = None      #  last used by
         self.sel_lst = []        # highlighted selected days


@@ -404,14 +436,15 @@ class PrintCalend:
     def Preview(self):
         printout = SetPrintout(self)
         printout2 = SetPrintout(self)
     def Preview(self):
         printout = SetPrintout(self)
         printout2 = SetPrintout(self)

-        self.preview = wxPrintPreview(printout, printout2, self.printData)
+        self.preview = wx.PrintPreview(printout, printout2, self.printData)
+

         if not self.preview.Ok():
         if not self.preview.Ok():

-            wxMessageBox("There was a problem printing!", "Printing", wxOK)
+            wx.MessageBox("There was a problem printing!", "Printing", wx.OK)

             return
 
         self.preview.SetZoom(60)        # initial zoom value
 
             return
 
         self.preview.SetZoom(60)        # initial zoom value
 

-        frame = wxPreviewFrame(self.preview, self.frame, "Print preview")
+        frame = wx.PreviewFrame(self.preview, self.frame, "Print preview")

 
         frame.Initialize()
         frame.SetPosition(self.frame.GetPosition())
 
         frame.Initialize()
         frame.SetPosition(self.frame.GetPosition())


@@ -419,22 +452,24 @@ class PrintCalend:
         frame.Show(True)
 
     def Print(self):
         frame.Show(True)
 
     def Print(self):

-        pdd = wxPrintDialogData()
+        pdd = wx.PrintDialogData()

         pdd.SetPrintData(self.printData)
         pdd.SetPrintData(self.printData)

-        printer = wxPrinter(pdd)
+        printer = wx.Printer(pdd)

         printout = SetPrintout(self)
         printout = SetPrintout(self)

-        frame = wxFrame(None, -1, "Test")
+        frame = wx.Frame(None, -1, "Test")
+

         if not printer.Print(frame, printout):
         if not printer.Print(frame, printout):

-            wxMessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wxOK)
+            wx.MessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wx.OK)

         else:
             self.printData = printer.GetPrintDialogData().GetPrintData()
         else:
             self.printData = printer.GetPrintDialogData().GetPrintData()

+

         printout.Destroy()
 
     def DoDrawing(self, DC):
         printout.Destroy()
 
     def DoDrawing(self, DC):

-        size = DC.GetSizeTuple()
+        size = DC.GetSize()

         DC.BeginDrawing()
 
         DC.BeginDrawing()
 

-        cal = PrtCalDraw(self)
+        cal = wx.lib.calendar.PrtCalDraw(self)

 
         if self.preview is None:
             cal.SetPSize(size[0]/self.pagew, size[1]/self.pageh)
 
         if self.preview is None:
             cal.SetPSize(size[0]/self.pagew, size[1]/self.pageh)


@@ -458,14 +493,16 @@ class PrintCalend:
         cal.font = self.font
         cal.bold = self.bold
 
         cal.font = self.font
         cal.bold = self.bold
 

-        cal_size = wxSize(3.0, 3.0)
+        cal_size = (3.0, 3.0)

         cal.SetSize(cal_size)
 
         year, month = self.year, self.month
 
         x = 1.0
         cal.SetSize(cal_size)
 
         year, month = self.year, self.month
 
         x = 1.0

+

         for i in range(2):
             y = 0.5
         for i in range(2):
             y = 0.5

+

             for j in range(3):
                 cal.SetCal(year, month)       # current month
                 cal.SetPos(x, y)
             for j in range(3):
                 cal.SetCal(year, month)       # current month
                 cal.SetPos(x, y)


@@ -481,7 +518,8 @@ class PrintCalend:
 
                 year, month = self.IncMonth(year, month)
                 y = y + 3.5
 
                 year, month = self.IncMonth(year, month)
                 y = y + 3.5

-            x = x + 4.0     # next colum
+
+            x = x + 4.0     # next column

 
         DC.EndDrawing()
 
 
         DC.EndDrawing()
 


@@ -490,6 +528,7 @@ class PrintCalend:
 
     def IncMonth(self, year, month):     # next month
         month = month + 1
 
     def IncMonth(self, year, month):     # next month
         month = month + 1

+

         if month > 12:
             month = 1
             year = year + 1
         if month > 12:
             month = 1
             year = year + 1


@@ -520,9 +559,9 @@ class PrintCalend:
 def SetToolPath(self, tb, id, bmp, title):
     tb.AddSimpleTool(id, bmp, title, title)
 
 def SetToolPath(self, tb, id, bmp, title):
     tb.AddSimpleTool(id, bmp, title, title)
 

-class SetPrintout(wxPrintout):
+class SetPrintout(wx.Printout):

     def __init__(self, canvas):
     def __init__(self, canvas):

-        wxPrintout.__init__(self)
+        wx.Printout.__init__(self)

         self.canvas = canvas
         self.end_pg = 1
 
         self.canvas = canvas
         self.end_pg = 1
 


@@ -541,10 +580,12 @@ class SetPrintout(wxPrintout):
     def GetPageInfo(self):
         self.end_pg = self.canvas.GetTotalPages()
         str_pg = 1
     def GetPageInfo(self):
         self.end_pg = self.canvas.GetTotalPages()
         str_pg = 1

+

         try:
             end_pg = self.end_pg
         except:
             end_pg = 1
         try:
             end_pg = self.end_pg
         except:
             end_pg = 1

+

         return (str_pg, end_pg, str_pg, end_pg)
 
     def OnPreparePrinting(self):
         return (str_pg, end_pg, str_pg, end_pg)
 
     def OnPreparePrinting(self):


@@ -554,12 +595,13 @@ class SetPrintout(wxPrintout):
         dc = self.GetDC()
 
         self.preview = self.IsPreview()
         dc = self.GetDC()
 
         self.preview = self.IsPreview()

+

         if (self.preview):
             self.pixelsPerInch = self.GetPPIScreen()
         else:
             self.pixelsPerInch = self.GetPPIPrinter()
 
         if (self.preview):
             self.pixelsPerInch = self.GetPPIScreen()
         else:
             self.pixelsPerInch = self.GetPPIPrinter()
 

-        (w, h) = dc.GetSizeTuple()
+        (w, h) = dc.GetSize()

         scaleX = float(w) / 1000
         scaleY = float(h) / 1000
         self.printUserScale = min(scaleX, scaleY)
         scaleX = float(w) / 1000
         scaleY = float(h) / 1000
         self.printUserScale = min(scaleX, scaleY)


@@ -576,7 +618,7 @@ class SetPrintout(wxPrintout):
 
     def OnPrintPage(self, page):
         dc = self.GetDC()
 
     def OnPrintPage(self, page):
         dc = self.GetDC()

-        (w, h) = dc.GetSizeTuple()
+        (w, h) = dc.GetSize()

         scaleX = float(w) / 1000
         scaleY = float(h) / 1000
         self.printUserScale = min(scaleX, scaleY)
         scaleX = float(w) / 1000
         scaleY = float(h) / 1000
         self.printUserScale = min(scaleX, scaleY)


@@ -596,9 +638,9 @@ class SetPrintout(wxPrintout):
         self.canvas.DoDrawing(dc)
         return True
 
         self.canvas.DoDrawing(dc)
         return True
 

-class MyApp(wxApp):
+class MyApp(wx.App):

     def OnInit(self):
     def OnInit(self):

-        frame = CalendFrame(None, -1, "Test Calendar")
+        frame = CalendFrame(None, -1, "Test Calendar", log)

         frame.Show(True)
         self.SetTopWindow(frame)
         return True
         frame.Show(True)
         self.SetTopWindow(frame)
         return True


@@ -606,23 +648,12 @@ class MyApp(wxApp):
 #---------------------------------------------------------------------------
 
 def MessageDlg(self, message, type = 'Message'):
 #---------------------------------------------------------------------------
 
 def MessageDlg(self, message, type = 'Message'):

-    dlg = wxMessageDialog(self, message, type, wxOK | wxICON_INFORMATION)
+    dlg = wx.MessageDialog(self, message, type, wx.OK | wx.ICON_INFORMATION)

     dlg.ShowModal()
     dlg.Destroy()
 
 #---------------------------------------------------------------------------
 
     dlg.ShowModal()
     dlg.Destroy()
 
 #---------------------------------------------------------------------------
 

-def main():
-    app = MyApp(0)
-    app.MainLoop()
-
-
-if __name__ == '__main__':
-    main()
-
-
-#---------------------------------------------------------------------------
-

 def runTest(frame, nb, log):
     win = TestPanel(nb, log, frame)
     return win
 def runTest(frame, nb, log):
     win = TestPanel(nb, log, frame)
     return win


@@ -631,12 +662,24 @@ def runTest(frame, nb, log):
 
 
 overview = """\
 
 
 overview = """\

-This control provides a calendar control class for displaying and selecting dates.  In addition, the class is extended and can now be used for printing/previewing.
+This control provides a Calendar control class for displaying and selecting dates.  
+In addition, the class is extended and can be used for printing/previewing.

 
 

-Additional features include weekend highlighting and business type Monday-Sunday format.
+Additional features include weekend highlighting and business type Monday-Sunday 
+format.

 
 

-See example for various methods used to set display month, year, and highlighted dates (different font and background colours).
+See example for various methods used to set display month, year, and highlighted 
+dates (different font and background colours).

 
 by Lorne White
 
 """
 
 by Lorne White
 
 """

+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+