X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/babc97583e1280ac0992ca8e3dbd7604e2d3963b..fda91381cd9683cb9c147e53aee537ed1e4e710f:/include/wx/generic/treelay.h

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index c6c5185c03..02a697132f 100644
--- 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);
@@ -93,12 +93,12 @@ public:
  * A version of wxTreeLayout with storage for nodes
  */
 
-class WXDLLEXPORT wxLayoutTreeStored: public wxTreeLayout
+class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout
 {
-    DECLARE_DYNAMIC_CLASS(wxLayoutTreeStored)
+    DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
 public:
-    wxLayoutTreeStored(int noNodes = 200);
-    ~wxLayoutTreeStored(void);
+    wxTreeLayoutStored(int noNodes = 200);
+    ~wxTreeLayoutStored(void);
     void Initialize(int n);
     
     wxString HitTest(wxMouseEvent& event, wxDC& dc);
@@ -131,7 +131,7 @@ private:
 };
 
 // For backward compatibility
-#define wxStoredTree wxLayoutTreeStored
+#define wxStoredTree wxTreeLayoutStored
 
 #endif
  // _WX_TREELAY_H_