Applied patch [ 1407318 ] bitmap clipping / transparency mask (X11 port)

[wxWidgets.git] / wxPython / samples / ide / activegrid / tool / OutlineService.py

diff --git a/wxPython/samples/ide/activegrid/tool/OutlineService.py b/wxPython/samples/ide/activegrid/tool/OutlineService.py
index c04f1ecc1f5a7e6318de62c158c653a93a67eb2b..75fc67e0d224acd63fafd0dcb17090029473711a 100644 (file)
--- a/wxPython/samples/ide/activegrid/tool/OutlineService.py
+++ b/wxPython/samples/ide/activegrid/tool/OutlineService.py
@@ -84,6 +84,7 @@ class OutlineView(Service.ServiceView):
         item = self.GetControl().GetSelection()
         if item:
             self.GetControl().CallDoSelectCallback(item)
         item = self.GetControl().GetSelection()
         if item:
             self.GetControl().CallDoSelectCallback(item)

+        event.Skip()

 
 
     def ResumeActionOnSelect(self):
 
 
     def ResumeActionOnSelect(self):


@@ -320,7 +321,7 @@ class OutlineService(Service.Service):
 
     def __init__(self, serviceName, embeddedWindowLocation = wx.lib.pydocview.EMBEDDED_WINDOW_BOTTOM):
         Service.Service.__init__(self, serviceName, embeddedWindowLocation)
 
     def __init__(self, serviceName, embeddedWindowLocation = wx.lib.pydocview.EMBEDDED_WINDOW_BOTTOM):
         Service.Service.__init__(self, serviceName, embeddedWindowLocation)

-        self._validTemplates = []
+        self._validViewTypes = []

 
 
     def _CreateView(self):
 
 
     def _CreateView(self):


@@ -492,9 +493,8 @@ class OutlineService(Service.Service):
         if self.GetView():
             currView = wx.GetApp().GetDocumentManager().GetCurrentView()
             if currView:
         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
                         self.LoadOutline(currView)
                         foundRegisteredView = True
                         break


@@ -505,14 +505,14 @@ class OutlineService(Service.Service):
         self._timer.Start(1000) # 1 second interval
 
 
         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)