X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2d049f28a5a6b9e78863df05c58737dc9a8f905..9fd1fa4b1a6a25fe70e703ceb68231c771de5d4e:/wxPython/wx/lib/masked/maskededit.py

diff --git a/wxPython/wx/lib/masked/maskededit.py b/wxPython/wx/lib/masked/maskededit.py
index dc78b9dc7e..c64c48588e 100644
--- a/wxPython/wx/lib/masked/maskededit.py
+++ b/wxPython/wx/lib/masked/maskededit.py
@@ -1919,8 +1919,7 @@ class MaskedEditMixin:
                 width = self.GetSize().width
                 height = self.GetBestSize().height
 ##                dbg('setting client size to:', (width, height))
-                self.SetSize((width, height))
-                self.SetSizeHints((width, height))
+                self.SetBestFittingSize((width, height))
 
             # Set value/type-specific formatting
             self._applyFormatting()
@@ -2002,7 +2001,7 @@ class MaskedEditMixin:
                     #  the outside size that does include the borders.  What you are
                     #  calculating (in _CalcSize) is the client size, but the sizers
                     #  deal with the full size and so that is the minimum size that
-                    #  we need to set with SetSizeHints.  The root of the problem is
+                    #  we need to set with SetBestFittingSize.  The root of the problem is
                     #  that in _calcSize the current client size height is returned,
                     #  instead of a height based on the current font.  So I suggest using
                     #  _calcSize to just get the width, and then use GetBestSize to
@@ -2010,8 +2009,7 @@ class MaskedEditMixin:
                     self.SetClientSize(self._CalcSize())
                     width = self.GetSize().width
                     height = self.GetBestSize().height
-                    self.SetSize((width, height))
-                    self.SetSizeHints((width, height))
+                    self.SetBestFittingSize((width, height))
 
 
             # Set value/type-specific formatting
@@ -4930,7 +4928,7 @@ class MaskedEditMixin:
                     matched_str = newtext
                     newtext = self._ctrl_constraints._choices[match_index]
                     edit_end = self._ctrl_constraints._extent[1]
-                    new_select_to = min(edit_end, len(newvalue.rstrip()))
+                    new_select_to = min(edit_end, len(newtext.rstrip()))
                     match_field = self._ctrl_constraints
                     if self._ctrl_constraints._insertRight:
                         # adjust position to just after partial match in control: