implemented Freeze/Thaw() (patch 922156)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 781c4b1824351dbc41dc8e975027728568fd3670..51b8a4d090590aa69e325c299f737de0a817ecfb 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -89,8 +89,8 @@ All (GUI):
 
 - wxHtmlWindow now delays image scaling until rendering,
   resulting in much better display of scaled images
 
 - wxHtmlWindow now delays image scaling until rendering,
   resulting in much better display of scaled images

-- Added UpdateSize to wxSplitterWindow to allow layout
-  while hidden
+- Added UpdateSize to wxSplitterWindow to allow layout while hidden
+- implemented Freeze/Thaw() for wxGenericTreeCtrl (Kevin Hock)

 
 wxMSW:
 
 
 wxMSW:
 

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index db054192235588610f963ca4c342e05ee3c7a45e..2aba6baa1013bb7055cf0989f1cab591cebe9838 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -378,6 +378,9 @@ public:
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
 
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
 

+    virtual void Freeze();
+    virtual void Thaw();
+ 

     // callbacks
     void OnPaint( wxPaintEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     // callbacks
     void OnPaint( wxPaintEvent &event );
     void OnSetFocus( wxFocusEvent &event );


@@ -419,6 +422,7 @@ protected:
                         *m_imageListState,
                         *m_imageListButtons;
 
                         *m_imageListState,
                         *m_imageListButtons;
 

+    int                  m_freezeCount; 

     int                  m_dragCount;
     wxPoint              m_dragStart;
     wxGenericTreeItem   *m_dropTarget;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     wxGenericTreeItem   *m_dropTarget;

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 97c309222a1461ff9b2d1d874e75fabf99bf4b5b..69637e09c01a6a99fb07dad0035ab84568b16128 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -734,6 +734,8 @@ void wxGenericTreeCtrl::Init()
     m_textCtrl = NULL;
 
     m_renameTimer = NULL;
     m_textCtrl = NULL;
 
     m_renameTimer = NULL;

+    m_freezeCount = 0;
+

     m_findTimer = NULL;
 
     m_lastOnSame = FALSE;
     m_findTimer = NULL;
 
     m_lastOnSame = FALSE;


@@ -3219,7 +3221,8 @@ void wxGenericTreeCtrl::OnInternalIdle()
      * we actually redraw the tree when everything is over */
 
     if (!m_dirty) return;
      * we actually redraw the tree when everything is over */
 
     if (!m_dirty) return;

-
+    if (m_freezeCount) return;
+    

     m_dirty = FALSE;
 
     CalculatePositions();
     m_dirty = FALSE;
 
     CalculatePositions();


@@ -3330,6 +3333,7 @@ void wxGenericTreeCtrl::CalculatePositions()
 void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {
     if (m_dirty) return;
 void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {
     if (m_dirty) return;

+    if (m_freezeCount) return;

 
     wxSize client = GetClientSize();
 
 
     wxSize client = GetClientSize();
 


@@ -3346,6 +3350,7 @@ void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {
     if (m_dirty) return;
 void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {
     if (m_dirty) return;

+    if (m_freezeCount) return;

 
     wxRect rect;
     CalcScrolledPosition(0, item->GetY(), NULL, &rect.y);
 
     wxRect rect;
     CalcScrolledPosition(0, item->GetY(), NULL, &rect.y);


@@ -3357,6 +3362,8 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 
 void wxGenericTreeCtrl::RefreshSelected()
 {
 
 void wxGenericTreeCtrl::RefreshSelected()
 {

+    if (m_freezeCount) return;
+    

     // TODO: this is awfully inefficient, we should keep the list of all
     //       selected items internally, should be much faster
     if ( m_anchor )
     // TODO: this is awfully inefficient, we should keep the list of all
     //       selected items internally, should be much faster
     if ( m_anchor )


@@ -3365,6 +3372,8 @@ void wxGenericTreeCtrl::RefreshSelected()
 
 void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
 {
 
 void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
 {

+    if (m_freezeCount) return;
+    

     if ( item->IsSelected() )
         RefreshLine(item);
 
     if ( item->IsSelected() )
         RefreshLine(item);
 


@@ -3376,6 +3385,21 @@ void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
     }
 }
 
     }
 }
 

+void wxGenericTreeCtrl::Freeze()
+{
+    m_freezeCount++;
+}
+
+void wxGenericTreeCtrl::Thaw()
+{
+    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
+    
+    if ( !--m_freezeCount )
+    {
+        Refresh();
+    }
+}
+

 // ----------------------------------------------------------------------------
 // changing colours: we need to refresh the tree control
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // changing colours: we need to refresh the tree control
 // ----------------------------------------------------------------------------


@@ -3385,6 +3409,8 @@ bool wxGenericTreeCtrl::SetBackgroundColour(const wxColour& colour)
     if ( !wxWindow::SetBackgroundColour(colour) )
         return FALSE;
 
     if ( !wxWindow::SetBackgroundColour(colour) )
         return FALSE;
 

+    if (m_freezeCount) return TRUE;
+    

     Refresh();
 
     return TRUE;
     Refresh();
 
     return TRUE;


@@ -3395,6 +3421,8 @@ bool wxGenericTreeCtrl::SetForegroundColour(const wxColour& colour)
     if ( !wxWindow::SetForegroundColour(colour) )
         return FALSE;
 
     if ( !wxWindow::SetForegroundColour(colour) )
         return FALSE;
 

+    if (m_freezeCount) return TRUE;
+    

     Refresh();
 
     return TRUE;
     Refresh();
 
     return TRUE;