Changeset 1489

Timestamp:

07/11/08 19:36:22 (8 weeks ago)

Author:

rob

Message:

Found out where the SetFocus? events were getting called: from within the TextCtrlAutoComplete?.
* made new callback method setFocusCallback to make sure the control hasn't been removed before setting focus

Location:

trunk/peppy

Files:

• actions/minibuffer.py (modified) (3 diffs)
• lib/textctrl_autocomplete.py (modified) (3 diffs)

trunk/peppy/actions/minibuffer.py

@@ -174 +174 @@
         self.panel = None
 
-    def removeFromParent(self):
+    def removeFromParent(self, call_after=False):
         """
         Convenience routine to destroy minibuffer after the event loop
@@ -184 +184 @@
         # remove the minibuffer if the mode is still valid.
         if self.mode:
-            wx.CallAfter(self.mode.removeMinibuffer, self)
+            if call_after:
+                wx.CallAfter(self.mode.removeMinibuffer, self)
+            else:
+                self.mode.removeMinibuffer(self)
     
     def performAction(self, value):
@@ -243 +246 @@
             # the tab focus doesn't get confused.  If you try to perform these
             # actions directly, the focus will return to the original tab if
-            # the action causes a new tab to be created.  Moving everything to
-            # CallAfters prevents this.
+            # the action causes a new tab to be created.  Moving everything
+            # to CallAfters prevents this.  Also, MSW can crash if performing
+            # these directly, so it's worth the extra milliseconds to use
+            # CallAfter
             wx.CallAfter(self.removeFromParent)
             if text is not None:
                 wx.CallAfter(self.performAction, text)
-        
+
 
 class IntMinibuffer(TextMinibuffer):

trunk/peppy/lib/textctrl_autocomplete.py

@@ -380 +380 @@
         if ( self.GetInsertionPoint() == self._lastinsertionpoint ) :
             self._showDropDown ( not self.dropdown.IsShown() )
-        wx.CallAfter(self.SetFocus)
+        wx.CallAfter(self.setFocusCallback)
         event.Skip ()
+    
+    def setFocusCallback(self, end=False):
+        """Callback for use within wx.CallAfter to prevent focus being set
+        after the control has been removed.
+        """
+        #print("Here in setFocusCallback")
+        if self:
+            #print("setting focus")
+            self.SetFocus()
+            if end:
+                self.SetInsertionPointEnd()
     
     def OnSetFocus(self, evt):
@@ -392 +403 @@
         #print("changed=%s other=%s" % (changed, other))
         if self._mac:
-            wx.CallAfter(self.SetFocus)
-            wx.CallAfter(self.SetInsertionPointEnd)
+            wx.CallAfter(self.setFocusCallback, True)
             event.Skip()
             return
@@ -470 +480 @@
                 self.dropdown . SetPosition ( wx.Point(x, y - height - size.GetHeight()) )
         self.dropdown.Show ( show )
-        wx.CallAfter(self.SetFocus)
+        wx.CallAfter(self.setFocusCallback)
 
     def _listItemVisible( self ) :