new locales code checked in

[wxWidgets.git] / include / wx / generic / treelay.h

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index c6c5185c03df86db2a24168640e4e98c4cd5efdf..02a697132f23028d636a16c358c68e6a622b52a0 100644 (file)
--- 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_