X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5438a5665e35ee6286c5af73747873df9daed252..bca7bfc878242483c1130c460c488c27002607a9:/include/wx/generic/treelay.h

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index b59e1488f8..4bcc4baf0f 100644
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -12,18 +12,20 @@
 #ifndef _WX_TREELAY_H_
 #define _WX_TREELAY_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wxtree.h"
 #endif
 
 #ifndef WX_PRECOMP
-#include <wx/object.h>
+#include "wx/object.h"
 class wxList;
 class wxDC;
 class wxMouseEvent;
 #endif
 
-#include <wx/string.h>
+#include "wx/string.h"
+
+#if wxUSE_TREELAYOUT
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {
@@ -31,6 +33,7 @@ class WXDLLEXPORT wxTreeLayout: public wxObject
 
 public:
     wxTreeLayout();
+    virtual ~wxTreeLayout() { }
 
     // Redefine these
     virtual void GetChildren(long id, wxList& list) = 0;
@@ -105,7 +108,7 @@ 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);
@@ -128,6 +131,7 @@ public:
     virtual long GetClientData(long id) const;
 
     virtual long AddChild(const wxString& name, const wxString& parent = "");
+    virtual long AddChild(const wxString& name, long parent);
     virtual long NameToId(const wxString& name);
 
     // Data members
@@ -140,6 +144,9 @@ private:
 // For backward compatibility
 #define wxStoredTree wxTreeLayoutStored
 
+#endif
+    // wxUSE_TREELAYOUT
+
 #endif
  // _WX_TREELAY_H_