Remove const bool

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

diff --git a/wxPython/demo/MaskedNumCtrl.py b/wxPython/demo/MaskedNumCtrl.py
index 81ad6cfe33395764c4bc3b2b33a6de629dc40beb..6926f8da5ad62fdaf488759cc73ed2c215f815bd 100644 (file)
--- a/wxPython/demo/MaskedNumCtrl.py
+++ b/wxPython/demo/MaskedNumCtrl.py
@@ -4,7 +4,8 @@ import  sys
 import  traceback
 
 import  wx
 import  traceback
 
 import  wx

-import  wx.lib.maskednumctrl    as mnum
+from    wx.lib import masked
+

 #----------------------------------------------------------------------
 
 class TestPanel( wx.Panel ):
 #----------------------------------------------------------------------
 
 class TestPanel( wx.Panel ):


@@ -15,44 +16,45 @@ class TestPanel( wx.Panel ):
         panel = wx.Panel( self, -1 )
 
         header = wx.StaticText(panel, -1, """\
         panel = wx.Panel( self, -1 )
 
         header = wx.StaticText(panel, -1, """\

-This shows the various options for MaskedNumCtrl.
+This shows the various options for masked.NumCtrl.

 The controls at the top reconfigure the resulting control at the bottom.
 """)
         header.SetForegroundColour( "Blue" )
 
         intlabel = wx.StaticText( panel, -1, "Integer width:" )
 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.MaskedNumCtrl(
+        self.integerwidth = masked.NumCtrl(

                                 panel, value=10, integerWidth=2, allowNegative=False
                                 )
 
         fraclabel = wx.StaticText( panel, -1, "Fraction width:" )
                                 panel, value=10, integerWidth=2, allowNegative=False
                                 )
 
         fraclabel = wx.StaticText( panel, -1, "Fraction width:" )

-        self.fractionwidth = mnum.MaskedNumCtrl(
-                                panel, value=0, integerWidth=2, allowNegative=False 
+        self.fractionwidth = masked.NumCtrl(
+                                panel, value=0, integerWidth=2, allowNegative=False

                                 )
 
         groupcharlabel = wx.StaticText( panel,-1, "Grouping char:" )
                                 )
 
         groupcharlabel = wx.StaticText( panel,-1, "Grouping char:" )

-        self.groupchar = mnum.MaskedTextCtrl( 
-                                panel, -1, value=',', mask='&', excludeChars = '-()',
-                                formatcodes='F', emptyInvalid=True, validRequired=True
+        self.groupchar = masked.TextCtrl(
+                                panel, -1, value=',', mask='*', includeChars = ' ', excludeChars = '-()0123456789',
+                                formatcodes='F', emptyInvalid=False, validRequired=True

                                 )
 
         decimalcharlabel = wx.StaticText( panel,-1, "Decimal char:" )
                                 )
 
         decimalcharlabel = wx.StaticText( panel,-1, "Decimal char:" )

-        self.decimalchar = mnum.MaskedTextCtrl( 
+        self.decimalchar = masked.TextCtrl(

                                 panel, -1, value='.', mask='&', excludeChars = '-()',
                                 formatcodes='F', emptyInvalid=True, validRequired=True
                                 )
 
         self.set_min = wx.CheckBox( panel, -1, "Set minimum value:" )
                                 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.MaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
+        # Create this masked.NumCtrl using factory, to show how:
+        self.min = masked.Ctrl( panel, integerWidth=5, fractionWidth=2, controlType=masked.controlTypes.NUMBER )

         self.min.Enable( False )
 
         self.set_max = wx.CheckBox( panel, -1, "Set maximum value:" )
         self.min.Enable( False )
 
         self.set_max = wx.CheckBox( panel, -1, "Set maximum value:" )

-        self.max = mnum.MaskedNumCtrl( panel, integerWidth=5, fractionWidth=2 )
+        self.max = masked.NumCtrl( panel, integerWidth=5, fractionWidth=2 )

         self.max.Enable( False )
 
 
         self.limit_target = wx.CheckBox( panel, -1, "Limit control" )
         self.max.Enable( False )
 
 
         self.limit_target = wx.CheckBox( panel, -1, "Limit control" )

+        self.limit_on_field_change = wx.CheckBox( panel, -1, "Limit on field change" )

         self.allow_none = wx.CheckBox( panel, -1, "Allow empty control" )
         self.group_digits = wx.CheckBox( panel, -1, "Group digits" )
         self.group_digits.SetValue( True )
         self.allow_none = wx.CheckBox( panel, -1, "Allow empty control" )
         self.group_digits = wx.CheckBox( panel, -1, "Group digits" )
         self.group_digits.SetValue( True )


@@ -67,7 +69,7 @@ The controls at the top reconfigure the resulting control at the bottom.
         font.SetWeight(wx.BOLD)
         label.SetFont(font)
 
         font.SetWeight(wx.BOLD)
         label.SetFont(font)
 

-        self.target_ctl = mnum.MaskedNumCtrl( panel, -1, name="target control" )
+        self.target_ctl = masked.NumCtrl( panel, -1, name="target control" )

 
         label_numselect = wx.StaticText( panel, -1, """\
 Programmatically set the above
 
         label_numselect = wx.StaticText( panel, -1, """\
 Programmatically set the above


@@ -101,21 +103,26 @@ value entry ctrl:""")
 
 
         grid1.Add( self.limit_target, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
 
 
         grid1.Add( self.limit_target, 0, wx.ALIGN_LEFT|wx.ALL, 5 )

-        grid1.Add( self.allow_none, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid1.Add( self.limit_on_field_change, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        

         hbox1 = wx.BoxSizer( wx.HORIZONTAL )
         hbox1.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
         hbox1 = wx.BoxSizer( wx.HORIZONTAL )
         hbox1.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)

-        hbox1.Add( self.group_digits, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        hbox1.Add( self.allow_none, 0, wx.ALIGN_LEFT|wx.ALL, 5 )

         grid1.Add( hbox1, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
 
         grid1.Add( hbox1, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
 

-        grid1.Add( self.allow_negative, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
-        grid1.Add( self.use_parens, 0, wx.ALIGN_LEFT|wx.ALL, 5 )
+        grid1.Add( self.group_digits, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        grid1.Add( self.allow_negative, 0, wx.ALIGN_LEFT|wx.ALL, 5 )        

         hbox2 = wx.BoxSizer( wx.HORIZONTAL )
         hbox2.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
         hbox2 = wx.BoxSizer( wx.HORIZONTAL )
         hbox2.Add( (17,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)

-        hbox2.Add( self.select_on_entry, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        hbox2.Add( self.use_parens, 0, wx.ALIGN_LEFT|wx.ALL, 5 )

         grid1.Add( hbox2, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( hbox2, 0, wx.ALIGN_LEFT|wx.ALL, 5)
         grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)

-
+        
+        grid1.Add( self.select_on_entry, 0, wx.ALIGN_LEFT|wx.LEFT, 5 )
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        grid1.Add( (5,5), 0, wx.ALIGN_LEFT|wx.ALL, 5)

 
         grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         grid2.Add( label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 
         grid2 = wx.FlexGridSizer( 0, 2, 0, 0 )
         grid2.Add( label, 0, wx.ALIGN_LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )


@@ -140,24 +147,25 @@ value entry ctrl:""")
         panel.Move( (50,10) )
         self.panel = panel
 
         panel.Move( (50,10) )
         self.panel = panel
 

-        self.Bind(mnum.EVT_MASKEDNUM, self.OnSetIntWidth, self.integerwidth )
-        self.Bind(mnum.EVT_MASKEDNUM, self.OnSetFractionWidth, self.fractionwidth )
+        self.Bind(masked.EVT_NUM, self.OnSetIntWidth, self.integerwidth )
+        self.Bind(masked.EVT_NUM, 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 )
         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 )

-        self.Bind(mnum.EVT_MASKEDNUM, self.SetTargetMinMax, self.min )
-        self.Bind(mnum.EVT_MASKEDNUM, self.SetTargetMinMax, self.max )
+        self.Bind(masked.EVT_NUM, self.SetTargetMinMax, self.min )
+        self.Bind(masked.EVT_NUM, self.SetTargetMinMax, self.max )

 
 

-        self.Bind(wx.EVT_CHECKBOX, self.SetTargetMinMax, self.limit_target )
+        self.Bind(wx.EVT_CHECKBOX, self.OnSetLimited, self.limit_target )
+        self.Bind(wx.EVT_CHECKBOX, self.OnSetLimitOnFieldChange, self.limit_on_field_change )

         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNone, self.allow_none )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetGroupDigits, self.group_digits )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNegative, self.allow_negative )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetUseParens, self.use_parens )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetSelectOnEntry, self.select_on_entry )
 
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNone, self.allow_none )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetGroupDigits, self.group_digits )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetAllowNegative, self.allow_negative )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetUseParens, self.use_parens )
         self.Bind(wx.EVT_CHECKBOX, self.OnSetSelectOnEntry, self.select_on_entry )
 

-        self.Bind(mnum.EVT_MASKEDNUM, self.OnTargetChange, self.target_ctl )
+        self.Bind(masked.EVT_NUM, self.OnTargetChange, self.target_ctl )

         self.Bind(wx.EVT_COMBOBOX, self.OnNumberSelect, self.numselect )
 
 
         self.Bind(wx.EVT_COMBOBOX, self.OnNumberSelect, self.numselect )
 
 


@@ -217,10 +225,26 @@ value entry ctrl:""")
         self.SetTargetMinMax()
 
 
         self.SetTargetMinMax()
 
 

+    def OnSetLimited( self, event ):
+        limited = self.limit_target.GetValue()
+        self.target_ctl.SetLimited( limited )
+        limit_on_field_change = self.limit_on_field_change.GetValue()
+        if limited and limit_on_field_change:
+            self.limit_on_field_change.SetValue(False)
+            self.target_ctl.SetLimitOnFieldChange( False )
+        self.SetTargetMinMax()
+
+
+    def OnSetLimitOnFieldChange( self, event ):
+        limit_on_field_change = self.limit_on_field_change.GetValue()
+        self.target_ctl.SetLimitOnFieldChange( limit_on_field_change )
+        limited = self.limit_target.GetValue()
+        if limited and limit_on_field_change:
+            self.limit_target.SetValue(False)
+            self.target_ctl.SetLimited( False )
+

     def SetTargetMinMax( self, event=None ):
         min = max = None
     def SetTargetMinMax( self, event=None ):
         min = max = None

-        self.target_ctl.SetLimited( self.limit_target.GetValue() )
-

         if self.set_min.GetValue():
             min = self.min.GetValue()
         if self.set_max.GetValue():
         if self.set_min.GetValue():
             min = self.min.GetValue()
         if self.set_max.GetValue():


@@ -322,9 +346,13 @@ def runTest( frame, nb, log ):
     return win
 
 #----------------------------------------------------------------------
     return win
 
 #----------------------------------------------------------------------

-overview = mnum.__doc__
+import wx.lib.masked.numctrl as mnum
+overview = """<html>
+<PRE><FONT SIZE=-1>
+""" + mnum.__doc__ + """
+</FONT></PRE>"""

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