Changeset 1487 for trunk/peppy/major.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/major.py (modified) (2 diffs)

trunk/peppy/major.py

@@ -222 +222 @@
             self.minibuffer = None
             self.Layout()
-            self.editwin.focus()
+            dprint("active major mode = %s, trying to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))
+            if self.editwin.frame.getActiveMajorMode() == self.editwin:
+                self.editwin.focus()
+            else:
+                dprint("active major mode = %s, tried to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))
 
 
@@ -900 +904 @@
         # still in the active tab before setting focus.  Otherwise we might
         # change tabs unexpectedly.
-        if self.frame.getActiveMajorMode() == self:
+        if self and self.frame.getActiveMajorMode() == self:
             self.SetFocus()
             self.focusPostHook()