corrected conditional compilation tests

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index b59e1488f8588a675b32e818cbdf416115e23500..9c626dcf9fe278c5b5d82939385943b84cd07158 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -25,12 +25,15 @@ class wxMouseEvent;
 
 #include <wx/string.h>
 
 
 #include <wx/string.h>
 

+#if wxUSE_TREELAYOUT
+

 class WXDLLEXPORT wxTreeLayout: public wxObject
 {
     DECLARE_ABSTRACT_CLASS(wxTreeLayout)
 
 public:
     wxTreeLayout();
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {
     DECLARE_ABSTRACT_CLASS(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_