gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index a3b3a95cf8e48dd7d70064f3ace8017395b90c44..91d4eea2ab0f75afe7c8f6b87d45a358f3b5be47 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.h
+// Name:        wx/msw/treectrl.h

 // Purpose:     wxTreeCtrl class
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10/10/98
 // Purpose:     wxTreeCtrl class
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10/10/98


@@ -34,6 +34,7 @@ typedef long wxDataType;
 
 // fwd decl
 class  WXDLLEXPORT wxImageList;
 
 // fwd decl
 class  WXDLLEXPORT wxImageList;

+class  WXDLLEXPORT wxDragImage;

 struct WXDLLEXPORT wxTreeViewItem;
 
 // a callback function used for sorting tree items, it should return -1 if the
 struct WXDLLEXPORT wxTreeViewItem;
 
 // a callback function used for sorting tree items, it should return -1 if the


@@ -439,6 +440,8 @@ public:
 
     // implementation
     // --------------
 
     // implementation
     // --------------

+
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 


@@ -498,6 +501,12 @@ private:
     // TRUE if the hash above is not empty
     bool m_hasAnyAttr;
 
     // TRUE if the hash above is not empty
     bool m_hasAnyAttr;
 

+    // used for dragging
+    wxDragImage *m_dragImage;
+
+    // the starting item for selection with Shift
+    WXHTREEITEM m_htSelStart;
+

     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 };