Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions

View File

@@ -321,7 +321,7 @@ class OutlineService(Service.Service):
def __init__(self, serviceName, embeddedWindowLocation = wx.lib.pydocview.EMBEDDED_WINDOW_BOTTOM):
Service.Service.__init__(self, serviceName, embeddedWindowLocation)
self._validTemplates = []
self._validViewTypes = []
def _CreateView(self):
@@ -493,9 +493,8 @@ class OutlineService(Service.Service):
if self.GetView():
currView = wx.GetApp().GetDocumentManager().GetCurrentView()
if currView:
for template in self._validTemplates:
type = template.GetViewType()
if isinstance(currView, type):
for viewType in self._validViewTypes:
if isinstance(currView, viewType):
self.LoadOutline(currView)
foundRegisteredView = True
break
@@ -506,14 +505,14 @@ class OutlineService(Service.Service):
self._timer.Start(1000) # 1 second interval
def AddTemplateForBackgroundHandler(self, template):
self._validTemplates.append(template)
def AddViewTypeForBackgroundHandler(self, viewType):
self._validViewTypes.append(viewType)
def GetTemplatesForBackgroundHandler(self):
return self._validTemplates
def GetViewTypesForBackgroundHandler(self):
return self._validViewTypes
def RemoveTemplateForBackgroundHandler(self, template):
self._validTemplates.remove(template)
def RemoveViewTypeForBackgroundHandler(self, viewType):
self._validViewTypes.remove(viewType)