Fixes from Andrea

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/lib/buttonpanel.py b/wxPython/wx/lib/buttonpanel.py
index 872ef938228c14e187dd23cfb7a81d51149af66e..a31eb087186f79df04f2066da25809049e0dbaa5 100644 (file)
--- a/wxPython/wx/lib/buttonpanel.py
+++ b/wxPython/wx/lib/buttonpanel.py
@@ -1113,7 +1113,7 @@ class ButtonInfo(Control):
         if alignment == self._textAlignment:
             return
 
         if alignment == self._textAlignment:
             return
 

-        self._alignment = alignment
+        self._textAlignment = alignment

         
 
     def GetToggled(self):
         
 
     def GetToggled(self):

diff --git a/wxPython/wx/lib/customtreectrl.py b/wxPython/wx/lib/customtreectrl.py
index 34a79ba748eb27785f162c5da5f94b13ca3b730b..75d792258c7ec6eb1d92554d6107b42f5ac9a3f4 100644 (file)
--- a/wxPython/wx/lib/customtreectrl.py
+++ b/wxPython/wx/lib/customtreectrl.py
@@ -3443,7 +3443,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         if not item:
             raise "\nERROR: Invalid Tree Item. "
         
         if not item:
             raise "\nERROR: Invalid Tree Item. "
         

-        if not self.HasFlag(TR_HIDE_ROOT) or item != GetRootItem():
+        if not self.HasFlag(TR_HIDE_ROOT) or item != self.GetRootItem():

             self.Expand(item)
             if not self.IsExpanded(item):
                 return
             self.Expand(item)
             if not self.IsExpanded(item):
                 return