X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa876ca9ec87e90605808bfcab4d4226965dbad..61940a7061d0b5d5122b1e1e939cfa2d72596999:/wxPython/demo/wxTimeCtrl.py?ds=sidebyside

diff --git a/wxPython/demo/wxTimeCtrl.py b/wxPython/demo/wxTimeCtrl.py
index 8acb1a5cb8..aa5cf52762 100644
--- a/wxPython/demo/wxTimeCtrl.py
+++ b/wxPython/demo/wxTimeCtrl.py
@@ -7,6 +7,15 @@
 # o wx renamer needed for timectrl lib
 # o presense of spin control causing probs (see spin ctrl demo for details)
 # 
+# 12/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o New binders applied. Issues still exist.
+#
+# 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxTimeCtrl -> TimeCtrl
+# o wxScrolledPanel -> ScrolledPanel
+#
 
 import  wx
 import  wx.lib.timectrl         as  timectl
@@ -14,27 +23,27 @@ import  wx.lib.scrolledpanel    as  scrolled
 
 #----------------------------------------------------------------------
 
-class TestPanel( scrolled.wxScrolledPanel ):
+class TestPanel( scrolled.ScrolledPanel ):
     def __init__( self, parent, log ):
 
-        scrolled.wxScrolledPanel.__init__( self, parent, -1 )
+        scrolled.ScrolledPanel.__init__( self, parent, -1 )
         self.log = log
 
 
         text1 = wx.StaticText( self, -1, "12-hour format:")
-        self.time12 = timectl.wxTimeCtrl( self, -1, name="12 hour control" )
+        self.time12 = timectl.TimeCtrl( self, -1, name="12 hour control" )
         spin1 = wx.SpinButton( self, -1, wx.DefaultPosition, (-1,20), 0 )
         self.time12.BindSpinButton( spin1 )
 
         text2 = wx.StaticText( self, -1, "24-hour format:")
         spin2 = wx.SpinButton( self, -1, wx.DefaultPosition, (-1,20), 0 )
-        self.time24 = timectl.wxTimeCtrl(
+        self.time24 = timectl.TimeCtrl(
                         self, -1, name="24 hour control", fmt24hr=True, 
                         spinButton = spin2 
                         )
 
         text3 = wx.StaticText( self, -1, "No seconds\nor spin button:")
-        self.spinless_ctrl = timectl.wxTimeCtrl(
+        self.spinless_ctrl = timectl.TimeCtrl(
                                 self, -1, name="spinless control", 
                                 display_seconds = False 
                                 )
@@ -90,17 +99,17 @@ class TestPanel( scrolled.wxScrolledPanel ):
         self.set_bounds = wx.CheckBox( self, -1, "Set time bounds:" )
 
         minlabel = wx.StaticText( self, -1, "minimum time:" )
-        self.min = timectl.wxTimeCtrl( self, -1, name="min", display_seconds = False )
+        self.min = timectl.TimeCtrl( self, -1, name="min", display_seconds = False )
         self.min.Enable( False )
 
         maxlabel = wx.StaticText( self, -1, "maximum time:" )
-        self.max = timectl.wxTimeCtrl( self, -1, name="max", display_seconds = False )
+        self.max = timectl.TimeCtrl( self, -1, name="max", display_seconds = False )
         self.max.Enable( False )
 
         self.limit_check = wx.CheckBox( self, -1, "Limit control" )
 
         label = wx.StaticText( self, -1, "Resulting time control:" )
-        self.target_ctrl = timectl.wxTimeCtrl( self, -1, name="new" )
+        self.target_ctrl = timectl.TimeCtrl( self, -1, name="new" )
 
         grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         grid2.Add( (20, 0), 0, wx.ALIGN_LEFT|wx.ALL, 5 )
@@ -146,17 +155,14 @@ class TestPanel( scrolled.wxScrolledPanel ):
         self.SetupScrolling()
 
         self.Bind(wx.EVT_BUTTON, self.OnButtonClick, buttonChange )
-        timectl.EVT_TIMEUPDATE( self, self.time12.GetId(), self.OnTimeChange )
-        timectl.EVT_TIMEUPDATE( self, self.time24.GetId(), self.OnTimeChange )
-        timectl.EVT_TIMEUPDATE( self, self.spinless_ctrl.GetId(), self.OnTimeChange )
-
-
+        self.Bind(timectl.EVT_TIMEUPDATE, self.OnTimeChange, self.time12 )
+        self.Bind(timectl.EVT_TIMEUPDATE, self.OnTimeChange, self.time24 )
+        self.Bind(timectl.EVT_TIMEUPDATE, self.OnTimeChange, self.spinless_ctrl )
         self.Bind(wx.EVT_CHECKBOX, self.OnBoundsCheck, self.set_bounds )
         self.Bind(wx.EVT_CHECKBOX, self.SetTargetMinMax, self.limit_check )
-        timectl.EVT_TIMEUPDATE( self, self.min.GetId(), self.SetTargetMinMax )
-        timectl.EVT_TIMEUPDATE( self, self.max.GetId(), self.SetTargetMinMax )
-        timectl.EVT_TIMEUPDATE( self, self.target_ctrl.GetId(), self.OnTimeChange )
-
+        self.Bind(timectl.EVT_TIMEUPDATE, self.SetTargetMinMax, self.min )
+        self.Bind(timectl.EVT_TIMEUPDATE, self.SetTargetMinMax, self.max )
+        self.Bind(timectl.EVT_TIMEUPDATE, self.OnTimeChange, self.target_ctrl )
 
 
     def OnTimeChange( self, event ):