Commit 605f6923 authored by Jack Jansen's avatar Jack Jansen

Fix for #731643: allow "lookup in documentation" to also work if the

interactive window is frontmost.
parent 246f0a80
......@@ -236,7 +236,9 @@ class PyConsole(W.Window):
prefs.console.tabsettings = self.consoletext.gettabsettings()
prefs.save()
def getselectedtext(self):
return self.consoletext.getselectedtext()
class OutputTextWidget(W.EditText):
def domenu_save_as(self, *args):
......
......@@ -168,6 +168,9 @@ class Editor(W.Window):
def setselection(self, selstart, selend):
self.editgroup.editor.setselection(selstart, selend)
def getselectedtext(self):
return self.editgroup.editor.getselectedtext()
def getfilename(self):
if self.path:
......
......@@ -414,10 +414,10 @@ class PythonIDE(Wapplication.Application):
W.Message("AppleHelp Error: %s" % `arg`)
def _getsearchstring(self):
import PyEdit
editor = PyEdit.findeditor(None, fromtop=1)
if editor:
text = editor.getselectedtext()
# First we get the frontmost window
front = self.getfrontwindow()
if front and hasattr(front, 'getselectedtext'):
text = front.getselectedtext()
if text:
return text
# This is a cop-out. We should have disabled the menus
......
......@@ -131,6 +131,12 @@ class Application(FrameWork.Application):
handler = getattr(window, attr)
apply(handler, args)
return 1
def getfrontwindow(self):
wid = MyFrontWindow()
if wid and self._windows.has_key(wid):
return self._windows[wid]
return None
def appendwindow(self, wid, window):
self._windows[wid] = window
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment