drop highlight color fix

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

diff --git a/wxPython/demo/MaskedEditControls.py b/wxPython/demo/MaskedEditControls.py
index edc3052e1d6d1aade4b91f7f7af5bb73eb11ba95..5e83e9cc3b0aa8f739ab9439cae2337b079d845b 100644 (file)
--- a/wxPython/demo/MaskedEditControls.py
+++ b/wxPython/demo/MaskedEditControls.py
@@ -1,21 +1,11 @@
-# 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  traceback
 
 import  wx
 
 import  string
 import  sys
 import  traceback
 
 import  wx

-import  wx.lib.maskededit       as  med
-import  wx.lib.maskedctrl       as  mctl
-import  wx.lib.scrolledpanel    as  scroll
+import  wx.lib.masked             as  masked
+import  wx.lib.scrolledpanel      as  scroll

 
 
 class demoMixin:
 
 
 class demoMixin:


@@ -27,7 +17,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, "Masked TextCtrl" )

 
         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 +40,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  = masked.TextCtrl( self, -1, "",

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


@@ -81,14 +71,14 @@ 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  = []
 
         label = wx.StaticText( self, -1, """\
         self.sizer = wx.BoxSizer( wx.VERTICAL )
         self.editList  = []
 
         label = wx.StaticText( self, -1, """\

-Here are some basic MaskedTextCtrls to give you an idea of what you can do
+Here are some basic masked TextCtrls to give you an idea of what you can do

 with this control.  Note that all controls have been auto-sized by including 'F' in
 the format codes.
 
 with this control.  Note that all controls have been auto-sized by including 'F' in
 the format codes.
 


@@ -153,16 +143,16 @@ 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.
-The maskededit module contains an internal dictionary of types and formats (autoformats).
+and use the factory class masked.Ctrl with its default controlType.
+The masked package 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.
 """)
 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.
 """)


@@ -172,7 +162,7 @@ Many of these already do complicated validation; To see some examples, try
 
         description = wx.StaticText( self, -1, "Description")
         autofmt     = wx.StaticText( self, -1, "AutoFormat Code")
 
         description = wx.StaticText( self, -1, "Description")
         autofmt     = wx.StaticText( self, -1, "AutoFormat Code")

-        ctrl        = wx.StaticText( self, -1, "MaskedCtrl")
+        ctrl        = wx.StaticText( self, -1, "Masked Ctrl")

 
         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 ) )


@@ -183,10 +173,10 @@ Many of these already do complicated validation; To see some examples, try
         grid.Add( autofmt,     0, wx.ALIGN_LEFT )
         grid.Add( ctrl,        0, wx.ALIGN_LEFT )
 
         grid.Add( autofmt,     0, wx.ALIGN_LEFT )
         grid.Add( ctrl,        0, wx.ALIGN_LEFT )
 

