Updated version number

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

diff --git a/wxPython/demo/MaskedEditControls.py b/wxPython/demo/MaskedEditControls.py
index edc3052e1d6d1aade4b91f7f7af5bb73eb11ba95..c20988837af7e4e245791d97592d2f220215e420 100644 (file)
--- a/wxPython/demo/MaskedEditControls.py
+++ b/wxPython/demo/MaskedEditControls.py
@@ -1,12 +1,3 @@
-# 11/23/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 11/26/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o the three libraries below all have not been hit by the 
-#   wx renamer.
-# 

 
 import  string
 import  sys
 
 import  string
 import  sys


@@ -27,7 +18,7 @@ class demoMixin:
         mask        = wx.StaticText( self, -1, "Mask Value" )
         formatcode  = wx.StaticText( self, -1, "Format" )
         regex       = wx.StaticText( self, -1, "Regexp Validator(opt.)" )
         mask        = wx.StaticText( self, -1, "Mask Value" )
         formatcode  = wx.StaticText( self, -1, "Format" )
         regex       = wx.StaticText( self, -1, "Regexp Validator(opt.)" )

-        ctrl        = wx.StaticText( self, -1, "wxMaskedTextCtrl" )
+        ctrl        = wx.StaticText( self, -1, "MaskedTextCtrl" )

 
         description.SetFont( wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD))
         mask.SetFont( wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD))
 
         description.SetFont( wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD))
         mask.SetFont( wx.Font(9, wx.SWISS, wx.NORMAL, wx.BOLD))


@@ -50,7 +41,7 @@ class demoMixin:
             sizer.Add( wx.StaticText( self, -1, control[4]) )
 
             if control in controls:
             sizer.Add( wx.StaticText( self, -1, control[4]) )
 
             if control in controls:

-                newControl  = med.wxMaskedTextCtrl( self, -1, "",
+                newControl  = med.MaskedTextCtrl( self, -1, "",

                                                 mask         = control[1],
                                                 excludeChars = control[2],
                                                 formatcodes  = control[3],
                                                 mask         = control[1],
                                                 excludeChars = control[2],
                                                 formatcodes  = control[3],


@@ -81,9 +72,9 @@ class demoMixin:
 
 
 #----------------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------------

-class demoPage1(scroll.wxScrolledPanel, demoMixin):
+class demoPage1(scroll.ScrolledPanel, demoMixin):

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

-        scroll.wxScrolledPanel.__init__(self, parent, -1)
+        scroll.ScrolledPanel.__init__(self, parent, -1)

         self.sizer = wx.BoxSizer( wx.VERTICAL )
         self.editList  = []
 
         self.sizer = wx.BoxSizer( wx.VERTICAL )
         self.editList  = []
 


@@ -153,15 +144,15 @@ Smith, Jones, Williams).  Signs on numbers can be toggled with the minus key.
         self.changeControlParams( event, "fillChar", '?', ' ' )
 
 
         self.changeControlParams( event, "fillChar", '?', ' ' )
 
 

-class demoPage2(scroll.wxScrolledPanel, demoMixin):
+class demoPage2(scroll.ScrolledPanel, demoMixin):

     def __init__( self, parent, log ):
         self.log = log
     def __init__( self, parent, log ):
         self.log = log

-        scroll.wxScrolledPanel.__init__( self, parent, -1 )
+        scroll.ScrolledPanel.__init__( self, parent, -1 )

         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
         label = wx.StaticText( self, -1, """\
 All these controls have been created by passing a single parameter, the autoformat code,
         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
         label = wx.StaticText( self, -1, """\
 All these controls have been created by passing a single parameter, the autoformat code,

-and use the factory class wxMaskedCtrl with its default controlType.
+and use the factory class MaskedCtrl with its default controlType.

 The maskededit module contains an internal dictionary of types and formats (autoformats).
 Many of these already do complicated validation; To see some examples, try
 29 Feb 2002 vs. 2004 for the date formats, or email address validation.
 The maskededit module contains an internal dictionary of types and formats (autoformats).
 Many of these already do complicated validation; To see some examples, try
 29 Feb 2002 vs. 2004 for the date formats, or email address validation.


@@ -186,7 +177,7 @@ Many of these already do complicated validation; To see some examples, try
         for autoformat, desc in med.autoformats:
             grid.Add( wx.StaticText( self, -1, desc), 0, wx.ALIGN_LEFT )
             grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT )
         for autoformat, desc in med.autoformats:
             grid.Add( wx.StaticText( self, -1, desc), 0, wx.ALIGN_LEFT )
             grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT )

