#ifndef _WX_TREELAY_H_
#define _WX_TREELAY_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#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
{
- DECLARE_ABSTRACT_CLASS(wxTreeLayout)
-
public:
wxTreeLayout();
+ virtual ~wxTreeLayout() { }
// Redefine these
virtual void GetChildren(long id, wxList& list) = 0;
// Optional redefinition
void Initialize(void);
inline virtual void SetNodeName(long WXUNUSED(id), const wxString& WXUNUSED(name)) {}
- inline virtual wxString GetNodeName(long WXUNUSED(id)) { return wxString(""); }
+ inline virtual wxString GetNodeName(long WXUNUSED(id)) { return wxString(wxT("")); }
virtual void GetNodeSize(long id, long *x, long *y, wxDC& dc);
virtual void Draw(wxDC& dc);
virtual void DrawNodes(wxDC& dc);
private:
void CalcLayout(long node_id, int level, wxDC& dc);
- // Members
-
protected:
long m_parentNode;
long m_lastY;
long m_topMargin;
long m_leftMargin;
bool m_orientation; // TRUE for top-to-bottom, FALSE for left-to-right
+
+private:
+ DECLARE_ABSTRACT_CLASS(wxTreeLayout)
};
class WXDLLEXPORT wxStoredNode
class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout
{
- DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
public:
wxTreeLayoutStored(int noNodes = 200);
- ~wxTreeLayoutStored(void);
+ virtual ~wxTreeLayoutStored(void);
void Initialize(int n);
wxString HitTest(wxMouseEvent& event, wxDC& dc);
virtual void SetClientData(long id, long clientData);
virtual long GetClientData(long id) const;
- virtual long AddChild(const wxString& name, const wxString& parent = "");
+ virtual long AddChild(const wxString& name, const wxString& parent = wxT(""));
+ virtual long AddChild(const wxString& name, long parent);
virtual long NameToId(const wxString& name);
// Data members
wxStoredNode* m_nodes;
int m_num;
int m_maxNodes;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
+ DECLARE_NO_COPY_CLASS(wxTreeLayoutStored)
};
// For backward compatibility
#define wxStoredTree wxTreeLayoutStored
+#endif
+ // wxUSE_TREELAYOUT
+
#endif
// _WX_TREELAY_H_