1. Grid cell defaults are now handled by an internal

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

diff --git a/utils/wxPython/demo/wxCalendar.py b/utils/wxPython/demo/wxCalendar.py
index 7648a7fbe86c8d624c5cb67beb67fcdefb6b6b14..eda9cd341aca21a74ccfc7ebf3faff840115b557 100644 (file)
--- a/utils/wxPython/demo/wxCalendar.py
+++ b/utils/wxPython/demo/wxCalendar.py
@@ -100,7 +100,7 @@ class TestPanel(wxPanel):
 
         wxStaticText(self, -1, "Test Calendar Dialog", wxPoint(350, 50)).SetBackgroundColour(wxNamedColour('Red'))
 
 
         wxStaticText(self, -1, "Test Calendar Dialog", wxPoint(350, 50)).SetBackgroundColour(wxNamedColour('Red'))
 

-        bmp = wxBitmap('Calbmp/Calend.bmp', wxBITMAP_TYPE_BMP)
+        bmp = wxBitmap('bitmaps/Calend.bmp', wxBITMAP_TYPE_BMP)

         self.but = wxBitmapButton(self, 60, bmp, wxPoint(380, 80))#, wxSize(30, 30))
         EVT_BUTTON(self, 60, self.TestDlg)
 
         self.but = wxBitmapButton(self, 60, bmp, wxPoint(380, 80))#, wxSize(30, 30))
         EVT_BUTTON(self, 60, self.TestDlg)
 


@@ -108,7 +108,7 @@ class TestPanel(wxPanel):
 
         wxStaticText(self, -1, "Test Calendar Window", wxPoint(350, 150)).SetBackgroundColour(wxNamedColour('Blue'))
 
 
         wxStaticText(self, -1, "Test Calendar Window", wxPoint(350, 150)).SetBackgroundColour(wxNamedColour('Blue'))
 

-        bmp = wxBitmap('Calbmp/Calend.bmp', wxBITMAP_TYPE_BMP)
+        bmp = wxBitmap('bitmaps/Calend.bmp', wxBITMAP_TYPE_BMP)

         self.but = wxBitmapButton(self, 160, bmp, wxPoint(380, 180))#, wxSize(30, 30))
         EVT_BUTTON(self, 160, self.TestFrame)
 
         self.but = wxBitmapButton(self, 160, bmp, wxPoint(380, 180))#, wxSize(30, 30))
         EVT_BUTTON(self, 160, self.TestFrame)
 


@@ -374,7 +374,7 @@ class CalendFrame(wxFrame):
     def MakeToolMenu(self):
         tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
 
     def MakeToolMenu(self):
         tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
 

-        bmp_path = 'Calbmp/'
+        bmp_path = 'bitmaps/'

         SetToolPath(self, tb, 10, bmp_path + 'DbDec.bmp', 'Dec Year')
         EVT_TOOL(self, 10, self.OnDecYear)
 
         SetToolPath(self, tb, 10, bmp_path + 'DbDec.bmp', 'Dec Year')
         EVT_TOOL(self, 10, self.OnDecYear)
 


@@ -394,7 +394,8 @@ class CalendFrame(wxFrame):
 
 def SetToolPath(self, tb, id, bmp, title):
     global dir_path
 
 def SetToolPath(self, tb, id, bmp, title):
     global dir_path

-    tb.AddTool(id, wxBitmap(os.path.join(dir_path, bmp), wxBITMAP_TYPE_BMP), wxNullBitmap, false, -1, -1, title, title)
+    tb.AddSimpleTool(id, wxBitmap(os.path.join(dir_path, bmp), wxBITMAP_TYPE_BMP),
+                     title, title)

 
 
 class MyApp(wxApp):
 
 
 class MyApp(wxApp):