Changeset 1496

Timestamp:

07/21/08 20:33:09 (5 weeks ago)

Author:

rob

Message:

Changed CloseTab? and NewTab? to work as popup actions

Files:

• trunk/peppy/mainmenu.py (modified) (2 diffs)

trunk/peppy/mainmenu.py

@@ -32 +32 @@
     def action(self, index=-1, multiplier=1):
         assert self.dprint("id=%x name=%s index=%s" % (id(self),self.name,str(index)))
-        self.frame.open("about:blank", force_new_tab=True)
+        # Have to use a CallAfter because this action may be called in a popup menu
+        wx.CallAfter(self.frame.open, "about:blank", force_new_tab=True)
 
 class CloseTab(SelectAction):
@@ -41 +42 @@
     def action(self, index=-1, multiplier=1):
         assert self.dprint("id=%x name=%s index=%s" % (id(self),self.name,str(index)))
-        self.frame.tabs.closeTab()
+        # FIXME: change this so I don't have to break encapsulation on the frame's notebook
+        tab = self.frame.tabs.context_tab
+        wx.CallAfter(self.frame.tabs.closeTab, tab)
 
 class MoveTabToNewWindow(SelectAction):