X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa876ca9ec87e90605808bfcab4d4226965dbad..ca6c45b23dd2a583dabbf8567f23657d310eb0b0:/wxPython/demo/wxMaskedNumCtrl.py?ds=inline

diff --git a/wxPython/demo/wxMaskedNumCtrl.py b/wxPython/demo/wxMaskedNumCtrl.py
index 6bdef2cad3..855726b100 100644
--- a/wxPython/demo/wxMaskedNumCtrl.py
+++ b/wxPython/demo/wxMaskedNumCtrl.py
@@ -6,6 +6,14 @@
 #
 # o wx.lib.maskednumctrl needs hit up with the renamer and new binders
 # 
+# 12/09/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Issues with lib corrected.
+# 
+# 12/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxMaskedNumCtrl -> MaskedNumCtrl
+# 
 
 import  string
 import  sys
@@ -23,40 +31,40 @@ class TestPanel( wx.Panel ):
         panel = wx.Panel( self, -1 )
 
         header = wx.StaticText(panel, -1, """\
-This shows the various options for wxMaskedNumCtrl.
+This shows the various options for MaskedNumCtrl.
 The controls at the top reconfigure the resulting control at the bottom.
 """)
         header.SetForegroundColour( "Blue" )
 
         intlabel = wx.StaticText( panel, -1, "Integer width:" )
-        self.integerwidth = mnum.wxMaskedNumCtrl(
+        self.integerwidth = mnum.MaskedNumCtrl(
                                 panel, value=10, integerWidth=2, allowNegative=False
                                 )
 
         fraclabel = wx.StaticText( panel, -1, "Fraction width:" )
-        self.fractionwidth = mnum.wxMaskedNumCtrl(
+        self.fractionwidth = mnum.MaskedNumCtrl(
                                 panel, value=0, integerWidth=2, allowNegative=False 
                                 )
 
         groupcharlabel = wx.StaticText( panel,-1, "Grouping char:" )
-        self.groupchar = mnum.wxMaskedTextCtrl( 
+        self.groupchar = mnum.MaskedTextCtrl( 
                                 panel, -1, value=',', mask='&', excludeChars = '-()',
                                 formatcodes='F', emptyInvalid=True, validRequired=True
                                 )
 
         decimalcharlabel = wx.StaticText( panel,-1, "Decimal char:" )
-        self.decimalchar = mnum.wxMaskedTextCtrl( 
+        self.decimalchar = mnum.MaskedTextCtrl( 
                                 panel, -1, value='.', mask='&', excludeChars = '-()',
                                 formatcodes='F', emptyInvalid=True, validRequired=True
                                 )
 
         self.set_min = wx.CheckBox( panel, -1, "Set minimum value:" )
         # Create this MaskedNumCtrl using factory, to show how:
-        self.min = mnum.wxMaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
+        self.min = mnum.MaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
         self.min.Enable( False )
 
         self.set_max = wx.CheckBox( panel, -1, "Set maximum value:" )
-        self.max = mnum.wxMaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
+        self.max = mnum.MaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
         self.max.Enable( False )
 
 
@@ -75,7 +83,7 @@ The controls at the top reconfigure the resulting control at the bottom.
         font.SetWeight(wx.BOLD)
         label.SetFont(font)
 
-        self.target_ctl = mnum.wxMaskedNumCtrl( panel, -1, name="target control" )
+        self.target_ctl = mnum.MaskedNumCtrl( panel, -1, name="target control" )
 
         label_numselect = wx.StaticText( panel, -1, """\
 Programmatically set the above
@@ -148,15 +156,15 @@ value entry ctrl:""")
         panel.Move( (50,10) )
         self.panel = panel
 
-        mnum.EVT_MASKEDNUM( self, self.integerwidth.GetId(), self.OnSetIntWidth )
-        mnum.EVT_MASKEDNUM( self, self.fractionwidth.GetId(), self.OnSetFractionWidth )
+        self.Bind(mnum.EVT_MASKEDNUM, self.OnSetIntWidth, self.integerwidth )
+        self.Bind(mnum.EVT_MASKEDNUM, self.OnSetFractionWidth, self.fractionwidth )
         self.Bind(wx.EVT_TEXT, self.OnSetGroupChar, self.groupchar )
         self.Bind(wx.EVT_TEXT, self.OnSetDecimalChar, self.decimalchar )
 
         self.Bind(wx.EVT_CHECKBOX, self.OnSetMin, self.set_min )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetMax, self.set_max )
-        mnum.EVT_MASKEDNUM( self, self.min.GetId(), self.SetTargetMinMax )
-        mnum.EVT_MASKEDNUM( self, self.max.GetId(), self.SetTargetMinMax )
+        self.Bind(mnum.EVT_MASKEDNUM, self.SetTargetMinMax, self.min )
+        self.Bind(mnum.EVT_MASKEDNUM, self.SetTargetMinMax, self.max )
 
         self.Bind(wx.EVT_CHECKBOX, self.SetTargetMinMax, self.limit_target )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNone, self.allow_none )
@@ -165,7 +173,7 @@ value entry ctrl:""")
         self.Bind(wx.EVT_CHECKBOX, self.OnSetUseParens, self.use_parens )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetSelectOnEntry, self.select_on_entry )
 
-        mnum.EVT_MASKEDNUM( self, self.target_ctl.GetId(), self.OnTargetChange )
+        self.Bind(mnum.EVT_MASKEDNUM, self.OnTargetChange, self.target_ctl )
         self.Bind(wx.EVT_COMBOBOX, self.OnNumberSelect, self.numselect )