X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19723525ce7b6cc80b5c642fef6bbd46266b6071..091111d693989a6be93685726db948cccb203347:/src/common/datavcmn.cpp?ds=sidebyside diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 8204cf9391..c0850cbf16 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -19,6 +19,7 @@ #include "wx/dataview.h" #include "wx/spinctrl.h" +#include "wx/choice.h" #include "wx/weakref.h" @@ -30,7 +31,7 @@ #include "wx/crt.h" #endif -const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl"); +const char wxDataViewCtrlNameStr[] = "dataviewCtrl"; bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) @@ -41,7 +42,7 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right) #ifdef __WXDEBUG__ void wxDataViewItem::Print(const wxString& text) const { - wxPrintf(wxT("item %s: %l\n"), text.GetData(), (long)m_id); + wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id)); } #endif @@ -260,38 +261,41 @@ int wxDataViewModel::Compare( const wxDataViewItem &item1, const wxDataViewItem wxString str1 = value1.GetString(); wxString str2 = value2.GetString(); int res = str1.Cmp( str2 ); - if (res) return res; - } else - if (value1.GetType() == wxT("long")) + if (res) + return res; + } + else if (value1.GetType() == wxT("long")) { long l1 = value1.GetLong(); long l2 = value2.GetLong(); long res = l1-l2; - if (res) return res; - } else - if (value1.GetType() == wxT("double")) + if (res) + return res; + } + else if (value1.GetType() == wxT("double")) { double d1 = value1.GetDouble(); double d2 = value2.GetDouble(); - if (d1 < d2) return 1; - if (d1 > d2) return -1; - } else - if (value1.GetType() == wxT("datetime")) + if (d1 < d2) + return 1; + if (d1 > d2) + return -1; + } + else if (value1.GetType() == wxT("datetime")) { wxDateTime dt1 = value1.GetDateTime(); wxDateTime dt2 = value2.GetDateTime(); - if (dt1.IsEarlierThan(dt2)) return 1; - if (dt2.IsEarlierThan(dt1)) return -11; + if (dt1.IsEarlierThan(dt2)) + return 1; + if (dt2.IsEarlierThan(dt1)) + return -11; } // items must be different - unsigned long litem1 = (unsigned long) item1.GetID(); - unsigned long litem2 = (unsigned long) item2.GetID(); + wxUIntPtr id1 = wxPtrToUInt(item1.GetID()), + id2 = wxPtrToUInt(item2.GetID()); - if (!ascending) - return litem2-litem2; - - return litem1-litem2; + return ascending ? id1 - id2 : id2 - id1; } // --------------------------------------------------------- @@ -308,11 +312,11 @@ 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_hash.Add( wxUIntToPtr(i) ); m_lastIndex = initial_size + 1; } @@ -323,51 +327,51 @@ 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_hash.Add( wxUIntToPtr(i) ); m_lastIndex = new_size + 1; - + wxDataViewModel::Cleared(); } void wxDataViewIndexListModel::RowPrepended() { m_ordered = false; - + unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, 0 ); - wxDataViewItem item( (void*) id ); + m_hash.Insert( wxUIntToPtr(id), 0 ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowInserted( unsigned int before ) { m_ordered = false; - + unsigned int id = m_lastIndex++; - m_hash.Insert( (void*) id, before ); - wxDataViewItem item( (void*) id ); + m_hash.Insert( wxUIntToPtr(id), before ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowAppended() { unsigned int id = m_lastIndex++; - m_hash.Add( (void*) id ); - wxDataViewItem item( (void*) id ); + m_hash.Add( wxUIntToPtr(id) ); + wxDataViewItem item( wxUIntToPtr(id) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewIndexListModel::RowDeleted( unsigned int row ) { m_ordered = false; - + wxDataViewItem item( m_hash[row] ); wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); m_hash.RemoveAt( row ); @@ -377,9 +381,9 @@ 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++) @@ -388,7 +392,7 @@ void wxDataViewIndexListModel::RowsDeleted( const wxArrayInt &rows ) array.Add( item ); } wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); - + for (i = 0; i < sorted.GetCount(); i++) m_hash.RemoveAt( sorted[i] ); } @@ -410,7 +414,7 @@ unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) cons unsigned int pos = wxPtrToUInt( item.GetID() ); return pos-1; } - + // assert for not found return (unsigned int) m_hash.Index( item.GetID() ); } @@ -422,7 +426,7 @@ wxDataViewItem wxDataViewIndexListModel::GetItem( unsigned int row ) const } bool wxDataViewIndexListModel::HasDefaultCompare() const -{ +{ return !m_ordered; } @@ -435,13 +439,13 @@ int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1, { unsigned int pos1 = wxPtrToUInt(item1.GetID()); unsigned int pos2 = wxPtrToUInt(item2.GetID()); - + if (ascending) return pos1 - pos2; - else + else return pos2 - pos1; } - + if (ascending) return GetRow(item1) - GetRow(item2); @@ -485,7 +489,7 @@ unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, return 0; children = m_hash; - + return m_hash.GetCount(); } @@ -507,34 +511,34 @@ 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 ); + wxDataViewItem item( NULL ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowInserted( unsigned int before ) { m_lastIndex++; - wxDataViewItem item( (void*) before ); + wxDataViewItem item( wxUIntToPtr(before) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowAppended() { m_lastIndex++; - wxDataViewItem item( (void*) m_lastIndex ); + wxDataViewItem item( wxUIntToPtr(m_lastIndex) ); ItemAdded( wxDataViewItem(0), item ); } void wxDataViewVirtualListModel::RowDeleted( unsigned int row ) { - wxDataViewItem item( (void*) row ); + wxDataViewItem item( wxUIntToPtr(row) ); wxDataViewModel::ItemDeleted( wxDataViewItem(0), item ); m_lastIndex++; } @@ -543,16 +547,16 @@ 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] ); + wxDataViewItem item( wxUIntToPtr(sorted[i]) ); array.Add( item ); } wxDataViewModel::ItemsDeleted( wxDataViewItem(0), array ); - + m_lastIndex -= rows.GetCount(); } @@ -573,11 +577,11 @@ unsigned int wxDataViewVirtualListModel::GetRow( const wxDataViewItem &item ) co wxDataViewItem wxDataViewVirtualListModel::GetItem( unsigned int row ) const { - return wxDataViewItem( (void*) row ); + return wxDataViewItem( wxUIntToPtr(row) ); } bool wxDataViewVirtualListModel::HasDefaultCompare() const -{ +{ return true; } @@ -588,10 +592,10 @@ int wxDataViewVirtualListModel::Compare(const wxDataViewItem& item1, { unsigned int pos1 = wxPtrToUInt(item1.GetID()); unsigned int pos2 = wxPtrToUInt(item2.GetID()); - + if (ascending) return pos1 - pos2; - else + else return pos2 - pos1; } @@ -668,12 +672,12 @@ wxDataViewRendererBase::~wxDataViewRendererBase() const wxDataViewCtrl* wxDataViewRendererBase::GetView() const { - return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner(); + return const_cast(this)->GetOwner()->GetOwner(); } class wxKillRef: public wxWindowRef -{ -public: +{ +public: wxKillRef( wxWindow *win ) : wxWindowRef( win ) { } virtual void OnObjectDestroy() { @@ -717,14 +721,18 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la void wxDataViewRendererBase::CancelEditing() { + if (!m_editorCtrl) return; + GetOwner()->GetOwner()->GetMainWindow()->SetFocus(); - + m_editorCtrl->Hide(); wxPendingDelete.Append( m_editorCtrl ); } bool wxDataViewRendererBase::FinishEditing() { + if (!m_editorCtrl) return true; + wxVariant value; GetValueFromEditorCtrl( m_editorCtrl, value ); @@ -732,7 +740,7 @@ bool wxDataViewRendererBase::FinishEditing() m_editorCtrl->Hide(); wxPendingDelete.Append( m_editorCtrl ); - + if (!Validate(value)) return false; @@ -758,6 +766,7 @@ BEGIN_EVENT_TABLE(wxDataViewEditorCtrlEvtHandler, wxEvtHandler) EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar) EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus) EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle) + EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter) END_EVENT_TABLE() wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler( @@ -782,6 +791,12 @@ void wxDataViewEditorCtrlEvtHandler::OnIdle( wxIdleEvent &event ) event.Skip(); } +void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) ) +{ + m_finished = true; + m_owner->FinishEditing(); +} + void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) { switch ( event.m_keyCode ) @@ -792,10 +807,11 @@ void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event ) break; case WXK_ESCAPE: + { m_finished = true; m_owner->CancelEditing(); break; - + } default: event.Skip(); } @@ -1205,7 +1221,7 @@ wxDataViewCtrlBase::PrependColumn( wxDataViewColumn *col ) return true; } -bool +bool wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col ) { col->SetOwner( (wxDataViewCtrl*) this ); @@ -1258,13 +1274,13 @@ wxControl* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect la 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 ); + labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, 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; } @@ -1301,6 +1317,64 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const return true; } +// ------------------------------------- +// wxDataViewChoiceRenderer +// ------------------------------------- + +#ifndef __WXGTK20__ + +wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString& choices, wxDataViewCellMode mode, int alignment ) : + wxDataViewCustomRenderer(wxT("string"), mode, alignment ) +{ + m_choices = choices; +} + +wxControl* wxDataViewChoiceRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) +{ + wxString s = value; + wxSize size = labelRect.GetSize(); +#ifdef __WXMAC__ + size = wxSize( wxMax(70,labelRect.width ), -1 ); +#endif + wxChoice *c = new wxChoice( parent, wxID_ANY, labelRect.GetTopLeft(), size, m_choices ); + c->SetStringSelection( value.GetString() ); + + return c; +} + +bool wxDataViewChoiceRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ) +{ + wxChoice *c = (wxChoice*) editor; + wxString s = c->GetStringSelection(); + value = s; + return true; +} + +bool wxDataViewChoiceRenderer::Render( wxRect rect, wxDC *dc, int state ) +{ + RenderText( m_data, 0, rect, dc, state ); + return true; +} + +wxSize wxDataViewChoiceRenderer::GetSize() const +{ + return wxSize(80,16); +} + +bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) +{ + m_data = value.GetString(); + return true; +} + +bool wxDataViewChoiceRenderer::GetValue( wxVariant &value ) const +{ + value = m_data; + return true; +} + +#endif + //----------------------------------------------------------------------------- // wxDataViewTreeStore //----------------------------------------------------------------------------- @@ -1599,7 +1673,7 @@ wxDataViewTreeStore::GetValue(wxVariant &variant, if (container->IsExpanded() && container->GetExpandedIcon().IsOk()) icon = container->GetExpandedIcon(); } - + wxDataViewIconText data( node->GetText(), icon ); variant << data; @@ -1730,15 +1804,15 @@ wxDataViewTreeCtrl::wxDataViewTreeCtrl() } wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) + const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { m_imageList = NULL; Create( parent, id, pos, size, style, validator ); - + wxDataViewTreeStore *store = new wxDataViewTreeStore; AssociateModel( store ); store->DecRef(); - + AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1); } @@ -1759,16 +1833,16 @@ void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist ) if (m_imageList) delete m_imageList; - m_imageList = imagelist; + m_imageList = imagelist; } - + wxDataViewItem wxDataViewTreeCtrl::AppendItem( const wxDataViewItem& parent, const wxString &text, int iconIndex, wxClientData *data ) { wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + return GetStore()->AppendItem( parent, text, icon, data ); } @@ -1778,7 +1852,7 @@ wxDataViewItem wxDataViewTreeCtrl::PrependItem( const wxDataViewItem& parent, wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + return GetStore()->PrependItem( parent, text, icon, data ); } @@ -1788,7 +1862,7 @@ wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, con wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + return GetStore()->InsertItem( parent, previous, text, icon, data ); } @@ -1798,11 +1872,11 @@ wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& paren wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + wxIcon expanded = wxNullIcon; if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - + return GetStore()->PrependContainer( parent, text, icon, expanded, data ); } @@ -1812,11 +1886,11 @@ wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + wxIcon expanded = wxNullIcon; if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - + return GetStore()->AppendContainer( parent, text, icon, expanded, data ); } @@ -1826,21 +1900,21 @@ wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent wxIcon icon = wxNullIcon; if (m_imageList && (iconIndex != -1)) icon = m_imageList->GetIcon( iconIndex ); - + wxIcon expanded = wxNullIcon; if (m_imageList && (expandedIndex != -1)) expanded = m_imageList->GetIcon( expandedIndex ); - + return GetStore()->InsertContainer( parent, previous, text, icon, expanded, data ); } void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) { if (m_imageList) return; - + wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); if (!container) return; - + container->SetExpanded( true ); GetStore()->ItemChanged( event.GetItem() ); } @@ -1848,10 +1922,10 @@ void wxDataViewTreeCtrl::OnExpanded( wxDataViewEvent &event ) void wxDataViewTreeCtrl::OnCollapsed( wxDataViewEvent &event ) { if (m_imageList) return; - + wxDataViewTreeStoreContainerNode* container = GetStore()->FindContainerNode( event.GetItem() ); if (!container) return; - + container->SetExpanded( false ); GetStore()->ItemChanged( event.GetItem() ); } @@ -1861,7 +1935,7 @@ void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event ) #if defined(wxUSE_GENERICDATAVIEWCTRL) wxSize size = GetClientSize(); wxDataViewColumn *col = GetColumn( 0 ); - if (col) + if (col) col->SetWidth( size.x ); #endif event.Skip( true );