GetRegion is not needed anymore

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

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 1b4f25948965efe42ed9f313375282ddbc69e071..71dea9fc13a3c7bab2639f1e12046d853ddb1e49 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -21,20 +21,20 @@
 // forward declaration
 // -----------------------------------------------------------------------------
 
 // forward declaration
 // -----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericTreeItem;
+class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;

 
 

-class WXDLLEXPORT wxTreeItemData;
+class WXDLLIMPEXP_FWD_CORE wxTreeItemData;

 
 

-class WXDLLEXPORT wxTreeRenameTimer;
-class WXDLLEXPORT wxTreeFindTimer;
-class WXDLLEXPORT wxTreeTextCtrl;
-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTreeRenameTimer;
+class WXDLLIMPEXP_FWD_CORE wxTreeFindTimer;
+class WXDLLIMPEXP_FWD_CORE wxTreeTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

 
 // -----------------------------------------------------------------------------
 // wxGenericTreeCtrl - the tree control
 // -----------------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------------
 // wxGenericTreeCtrl - the tree control
 // -----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericTreeCtrl : public wxTreeCtrlBase,
+class WXDLLIMPEXP_CORE wxGenericTreeCtrl : public wxTreeCtrlBase,

                                       public wxScrollHelper
 {
 public:
                                       public wxScrollHelper
 {
 public:


@@ -112,7 +112,13 @@ public:
     // ----------
 
     virtual wxTreeItemId GetRootItem() const { return m_anchor; }
     // ----------
 
     virtual wxTreeItemId GetRootItem() const { return m_anchor; }

-    virtual wxTreeItemId GetSelection() const { return m_current; }
+    virtual wxTreeItemId GetSelection() const
+    {
+        wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE),
+                       wxT("must use GetSelections() with this control") );
+
+        return m_current;
+    }

     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;


@@ -180,36 +186,18 @@ public:
 
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
 
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 

-    void ExpandAll(const wxTreeItemId& item);
-

 #if WXWIN_COMPATIBILITY_2_6
     // use EditLabel() instead
     void Edit( const wxTreeItemId& item ) { EditLabel(item); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
 #if WXWIN_COMPATIBILITY_2_6
     // use EditLabel() instead
     void Edit( const wxTreeItemId& item ) { EditLabel(item); }
 #endif // WXWIN_COMPATIBILITY_2_6
 

-#if WXWIN_COMPATIBILITY_2_4
-    // deprecated functions: use Set/GetItemImage directly
-    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
-    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
-
-    // use the versions taking wxTreeItemIdValue cookies (note that
-    // GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we
-    // get twice as many warnings without any added benefit: it is always used
-    // with GetFirstChild() anyhow)
-    wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
-                                             long& cookie) const );
-    wxTreeItemId GetNextChild(const wxTreeItemId& item,
-                              long& cookie) const;
-#endif // WXWIN_COMPATIBILITY_2_4
-

     // implementation only from now on
 
     // overridden base class virtuals
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
 
     // implementation only from now on
 
     // overridden base class virtuals
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
 

-    virtual void Freeze();
-    virtual void Thaw();
+    virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);

 
     virtual bool SetFont( const wxFont &font );
     virtual void SetWindowStyle(const long styles);
 
     virtual bool SetFont( const wxFont &font );
     virtual void SetWindowStyle(const long styles);


@@ -221,6 +209,7 @@ public:
     void OnChar( wxKeyEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnGetToolTip( wxTreeEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnGetToolTip( wxTreeEvent &event );

+    void OnSize( wxSizeEvent &event );

     void OnInternalIdle( );
 
     virtual wxVisualAttributes GetDefaultAttributes() const
     void OnInternalIdle( );
 
     virtual wxVisualAttributes GetDefaultAttributes() const


@@ -262,14 +251,18 @@ protected:
     bool                 m_lastOnSame;  // last click on the same item as prev
     wxImageList         *m_imageListButtons;
 
     bool                 m_lastOnSame;  // last click on the same item as prev
     wxImageList         *m_imageListButtons;
 

-    int                  m_freezeCount;

     int                  m_dragCount;
     wxPoint              m_dragStart;
     wxGenericTreeItem   *m_dropTarget;
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
     int                  m_dragCount;
     wxPoint              m_dragStart;
     wxGenericTreeItem   *m_dropTarget;
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects

+    
+    enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
+    wxGenericTreeItem   *m_dndEffectItem; 
+    

     wxTreeTextCtrl      *m_textCtrl;
     wxTreeTextCtrl      *m_textCtrl;

+    

 
     wxTimer             *m_renameTimer;
 
 
     wxTimer             *m_renameTimer;
 


@@ -282,6 +275,9 @@ protected:
     // the common part of all ctors
     void Init();
 
     // the common part of all ctors
     void Init();
 

+    // overridden wxWindow methods 
+    virtual void DoThaw();
+

     // misc helpers
     void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted);
 
     // misc helpers
     void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted);
 


@@ -293,6 +289,9 @@ protected:
                       bool unselect_others = true,
                       bool extended_select = false);
 
                       bool unselect_others = true,
                       bool extended_select = false);
 

+    virtual int DoGetItemState(const wxTreeItemId& item) const;
+    virtual void DoSetItemState(const wxTreeItemId& item, int state);
+

     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t previous,
                                       const wxString& text,
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t previous,
                                       const wxString& text,


@@ -304,7 +303,7 @@ protected:
                                        const wxString& text,
                                        int image = -1, int selImage = -1,
                                        wxTreeItemData *data = NULL);
                                        const wxString& text,
                                        int image = -1, int selImage = -1,
                                        wxTreeItemData *data = NULL);

-    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags);
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const;

 
     // called by wxTextTreeCtrl when it marks itself for deletion
     void ResetTextControl();
 
     // called by wxTextTreeCtrl when it marks itself for deletion
     void ResetTextControl();


@@ -321,7 +320,6 @@ protected:
 
     void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
     void CalculatePositions();
 
     void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
     void CalculatePositions();

-    void CalculateSize( wxGenericTreeItem *item, wxDC &dc );

 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );


@@ -343,10 +341,14 @@ protected:
     void UnselectAllChildren( wxGenericTreeItem *item );
     void ChildrenClosing(wxGenericTreeItem* item);
 
     void UnselectAllChildren( wxGenericTreeItem *item );
     void ChildrenClosing(wxGenericTreeItem* item);
 

+    void DoDirtyProcessing();
+
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)

-    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
+    wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);

 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)


@@ -355,7 +357,7 @@ private:
  * the run-time information.
  */
 
  * the run-time information.
  */
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 
 {
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 


@@ -377,4 +379,3 @@ public:
 #endif // wxUSE_TREECTRL
 
 #endif // _GENERIC_TREECTRL_H_
 #endif // wxUSE_TREECTRL
 
 #endif // _GENERIC_TREECTRL_H_

-