Changeset 2888 for branch/2frame/GSASIIctrls.py

Timestamp:

Jul 1, 2017 6:22:10 AM (6 years ago)

Author:

vondreele

Message:

 

Location:

branch/2frame

Files:

• . (copied) (copied from trunk)
• GSASIIctrls.py (modified) (4 diffs)

branch/2frame/GSASIIctrls.py

@@ -57 +57 @@
     def __init__(self,parent=None,*args,**kwargs):
         super(self.__class__,self).__init__(parent=parent,*args,**kwargs)
-        self.G2frame = parent.GetParent()
+        self.G2frame = parent.GetParent().GetParent()
         self.root = self.AddRoot('Loaded Data: ')
         self.SelectionChanged = None
@@ -79 +79 @@
         '''Log each press on a tree item here. 
         '''
-        if not self.G2frame.dataFrame:
+        if not self.G2frame.treePanel:
             return
-        self.G2frame.dataFrame.userReSize = False
         if self.SelectionChanged:
             textlist = self._getTreeItemsList(event.GetItem())
@@ -93 +92 @@
             self.textlist = textlist
             self.SelectionChanged(event)
-        self.G2frame.dataFrame.userReSize = True
 
     def Bind(self,eventtype,handler,*args,**kwargs):
@@ -3039 +3037 @@
         
     def PageChangeEvent(self,event):
-        G2frame = self.parent.G2frame
+#        G2frame = self.parent.G2frame
         page = event.GetSelection()
-        if self.PageChangeHandler:
-            if log.LogInfo['Logging']:
-                log.MakeTabLog(
-                    G2frame.dataFrame.GetTitle(),
-                    G2frame.dataDisplay.GetPageText(page)
-                    )
-            self.PageChangeHandler(event)
+#        if self.PageChangeHandler:
+#            if log.LogInfo['Logging']:
+#                log.MakeTabLog(
+#                    G2frame.dataFrame.GetTitle(),
+#                    G2frame.dataDisplay.GetPageText(page)
+#                    )
+#            self.PageChangeHandler(event)
             
-    def Bind(self,eventtype,handler,*args,**kwargs):
-        '''Override the Bind() function so that page change events can be trapped
-        '''
-        if eventtype == wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED:
-            self.PageChangeHandler = handler
-            wx.aui.AuiNotebook.Bind(self,eventtype,self.PageChangeEvent)
-            return
-        wx.aui.AuiNotebook.Bind(self,eventtype,handler,*args,**kwargs)
+#    def Bind(self,eventtype,handler,*args,**kwargs):
+#        '''Override the Bind() function so that page change events can be trapped
+#        '''
+#        if eventtype == wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED:
+#            self.PageChangeHandler = handler
+#            wx.aui.AuiNotebook.Bind(self,eventtype,self.PageChangeEvent)
+#            return
+#        wx.aui.AuiNotebook.Bind(self,eventtype,handler,*args,**kwargs)
                                                       
     def Clear(self):