reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index b59e1488f8588a675b32e818cbdf416115e23500..9113f78f8a3239876a5aede8218b694042cec3cf 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -17,13 +17,15 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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
 {
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {


@@ -31,6 +33,7 @@ class WXDLLEXPORT wxTreeLayout: public wxObject
 
 public:
     wxTreeLayout();
 
 public:
     wxTreeLayout();

+    virtual ~wxTreeLayout() { }

 
     // Redefine these
     virtual void GetChildren(long id, wxList& list) = 0;
 
     // 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);
     DECLARE_DYNAMIC_CLASS(wxTreeLayoutStored)
 public:
     wxTreeLayoutStored(int noNodes = 200);

-    ~wxTreeLayoutStored(void);
+    virtual ~wxTreeLayoutStored(void);

     void Initialize(int n);
 
     wxString HitTest(wxMouseEvent& event, wxDC& dc);
     void Initialize(int n);
 
     wxString HitTest(wxMouseEvent& event, wxDC& dc);


@@ -140,6 +143,9 @@ private:
 // For backward compatibility
 #define wxStoredTree wxTreeLayoutStored
 
 // For backward compatibility
 #define wxStoredTree wxTreeLayoutStored
 

+#endif
+    // wxUSE_TREELAYOUT
+

 #endif
  // _WX_TREELAY_H_
 
 #endif
  // _WX_TREELAY_H_