fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index 3758c86c16d7d0198ae1e84caca4aaded4b2d1e3..4a99d302bff97e1118405d44134f430914a35d0c 100644 (file)
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -27,18 +27,20 @@
 typedef long wxDataType;
 
 // fwd decl
 typedef long wxDataType;
 
 // fwd decl

-class  WXDLLEXPORT wxImageList;
-class  WXDLLEXPORT wxDragImage;
-struct WXDLLEXPORT wxTreeViewItem;
+class  WXDLLIMPEXP_CORE wxImageList;
+class  WXDLLIMPEXP_CORE wxDragImage;
+struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;

 
 // a callback function used for sorting tree items, it should return -1 if the
 // first item precedes the second, +1 if the second precedes the first or 0 if
 // they're equivalent
 class wxTreeItemData;
 
 
 // a callback function used for sorting tree items, it should return -1 if the
 // first item precedes the second, +1 if the second precedes the first or 0 if
 // they're equivalent
 class wxTreeItemData;
 

-// flags for deprecated InsertItem() variant
-#define wxTREE_INSERT_FIRST 0xFFFF0001
-#define wxTREE_INSERT_LAST  0xFFFF0002
+#if WXWIN_COMPATIBILITY_2_6
+    // flags for deprecated InsertItem() variant
+    #define wxTREE_INSERT_FIRST 0xFFFF0001
+    #define wxTREE_INSERT_LAST  0xFFFF0002
+#endif

 
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 
 // hash storing attributes for our items
 WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);


@@ -46,7 +48,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


@@ -446,7 +448,7 @@ public:
     //
     // returns NULL for OS/2 in ALL cases
     //
     //
     // returns NULL for OS/2 in ALL cases
     //

-    wxTextCtrl* GetEditControl(void) const {return (wxTextCtrl*)NULL;}
+    wxTextCtrl* GetEditControl(void) const {return NULL;}

 
     //
     // End editing and accept or discard the changes to item label
 
     //
     // End editing and accept or discard the changes to item label


@@ -504,70 +506,6 @@ public:
                          ,bool                bTextOnly = false
                         ) const;
 
                          ,bool                bTextOnly = false
                         ) const;
 

-    //
-    // Deprecated
-    // ----------
-
-#if WXWIN_COMPATIBILITY_2_4
-    // These methods are deprecated and will be removed in future versions of
-    // wxWidgets, they're here for compatibility only, don't use them in new
-    // code (the comments indicate why these methods are now useless and how to
-    // replace them)
-    //
-
-    //
-    // Use Expand, Collapse, CollapseAndReset or Toggle
-    //
-    wxDEPRECATED( void ExpandItem( const wxTreeItemId& rItem
-                                  ,int                 nAction
-                                 ) );
-
-    //
-    // Use AddRoot, PrependItem or AppendItem
-    //
-    wxDEPRECATED( wxTreeItemId InsertItem( const wxTreeItemId& pParent
-                                          ,const wxString&     rsText
-                                          ,int                 nImage = -1
-                                          ,int                 nSelImage = -1
-                                          ,long                lInsertAfter = wxTREE_INSERT_LAST
-                                         ) );
-
-    //
-    // Use Set/GetImageList and Set/GetStateImageList
-    //
-    wxDEPRECATED( wxImageList* GetImageList(int nVal) const );
-    wxDEPRECATED( void SetImageList(wxImageList* pImageList, int nVal) );
-
-    //
-    // Use Set/GetItemImage directly
-    //
-    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& rItem) const );
-    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) );
-
-    //
-    // For this enumeration function you must pass in a "cookie" parameter
-    // which is opaque for the application but is necessary for the library
-    // to make these functions reentrant (i.e. allow more than one
-    // enumeration on one and the same object simultaneously). Of course,
-    // the "cookie" passed to GetFirstChild() and GetNextChild() should be
-    // the same!
-    //
-
-    //
-    // Get the first child of this item
-    //
-    wxDEPRECATED( wxTreeItemId GetFirstChild( const wxTreeItemId& rItem
-                                             ,long&               rCookie
-                                            ) const );
-
-    //
-    // Get the next child
-    //
-    wxDEPRECATED( wxTreeItemId GetNextChild( const wxTreeItemId& rItem
-                                            ,long&               rCookie
-                                           ) const );
-#endif // WXWIN_COMPATIBILITY_2_4
-

     //
     // Implementation
     // --------------
     //
     // Implementation
     // --------------


@@ -686,7 +624,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);

 }; // end of CLASS wxTreeCtrl
 
 #endif // wxUSE_TREECTRL
 }; // end of CLASS wxTreeCtrl
 
 #endif // wxUSE_TREECTRL