-        for autoformat, desc in med.autoformats:
+        for autoformat, desc in masked.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( 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( masked.Ctrl( self, -1, "",

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


@@ -198,15 +188,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 masked TextCtrls 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.
 """)


@@ -224,7 +214,7 @@ has a legal range specified.
 
         controls = [
         #description        mask                    excl format     regexp                              range,list,initial
 
         controls = [
         #description        mask                    excl format     regexp                              range,list,initial

-       ("U.S. State (2 char)",      "AA",            "", 'F!_',       "[A-Z]{2}",                         '',med.states, med.states[0]),
+       ("U.S. State (2 char)",      "AA",            "", 'F!_',       "[A-Z]{2}",                         '', masked.states, masked.states[0]),

        ("Integer (signed)",         "#{6}",          "", 'F-_',       "",                                 '','', ' 0    '),
        ("Integer (unsigned)\n(1-399)","######",      "", 'F_',        "",                                 (1,399),'', '1     '),
        ("Float (signed)",           "#{6}.#{9}",     "", 'F-_R',      "",                                 '','', '000000.000000000'),
        ("Integer (signed)",         "#{6}",          "", 'F-_',       "",                                 '','', ' 0    '),
        ("Integer (unsigned)\n(1-399)","######",      "", 'F_',        "",                                 (1,399),'', '1     '),
        ("Float (signed)",           "#{6}.#{9}",     "", 'F-_R',      "",                                 '','', '000000.000000000'),


@@ -244,10 +234,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 +255,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, "Masked TextCtrl" )

 
         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 ) )


@@ -279,7 +269,7 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
         grid.Add( ctrl,        0, wx.ALIGN_LEFT )
 
         autoformat = "USPHONEFULLEXT"
         grid.Add( ctrl,        0, wx.ALIGN_LEFT )
 
         autoformat = "USPHONEFULLEXT"

-        fieldsDict = {0: med.Field(choices=["617","781","508","978","413"], choiceRequired=True)}
+        fieldsDict = {0: masked.Field(choices=["617","781","508","978","413"], choiceRequired=True)}

         fieldsLabel = """\
 {0: Field(choices=[
             "617","781",
         fieldsLabel = """\
 {0: Field(choices=[
             "617","781",


@@ -288,7 +278,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( masked.TextCtrl( self, -1, "",

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


@@ -296,12 +286,12 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
                   0, wx.ALIGN_LEFT )
 
         autoformat = "EXPDATEMMYY"
                   0, wx.ALIGN_LEFT )
 
         autoformat = "EXPDATEMMYY"

-        fieldsDict = {1: med.Field(choices=["03", "04", "05"], choiceRequired=True)}
+        fieldsDict = {1: masked.Field(choices=["03", "04", "05"], choiceRequired=True)}

         fieldsLabel = """\
 {1: Field(choices=[
             "03", "04", "05"],
           choiceRequired=True)}"""
         fieldsLabel = """\
 {1: Field(choices=[
             "03", "04", "05"],
           choiceRequired=True)}"""

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

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


@@ -312,15 +302,15 @@ Page Up and Shift-Up arrow will similarly cycle backwards through the list.
         grid.Add( wx.StaticText( self, -1, fieldsLabel), 0, wx.ALIGN_LEFT )
         grid.Add( exp, 0, wx.ALIGN_LEFT )
 
         grid.Add( wx.StaticText( self, -1, fieldsLabel), 0, wx.ALIGN_LEFT )
         grid.Add( exp, 0, wx.ALIGN_LEFT )
 

-        fieldsDict = {0: med.Field(choices=["02134","02155"], choiceRequired=True),
-                      1: med.Field(choices=["1234", "5678"],  choiceRequired=False)}
+        fieldsDict = {0: masked.Field(choices=["02134","02155"], choiceRequired=True),
+                      1: masked.Field(choices=["1234", "5678"],  choiceRequired=False)}

         fieldsLabel = """\
 {0: Field(choices=["02134","02155"],
           choiceRequired=True),
  1: Field(choices=["1234", "5678"],
           choiceRequired=False)}"""
         autoformat = "USZIPPLUS4"
         fieldsLabel = """\
 {0: Field(choices=["02134","02155"],
           choiceRequired=True),
  1: Field(choices=["1234", "5678"],
           choiceRequired=False)}"""
         autoformat = "USZIPPLUS4"

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

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


@@ -337,15 +327,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 masked.ComboBox:""")

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


@@ -353,8 +343,8 @@ 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],
-                                  choices = med.states,
+        statecode = masked.ComboBox( self, -1, masked.states[0],
+                                  choices = masked.states,

                                   autoformat="USSTATE")
 
         label_statename = wx.StaticText( self, -1, """\
                                   autoformat="USSTATE")
 
         label_statename = wx.StaticText( self, -1, """\


@@ -362,9 +352,9 @@ 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],
-                                  controlType = mctl.controlTypes.MASKEDCOMBO,
-                                  choices = med.state_names,
+        statename = masked.Ctrl( self, -1, masked.state_names[0],
+                                  controlType = masked.controlTypes.COMBO,
+                                  choices = masked.state_names,

                                   autoformat="USSTATENAME",
                                   autoSelect=True)
         statename.SetCtrlParameters(formatcodes = 'F!V_')
                                   autoformat="USSTATENAME",
                                   autoSelect=True)
         statename.SetCtrlParameters(formatcodes = 'F!V_')


@@ -372,8 +362,8 @@ with auto-select:""")
 
         numerators = [ str(i) for i in range(1, 4) ]
         denominators = [ string.ljust(str(i), 2) for i in [2,3,4,5,8,16,32,64] ]
 
         numerators = [ str(i) for i in range(1, 4) ]
         denominators = [ string.ljust(str(i), 2) for i in [2,3,4,5,8,16,32,64] ]

-        fieldsDict = {0: med.Field(choices=numerators, choiceRequired=False),
-                      1: med.Field(choices=denominators, choiceRequired=True)}
+        fieldsDict = {0: masked.Field(choices=numerators, choiceRequired=False),
+                      1: masked.Field(choices=denominators, choiceRequired=True)}

         choices = []
         for n in numerators:
             for d in denominators:
         choices = []
         for n in numerators:
             for d in denominators:


@@ -386,8 +376,8 @@ 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, "",
-                                 controlType = mctl.MASKEDCOMBO,
+        fraction = masked.Ctrl( self, -1, "",
+                                 controlType = masked.controlTypes.COMBO,

                                  choices = choices,
                                  choiceRequired = True,
                                  mask = "#/##",
                                  choices = choices,
                                  choiceRequired = True,
                                  mask = "#/##",


@@ -401,7 +391,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 = masked.ComboBox( self, -1, choices[0],

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


@@ -411,8 +401,8 @@ 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, '    ',
-                                      controlType = mctl.controlTypes.MASKEDCOMBO,
+        self.dynamicbox = masked.Ctrl( self, -1, '    ',
+                                      controlType = masked.controlTypes.COMBO,

                                       mask =    'XXXX',
                                       formatcodes = 'F_',
                                       # these are to give dropdown some initial height,
                                       mask =    'XXXX',
                                       formatcodes = 'F_',
                                       # these are to give dropdown some initial height,


@@ -424,23 +414,23 @@ 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 masked.TextCtrl:""")

         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 = masked.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 = masked.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,
-                                controlType = mctl.controlTypes.IPADDR,
+        ipaddr3 = masked.Ctrl( self, -1,
+                                controlType = masked.controlTypes.IPADDR,

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


@@ -450,22 +440,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 masked.TextCtrl for integer and floating point input that still treat
+the control as a text control.  (For a true numeric control, check out the masked.NumCtrl 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 = masked.TextCtrl(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 = masked.TextCtrl(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 = masked.TextCtrl(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 +567,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 +587,7 @@ with right-insert for ordinal:""")
             formatcodes += 'r'
             mask = '###'
         else:
             formatcodes += 'r'
             mask = '###'
         else:

-            choices = states
+            choices = masked.states

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


@@ -637,19 +627,21 @@ def runTest(frame, nb, log):
 
 def RunStandalone():
     app = wx.PySimpleApp()
 
 def RunStandalone():
     app = wx.PySimpleApp()

-    frame = wx.Frame(None, -1, "Test MaskedTextCtrl", size=(640, 480))
+    frame = wx.Frame(None, -1, "Test MaskedEditCtrls", size=(640, 480))

     win = TestMaskedTextCtrls(frame, -1, sys.stdout)
     frame.Show(True)
     app.MainLoop()
 #----------------------------------------------------------------------------
     win = TestMaskedTextCtrls(frame, -1, sys.stdout)
     frame.Show(True)
     app.MainLoop()
 #----------------------------------------------------------------------------

-
+import wx.lib.masked.maskededit as maskededit
+# strip out module header used for pydoc:
+demodoc = '\n'.join(maskededit.__doc__.split('\n')[2:])

 overview = """<html>
 <PRE><FONT SIZE=-1>
 overview = """<html>
 <PRE><FONT SIZE=-1>

-""" + med.__doc__ + """
+""" + demodoc + """

 </FONT></PRE>
 """
 
 if __name__ == "__main__":
     import sys,os
     import run
 </FONT></PRE>
 """
 
 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:])