#if wxUSE_DATAVIEWCTRL
#include "wx/dataview.h"
-
#include "wx/spinctrl.h"
-#include "wx/dc.h"
-#include "wx/settings.h"
+#include "wx/choice.h"
+
+#include "wx/weakref.h"
+#include "wx/vector.h"
#ifndef WX_PRECOMP
+ #include "wx/dc.h"
+ #include "wx/settings.h"
#include "wx/log.h"
#include "wx/icon.h"
+ #include "wx/crt.h"
#endif
-const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
+const char wxDataViewCtrlNameStr[] = "dataviewCtrl";
bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
return (left.GetID() == right.GetID() );
}
+#ifdef __WXDEBUG__
+void wxDataViewItem::Print(const wxString& text) const
+{
+ wxPrintf(wxT("item %s: %lu\n"), text.GetData(), wxPtrToUInt(m_id));
+}
+#endif
// ---------------------------------------------------------
// wxDataViewModelNotifier
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();
-
- if (!ascending)
- return litem2-litem2;
+ wxUIntPtr id1 = wxPtrToUInt(item1.GetID()),
+ id2 = wxPtrToUInt(item2.GetID());
- return litem1-litem2;
+ return ascending ? id1 - id2 : id2 - id1;
}
// ---------------------------------------------------------
// wxDataViewIndexListModel
// ---------------------------------------------------------
+static int my_sort( int *v1, int *v2 )
+{
+ return *v2-*v1;
+}
+
+
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;
}
{
}
+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( 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 );
}
+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( 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 )
{
wxDataViewModel::ItemChanged( GetItem(row) );
unsigned int wxDataViewIndexListModel::GetRow( const wxDataViewItem &item ) const
{
+ if (m_ordered)
+ {
+ unsigned int pos = wxPtrToUInt( item.GetID() );
+ return pos-1;
+ }
+
// assert for not found
return (unsigned int) m_hash.Index( item.GetID() );
}
return wxDataViewItem( m_hash[row] );
}
+bool wxDataViewIndexListModel::HasDefaultCompare() const
+{
+ return !m_ordered;
+}
+
int wxDataViewIndexListModel::Compare(const wxDataViewItem& item1,
const wxDataViewItem& item2,
unsigned int WXUNUSED(column),
bool ascending)
{
+ if (m_ordered)
+ {
+ unsigned int pos1 = wxPtrToUInt(item1.GetID());
+ unsigned int pos2 = wxPtrToUInt(item2.GetID());
+
+ if (ascending)
+ return pos1 - pos2;
+ else
+ return pos2 - pos1;
+ }
+
if (ascending)
return GetRow(item1) - GetRow(item2);
return SetValue( variant, GetRow(item), col );
}
+bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
+{
+ return GetAttr( GetRow(item), col, attr );
+}
+
wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
{
return wxDataViewItem(0);
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( NULL );
+ ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowInserted( unsigned int before )
+{
+ m_lastIndex++;
+ wxDataViewItem item( wxUIntToPtr(before) );
+ ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowAppended()
+{
+ m_lastIndex++;
+ wxDataViewItem item( wxUIntToPtr(m_lastIndex) );
+ ItemAdded( wxDataViewItem(0), item );
+}
+
+void wxDataViewVirtualListModel::RowDeleted( unsigned int row )
+{
+ wxDataViewItem item( wxUIntToPtr(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( wxUIntToPtr(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( wxUIntToPtr(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
//-----------------------------------------------------------------------------
int WXUNUSED(align) )
{
m_variantType = varianttype;
- m_editorCtrl = NULL;
+ m_owner = NULL;
+}
+
+wxDataViewRendererBase::~wxDataViewRendererBase()
+{
}
const wxDataViewCtrl* wxDataViewRendererBase::GetView() const
{
- return wx_const_cast(wxDataViewRendererBase*, this)->GetOwner()->GetOwner();
+ return const_cast<wxDataViewRendererBase*>(this)->GetOwner()->GetOwner();
}
+class wxKillRef: public wxWindowRef
+{
+public:
+ wxKillRef( wxWindow *win ) : wxWindowRef( win ) { }
+ virtual void OnObjectDestroy()
+ {
+ get()->PopEventHandler( true );
+ m_pobj = NULL;
+ delete this;
+ }
+};
+
bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect labelRect )
{
m_item = item; // remember for later
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 );
void wxDataViewRendererBase::CancelEditing()
{
- wxPendingDelete.Append( m_editorCtrl );
+ if (!m_editorCtrl) return;
GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
- // m_editorCtrl->PopEventHandler( true );
+ m_editorCtrl->Hide();
+ wxPendingDelete.Append( m_editorCtrl );
}
bool wxDataViewRendererBase::FinishEditing()
{
+ if (!m_editorCtrl) return true;
+
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;
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() );
EVT_CHAR (wxDataViewEditorCtrlEvtHandler::OnChar)
EVT_KILL_FOCUS (wxDataViewEditorCtrlEvtHandler::OnKillFocus)
EVT_IDLE (wxDataViewEditorCtrlEvtHandler::OnIdle)
+ EVT_TEXT_ENTER (-1, wxDataViewEditorCtrlEvtHandler::OnTextEnter)
END_EVENT_TABLE()
wxDataViewEditorCtrlEvtHandler::wxDataViewEditorCtrlEvtHandler(
event.Skip();
}
+void wxDataViewEditorCtrlEvtHandler::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
+{
+ m_finished = true;
+ m_owner->FinishEditing();
+}
+
void wxDataViewEditorCtrlEvtHandler::OnChar( wxKeyEvent &event )
{
switch ( event.m_keyCode )
break;
case WXK_ESCAPE:
+ {
m_finished = true;
m_owner->CancelEditing();
break;
-
+ }
default:
event.Skip();
}
// wxDataViewColumnBase
// ---------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
-
-wxDataViewColumnBase::wxDataViewColumnBase(const wxString& WXUNUSED(title),
- wxDataViewRenderer *renderer,
- unsigned int model_column,
- int WXUNUSED(width),
- wxAlignment WXUNUSED(align),
- int WXUNUSED(flags))
-{
- m_renderer = renderer;
- m_model_column = model_column;
- m_owner = NULL;
- m_renderer->SetOwner( (wxDataViewColumn*) this );
-
- // NOTE: the wxDataViewColumn's ctor must store the width, align, flags
- // parameters inside the native control!
-}
-
-wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
- wxDataViewRenderer *renderer,
- unsigned int model_column,
- int WXUNUSED(width),
- wxAlignment WXUNUSED(align),
- int WXUNUSED(flags) )
+void wxDataViewColumnBase::Init(wxDataViewRenderer *renderer,
+ unsigned int model_column)
{
m_renderer = renderer;
m_model_column = model_column;
- m_bitmap = bitmap;
m_owner = NULL;
m_renderer->SetOwner( (wxDataViewColumn*) this );
}
wxDataViewColumnBase::~wxDataViewColumnBase()
{
- if (m_renderer)
- delete m_renderer;
-}
-
-int wxDataViewColumnBase::GetFlags() const
-{
- int ret = 0;
-
- if (IsSortable())
- ret |= wxDATAVIEW_COL_SORTABLE;
- if (IsResizeable())
- ret |= wxDATAVIEW_COL_RESIZABLE;
- if (IsHidden())
- ret |= wxDATAVIEW_COL_HIDDEN;
-
- return ret;
-}
-
-void wxDataViewColumnBase::SetFlags(int flags)
-{
- SetSortable((flags & wxDATAVIEW_COL_SORTABLE) != 0);
- SetResizeable((flags & wxDATAVIEW_COL_RESIZABLE) != 0);
- SetHidden((flags & wxDATAVIEW_COL_HIDDEN) != 0);
+ delete m_renderer;
}
// ---------------------------------------------------------
return m_model;
}
+const wxDataViewModel* wxDataViewCtrlBase::GetModel() const
+{
+ return m_model;
+}
+
+void wxDataViewCtrlBase::ExpandAncestors( const wxDataViewItem & item )
+{
+ if (!m_model) return;
+
+ if (!item.IsOk()) return;
+
+ wxVector<wxDataViewItem> parentChain;
+
+ // at first we get all the parents of the selected item
+ wxDataViewItem parent = m_model->GetParent(item);
+ while (parent.IsOk())
+ {
+ parentChain.push_back(parent);
+ parent = m_model->GetParent(parent);
+ }
+
+ // then we expand the parents, starting at the root
+ while (!parentChain.empty())
+ {
+ Expand(parentChain.back());
+ parentChain.pop_back();
+ }
+}
+
wxDataViewColumn *
wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
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;
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;
{
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
{
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
return true;
}
+bool
+wxDataViewCtrlBase::InsertColumn( unsigned int WXUNUSED(pos), wxDataViewColumn *col )
+{
+ col->SetOwner( (wxDataViewCtrl*) this );
+ return true;
+}
+
// ---------------------------------------------------------
// wxDataViewEvent
// ---------------------------------------------------------
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED)
+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)
// -------------------------------------
// -------------------------------------
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;
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|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;
}
bool wxDataViewSpinRenderer::GetValueFromEditorCtrl( wxControl* editor, wxVariant &value )
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;
}
return true;
}
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
+
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__)
+
+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
//-----------------------------------------------------------------------------
wxDataViewTreeStoreNode( parent, text, icon, data )
{
m_iconExpanded = expanded;
+ m_isExpanded = false;
m_children.DeleteContents(true);
}
wxDataViewTreeStoreNode *node = FindNode( item );
if (!node) return;
- wxDataViewIconText data( node->GetText(), node->GetIcon() );
+ wxIcon icon( node->GetIcon());
+ if (node->IsContainer())
+ {
+ wxDataViewTreeStoreContainerNode *container = (wxDataViewTreeStoreContainerNode*) node;
+ if (container->IsExpanded() && container->GetExpandedIcon().IsOk())
+ icon = container->GetExpandedIcon();
+ }
+
+ wxDataViewIconText data( node->GetText(), icon );
variant << data;
}
return (wxDataViewTreeStoreContainerNode*) node;
}
+//-----------------------------------------------------------------------------
+// wxDataViewTreeCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxDataViewTreeCtrl,wxDataViewCtrl)
+
+BEGIN_EVENT_TABLE(wxDataViewTreeCtrl,wxDataViewCtrl)
+ EVT_DATAVIEW_ITEM_EXPANDED(-1, wxDataViewTreeCtrl::OnExpanded)
+ EVT_DATAVIEW_ITEM_COLLAPSED(-1, wxDataViewTreeCtrl::OnCollapsed)
+ EVT_SIZE( wxDataViewTreeCtrl::OnSize )
+END_EVENT_TABLE()
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl()
+{
+ m_imageList = NULL;
+}
+
+wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
+ 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);
+}
+
+wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
+{
+ if (m_imageList)
+ delete m_imageList;
+}
+
+bool wxDataViewTreeCtrl::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
+{
+ return wxDataViewCtrl::Create( parent, id, pos, size, style, validator );
+}
+
+void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
+{
+ if (m_imageList)
+ delete m_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 );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependItem( 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()->PrependItem( parent, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, wxClientData *data )
+{
+ wxIcon icon = wxNullIcon;
+ if (m_imageList && (iconIndex != -1))
+ icon = m_imageList->GetIcon( iconIndex );
+
+ return GetStore()->InsertItem( parent, previous, text, icon, data );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::PrependContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ 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 );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::AppendContainer( const wxDataViewItem& parent,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ 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 );
+}
+
+wxDataViewItem wxDataViewTreeCtrl::InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
+ const wxString &text, int iconIndex, int expandedIndex, wxClientData *data )
+{
+ 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() );
+}
+
+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() );
+}
+
+void wxDataViewTreeCtrl::OnSize( wxSizeEvent &event )
+{
+#if defined(wxUSE_GENERICDATAVIEWCTRL)
+ // automatically resize our only column to take the entire control width
+ if ( GetColumnCount() )
+ {
+ wxSize size = GetClientSize();
+ GetColumn(0)->SetWidth(size.x);
+ }
+#endif
+ event.Skip( true );
+}
+
#endif // wxUSE_DATAVIEWCTRL
projects / wxWidgets.git / blobdiff