Added missing AddBook

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

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index 9c626dcf9fe278c5b5d82939385943b84cd07158..b202da646ecb734e909a3b4f20091342eb821bbd 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -12,25 +12,23 @@
 #ifndef _WX_TREELAY_H_
 #define _WX_TREELAY_H_
 
 #ifndef _WX_TREELAY_H_
 #define _WX_TREELAY_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "wxtree.h"
 #endif
 
 #ifndef WX_PRECOMP
 #pragma interface "wxtree.h"
 #endif
 
 #ifndef WX_PRECOMP

-#include <wx/object.h>
+#include "wx/object.h"

 class wxList;
 class wxDC;
 class wxMouseEvent;
 #endif
 
 class wxList;
 class wxDC;
 class wxMouseEvent;
 #endif
 

-#include <wx/string.h>
+#include "wx/string.h"

 
 #if wxUSE_TREELAYOUT
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {
 
 #if wxUSE_TREELAYOUT
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {

-    DECLARE_ABSTRACT_CLASS(wxTreeLayout)
-

 public:
     wxTreeLayout();
     virtual ~wxTreeLayout() { }
 public:
     wxTreeLayout();
     virtual ~wxTreeLayout() { }


@@ -49,7 +47,7 @@ public:
     // Optional redefinition
     void Initialize(void);
     inline virtual void SetNodeName(long WXUNUSED(id), const wxString& WXUNUSED(name)) {}
     // 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);
     virtual void GetNodeSize(long id, long *x, long *y, wxDC& dc);
     virtual void Draw(wxDC& dc);
     virtual void DrawNodes(wxDC& dc);


@@ -76,8 +74,6 @@ public:
 private:
     void CalcLayout(long node_id, int level, wxDC& dc);
 
 private:
     void CalcLayout(long node_id, int level, wxDC& dc);
 

-    // Members
-

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


@@ -87,6 +83,9 @@ protected:
     long          m_topMargin;
     long          m_leftMargin;
     bool          m_orientation; // TRUE for top-to-bottom, FALSE for left-to-right
     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 wxStoredNode


@@ -105,7 +104,6 @@ public:
 
 class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout
 {
 
 class WXDLLEXPORT wxTreeLayoutStored: public wxTreeLayout
 {

-    DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)

 public:
     wxTreeLayoutStored(int noNodes = 200);
     virtual ~wxTreeLayoutStored(void);
 public:
     wxTreeLayoutStored(int noNodes = 200);
     virtual ~wxTreeLayoutStored(void);


@@ -130,7 +128,8 @@ public:
     virtual void SetClientData(long id, long clientData);
     virtual long GetClientData(long id) const;
 
     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
     virtual long NameToId(const wxString& name);
 
     // Data members


@@ -138,6 +137,9 @@ private:
     wxStoredNode*     m_nodes;
     int               m_num;
     int               m_maxNodes;
     wxStoredNode*     m_nodes;
     int               m_num;
     int               m_maxNodes;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)

 };
 
 // For backward compatibility
 };
 
 // For backward compatibility