diff --git a/wxPython/demo/BitmapButton.py b/wxPython/demo/BitmapButton.py
index f1d526fbc8..cd78af9b18 100644
--- a/wxPython/demo/BitmapButton.py
+++ b/wxPython/demo/BitmapButton.py
@@ -2,6 +2,9 @@
 import  wx
 import  images
 
+#import wx.lib.buttons
+#wx.BitmapButton = wx.lib.buttons.GenBitmapButton
+
 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
@@ -35,9 +38,12 @@ class TestPanel(wx.Panel):
         self.Bind(wx.EVT_BUTTON, self.OnClick, b)
 
         b = wx.BitmapButton(self, -1, bmp, (20, 120),
-                       (bmp.GetWidth()+10, bmp.GetHeight()+10),
-                        style = wx.NO_BORDER)
-        b.SetToolTipString("This is a bitmap button with \nwx.NO_BORDER style.")
+                            style = wx.NO_BORDER)
+        
+        # hide a little surprise in the button...
+        b.SetBitmapSelected(images.getRobinBitmap())
+
+       b.SetToolTipString("This is a bitmap button with \nwx.NO_BORDER style.")
         self.Bind(wx.EVT_BUTTON, self.OnClick, b)
         
 
diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
index b795ba5dc4..bfe0e706d5 100644
--- a/wxPython/demo/CalendarCtrl.py
+++ b/wxPython/demo/CalendarCtrl.py
@@ -23,7 +23,8 @@ class TestPanel(wx.Panel):
         self.OnChangeMonth()
 
         cal2 = wx.calendar.CalendarCtrl(self, -1, wx.DateTime_Now(), pos = (325,50))
-
+        self.Bind(wx.calendar.EVT_CALENDAR_SEL_CHANGED,
+                  self.OnCalSelChanged, cal2)
 
     def OnCalSelected(self, evt):
         self.log.write('OnCalSelected: %s\n' % evt.GetDate())
@@ -34,6 +35,14 @@ class TestPanel(wx.Panel):
             if month == cur_month:
                 self.cal.SetHoliday(day)
 
+    def OnCalSelChanged(self, evt):
+        cal = evt.GetEventObject()
+        self.log.write("OnCalSelChanged:\n\t%s: %s\n\t%s: %s\n\t%s: %s\n\t" %
+                       ("EventObject", cal,
+                        "Date       ", cal.GetDate(),
+                        "Ticks      ", cal.GetDate().GetTicks(),
+                        ))
+
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
diff --git a/wxPython/demo/ComboBox.py b/wxPython/demo/ComboBox.py
index 4ab15a6467..76f9f23ba1 100644
--- a/wxPython/demo/ComboBox.py
+++ b/wxPython/demo/ComboBox.py
@@ -47,12 +47,11 @@ class TestComboBox(wx.Panel):
             cb.Append(item, item.upper())
 
         self.Bind(wx.EVT_COMBOBOX, self.EvtComboBox, cb)
-        self.Bind(wx.EVT_COMBOBOX, self.EvtText, cb)
 
     # When the user selects something, we go here.
     def EvtComboBox(self, evt):
         cb = evt.GetEventObject()
-        data = cb.GetClientData(cb.GetSelection())
+        data = cb.GetClientData(evt.GetSelection())
         self.log.WriteText('EvtComboBox: %s\nClientData: %s\n' % (evt.GetString(), data))
 
         if evt.GetString() == 'one':