Changeset 1487 for trunk/peppy/actions/minibuffer.py

Timestamp:

07/10/08 22:43:13 (4 months ago)

Author:

rob

Message:

Removed the CallAfter? in OnTabChanged? to prevent an extra tab change back to the original tab after a minibuffer
* changed the descruction order of minibuffer
* FIXME: somewhere there's a bad SetFocus? call in a CallAfter?:

Traceback (most recent call last):

File "/usr/lib64/python2.5/site-packages/wx-2.8-gtk2-unicode/wx/_core.py", line 14550, in <lambda>

lambda event: event.callable(*event.args, **event.kw) )

File "/usr/lib64/python2.5/site-packages/wx-2.8-gtk2-unicode/wx/_core.py", line 9235, in SetFocus?

return _core_.Window_SetFocus(*args, **kwargs)

TypeError?: in method 'Window_SetFocus', expected argument 1 of type 'wxWindow *'

but it doesn't affect operation and it's better than leaving the code in a broken state on svn. Will fix ASAP.

Files:

• trunk/peppy/actions/minibuffer.py (modified) (5 diffs)

trunk/peppy/actions/minibuffer.py

@@ -235 +235 @@
             self.finish_callback()
         else:
+            self.mode.removeMinibuffer(detach_only=True)
             if text is not None:
                 error = self.action.processMinibuffer(self, self.mode, text)
                 if error is not None:
                     self.mode.frame.SetStatusText(error)
-            self.removeFromParent()
+            self.close()
+            #self.removeFromParent()
 
 class IntMinibuffer(TextMinibuffer):
@@ -329 +331 @@
         
     def SetFocus(self):
+        dprint(self)
         self.win.saveSetFocus()
         self.text.SetInsertionPointEnd()
@@ -379 +382 @@
 
         self.text.Bind(wx.EVT_TEXT_ENTER, self.OnEnter)
+        self.win.Bind(wx.EVT_SET_FOCUS, self.OnFocus)
 
         if self.initial is not None:
@@ -384 +388 @@
             self.text.SetChoices(self.complete(self.initial))
         self.text.SetEntryCallback(self.setDynamicChoices)
+        #self.text.SetInsertionPointEnd()
 
         self.win.saveSetFocus = self.win.SetFocus
@@ -389 +394 @@
         
     def SetFocus(self):
+        dprint(self)
         self.win.saveSetFocus()
+        self.text.SetInsertionPointEnd()
+    
+    def OnFocus(self, evt):
+        dprint()
         self.text.SetInsertionPointEnd()