-            grid.Add( mctl.wxMaskedCtrl( self, -1, "",
+            grid.Add( mctl.MaskedCtrl( self, -1, "",

                                     autoformat       = autoformat,
                                     demo             = True,
                                     name             = autoformat),
                                     autoformat       = autoformat,
                                     demo             = True,
                                     name             = autoformat),


@@ -198,15 +189,15 @@ Many of these already do complicated validation; To see some examples, try
         self.SetupScrolling()
 
 
         self.SetupScrolling()
 
 

-class demoPage3(scroll.wxScrolledPanel, demoMixin):
+class demoPage3(scroll.ScrolledPanel, demoMixin):

     def __init__(self, parent, log):
         self.log = log
     def __init__(self, parent, log):
         self.log = log

-        scroll.wxScrolledPanel.__init__(self, parent, -1)
+        scroll.ScrolledPanel.__init__(self, parent, -1)

         self.sizer = wx.BoxSizer( wx.VERTICAL )
         self.editList  = []
 
         label = wx.StaticText( self, -1, """\
         self.sizer = wx.BoxSizer( wx.VERTICAL )
         self.editList  = []
 
         label = wx.StaticText( self, -1, """\

-Here wxMaskedTextCtrls that have default values.  The states
+Here MaskedTextCtrls that have default values.  The states

 control has a list of valid values, and the unsigned integer
 has a legal range specified.
 """)
 control has a list of valid values, and the unsigned integer
 has a legal range specified.
 """)


@@ -244,10 +235,10 @@ has a legal range specified.
         self.changeControlParams( event, "validRequired", True, False )
 
 
         self.changeControlParams( event, "validRequired", True, False )
 
 

-class demoPage4(scroll.wxScrolledPanel, demoMixin):
+class demoPage4(scroll.ScrolledPanel, demoMixin):

     def __init__( self, parent, log ):
         self.log = log
     def __init__( self, parent, log ):
         self.log = log

-        scroll.wxScrolledPanel.__init__( self, parent, -1 )
+        scroll.ScrolledPanel.__init__( self, parent, -1 )

         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
         label = wx.StaticText( self, -1, """\
         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
         label = wx.StaticText( self, -1, """\


@@ -265,7 +256,7 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
         description  = wx.StaticText( self, -1, "Description" )
         autofmt      = wx.StaticText( self, -1, "AutoFormat Code" )
         fields       = wx.StaticText( self, -1, "Field Objects" )
         description  = wx.StaticText( self, -1, "Description" )
         autofmt      = wx.StaticText( self, -1, "AutoFormat Code" )
         fields       = wx.StaticText( self, -1, "Field Objects" )

-        ctrl         = wx.StaticText( self, -1, "wxMaskedTextCtrl" )
+        ctrl         = wx.StaticText( self, -1, "MaskedTextCtrl" )

 
         description.SetFont( wx.Font( 9, wx.SWISS, wx.NORMAL, wx.BOLD ) )
         autofmt.SetFont( wx.Font( 9, wx.SWISS, wx.NORMAL, wx.BOLD ) )
 
         description.SetFont( wx.Font( 9, wx.SWISS, wx.NORMAL, wx.BOLD ) )
         autofmt.SetFont( wx.Font( 9, wx.SWISS, wx.NORMAL, wx.BOLD ) )


@@ -288,7 +279,7 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
         grid.Add( wx.StaticText( self, -1, "Restricted Area Code"), 0, wx.ALIGN_LEFT )
         grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT )
         grid.Add( wx.StaticText( self, -1, fieldsLabel), 0, wx.ALIGN_LEFT )
         grid.Add( wx.StaticText( self, -1, "Restricted Area Code"), 0, wx.ALIGN_LEFT )
         grid.Add( wx.StaticText( self, -1, autoformat), 0, wx.ALIGN_LEFT )
         grid.Add( wx.StaticText( self, -1, fieldsLabel), 0, wx.ALIGN_LEFT )

-        grid.Add( med.wxMaskedTextCtrl( self, -1, "",
+        grid.Add( med.MaskedTextCtrl( self, -1, "",

                                     autoformat       = autoformat,
                                     fields           = fieldsDict,
                                     demo             = True,
                                     autoformat       = autoformat,
                                     fields           = fieldsDict,
                                     demo             = True,


@@ -301,7 +292,7 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
 {1: Field(choices=[
             "03", "04", "05"],
           choiceRequired=True)}"""
 {1: Field(choices=[
             "03", "04", "05"],
           choiceRequired=True)}"""

-        exp =  med.wxMaskedTextCtrl( self, -1, "",
+        exp =  med.MaskedTextCtrl( self, -1, "",

                                  autoformat       = autoformat,
                                  fields           = fieldsDict,
                                  demo             = True,
                                  autoformat       = autoformat,
                                  fields           = fieldsDict,
                                  demo             = True,


@@ -320,7 +311,7 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
  1: Field(choices=["1234", "5678"],
           choiceRequired=False)}"""
         autoformat = "USZIPPLUS4"
  1: Field(choices=["1234", "5678"],
           choiceRequired=False)}"""
         autoformat = "USZIPPLUS4"

-        zip =  med.wxMaskedTextCtrl( self, -1, "",
+        zip =  med.MaskedTextCtrl( self, -1, "",

                                  autoformat       = autoformat,
                                  fields           = fieldsDict,
                                  demo             = True,
                                  autoformat       = autoformat,
                                  fields           = fieldsDict,
                                  demo             = True,


@@ -337,15 +328,15 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
         self.SetupScrolling()
 
 
         self.SetupScrolling()
 
 

-class demoPage5(scroll.wxScrolledPanel, demoMixin):
+class demoPage5(scroll.ScrolledPanel, demoMixin):

     def __init__( self, parent, log ):
         self.log = log
     def __init__( self, parent, log ):
         self.log = log

-        scroll.wxScrolledPanel.__init__( self, parent, -1 )
+        scroll.ScrolledPanel.__init__( self, parent, -1 )

         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
 
         labelMaskedCombos = wx.StaticText( self, -1, """\
         self.sizer = wx.BoxSizer( wx.VERTICAL )
 
 
         labelMaskedCombos = wx.StaticText( self, -1, """\

-These are some examples of wxMaskedComboBox:""")
+These are some examples of MaskedComboBox:""")

         labelMaskedCombos.SetForegroundColour( "Blue" )
 
 
         labelMaskedCombos.SetForegroundColour( "Blue" )
 
 


@@ -353,7 +344,7 @@ These are some examples of wxMaskedComboBox:""")
 A state selector; only
 "legal" values can be
 entered:""")
 A state selector; only
 "legal" values can be
 entered:""")

-        statecode = med.wxMaskedComboBox( self, -1, med.states[0],
+        statecode = med.MaskedComboBox( self, -1, med.states[0],

                                   choices = med.states,
                                   autoformat="USSTATE")
 
                                   choices = med.states,
                                   autoformat="USSTATE")
 


@@ -362,7 +353,7 @@ A state name selector,
 with auto-select:""")
 
         # Create this one using factory function:
 with auto-select:""")
 
         # Create this one using factory function:

-        statename = mctl.wxMaskedCtrl( self, -1, med.state_names[0],
+        statename = mctl.MaskedCtrl( self, -1, med.state_names[0],

                                   controlType = mctl.controlTypes.MASKEDCOMBO,
                                   choices = med.state_names,
                                   autoformat="USSTATENAME",
                                   controlType = mctl.controlTypes.MASKEDCOMBO,
                                   choices = med.state_names,
                                   autoformat="USSTATENAME",


@@ -386,7 +377,7 @@ A masked ComboBox for fraction selection.
 Choices for each side of the fraction can
 be selected with PageUp/Down:""")
 
 Choices for each side of the fraction can
 be selected with PageUp/Down:""")
 

-        fraction = mctl.wxMaskedCtrl( self, -1, "",
+        fraction = mctl.MaskedCtrl( self, -1, "",

                                  controlType = mctl.MASKEDCOMBO,
                                  choices = choices,
                                  choiceRequired = True,
                                  controlType = mctl.MASKEDCOMBO,
                                  choices = choices,
                                  choiceRequired = True,


@@ -401,7 +392,7 @@ A masked ComboBox to validate
 text from a list of numeric codes:""")
 
         choices = ["91", "136", "305", "4579"]
 text from a list of numeric codes:""")
 
         choices = ["91", "136", "305", "4579"]

-        code = med.wxMaskedComboBox( self, -1, choices[0],
+        code = med.MaskedComboBox( self, -1, choices[0],

                                  choices = choices,
                                  choiceRequired = True,
                                  formatcodes = "F_r",
                                  choices = choices,
                                  choiceRequired = True,
                                  formatcodes = "F_r",


@@ -411,7 +402,7 @@ text from a list of numeric codes:""")
 Programmatically set
 choice sets:""")
         self.list_selector = wx.ComboBox(self, -1, '', choices = ['list1', 'list2', 'list3'])
 Programmatically set
 choice sets:""")
         self.list_selector = wx.ComboBox(self, -1, '', choices = ['list1', 'list2', 'list3'])

-        self.dynamicbox = mctl.wxMaskedCtrl( self, -1, '    ',
+        self.dynamicbox = mctl.MaskedCtrl( self, -1, '    ',

                                       controlType = mctl.controlTypes.MASKEDCOMBO,
                                       mask =    'XXXX',
                                       formatcodes = 'F_',
                                       controlType = mctl.controlTypes.MASKEDCOMBO,
                                       mask =    'XXXX',
                                       formatcodes = 'F_',


@@ -424,22 +415,22 @@ choice sets:""")
 
 
         labelIpAddrs = wx.StaticText( self, -1, """\
 
 
         labelIpAddrs = wx.StaticText( self, -1, """\

-Here are some examples of wxIpAddrCtrl, a control derived from wxMaskedTextCtrl:""")
+Here are some examples of IpAddrCtrl, a control derived from MaskedTextCtrl:""")

         labelIpAddrs.SetForegroundColour( "Blue" )
 
 
         label_ipaddr1 = wx.StaticText( self, -1, "An empty control:")
         labelIpAddrs.SetForegroundColour( "Blue" )
 
 
         label_ipaddr1 = wx.StaticText( self, -1, "An empty control:")

-        ipaddr1 = med.wxIpAddrCtrl( self, -1, style = wx.TE_PROCESS_TAB )
+        ipaddr1 = med.IpAddrCtrl( self, -1, style = wx.TE_PROCESS_TAB )

 
 
         label_ipaddr2 = wx.StaticText( self, -1, "A restricted mask:")
 
 
         label_ipaddr2 = wx.StaticText( self, -1, "A restricted mask:")

-        ipaddr2 = med.wxIpAddrCtrl( self, -1, mask=" 10.  1.109.###" )
+        ipaddr2 = med.IpAddrCtrl( self, -1, mask=" 10.  1.109.###" )

 
 
         label_ipaddr3 = wx.StaticText( self, -1, """\
 A control with restricted legal values:
 10. (1|2) . (129..255) . (0..255)""")
 
 
         label_ipaddr3 = wx.StaticText( self, -1, """\
 A control with restricted legal values:
 10. (1|2) . (129..255) . (0..255)""")

-        ipaddr3 = mctl.wxMaskedCtrl( self, -1,
+        ipaddr3 = mctl.MaskedCtrl( self, -1,

                                 controlType = mctl.controlTypes.IPADDR,
                                 mask=" 10.  #.###.###")
         ipaddr3.SetFieldParameters(0, validRegex="1|2",validRequired=False )   # requires entry to match or not allowed
                                 controlType = mctl.controlTypes.IPADDR,
                                 mask=" 10.  #.###.###")
         ipaddr3.SetFieldParameters(0, validRegex="1|2",validRequired=False )   # requires entry to match or not allowed


@@ -450,22 +441,22 @@ A control with restricted legal values:
 
 
         labelNumerics = wx.StaticText( self, -1, """\
 
 
         labelNumerics = wx.StaticText( self, -1, """\

-Here are some useful configurations of a wxMaskedTextCtrl for integer and floating point input that still treat
-the control as a text control.  (For a true numeric control, check out the wxMaskedNumCtrl class!)""")
+Here are some useful configurations of a MaskedTextCtrl for integer and floating point input that still treat
+the control as a text control.  (For a true numeric control, check out the MaskedNumCtrl class!)""")

         labelNumerics.SetForegroundColour( "Blue" )
 
         label_intctrl1 = wx.StaticText( self, -1, """\
 An integer entry control with
 shifting insert enabled:""")
         labelNumerics.SetForegroundColour( "Blue" )
 
         label_intctrl1 = wx.StaticText( self, -1, """\
 An integer entry control with
 shifting insert enabled:""")

-        self.intctrl1 = med.wxMaskedTextCtrl(self, -1, name='intctrl', mask="#{9}", formatcodes = '_-,F>')
+        self.intctrl1 = med.MaskedTextCtrl(self, -1, name='intctrl', mask="#{9}", formatcodes = '_-,F>')

         label_intctrl2 = wx.StaticText( self, -1, """\
      Right-insert integer entry:""")
         label_intctrl2 = wx.StaticText( self, -1, """\
      Right-insert integer entry:""")

-        self.intctrl2 = med.wxMaskedTextCtrl(self, -1, name='intctrl', mask="#{9}", formatcodes = '_-,Fr')
+        self.intctrl2 = med.MaskedTextCtrl(self, -1, name='intctrl', mask="#{9}", formatcodes = '_-,Fr')

 
         label_floatctrl = wx.StaticText( self, -1, """\
 A floating point entry control
 with right-insert for ordinal:""")
 
         label_floatctrl = wx.StaticText( self, -1, """\
 A floating point entry control
 with right-insert for ordinal:""")

-        self.floatctrl = med.wxMaskedTextCtrl(self, -1, name='floatctrl', mask="#{9}.#{2}", formatcodes="F,_-R", useParensForNegatives=False)
+        self.floatctrl = med.MaskedTextCtrl(self, -1, name='floatctrl', mask="#{9}.#{2}", formatcodes="F,_-R", useParensForNegatives=False)

         self.floatctrl.SetFieldParameters(0, formatcodes='r<', validRequired=True)  # right-insert, require explicit cursor movement to change fields
         self.floatctrl.SetFieldParameters(1, defaultValue='00')                     # don't allow blank fraction
 
         self.floatctrl.SetFieldParameters(0, formatcodes='r<', validRequired=True)  # right-insert, require explicit cursor movement to change fields
         self.floatctrl.SetFieldParameters(1, defaultValue='00')                     # don't allow blank fraction
 


@@ -577,9 +568,9 @@ with right-insert for ordinal:""")
                 self.log.write(line)
 
     def OnParensCheck( self, event ):
                 self.log.write(line)
 
     def OnParensCheck( self, event ):

-        self.intctrl1.SetCtrlParameters(useParensForNegatives=event.Checked())
-        self.intctrl2.SetCtrlParameters(useParensForNegatives=event.Checked())
-        self.floatctrl.SetCtrlParameters(useParensForNegatives=event.Checked())
+        self.intctrl1.SetCtrlParameters(useParensForNegatives=event.IsChecked())
+        self.intctrl2.SetCtrlParameters(useParensForNegatives=event.IsChecked())
+        self.floatctrl.SetCtrlParameters(useParensForNegatives=event.IsChecked())

 
     def OnIpAddrChange( self, event ):
         ipaddr = self.FindWindowById( event.GetId() )
 
     def OnIpAddrChange( self, event ):
         ipaddr = self.FindWindowById( event.GetId() )


@@ -597,7 +588,7 @@ with right-insert for ordinal:""")
             formatcodes += 'r'
             mask = '###'
         else:
             formatcodes += 'r'
             mask = '###'
         else:

-            choices = states
+            choices = med.states

             mask = 'AA'
             formatcodes += '!'
         self.dynamicbox.SetCtrlParameters( mask = mask,
             mask = 'AA'
             formatcodes += '!'
         self.dynamicbox.SetCtrlParameters( mask = mask,


@@ -652,4 +643,4 @@ overview = """<html>
 if __name__ == "__main__":
     import sys,os
     import run
 if __name__ == "__main__":
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])