Fixed Refresh to use a "const wxRect *" parameter.

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

diff --git a/include/wx/generic/treelay.h b/include/wx/generic/treelay.h
index 92963b63dbc7c7de0d54bcbc8412f643c9d3d1a3..4bcc4baf0f3b6f735c283233727d454a7378eaa0 100644 (file)
--- a/include/wx/generic/treelay.h
+++ b/include/wx/generic/treelay.h
@@ -12,11 +12,20 @@
 #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
 
 #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
 {
 
 class WXDLLEXPORT wxTreeLayout: public wxObject
 {


@@ -24,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;


@@ -98,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);


@@ -121,6 +131,7 @@ public:
     virtual long GetClientData(long id) const;
 
     virtual long AddChild(const wxString& name, const wxString& parent = "");
     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
     virtual long NameToId(const wxString& name);
 
     // Data members


@@ -133,6 +144,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_