merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -61,7 +61,7 @@ public:
    inline long GetLeftMargin(void) const { return m_leftMargin; }
    
    inline bool GetOrientation(void) const { return m_orientation; }
-    inline void SetOrientation(bool or) { m_orientation = or; }
+    inline void SetOrientation(bool orient) { m_orientation = orient; }
    
 private:
    void CalcLayout(long node_id, int level, wxDC& dc);