More WXDLLIMPEXP_GIZMOS fixes

[wxWidgets.git] / wxPython / wx / lib / masked / maskededit.py

diff --git a/wxPython/wx/lib/masked/maskededit.py b/wxPython/wx/lib/masked/maskededit.py
index 088ec62fc1c0ecc0ccc17411264423385c9d648d..5a99f9ec43aa9157fd3172e3f132f8fbdce22331 100644 (file)
--- a/wxPython/wx/lib/masked/maskededit.py
+++ b/wxPython/wx/lib/masked/maskededit.py
@@ -50,7 +50,7 @@
 # o wxTimeCtrl -> TimeCtrl
 #
 
 # o wxTimeCtrl -> TimeCtrl
 #
 

-'''\
+"""\

 ====================
 Masked Edit Overview
 ====================
 ====================
 Masked Edit Overview
 ====================


@@ -249,7 +249,7 @@ decimalChar
 
   Eg::
 
 
   Eg::
 

-        formatcodes = ',', groupChar="'"                   allows  12'345.34
+        formatcodes = ',', groupChar='\''                  allows  12'345.34

         formatcodes = ',', groupChar='.', decimalChar=','  allows  12.345,34
 
   (These are control-level parameters.)
         formatcodes = ',', groupChar='.', decimalChar=','  allows  12.345,34
 
   (These are control-level parameters.)


@@ -546,7 +546,7 @@ use either of the following::
 If not specified as a keyword argument, the default controlType is
 controlTypes.TEXT.
 
 If not specified as a keyword argument, the default controlType is
 controlTypes.TEXT.
 

-'''
+"""

 
 """
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 """
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -2892,9 +2892,9 @@ class MaskedEditMixin:
             field = self._FindField(pos)
 
 ##            dbg("key ='%s'" % chr(key))
             field = self._FindField(pos)
 
 ##            dbg("key ='%s'" % chr(key))

-##            if chr(key) == ' ':
+            if chr(key) == ' ':

 ##                dbg('okSpaces?', field._okSpaces)
 ##                dbg('okSpaces?', field._okSpaces)

-##                pass
+                pass

 
             char = chr(key) # (must work if we got this far)
 
 
             char = chr(key) # (must work if we got this far)
 


@@ -4434,9 +4434,16 @@ class MaskedEditMixin:
 
 
             # if entire field is selected or position is at end and field is not full,
 
 
             # if entire field is selected or position is at end and field is not full,

-            # or if allowed to right-insert at any point in field and field is not full and cursor is not at a fillChar:
+            # or if allowed to right-insert at any point in field and field is not full and cursor is not at a fillChar
+            # or the field is a singleton integer field and is currently 0 and we're at the end:

             if( (sel_start, sel_to) == field._extent
             if( (sel_start, sel_to) == field._extent

-                or (pos == end and input_len < field_len)):
+                or (pos == end and ((input_len < field_len)
+                                     or (field_len == 1
+                                         and input_len == field_len
+                                         and field._isInt
+                                         and value[end-1] == '0'
+                                         )
+                                    ) ) ):

                 pos = end - 1
 ##                dbg('pos = end - 1 = ', pos, 'right_insert? 1')
                 right_insert = True
                 pos = end - 1
 ##                dbg('pos = end - 1 = ', pos, 'right_insert? 1')
                 right_insert = True


@@ -4476,6 +4483,7 @@ class MaskedEditMixin:
 ##                dbg("checking appropriate regex's")
                 value = self._eraseSelection(self._GetValue())
                 if right_insert:
 ##                dbg("checking appropriate regex's")
                 value = self._eraseSelection(self._GetValue())
                 if right_insert:

+                    # move the position to the right side of the insertion:

                     at = pos+1
                 else:
                     at = pos
                     at = pos+1
                 else:
                     at = pos


@@ -4873,15 +4881,15 @@ class MaskedEditMixin:
             fstr = text[start:end]
             erasable_chars = [field._fillChar, ' ']
 
             fstr = text[start:end]
             erasable_chars = [field._fillChar, ' ']
 

-            if field._padZero:
+            # if zero padding field, or a single digit, and currently a value of 0, allow erasure of 0:
+            if field._padZero or (field._isInt and (end - start == 1) and fstr[0] == '0'):

                 erasable_chars.append('0')
 
             erased = ''
 ####            dbg("fstr[0]:'%s'" % fstr[0])
 ####            dbg('field_index:', field._index)
 ####            dbg("fstr[0] in erasable_chars?", fstr[0] in erasable_chars)
                 erasable_chars.append('0')
 
             erased = ''
 ####            dbg("fstr[0]:'%s'" % fstr[0])
 ####            dbg('field_index:', field._index)
 ####            dbg("fstr[0] in erasable_chars?", fstr[0] in erasable_chars)

-####            dbg("self._signOk and field._index == 0 and fstr[0] in ('-','(')?",
-##                 self._signOk and field._index == 0 and fstr[0] in ('-','('))
+####            dbg("self._signOk and field._index == 0 and fstr[0] in ('-','(')?", self._signOk and field._index == 0 and fstr[0] in ('-','('))

             if fstr[0] in erasable_chars or (self._signOk and field._index == 0 and fstr[0] in ('-','(')):
                 erased = fstr[0]
 ####                dbg('value:      "%s"' % text)
             if fstr[0] in erasable_chars or (self._signOk and field._index == 0 and fstr[0] in ('-','(')):
                 erased = fstr[0]
 ####                dbg('value:      "%s"' % text)


@@ -5253,7 +5261,7 @@ class MaskedEditMixin:
                     if not valid:
 ##                        dbg('cannot convert string to valid time')
                         pass
                     if not valid:
 ##                        dbg('cannot convert string to valid time')
                         pass

-        if valid: dbg('valid date')
+##        if valid: dbg('valid date')

 ##        dbg(indent=0)
         return valid
 
 ##        dbg(indent=0)
         return valid
 


@@ -5622,7 +5630,7 @@ class MaskedEditMixin:
                 and sel_to >= edit_end
                 and not self._GetValue()[edit_start:sel_start].strip() ):
                 # text won't fit within selection, but left of selection is empty;
                 and sel_to >= edit_end
                 and not self._GetValue()[edit_start:sel_start].strip() ):
                 # text won't fit within selection, but left of selection is empty;

-                # check to see if we can expand selection to accomodate the value:
+                # check to see if we can expand selection to accommodate the value:

                 empty_space = sel_start - edit_start
                 amount_needed = len(paste_text) - (sel_to - sel_start)
                 if amount_needed <= empty_space:
                 empty_space = sel_start - edit_start
                 amount_needed = len(paste_text) - (sel_to - sel_start)
                 if amount_needed <= empty_space: