X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6aaf49fc5192cd90c2fef9988da6abb38d76925..394b2900ffb066b20f3a06482b470521e3b876fe:/src/common/datavcmn.cpp diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index a95f2d7563..7f85194b9b 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -18,9 +18,10 @@ #if wxUSE_DATAVIEWCTRL #include "wx/dataview.h" - #include "wx/spinctrl.h" +#include "wx/weakref.h" + #ifndef WX_PRECOMP #include "wx/dc.h" #include "wx/settings.h" @@ -40,7 +41,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) #ifdef __WXDEBUG__ void wxDataViewItem::Print(const wxString& text) const { - wxPrintf("item %s: %l\n", text, (long)m_id); + wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id); } #endif @@ -297,104 +298,99 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem // wxDataViewIndexListModel // --------------------------------------------------------- -wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) +static int my_sort( int *v1, int *v2 ) { -#ifndef __WXMAC__ - m_useHash = false; -#else - m_useHash = true; -#endif + return *v2-*v1; +} - if (m_useHash) - { - // IDs are ordered until an item gets deleted or inserted - m_ordered = true; - - // build initial index - unsigned int i; - for (i = 1; i < initial_size+1; i++) + +wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size ) +{ + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; + + // build initial index + unsigned int i; + for (i = 1; i < initial_size+1; i++) m_hash.Add( (void*) i ); - m_lastIndex = initial_size + 1; - } - else - { - m_lastIndex = initial_size-1; - } + m_lastIndex = initial_size + 1; } wxDataViewIndexListModel::~wxDataViewIndexListModel() { } +void wxDataViewIndexListModel::Reset( unsigned int new_size ) +{ + m_hash.Clear(); + + // IDs are ordered until an item gets deleted or inserted + m_ordered = true; + + // build initial index + unsigned int i; + for (i = 1; i < new_size+1; i++) + m_hash.Add( (void*) i ); + m_lastIndex = new_size + 1; + + wxDataViewModel::Cleared(); +} + void wxDataViewIndexListModel::RowPrepended() { - if (m_useHash) - { - m_ordered = false; + m_ordered = false; - unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, 0 ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); - } - else - { - m_lastIndex++; - wxDataViewItem item( (void*) 0 ); - ItemAdded( wxDataViewItem(0), item ); - } + unsigned int id = m_lastIndex++; + m_hash.Insert( (void*) id, 0 ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowInserted( unsigned int before ) { - if (m_useHash) - { - m_ordered = false; + m_ordered = false; - unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, before ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); - } - else - { - m_lastIndex++; - wxDataViewItem item( (void*) before ); - ItemAdded( wxDataViewItem(0), item ); - } + unsigned int id = m_lastIndex++; + m_hash.Insert( (void*) id, before ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowAppended() { - if (m_useHash) - { - unsigned int id = m_lastIndex++; - m_hash.Add( (void*) id ); - wxDataViewItem item( (void*) id ); - ItemAdded( wxDataViewItem(0), item ); - } - else - { - m_lastIndex++; - wxDataViewItem item( (void*) m_lastIndex ); - ItemAdded( wxDataViewItem(0), item ); - } + unsigned int id = m_lastIndex++; + m_hash.Add( (void*) id ); + wxDataViewItem item( (void*) id ); + ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { - if (m_useHash) - { - wxDataViewItem item( m_hash[row] ); - wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); - m_hash.RemoveAt( row ); - } - else + m_ordered = false; + + wxDataViewItem item( m_hash[row] ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_hash.RemoveAt( row ); +} + +void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) +{ + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); + + m_ordered = false; + + wxDataViewItemArray array; + unsigned int i; + for (i = 0; i < rows.GetCount(); i++) { - wxDataViewItem item( (void*) row ); - wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); - m_lastIndex++; + wxDataViewItem item( m_hash[rows[i]] ); + array.Add( item ); } + wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); + + for (i = 0; i < sorted.GetCount(); i++) + m_hash.RemoveAt( sorted[i] ); } void wxDataViewIndexListModel::RowChanged( unsigned int row ) @@ -409,34 +405,20 @@ void wxDataViewIndexListModel::RowValueChanged( unsigned int row, unsigned int c unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const { - if (m_useHash) + if (m_ordered) { - if (m_ordered) - { unsigned int pos = wxPtrToUInt( item.GetID() ); return pos-1; - } - - // assert for not found - return (unsigned int) m_hash.Index( item.GetID() ); - } - else - { - return wxPtrToUInt( item.GetID() ); } + + // assert for not found + return (unsigned int) m_hash.Index( item.GetID() ); } wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const { - if (m_useHash) - { - wxASSERT( row < m_hash.GetCount() ); - return wxDataViewItem( m_hash[row] ); - } - else - { - return wxDataViewItem( (void*) row ); - } + wxASSERT( row < m_hash.GetCount() ); + return wxDataViewItem( m_hash[row] ); } bool wxDataViewIndexListModel::HasDefaultCompare() const @@ -449,7 +431,7 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, unsigned int WXUNUSED(column), bool ascending) { - if (m_ordered || !m_useHash) + if (m_ordered) { unsigned int pos1 = wxPtrToUInt(item1.GetID()); unsigned int pos2 = wxPtrToUInt(item2.GetID()); @@ -499,17 +481,158 @@ bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const { - if (!m_useHash) - return 0; // error - if (item.IsOk()) return 0; children = m_hash; - + return m_hash.GetCount(); } +// --------------------------------------------------------- +// wxDataViewVirtualListModel +// --------------------------------------------------------- + +#ifndef __WXMAC__ + +wxDataViewVirtualListModel::wxDataViewVirtualListModel( unsigned int initial_size ) +{ + m_lastIndex = initial_size-1; +} + +wxDataViewVirtualListModel::~wxDataViewVirtualListModel() +{ +} + +void wxDataViewVirtualListModel::Reset( unsigned int new_size ) +{ + m_lastIndex = new_size-1; + + wxDataViewModel::Cleared(); +} + +void wxDataViewVirtualListModel::RowPrepended() +{ + m_lastIndex++; + wxDataViewItem item( (void*) 0 ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowInserted( unsigned int before ) +{ + m_lastIndex++; + wxDataViewItem item( (void*) before ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowAppended() +{ + m_lastIndex++; + wxDataViewItem item( (void*) m_lastIndex ); + ItemAdded( wxDataViewItem(0), item ); +} + +void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) +{ + wxDataViewItem item( (void*) row ); + wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); + m_lastIndex++; +} + +void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows ) +{ + wxArrayInt sorted = rows; + sorted.Sort( my_sort ); + + wxDataViewItemArray array; + unsigned int i; + for (i = 0; i < sorted.GetCount(); i++) + { + wxDataViewItem item( (void*) sorted[i] ); + array.Add( item ); + } + wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); + + m_lastIndex -= rows.GetCount(); +} + +void wxDataViewVirtualListModel::RowChanged( unsigned int row ) +{ + wxDataViewModel::ItemChanged( GetItem(row) ); +} + +void wxDataViewVirtualListModel::RowValueChanged( unsigned int row, unsigned int col ) +{ + wxDataViewModel::ValueChanged( GetItem(row), col ); +} + +unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) const +{ + return wxPtrToUInt( item.GetID() ); +} + +wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const +{ + return wxDataViewItem( (void*) row ); +} + +bool wxDataViewVirtualListModel::HasDefaultCompare() const +{ + return true; +} + +int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, + const wxDataViewItem& item2, + unsigned int WXUNUSED(column), + bool ascending) +{ + unsigned int pos1 = wxPtrToUInt(item1.GetID()); + unsigned int pos2 = wxPtrToUInt(item2.GetID()); + + if (ascending) + return pos1 - pos2; + else + return pos2 - pos1; +} + +void wxDataViewVirtualListModel::GetValue( wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) const +{ + GetValue( variant, GetRow(item), col ); +} + +bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant, + const wxDataViewItem &item, unsigned int col ) +{ + return SetValue( variant, GetRow(item), col ); +} + +bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr ) +{ + return GetAttr( GetRow(item), col, attr ); +} + +wxDataViewItem wxDataViewVirtualListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const +{ + return wxDataViewItem(0); +} + +bool wxDataViewVirtualListModel::IsContainer( const wxDataViewItem &item ) const +{ + // only the invisible root item has children + if (!item.IsOk()) + return true; + + return false; +} + +unsigned int wxDataViewVirtualListModel::GetChildren( const wxDataViewItem &WXUNUSED(item), wxDataViewItemArray &WXUNUSED(children) ) const +{ + return 0; // should we report an error ? +} + +#endif // __WXMAC__ + //----------------------------------------------------------------------------- // wxDataViewIconText //----------------------------------------------------------------------------- @@ -536,7 +659,11 @@ wxDataViewRendererBase::wxDataViewRendererBase( const wxString &varianttype, int WXUNUSED(align) ) { m_variantType = varianttype; - m_editorCtrl = NULL; + m_owner = NULL; +} + +wxDataViewRendererBase::~wxDataViewRendererBase() +{ } const wxDataViewCtrl* wxDataViewRendererBase::GetView() const @@ -544,6 +671,17 @@ const wxDataViewCtrl* wxDataViewRendererBase::GetView() const return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); } +class wxKillRef: public wxWindowRef +{ +public: + wxKillRef( wxWindow *win ) : wxWindowRef( win ) { } + virtual void OnObjectDestroy() + { + get()->PopEventHandler( true ); + delete this; + } +}; + bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect ) { m_item = item; // remember for later @@ -553,6 +691,7 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la GetOwner()->GetOwner()->GetModel()->GetValue( value, item, col ); m_editorCtrl = CreateEditorCtrl( GetOwner()->GetOwner()->GetMainWindow(), labelRect, value ); + (void) new wxKillRef( m_editorCtrl.get() ); wxDataViewEditorCtrlEvtHandler *handler = new wxDataViewEditorCtrlEvtHandler( m_editorCtrl, (wxDataViewRenderer*) this ); @@ -577,11 +716,10 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::CancelEditing() { - wxPendingDelete.Append( m_editorCtrl ); - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - - // m_editorCtrl->PopEventHandler( true ); + + m_editorCtrl->Hide(); + wxPendingDelete.Append( m_editorCtrl ); } bool wxDataViewRendererBase::FinishEditing() @@ -589,10 +727,11 @@ bool wxDataViewRendererBase::FinishEditing() wxVariant value; GetValueFromEditorCtrl( m_editorCtrl, value ); - wxPendingDelete.Append( m_editorCtrl ); - GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); + m_editorCtrl->Hide(); + wxPendingDelete.Append( m_editorCtrl ); + if (!Validate(value)) return false; @@ -600,8 +739,6 @@ bool wxDataViewRendererBase::FinishEditing() GetOwner()->GetOwner()->GetModel()->SetValue( value, m_item, col ); GetOwner()->GetOwner()->GetModel()->ValueChanged( m_item, col ); - // m_editorCtrl->PopEventHandler( true ); - // Now we should send Editing Done event wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, GetOwner()->GetOwner()->GetId() ); event.SetDataViewColumn( GetOwner() ); @@ -735,6 +872,7 @@ void wxDataViewColumnBase::SetFlags(int flags) SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0); SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0); SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0); + SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0); } // --------------------------------------------------------- @@ -791,7 +929,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -802,7 +940,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxString &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -814,7 +952,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int mode { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -825,7 +963,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -836,7 +974,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -847,7 +985,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -858,7 +996,7 @@ wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -869,7 +1007,7 @@ wxDataViewCtrlBase::AppendIconTextColumn( const wxBitmap &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -880,7 +1018,7 @@ wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -891,7 +1029,7 @@ wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int mo wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -902,7 +1040,7 @@ wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_ wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -913,7 +1051,7 @@ wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int mode wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); AppendColumn( ret ); return ret; @@ -924,7 +1062,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxString &label, unsigned int model wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -935,7 +1073,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxString &label, unsigned int m wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -947,7 +1085,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxString &label, unsigned int mod { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -958,7 +1096,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxString &label, unsigned int m wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -969,7 +1107,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxString &label, unsigned int model wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -980,7 +1118,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxString &label, unsigned int mod wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -991,7 +1129,7 @@ wxDataViewCtrlBase::PrependTextColumn( const wxBitmap &label, unsigned int model wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewTextRenderer( wxT("string"), mode, (int)align ), + new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1002,7 +1140,7 @@ wxDataViewCtrlBase::PrependIconTextColumn( const wxBitmap &label, unsigned int m wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode, (int)align ), + new wxDataViewIconTextRenderer( wxT("wxDataViewIconText"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1013,7 +1151,7 @@ wxDataViewCtrlBase::PrependToggleColumn( const wxBitmap &label, unsigned int mod wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewToggleRenderer( wxT("bool"), mode, (int)align ), + new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1024,7 +1162,7 @@ wxDataViewCtrlBase::PrependProgressColumn( const wxBitmap &label, unsigned int m wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode, (int)align ), + new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1035,7 +1173,7 @@ wxDataViewCtrlBase::PrependDateColumn( const wxBitmap &label, unsigned int model wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewDateRenderer( wxT("datetime"), mode, (int)align ), + new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1046,7 +1184,7 @@ wxDataViewCtrlBase::PrependBitmapColumn( const wxBitmap &label, unsigned int mod wxDataViewCellMode mode, int width, wxAlignment align, int flags ) { wxDataViewColumn *ret = new wxDataViewColumn( label, - new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode, (int)align ), + new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width, align, flags ); PrependColumn( ret ); return ret; @@ -1088,6 +1226,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK) DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED) // ------------------------------------- @@ -1095,7 +1234,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED) // ------------------------------------- wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCellMode mode, int alignment ) : - wxDataViewCustomRenderer( "long", mode, alignment ) + wxDataViewCustomRenderer(wxT("long"), mode, alignment ) { m_min = min; m_max = max; @@ -1104,8 +1243,21 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) { long l = value; - return new wxSpinCtrl( parent, wxID_ANY, wxEmptyString, - labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS, m_min, m_max, l ); + wxSize size = labelRect.GetSize(); +#ifdef __WXMAC__ + size = wxSize( wxMax(70,labelRect.width ), -1 ); +#endif + wxString str; + str.Printf( wxT("%d"), (int) l ); + wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str, + labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS, m_min, m_max, l ); +#ifdef __WXMAC__ + size = sc->GetSize(); + wxPoint pt = sc->GetPosition(); + sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y ); +#endif + + return sc; } bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) @@ -1119,7 +1271,7 @@ bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVarian bool wxDataViewSpinRenderer::Render( wxRect rect, wxDC *dc, int state ) { wxString str; - str.Printf( "%d", (int) m_data ); + str.Printf(wxT("%d"), (int) m_data ); RenderText( str, 0, rect, dc, state ); return true; } @@ -1579,14 +1731,7 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id, AssociateModel( store ); store->DecRef(); -#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL) - wxDataViewColumn *col = AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 ); - - wxSize cient_size = GetClientSize(); - col->SetWidth( size.x ); -#else - AppendIconTextColumn( "", 0, wxDATAVIEW_CELL_INERT, 40 ); -#endif + AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1); } wxDataViewTreeCtrl::~wxDataViewTreeCtrl() @@ -1705,10 +1850,11 @@ void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event ) { -#if !defined(__WXGTK20__) || defined(wxUSE_GENERICDATAVIEWCTRL) +#if defined(wxUSE_GENERICDATAVIEWCTRL) wxSize size = GetClientSize(); wxDataViewColumn *col = GetColumn( 0 ); - if (col) col->SetWidth( size.x ); + if (col) + col->SetWidth( size.x ); #endif event.Skip( true ); }