don't crash when loading images with verbose==false (patch 1449823)

[wxWidgets.git] / src / common / datavcmn.cpp

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 28191f678901be2736afec817d8ffbad7a9fc8e6..56966186a5af2244dfbf1db9b700fbfe13132695 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -15,24 +15,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_DATAVIEWCTRL
 
 #if wxUSE_DATAVIEWCTRL
 

-#include "wx/object.h"
-#include "wx/dataview.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/image.h"
 #include "wx/image.h"

+#include "wx/dataview.h"

 
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewModel
 // wxDataViewModel

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewListModel
 // wxDataViewListModel

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
 


@@ -58,7 +59,7 @@ bool wxDataViewListModel::RowAppended()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -74,7 +75,7 @@ bool wxDataViewListModel::RowPrepended()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -90,7 +91,7 @@ bool wxDataViewListModel::RowInserted( size_t before )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -106,7 +107,7 @@ bool wxDataViewListModel::RowDeleted( size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -122,7 +123,7 @@ bool wxDataViewListModel::RowChanged( size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -138,7 +139,23 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-    
+
+    return ret;
+}
+
+bool wxDataViewListModel::RowsReordered( size_t *new_order )
+{
+    bool ret = true;
+
+    wxNode *node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        if (!notifier->RowsReordered( new_order ))
+            ret = false;
+        node = node->GetNext();
+    }
+

     return ret;
 }
 
     return ret;
 }
 


@@ -154,7 +171,7 @@ bool wxDataViewListModel::Cleared()
             ret = false;
         node = node->GetNext();
     }
             ret = false;
         node = node->GetNext();
     }

-        
+

     return ret;
 }
 
     return ret;
 }
 


