Allow wxThread::Wait() and Delete() to block, even under wxMSW.

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index ad8d31210d6f4ba2575c6257c521ce0a92a5a7d4..83e4afa6f2d1f74758845348da053c472d9070f7 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -127,6 +127,11 @@ public:
     virtual wxTreeItemId GetRootItem() const;
     virtual wxTreeItemId GetSelection() const;
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;
     virtual wxTreeItemId GetRootItem() const;
     virtual wxTreeItemId GetSelection() const;
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;

+    virtual wxTreeItemId GetFocusedItem() const;
+
+    virtual void ClearFocusedItem();
+    virtual void SetFocusedItem(const wxTreeItemId& item);
+

 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,


@@ -161,12 +166,13 @@ public:
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);

+    virtual void SelectChildren(const wxTreeItemId& parent);

 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
 
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
 
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,

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

     virtual wxTextCtrl *GetEditControl() const;
     virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item),
                               bool discardChanges = false)
     virtual wxTextCtrl *GetEditControl() const;
     virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item),
                               bool discardChanges = false)


@@ -233,6 +239,28 @@ protected:
     // obtain the user data for the lParam member of TV_ITEM
     class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;
 
     // obtain the user data for the lParam member of TV_ITEM
     class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;
 

+    // update the event to include the items client data and pass it to
+    // HandleWindowEvent(), return true if it processed it
+    bool HandleTreeEvent(wxTreeEvent& event) const;
+
+    // pass the event to HandleTreeEvent() and return true if the event was
+    // either unprocessed or not vetoed
+    bool IsTreeEventAllowed(wxTreeEvent& event) const
+    {
+        return !HandleTreeEvent(event) || event.IsAllowed();
+    }
+
+    // generate a wxEVT_KEY_DOWN event from the specified WPARAM/LPARAM values
+    // having the same meaning as for WM_KEYDOWN, return true if it was
+    // processed
+    bool MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam);
+
+    // handle a key event in a multi-selection control, should be only called
+    // for keys which can be used to change the selection
+    //
+    // return true if the key was processed, false otherwise
+    bool MSWHandleSelectionKey(unsigned vkey);
+

 
     // data used only while editing the item label:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
 
     // data used only while editing the item label:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited


@@ -248,6 +276,13 @@ private:
 
     void DoExpand(const wxTreeItemId& item, int flag);
 
 
     void DoExpand(const wxTreeItemId& item, int flag);
 

+    void DoSelectItem(const wxTreeItemId& item, bool select = true);
+    void DoUnselectItem(const wxTreeItemId& item);
+    void DoToggleItemSelection(const wxTreeItemId& item);
+
+    void DoUnselectAll();
+    void DoSelectChildren(const wxTreeItemId& parent);
+

     void DeleteTextCtrl();
 
     // return true if the item is the hidden root one (i.e. it's the root item
     void DeleteTextCtrl();
 
     // return true if the item is the hidden root one (i.e. it's the root item


@@ -255,6 +290,14 @@ private:
     bool IsHiddenRoot(const wxTreeItemId& item) const;
 
 
     bool IsHiddenRoot(const wxTreeItemId& item) const;
 
 

+    // check if the given flags (taken from TV_HITTESTINFO structure)
+    // indicate a position "on item": this is less trivial than just checking
+    // for TVHT_ONITEM because we consider that points to the left and right of
+    // item text are also "on item" when wxTR_FULL_ROW_HIGHLIGHT is used as the
+    // item visually spans the entire breadth of the window then
+    bool MSWIsOnItem(unsigned flags) const;
+
+

     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;
 
     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;
 


@@ -273,11 +316,27 @@ private:
     wxTreeItemId m_htSelStart, m_htClickedItem;
     wxPoint m_ptClick;
 
     wxTreeItemId m_htSelStart, m_htClickedItem;
     wxPoint m_ptClick;
 

+    // whether dragging has started
+    bool m_dragStarted;
+
+    // whether focus was lost between subsequent clicks of a single item
+    bool m_focusLost;
+
+    // set when we are changing selection ourselves (only used in multi
+    // selection mode)
+    bool m_changingSelection;
+
+    // whether we need to trigger a state image click event
+    bool m_triggerStateImageClick;
+
+    // whether we need to deselect other items on mouse up
+    bool m_mouseUpDeselect;
+

     friend class wxTreeItemIndirectData;
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
     friend class wxTreeItemIndirectData;
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)

-    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);

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