attempts to make wxCondition::Broadcast() and Signal() work simultaneously - currentl...

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

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index c6c5185c03df86db2a24168640e4e98c4cd5efdf..9113f78f8a3239876a5aede8218b694042cec3cf 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -2,7 +2,7 @@
 // Name:        treelay.h
 // Purpose:     wxTreeLayout class
 // Author:      Julian Smart
 // Name:        treelay.h
 // Purpose:     wxTreeLayout class
 // Author:      Julian Smart

-// Modified by: 
+// Modified by:

 // Created:     7/4/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     7/4/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart


@@ -16,7 +16,16 @@
 #pragma interface "wxtree.h"
 #endif
 
 #pragma interface "wxtree.h"
 #endif
 

-#include <wx/string.h>
+#ifndef WX_PRECOMP
+#include "wx/object.h"
+class wxList;
+class wxDC;
+class wxMouseEvent;
+#endif
+
+#include "wx/string.h"
+
+#if wxUSE_TREELAYOUT

 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {


@@ -24,7 +33,8 @@ class WXDLLEXPORT wxTreeLayout: public wxObject
 
 public:
     wxTreeLayout();
 
 public:
     wxTreeLayout();

-    
+    virtual ~wxTreeLayout() { }
+

     // Redefine these
     virtual void GetChildren(long id, wxList& list) = 0;
     virtual long GetNextNode(long id) = 0;
     // Redefine these
     virtual void GetChildren(long id, wxList& list) = 0;
     virtual long GetNextNode(long id) = 0;


@@ -35,21 +45,21 @@ public:
     virtual void SetNodeY(long id, long y) = 0;
     virtual void ActivateNode(long id, bool active) = 0;
     virtual bool NodeActive(long id) = 0;
     virtual void SetNodeY(long id, long y) = 0;
     virtual void ActivateNode(long id, bool active) = 0;
     virtual bool NodeActive(long id) = 0;

-    
+

     // Optional redefinition
     void Initialize(void);
     // Optional redefinition
     void Initialize(void);

-    inline virtual void SetNodeName(long id, const wxString& name) {}
-    inline virtual wxString GetNodeName(long id) { return wxString(""); }
+    inline virtual void SetNodeName(long WXUNUSED(id), const wxString& WXUNUSED(name)) {}
+    inline virtual wxString GetNodeName(long WXUNUSED(id)) { return wxString(""); }

     virtual void GetNodeSize(long id, long *x, long *y, wxDC& dc);
     virtual void Draw(wxDC& dc);
     virtual void DrawNodes(wxDC& dc);
     virtual void DrawBranches(wxDC& dc);
     virtual void DrawNode(long id, wxDC& dc);
     virtual void DrawBranch(long from, long to, wxDC& dc);
     virtual void GetNodeSize(long id, long *x, long *y, wxDC& dc);
     virtual void Draw(wxDC& dc);
     virtual void DrawNodes(wxDC& dc);
     virtual void DrawBranches(wxDC& dc);
     virtual void DrawNode(long id, wxDC& dc);
     virtual void DrawBranch(long from, long to, wxDC& dc);

-    
+

     // Don't redefine
     virtual void DoLayout(wxDC& dc, long topNode = -1);
     // Don't redefine
     virtual void DoLayout(wxDC& dc, long topNode = -1);

-    
+

     // Accessors -- don't redefine
     inline void SetTopNode(long id) { m_parentNode = id; }
     inline long GetTopNode(void) const { return m_parentNode; }
     // Accessors -- don't redefine
     inline void SetTopNode(long id) { m_parentNode = id; }
     inline long GetTopNode(void) const { return m_parentNode; }


@@ -59,15 +69,15 @@ public:
     inline void SetMargins(long x, long y) { m_leftMargin = x; m_topMargin = y; }
     inline long GetTopMargin(void) const { return m_topMargin; }
     inline long GetLeftMargin(void) const { return m_leftMargin; }
     inline void SetMargins(long x, long y) { m_leftMargin = x; m_topMargin = y; }
     inline long GetTopMargin(void) const { return m_topMargin; }
     inline long GetLeftMargin(void) const { return m_leftMargin; }

-    
+

     inline bool GetOrientation(void) const { return m_orientation; }
     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);
 private:
     void CalcLayout(long node_id, int level, wxDC& dc);

-    
+

     // Members
     // Members

-    
+

 protected:
     long          m_parentNode;
     long          m_lastY;
 protected:
     long          m_parentNode;
     long          m_lastY;


@@ -93,19 +103,19 @@ public:
  * A version of wxTreeLayout with storage for nodes
  */
 
  * 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:
 public:

-    wxLayoutTreeStored(int noNodes = 200);
-    ~wxLayoutTreeStored(void);
+    wxTreeLayoutStored(int noNodes = 200);
+    virtual ~wxTreeLayoutStored(void);

     void Initialize(int n);
     void Initialize(int n);

-    
+

     wxString HitTest(wxMouseEvent& event, wxDC& dc);
     wxStoredNode* GetNode(long id) const;
     inline int GetNumNodes() const { return m_maxNodes; };
     inline int GetNodeCount() const { return m_num; };
     wxString HitTest(wxMouseEvent& event, wxDC& dc);
     wxStoredNode* GetNode(long id) const;
     inline int GetNumNodes() const { return m_maxNodes; };
     inline int GetNodeCount() const { return m_num; };

-    
+

     virtual void GetChildren(long id, wxList& list);
     virtual long GetNextNode(long id);
     virtual long GetNodeParent(long id);
     virtual void GetChildren(long id, wxList& list);
     virtual long GetNextNode(long id);
     virtual long GetNodeParent(long id);


@@ -119,10 +129,10 @@ public:
     virtual bool NodeActive(long id);
     virtual void SetClientData(long id, long clientData);
     virtual long GetClientData(long id) const;
     virtual bool NodeActive(long id);
     virtual void SetClientData(long id, long clientData);
     virtual long GetClientData(long id) const;

-    
+

     virtual long AddChild(const wxString& name, const wxString& parent = "");
     virtual long NameToId(const wxString& name);
     virtual long AddChild(const wxString& name, const wxString& parent = "");
     virtual long NameToId(const wxString& name);

-    
+

     // Data members
 private:
     wxStoredNode*     m_nodes;
     // Data members
 private:
     wxStoredNode*     m_nodes;


@@ -131,8 +141,11 @@ private:
 };
 
 // For backward compatibility
 };
 
 // For backward compatibility

-#define wxStoredTree wxLayoutTreeStored
+#define wxStoredTree wxTreeLayoutStored
+
+#endif
+    // wxUSE_TREELAYOUT

 
 #endif
  // _WX_TREELAY_H_
 
 #endif
  // _WX_TREELAY_H_

-  
+