@@ -169,13 +186,13 @@ void wxDataViewListModel::RemoveViewingColumn( wxDataViewColumn *column )
     while (node)
     {
         wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();
     while (node)
     {
         wxDataViewViewingColumn* tmp = (wxDataViewViewingColumn*) node->GetData();

-        
+

         if (tmp->m_viewColumn == column)
         {
             m_viewingColumns.DeleteObject( tmp );
             return;
         }
         if (tmp->m_viewColumn == column)
         {
             m_viewingColumns.DeleteObject( tmp );
             return;
         }

-    
+

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -191,15 +208,39 @@ void wxDataViewListModel::RemoveNotifier( wxDataViewListModelNotifier *notifier
     m_notifiers.DeleteObject( notifier );
 }
 
     m_notifiers.DeleteObject( notifier );
 }
 

-// --------------------------------------------------------- 
-// wxDataViewSortedListModel
-// --------------------------------------------------------- 
+// ---------------------------------------------------------
+// wxDataViewSortedListModelNotifier
+// ---------------------------------------------------------
+
+class wxDataViewSortedListModelNotifier: public wxDataViewListModelNotifier
+{
+public:
+    wxDataViewSortedListModelNotifier( wxDataViewSortedListModel *model )
+    { m_model = model; }
+
+    virtual bool RowAppended() { return true; }
+    virtual bool RowPrepended()  { return true; }
+    virtual bool RowInserted( size_t WXUNUSED(before) )  { return true; }
+    virtual bool RowDeleted( size_t WXUNUSED(row) ) { return true; }
+    virtual bool RowChanged( size_t WXUNUSED(row) ) { return true; }
+    virtual bool ValueChanged( size_t col, size_t row )
+         { return m_model->ChildValueChanged( col, row); }
+    virtual bool RowsReordered( size_t *WXUNUSED(new_order) ) { return true; }
+    virtual bool Cleared() { return true; }
+
+    wxDataViewSortedListModel *m_model;
+};
+
+// ---------------------------------------------------------
+// wxDataViewSortedListModel compare function
+// ---------------------------------------------------------

 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
       (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
 {
 
 int wxCALLBACK wxDataViewListModelSortedDefaultCompare
       (size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
 {

-    wxVariant value1 = model->GetValue( col, row1 );
-    wxVariant value2 = model->GetValue( col, row2 );
+    wxVariant value1,value2;
+    model->GetValue( value1, col, row1 );
+    model->GetValue( value2, col, row2 );

     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();
     if (value1.GetType() == wxT("string"))
     {
         wxString str1 = value1.GetString();


@@ -241,6 +282,9 @@ int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 
     return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
 }
 

+// ---------------------------------------------------------
+// wxDataViewSortedListModel
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
 


@@ -251,12 +295,16 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
     s_CmpCol = 0;
     s_CmpModel = child;
     s_CmpFunc = wxDataViewListModelSortedDefaultCompare;
     s_CmpCol = 0;
     s_CmpModel = child;
     s_CmpFunc = wxDataViewListModelSortedDefaultCompare;

-    
-    Resort();    
+
+    m_notifierOnChild = new wxDataViewSortedListModelNotifier( this );
+    m_child->AddNotifier( m_notifierOnChild );
+
+    Resort();

 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
 }
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {

+    m_child->RemoveNotifier( m_notifierOnChild );

 }
 
 void wxDataViewSortedListModel::Resort()
 }
 
 void wxDataViewSortedListModel::Resort()


@@ -268,9 +316,79 @@ void wxDataViewSortedListModel::Resort()
         m_array.Add( i );
 }
 
         m_array.Add( i );
 }
 

+#if 0
+static void Dump( wxDataViewListModel *model, size_t col )
+{
+    size_t n = model->GetNumberOfRows();
+    size_t i;
+    for (i = 0; i < n; i++)
+    {
+        wxVariant variant;
+        model->GetValue( variant, col, i );
+        wxString tmp;
+        tmp = variant.GetString();
+        wxPrintf( wxT("%d: %s\n"), (int) i, tmp.c_str() );
+    }
+}
+#endif
+
+bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
+{
+    size_t i;
+    size_t len = m_array.GetCount();
+
+    // Remove and readd sorted. Find out at which
+    // position it was and where it ended.
+    size_t start_pos = 0,end_pos = 0;
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            start_pos = i;
+            break;
+        }
+    m_array.RemoveAt( start_pos );
+    m_array.Add( row );
+
+    for (i = 0; i < len; i++)
+        if (m_array[i] == row)
+        {
+            end_pos = i;
+            break;
+        }
+
+    if (end_pos == start_pos)
+        return wxDataViewListModel::ValueChanged( col, start_pos );
+
+    // Create an array where order[old] -> new_pos, so that
+    // if nothing changed order[0] -> 0 etc.
+    size_t *order = new size_t[ len ];
+    // Fill up initial values.
+    for (i = 0; i < len; i++)
+        order[i] = i;
+
+    if (start_pos < end_pos)
+    {
+        for (i = start_pos; i < end_pos; i++)
+            order[i] = order[i+1];
+        order[end_pos] = start_pos;
+    }
+    else
+    {
+        for (i = end_pos; i > start_pos; i--)
+            order[i] = order[i-1];
+        order[start_pos] = end_pos;
+    }
+
+    wxDataViewListModel::RowsReordered( order );
+
+    delete [] order;
+
+    return true;
+}
+

 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {
 size_t wxDataViewSortedListModel::GetNumberOfRows()
 {

-    return m_child->GetNumberOfRows();
+    return m_array.GetCount();

 }
 
 size_t wxDataViewSortedListModel::GetNumberOfCols()
 }
 
 size_t wxDataViewSortedListModel::GetNumberOfCols()


@@ -283,17 +401,19 @@ wxString wxDataViewSortedListModel::GetColType( size_t col )
     return m_child->GetColType( col );
 }
 
     return m_child->GetColType( col );
 }
 

-wxVariant wxDataViewSortedListModel::GetValue( size_t col, size_t row )
+void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )

 {
     size_t child_row = m_array[row];
 {
     size_t child_row = m_array[row];

-    return m_child->GetValue( col, child_row );
+    m_child->GetValue( variant, col, child_row );

 }
 
 bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
 {
     size_t child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );
 }
 
 bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
 {
     size_t child_row = m_array[row];
     bool ret = m_child->SetValue( variant, col, child_row );

-    // resort in ::ValueChanged()
+
+    // Resort in ::ChildValueChanged() which gets reported back.
+

     return ret;
 }
 
     return ret;
 }
 


