const char wxDataViewCtrlNameStr[] = "dataviewCtrl";
-
-bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
-{
- return (left.GetID() == right.GetID() );
-}
-
// ---------------------------------------------------------
// wxDataViewModelNotifier
// ---------------------------------------------------------
if (dt1.IsEarlierThan(dt2))
return 1;
if (dt2.IsEarlierThan(dt1))
- return -11;
+ return -1;
}
// items must be different
m_nextFreeID = initial_size + 1;
}
-wxDataViewIndexListModel::~wxDataViewIndexListModel()
-{
-}
-
void wxDataViewIndexListModel::Reset( unsigned int new_size )
{
m_hash.Clear();
unsigned int i;
for (i = 1; i < new_size+1; i++)
m_hash.Add( wxUIntToPtr(i) );
-
+
m_nextFreeID = new_size + 1;
wxDataViewModel::Cleared();
unsigned int id = m_nextFreeID;
m_nextFreeID++;
-
+
m_hash.Insert( wxUIntToPtr(id), 0 );
wxDataViewItem item( wxUIntToPtr(id) );
ItemAdded( wxDataViewItem(0), item );
-
+
}
void wxDataViewIndexListModel::RowInserted( unsigned int before )
unsigned int id = m_nextFreeID;
m_nextFreeID++;
-
+
m_hash.Insert( wxUIntToPtr(id), before );
wxDataViewItem item( wxUIntToPtr(id) );
ItemAdded( wxDataViewItem(0), item );
{
unsigned int id = m_nextFreeID;
m_nextFreeID++;
-
+
m_hash.Add( wxUIntToPtr(id) );
wxDataViewItem item( wxUIntToPtr(id) );
ItemAdded( wxDataViewItem(0), item );
return GetRow(item2) - GetRow(item1);
}
-void wxDataViewIndexListModel::GetValue( wxVariant &variant,
- const wxDataViewItem &item, unsigned int col ) const
-{
- GetValueByRow( variant, GetRow(item), col );
-}
-
-bool wxDataViewIndexListModel::SetValue( const wxVariant &variant,
- const wxDataViewItem &item, unsigned int col )
-{
- return SetValueByRow( variant, GetRow(item), col );
-}
-
-bool wxDataViewIndexListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
-{
- return GetAttrByRow( GetRow(item), col, attr );
-}
-
-wxDataViewItem wxDataViewIndexListModel::GetParent( const wxDataViewItem & WXUNUSED(item) ) const
-{
- return wxDataViewItem(0);
-}
-
-bool wxDataViewIndexListModel::IsContainer( const wxDataViewItem &item ) const
-{
- // only the invisible root item has children
- if (!item.IsOk())
- return true;
-
- return false;
-}
-
unsigned int wxDataViewIndexListModel::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
{
if (item.IsOk())
m_size = initial_size;
}
-wxDataViewVirtualListModel::~wxDataViewVirtualListModel()
-{
-}
-
void wxDataViewVirtualListModel::Reset( unsigned int new_size )
{
m_size = new_size;
void wxDataViewVirtualListModel::RowsDeleted( const wxArrayInt &rows )
{
m_size -= rows.GetCount();
-
+
wxArrayInt sorted = rows;
sorted.Sort( my_sort );
return pos2 - pos1;
}
-void wxDataViewVirtualListModel::GetValue( wxVariant &variant,
- const wxDataViewItem &item, unsigned int col ) const
-{
- GetValueByRow( variant, GetRow(item), col );
-}
-
-bool wxDataViewVirtualListModel::SetValue( const wxVariant &variant,
- const wxDataViewItem &item, unsigned int col )
-{
- return SetValueByRow( variant, GetRow(item), col );
-}
-
-bool wxDataViewVirtualListModel::GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr )
-{
- return GetAttrByRow( 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 ?
IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
-bool operator == (const wxDataViewIconText &one, const wxDataViewIconText &two)
-{
- if (one.GetText() != two.GetText()) return false;
- if (one.IsSameAs(two)) return false;
- return true;
-}
-
// ---------------------------------------------------------
// wxDataViewRendererBase
// ---------------------------------------------------------
m_editorCtrl = CreateEditorCtrl( dv_ctrl->GetMainWindow(), labelRect, value );
- // there might be no editor control for the given item
+ // there might be no editor control for the given item
if(!m_editorCtrl)
return false;
return false;
unsigned int col = GetOwner()->GetModelColumn();
- dv_ctrl->GetModel()->SetValue( value, m_item, col );
- dv_ctrl->GetModel()->ValueChanged( m_item, col );
+ dv_ctrl->GetModel()->ChangeValue(value, m_item, col);
// Now we should send Editing Done event
wxDataViewEvent event( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, dv_ctrl->GetId() );
return true;
}
+// ----------------------------------------------------------------------------
+// wxDataViewCustomRendererBase
+// ----------------------------------------------------------------------------
+
+void
+wxDataViewCustomRendererBase::WXCallRender(wxRect rectCell, wxDC *dc, int state)
+{
+ wxCHECK_RET( dc, "no DC to draw on in custom renderer?" );
+
+ // adjust the rectangle ourselves to account for the alignment
+ wxRect rectItem = rectCell;
+ const int align = GetAlignment();
+ if ( align != wxDVR_DEFAULT_ALIGNMENT )
+ {
+ const wxSize size = GetSize();
+
+ // take alignment into account only if there is enough space, otherwise
+ // show as much contents as possible
+ //
+ // notice that many existing renderers (e.g. wxDataViewSpinRenderer)
+ // return hard-coded size which can be more than they need and if we
+ // trusted their GetSize() we'd draw the text out of cell bounds
+ // entirely
+
+ if ( size.x >= 0 && size.x < rectCell.width )
+ {
+ if ( align & wxALIGN_CENTER_HORIZONTAL )
+ rectItem.x += (rectCell.width - size.x)/2;
+ else if ( align & wxALIGN_RIGHT )
+ rectItem.x += rectCell.width - size.x;
+ // else: wxALIGN_LEFT is the default
+
+ rectItem.width = size.x;
+ }
+
+ if ( size.y >= 0 && size.y < rectCell.height )
+ {
+ if ( align & wxALIGN_CENTER_VERTICAL )
+ rectItem.y += (rectCell.height - size.y)/2;
+ else if ( align & wxALIGN_BOTTOM )
+ rectItem.y += rectCell.height - size.y;
+ // else: wxALIGN_TOP is the default
+
+ rectItem.height = size.y;
+ }
+ }
+
+
+ // set up the DC attributes
+
+ // override custom foreground with the standard one for the selected items
+ // because we currently don't allow changing the selection background and
+ // custom colours may be unreadable on it
+ wxColour col;
+ if ( state & wxDATAVIEW_CELL_SELECTED )
+ col = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+ else if ( m_attr.HasColour() )
+ col = m_attr.GetColour();
+ else // use default foreground
+ col = GetOwner()->GetOwner()->GetForegroundColour();
+
+ wxDCTextColourChanger changeFg(*dc, col);
+
+ wxDCFontChanger changeFont(*dc);
+ if ( m_attr.HasFont() )
+ {
+ wxFont font(dc->GetFont());
+ if ( m_attr.GetBold() )
+ font.MakeBold();
+ if ( m_attr.GetItalic() )
+ font.MakeItalic();
+
+ changeFont.Set(font);
+ }
+
+ Render(rectItem, dc, state);
+}
+
+void
+wxDataViewCustomRendererBase::RenderText(const wxString& text,
+ int xoffset,
+ wxRect rect,
+ wxDC *dc,
+ int WXUNUSED(state))
+{
+ wxRect rectText = rect;
+ rectText.x += xoffset;
+ rectText.width -= xoffset;
+
+ // check if we want to ellipsize the text if it doesn't fit
+ wxString ellipsizedText;
+ if ( GetEllipsizeMode() != wxELLIPSIZE_NONE )
+ {
+ ellipsizedText = wxControl::Ellipsize
+ (
+ text,
+ *dc,
+ GetEllipsizeMode(),
+ rectText.width,
+ wxELLIPSIZE_FLAGS_NONE
+ );
+ }
+
+ // get the alignment to use
+ int align = GetAlignment();
+ if ( align == wxDVR_DEFAULT_ALIGNMENT )
+ {
+ // if we don't have an explicit alignment ourselves, use that of the
+ // column in horizontal direction and default vertical alignment
+ align = GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
+ }
+
+ dc->DrawLabel(ellipsizedText.empty() ? text : ellipsizedText,
+ rectText, align);
+}
+
//-----------------------------------------------------------------------------
// wxDataViewEditorCtrlEvtHandler
//-----------------------------------------------------------------------------
RowPrepended();
}
-void wxDataViewListStore::InsertItem( unsigned int row, const wxVector<wxVariant> &values,
+void wxDataViewListStore::InsertItem( unsigned int row, const wxVector<wxVariant> &values,
wxClientData *data )
{
wxDataViewListStoreLine *line = new wxDataViewListStoreLine( data );
void wxDataViewListStore::DeleteItem( unsigned int row )
{
wxVector<wxDataViewListStoreLine*>::iterator it = m_data.begin() + row;
+ delete *it;
m_data.erase( it );
RowDeleted( row );
return AppendColumn( col, "string" );
}
-wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label,
+wxDataViewColumn *wxDataViewListCtrl::AppendTextColumn( const wxString &label,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
GetStore()->AppendColumn( wxT("string") );
return ret;
}
-wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label,
+wxDataViewColumn *wxDataViewListCtrl::AppendToggleColumn( const wxString &label,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
GetStore()->AppendColumn( wxT("bool") );
return ret;
}
-wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label,
+wxDataViewColumn *wxDataViewListCtrl::AppendProgressColumn( const wxString &label,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
GetStore()->AppendColumn( wxT("long") );
return ret;
}
-wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label,
+wxDataViewColumn *wxDataViewListCtrl::AppendIconTextColumn( const wxString &label,
wxDataViewCellMode mode, int width, wxAlignment align, int flags )
{
GetStore()->AppendColumn( wxT("wxDataViewIconText") );
return node->GetItem();
}
+bool wxDataViewTreeStore::IsContainer( const wxDataViewItem& item ) const
+{
+ wxDataViewTreeStoreNode *node = FindNode( item );
+ if (!node) return false;
+
+ return node->IsContainer();
+}
+
wxDataViewItem wxDataViewTreeStore::GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
{
wxDataViewTreeStoreContainerNode *parent_node = FindContainerNode( parent );
void wxDataViewTreeStore::DeleteAllItems()
{
- // TODO
+ DeleteChildren(m_root);
}
void
return parent->GetItem();
}
-bool wxDataViewTreeStore::IsContainer( const wxDataViewItem &item ) const
-{
- wxDataViewTreeStoreNode *node = FindNode( item );
- if (!node) return false;
-
- return node->IsContainer();
-}
-
unsigned int wxDataViewTreeStore::GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const
{
wxDataViewTreeStoreContainerNode *node = FindContainerNode( item );
return 0;
}
- if (node1->IsContainer() && !!node2->IsContainer())
- return 1;
-
- if (node2->IsContainer() && !!node1->IsContainer())
+ if (node1->IsContainer() && !node2->IsContainer())
return -1;
- return parent1->GetChildren().IndexOf( node1 ) - parent1->GetChildren().IndexOf( node2 );
+ if (node2->IsContainer() && !node1->IsContainer())
+ return 1;
+
+ return parent1->GetChildren().IndexOf( node1 ) - parent2->GetChildren().IndexOf( node2 );
}
wxDataViewTreeStoreNode *wxDataViewTreeStore::FindNode( const wxDataViewItem &item ) const
EVT_SIZE( wxDataViewTreeCtrl::OnSize )
END_EVENT_TABLE()
-wxDataViewTreeCtrl::wxDataViewTreeCtrl()
+wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
{
- m_imageList = NULL;
+ delete m_imageList;
}
-wxDataViewTreeCtrl::wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,
+bool wxDataViewTreeCtrl::Create( 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 );
+ if ( !wxDataViewCtrl::Create( parent, id, pos, size, style, validator ) )
+ return false;
+ // create the standard model and a column in the tree
wxDataViewTreeStore *store = new wxDataViewTreeStore;
AssociateModel( store );
store->DecRef();
- AppendIconTextColumn(wxString(),0,wxDATAVIEW_CELL_INERT,-1);
-}
-
-wxDataViewTreeCtrl::~wxDataViewTreeCtrl()
-{
- if (m_imageList)
- delete m_imageList;
-}
+ AppendIconTextColumn
+ (
+ wxString(), // no label (header is not shown anyhow)
+ 0, // the only model column
+ wxDATAVIEW_CELL_EDITABLE,
+ -1, // default width
+ wxALIGN_NOT, // and alignment
+ 0 // not resizeable
+ );
-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 );
+ return true;
}
void wxDataViewTreeCtrl::SetImageList( wxImageList *imagelist )
{
- if (m_imageList)
- delete m_imageList;
+ delete m_imageList;
m_imageList = imagelist;
}
}
void wxDataViewTreeCtrl::SetItemText( const wxDataViewItem& item, const wxString &text )
-{
+{
GetStore()->SetItemText(item,text);
// notify control
}
void wxDataViewTreeCtrl::SetItemIcon( const wxDataViewItem& item, const wxIcon &icon )
-{
+{
GetStore()->SetItemIcon(item,icon);
// notify control
}
void wxDataViewTreeCtrl::SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon )
-{
+{
GetStore()->SetItemExpandedIcon(item,icon);
// notify control
}
void wxDataViewTreeCtrl::DeleteItem( const wxDataViewItem& item )
-{
+{
wxDataViewItem parent_item = GetStore()->GetParent( item );
GetStore()->DeleteItem(item);
}
void wxDataViewTreeCtrl::DeleteChildren( const wxDataViewItem& item )
-{
+{
wxDataViewTreeStoreContainerNode *node = GetStore()->FindContainerNode( item );
if (!node) return;
}
void wxDataViewTreeCtrl::DeleteAllItems()
-{
+{
GetStore()->DeleteAllItems();
GetStore()->Cleared();
projects / wxWidgets.git / blobdiff