Disable wxUSE_STD_CONTAINERS by default for MSVC6.

[wxWidgets.git] / include / wx / palmos / treectrl.h

diff --git a/include/wx/palmos/treectrl.h b/include/wx/palmos/treectrl.h
index 7c235454df96a427c49e9d5e0497f97f1927d45d..32b5fc965618418f23e5de6e701ba7afbe4ba54b 100644 (file)
--- a/include/wx/palmos/treectrl.h
+++ b/include/wx/palmos/treectrl.h
@@ -24,8 +24,8 @@
 #include "wx/hashmap.h"
 
 // fwd decl
 #include "wx/hashmap.h"
 
 // fwd decl

-class  WXDLLEXPORT wxImageList;
-class  WXDLLEXPORT wxDragImage;
+class  WXDLLIMPEXP_CORE wxImageList;
+class  WXDLLIMPEXP_CORE wxDragImage;

 struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
 
 // hash storing attributes for our items
 struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
 
 // hash storing attributes for our items


@@ -35,7 +35,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTreeCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl

 {
 public:
     // creation
 {
 public:
     // creation


@@ -297,7 +297,7 @@ public:
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     wxTextCtrl* EditLabel(const wxTreeItemId& item,
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     wxTextCtrl* EditLabel(const wxTreeItemId& item,

-                          wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl));
+                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));

         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)
         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)


@@ -425,7 +425,7 @@ private:
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)

-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);

 };
 
 #endif // wxUSE_TREECTRL
 };
 
 #endif // wxUSE_TREECTRL