@@ -301,9 +421,9 @@ bool wxDataViewSortedListModel::RowAppended()
 {
     // you can only append
     bool ret = m_child->RowAppended();
 {
     // you can only append
     bool ret = m_child->RowAppended();

-    
+

     // report RowInsrted
     // report RowInsrted

-    
+

     return ret;
 }
 
     return ret;
 }
 


@@ -311,30 +431,31 @@ bool wxDataViewSortedListModel::RowPrepended()
 {
     // you can only append
     bool ret = m_child->RowAppended();
 {
     // you can only append
     bool ret = m_child->RowAppended();

-    
+

     // report RowInsrted
     // report RowInsrted

-    
+

     return ret;
 }
 
     return ret;
 }
 

-bool wxDataViewSortedListModel::RowInserted( size_t before )
+bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )

 {
     // you can only append
     bool ret = m_child->RowAppended();
 {
     // you can only append
     bool ret = m_child->RowAppended();

-    
+

     // report different RowInsrted
     // report different RowInsrted

-    
+

     return ret;
 }
 
 bool wxDataViewSortedListModel::RowDeleted( size_t row )
 {
     size_t child_row = m_array[row];
     return ret;
 }
 
 bool wxDataViewSortedListModel::RowDeleted( size_t row )
 {
     size_t child_row = m_array[row];

-    
+

     bool ret = m_child->RowDeleted( child_row );
     bool ret = m_child->RowDeleted( child_row );

-    
-    wxDataViewListModel::RowDeleted( row );
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+

     return ret;
 }
 
     return ret;
 }
 


@@ -342,9 +463,10 @@ bool wxDataViewSortedListModel::RowChanged( size_t row )
 {
     size_t child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );
 {
     size_t child_row = m_array[row];
     bool ret = m_child->RowChanged( child_row );

-    
-    // report delete old pos, inserted new pos
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+

     return ret;
 }
 
     return ret;
 }
 


@@ -352,25 +474,32 @@ bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
 {
     size_t child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );
 {
     size_t child_row = m_array[row];
     bool ret = m_child->ValueChanged( col, child_row );

-    
-    // Do nothing if not the sorted col..
-    // report delete old pos, inserted new pos
-    
+
+    // Do nothing here as the change in the
+    // child model will be reported back.
+

     return ret;
 }
 
     return ret;
 }
 

+bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
+{
+    // We sort them ourselves.
+
+    return false;
+}
+

 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();
 bool wxDataViewSortedListModel::Cleared()
 {
     bool ret = m_child->Cleared();

-    
+

     wxDataViewListModel::Cleared();
     wxDataViewListModel::Cleared();

-    
+

     return ret;
 }
 
     return ret;
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCellBase
 // wxDataViewCellBase

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCellBase, wxObject)
 


@@ -379,10 +508,10 @@ wxDataViewCellBase::wxDataViewCellBase( const wxString &varianttype, wxDataViewC
     m_variantType = varianttype;
     m_mode = mode;
 }
     m_variantType = varianttype;
     m_mode = mode;
 }

-    
-// --------------------------------------------------------- 
+
+// ---------------------------------------------------------

 // wxDataViewColumnBase
 // wxDataViewColumnBase

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
 


@@ -400,7 +529,7 @@ wxDataViewColumnBase::~wxDataViewColumnBase()
 {
     if (m_cell)
         delete m_cell;
 {
     if (m_cell)
         delete m_cell;

-        
+

     if (GetOwner())
     {
         GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );
     if (GetOwner())
     {
         GetOwner()->GetModel()->RemoveViewingColumn( (wxDataViewColumn*) this );


@@ -417,9 +546,9 @@ wxString wxDataViewColumnBase::GetTitle()
     return m_title;
 }
 
     return m_title;
 }
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewCtrlBase
 // wxDataViewCtrlBase

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 


@@ -436,7 +565,7 @@ wxDataViewCtrlBase::~wxDataViewCtrlBase()
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
     m_model = model;
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
     m_model = model;

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -478,7 +607,7 @@ size_t wxDataViewCtrlBase::GetNumberOfColumns()
     return m_cols.GetCount();
 }
 
     return m_cols.GetCount();
 }
 

-bool wxDataViewCtrlBase::DeleteColumn( size_t pos )
+bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )

 {
     return false;
 }
 {
     return false;
 }