Changeset 1487

Timestamp:

07/10/08 22:43:13 (2 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.

Location:

trunk/peppy

Files:

• actions/minibuffer.py (modified) (5 diffs)
• frame.py (modified) (3 diffs)
• main.py (modified) (1 diff)
• major.py (modified) (2 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()
 

trunk/peppy/frame.py

@@ -77 +77 @@
 
 class MyNotebook(wx.aui.AuiNotebook, debugmixin):
+    debuglevel = 1
+    
     def __init__(self, parent, size=wx.DefaultSize):
         wx.aui.AuiNotebook.__init__(self, parent, size=size, style=wx.aui.AUI_NB_WINDOWLIST_BUTTON|wx.aui.AUI_NB_TAB_MOVE|wx.aui.AUI_NB_TAB_SPLIT|wx.aui.AUI_NB_CLOSE_BUTTON|wx.aui.AUI_NB_SCROLL_BUTTONS, pos=(9000,9000))
@@ -100 +102 @@
             self.lastActivePage=None
         page=self.GetPage(newpage)
-        wx.CallAfter(self.frame.switchMode)
+        #wx.CallAfter(self.frame.switchMode)
+        self.frame.switchMode()
         evt.Skip()
 
@@ -322 +325 @@
 
 class BufferFrame(wx.Frame, ClassPrefs, debugmixin):
+    debuglevel = 1
     frameid=0
     load_error_count = 0

trunk/peppy/main.py

@@ -27 +27 @@
 from peppy.lib.processmanager import *
 from peppy.lib.textutil import piglatin
+
+OrigCallAfter = wx.CallAfter
+def NewCallAfter(*args, **kwargs):
+    dprint("CallAfter: args=%s kwargs=%s" % (str(args), str(kwargs)))
+    OrigCallAfter(*args, **kwargs)
+    #wx.GetApp().cooperativeYield()
+wx.CallAfter = NewCallAfter
 
 #### py2exe support

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()