#include "wx/icon.h"
#include "wx/list.h"
#include "wx/listimpl.cpp"
+#include "wx/imaglist.h"
//-----------------------------------------------------------------------------
// classes
// wxDataViewHeaderWindow
//-----------------------------------------------------------------------------
-#define USE_NATIVE_HEADER_WINDOW 1
+// on wxMSW the header window (only that part however) can be made native!
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+ #define USE_NATIVE_HEADER_WINDOW
+#endif
//Below is the compare stuff
//For the generic implements, both the leaf nodes and the nodes are sorted for fast search when needed
void SendEvent(wxEventType type, unsigned int n);
};
-// on wxMSW the header window (only that part however) can be made native!
-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+#ifdef USE_NATIVE_HEADER_WINDOW
#define COLUMN_WIDTH_OFFSET 2
#define wxDataViewHeaderWindowMSW wxDataViewHeaderWindow
// the column count
virtual void UpdateDisplay();
+ virtual void OnInternalIdle();
+
// called Refresh afterwards
virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
protected:
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
+
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
wxSize DoGetBestSize() const;
wxDataViewColumn *GetColumnFromHeader(NMHEADER *nmHDR)
{ return GetColumn(GetColumnIdxFromHeader(nmHDR)); }
-
- int m_scrollOffsetX;
- int m_buttonHeight;
+
+ int m_scrollOffsetX;
+ int m_buttonHeight;
+ bool m_delayedUpdate;
+ wxImageList *m_imageList;
private:
DECLARE_DYNAMIC_CLASS(wxDataViewHeaderWindowMSW)
return m_dc;
}
+void wxDataViewRenderer::SetAlignment( int align )
+{
+ m_align=align;
+}
+
+int wxDataViewRenderer::GetAlignment() const
+{
+ return m_align;
+}
+
+int wxDataViewRenderer::CalculateAlignment() const
+{
+ if (m_align == wxDVR_DEFAULT_ALIGNMENT)
+ {
+ if (GetOwner() == NULL)
+ return wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL;
+
+ return GetOwner()->GetAlignment() | wxALIGN_CENTRE_VERTICAL;
+ }
+
+ return m_align;
+}
+
// ---------------------------------------------------------
// wxDataViewCustomRenderer
// ---------------------------------------------------------
colour = dc->GetTextForeground();
dc->SetTextForeground( m_attr.GetColour() );
}
-
+
if (m_attr.GetBold() || m_attr.GetItalic())
{
font = dc->GetFont();
dc->SetFont( myfont );
}
}
-
+
dc->DrawText( m_text, cell.x, cell.y + ((cell.height - dc->GetCharHeight()) / 2));
-
+
// restore dc
if (m_hasAttr)
{
if (m_attr.HasColour())
dc->SetTextForeground( colour );
-
+
if (m_attr.GetBold() || m_attr.GetItalic())
dc->SetFont( font );
}
-
+
return true;
}
-
+
// ---------------------------------------------------------
// wxDataViewBitmapRenderer
SetTitle(title);
SetFlags(flags);
+ m_autosize = width < 0; // TODO
+
Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
}
SetAlignment(align);
SetFlags(flags);
- Init(width < 0 ? wxDVC_TOGGLE_DEFAULT_WIDTH : width);
+ Init(width < 0 ? wxDVC_DEFAULT_WIDTH : width);
}
wxDataViewColumn::~wxDataViewColumn()
GetOwner()->OnColumnChange();
}
+void wxDataViewColumn::SetReorderable( bool reorderable )
+{
+ if (reorderable)
+ m_flags |= wxDATAVIEW_COL_REORDERABLE;
+ else
+ m_flags &= ~wxDATAVIEW_COL_REORDERABLE;
+}
+
void wxDataViewColumn::SetSortOrder( bool ascending )
{
m_ascending = ascending;
parent->GetEventHandler()->ProcessEvent(le);
}
-#if defined(__WXMSW__) && USE_NATIVE_HEADER_WINDOW
+#ifdef USE_NATIVE_HEADER_WINDOW
#ifndef HDS_DRAGDROP
#define HDS_DRAGDROP 0x0040
m_owner = parent;
m_scrollOffsetX = 0;
- m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ) + 10;
+ m_delayedUpdate = false;
+ m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
int x = pos.x == wxDefaultCoord ? 0 : pos.x,
y = pos.y == wxDefaultCoord ? 0 : pos.y,
w = size.x == wxDefaultCoord ? 1 : size.x,
- h = size.y == wxDefaultCoord ? m_buttonHeight : size.y;
+ h = m_buttonHeight;
- if ( !CreateControl(parent, id, pos, size, 0, wxDefaultValidator, name) )
+ wxSize new_size(w,h);
+
+ if ( !CreateControl(parent, id, pos, new_size, 0, wxDefaultValidator, name) )
return false;
// create the native WC_HEADER window:
WXHWND hwndParent = (HWND)parent->GetHandle();
WXDWORD msStyle = WS_CHILD | HDS_DRAGDROP | HDS_BUTTONS | HDS_HORZ | HDS_HOTTRACK | HDS_FULLDRAG;
-
+
if ( m_isShown )
msStyle |= WS_VISIBLE;
-
+
m_hWnd = CreateWindowEx(0,
WC_HEADER,
(LPCTSTR) NULL,
return false;
}
+ m_imageList = new wxImageList( 16, 16 );
+ Header_SetImageList( (HWND) m_hWnd, m_imageList->GetHIMAGELIST() );
+
// we need to subclass the m_hWnd to force wxWindow::HandleNotify
// to call wxDataViewHeaderWindow::MSWOnNotify
SubclassWin(m_hWnd);
// the following is required to get the default win's font for
// header windows and must be done befor sending the HDM_LAYOUT msg
SetFont(GetFont());
-
+
return true;
}
wxDataViewHeaderWindowMSW::~wxDataViewHeaderWindow()
{
+ delete m_imageList;
UnsubclassWin();
}
wxSize wxDataViewHeaderWindowMSW::DoGetBestSize() const
{
- return wxSize(80, m_buttonHeight );
+ return wxSize( 80, m_buttonHeight+2 );
+}
+
+void wxDataViewHeaderWindowMSW::OnInternalIdle()
+{
+ if (m_delayedUpdate)
+ {
+ m_delayedUpdate = false;
+ UpdateDisplay();
+ }
}
void wxDataViewHeaderWindowMSW::UpdateDisplay()
// remove old columns
for (int j=0, max=Header_GetItemCount((HWND)m_hWnd); j < max; j++)
Header_DeleteItem((HWND)m_hWnd, 0);
+
+ m_imageList->RemoveAll();
// add the updated array of columns to the header control
unsigned int cols = GetOwner()->GetColumnCount();
HDITEM hdi;
hdi.mask = HDI_TEXT | HDI_FORMAT | HDI_WIDTH;
+ if (col->GetBitmap().IsOk())
+ {
+ m_imageList->Add( col->GetBitmap() );
+ hdi.mask |= HDI_IMAGE;
+ hdi.iImage = m_imageList->GetImageCount()-1;
+ }
hdi.pszText = (wxChar *) col->GetTitle().wx_str();
hdi.cxy = col->GetWidth();
hdi.cchTextMax = sizeof(hdi.pszText)/sizeof(hdi.pszText[0]);
hdi.fmt = HDF_LEFT | HDF_STRING;
+ if (col->GetBitmap().IsOk())
+ hdi.fmt |= HDF_IMAGE;
+
//hdi.fmt &= ~(HDF_SORTDOWN|HDF_SORTUP);
if (col->IsSortable() && GetOwner()->GetSortingColumn() == col)
case HDN_BEGINDRAG:
// user has started to reorder a column
+ if ((nmHDR->iItem != -1) && (!GetColumn(nmHDR->iItem)->IsReorderable()))
+ {
+ // veto it!
+ *result = TRUE;
+ }
+ break;
+
+ case HDN_ENDDRAG: // user has finished reordering a column
+ {
+ wxDataViewColumn *col = GetColumn(nmHDR->iItem);
+ unsigned int new_pos = nmHDR->pitem->iOrder;
+ m_owner->ColumnMoved( col, new_pos );
+ m_delayedUpdate = true;
+ }
break;
case HDN_ITEMCHANGING:
case HDN_ITEMCHANGED: // user is resizing a column
case HDN_ENDTRACK: // user has finished resizing a column
- case HDN_ENDDRAG: // user has finished reordering a column
// update the width of the modified column:
if (nmHDR->pitem != NULL &&
const wxRect * WXUNUSED(rect))
{
m_scrollOffsetX += dx;
-
+
GetParent()->Layout();
}
//-----------------------------------------------------------------------------
//The tree building helper, declared firstly
-void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node);
+static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node);
int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
{
SetBackgroundColour( *wxWHITE );
- m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+
+ m_penRule = wxPen(GetRuleColour());
//Here I compose a pen can draw black lines, maybe there are something system colour to use
- m_penExpander = wxPen( wxColour(0,0,0), 1, wxSOLID );
+ m_penExpander = wxPen(wxColour(0,0,0));
//Some new added code to deal with the tree structure
m_root = new wxDataViewTreeNode( NULL );
m_root->SetHasChildren(true);
wxVariant value;
wxDataViewTreeNode *node = NULL;
wxDataViewItem dataitem;
-
+
if (m_root)
{
node = GetTreeNodeByRow(item);
model->GetValue( value, dataitem, col->GetModelColumn());
cell->SetValue( value );
-
+
if (cell->GetWantsAttr())
{
wxDataViewItemAttr attr;
if ((m_root) && (col == expander))
{
indent = node->GetIndentLevel();
-
+
//Calculate the indent first
indent = cell_rect.x + GetOwner()->GetIndent() * indent;
else
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
}
- else
- {
- // I am wondering whether we should draw dot lines between tree nodes
- if (node)
- delete node;
- // Yes, if the node does not have any child, it must be a leaf which
- // mean that it is a temporarily created by GetTreeNodeByRow
- }
-
//force the expander column to left-center align
cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
}
-
+ if (node && !node->HasChildren())
+ {
+ // Yes, if the node does not have any child, it must be a leaf which
+ // mean that it is a temporarily created by GetTreeNodeByRow
+ wxDELETE(node)
+ }
// cannot be bigger than allocated space
wxSize size = cell->GetSize();
size.y = cell_rect.height;
wxRect item_rect(cell_rect.GetTopLeft(), size);
- int align = cell->GetAlignment();
+ int align = cell->CalculateAlignment();
// horizontal alignment:
item_rect.x = cell_rect.x;
UpdateDisplay();
return true;
}
-
+
SortPrepare();
wxDataViewTreeNode * node;
return true;
}
-void DestroyTreeHelper( wxDataViewTreeNode * node);
+static void DestroyTreeHelper( wxDataViewTreeNode * node);
bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
const wxDataViewItem& item)
m_currentRow = m_count - 1;
m_selection.Empty();
-
+
UpdateDisplay();
return true;
node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount();
- DestroyTreeHelper(n);
+ ::DestroyTreeHelper(n);
}
//Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1;
node->ChangeSubTreeCount(sub);
- if( node->GetChildrenNumber() == 0)
- {
- node->GetParent()->GetNodes().Remove( node );
- delete node;
- }
//Change the current row to the last row if the current exceed the max row number
if( m_currentRow > GetRowCount() )
bool wxDataViewMainWindow::Cleared()
{
DestroyTree();
-
+
SortPrepare();
BuildTree( GetOwner()->GetModel() );
-
+
UpdateDisplay();
return true;
if( node->GetChildrenNumber() == 0 )
{
SortPrepare();
- BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
+ ::BuildTreeHelper(GetOwner()->GetModel(), node->GetItem(), node);
}
m_count = -1;
UpdateDisplay();
if( node->GetChildrenNumber() == 0 )
{
SortPrepare();
- BuildTreeHelper(model, node->GetItem(), node);
+ ::BuildTreeHelper(model, node->GetItem(), node);
}
wxDataViewTreeNodes nodes = node->GetNodes();
- unsigned int i = 0;
- for (; i < nodes.GetCount(); i ++)
+ unsigned int i;
+ bool found = false;
+
+ for (i = 0; i < nodes.GetCount(); i ++)
{
if (nodes[i]->GetItem() == (**iter))
{
+ if (nodes[i]->GetItem() == item)
+ return nodes[i];
+
node = nodes[i];
+ found = true;
break;
}
}
- if (i == nodes.GetCount())
+ if (!found)
return NULL;
}
else
return NULL;
}
- return node;
+ return NULL;
}
void wxDataViewMainWindow::HitTest( const wxPoint & point, wxDataViewItem & item, wxDataViewColumn* &column )
}
}
-void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
+static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item, wxDataViewTreeNode * node)
{
if( !model->IsContainer( item ) )
return ;
{
DestroyTree();
- if (GetOwner()->GetModel()->IsIndexListModel())
+ if (GetOwner()->GetModel()->IsVirtualListModel())
{
m_count = -1 ;
return;
m_count = -1 ;
}
-void DestroyTreeHelper( wxDataViewTreeNode * node )
+static void DestroyTreeHelper( wxDataViewTreeNode * node )
{
if( node->GetNodeNumber() != 0 )
{
int len = node->GetNodeNumber();
int i = 0 ;
- wxDataViewTreeNodes nodes = node->GetNodes();
+ wxDataViewTreeNodes& nodes = node->GetNodes();
for( ; i < len; i ++ )
{
DestroyTreeHelper(nodes[i]);
{
if (m_root)
{
- DestroyTreeHelper(m_root);
+ ::DestroyTreeHelper(m_root);
m_count = 0;
m_root = NULL;
}
void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
{
- if (event.GetKeyCode() == WXK_TAB)
- {
- wxNavigationKeyEvent nevent;
- nevent.SetWindowChange( event.ControlDown() );
- nevent.SetDirection( !event.ShiftDown() );
- nevent.SetEventObject( GetParent()->GetParent() );
- nevent.SetCurrentFocus( m_parent );
- if (GetParent()->GetParent()->GetEventHandler()->ProcessEvent( nevent ))
- return;
- }
+ if ( HandleAsNavigationKey(event) )
+ return;
// no item -> nothing to do
if (!HasCurrentRow())
OnExpanding( current );
}
}
+ if (node && !node->HasChildren())
+ delete node;
}
//If the user click the expander, we do not do editing even if the column with expander are editable
if (m_lastOnSame && !expander && !ignore_other_columns)
{
if ((col == m_currentCol) && (current == m_currentRow) &&
- (cell->GetMode() == wxDATAVIEW_CELL_EDITABLE) )
+ (cell->GetMode() & wxDATAVIEW_CELL_EDITABLE) )
{
m_renameTimer->Start( 100, true );
}
SendSelectionChangedEvent(GetItemByRow( m_currentRow ) );
}
- // notify cell about right click
- // cell->...
-
- // Allow generation of context menu event
- event.Skip();
+ wxVariant value;
+ model->GetValue( value, item, col->GetModelColumn() );
+ wxWindow *parent = GetParent();
+ wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
+ le.SetItem( item );
+ le.SetEventObject(parent);
+ le.SetModel(GetOwner()->GetModel());
+ le.SetValue(value);
+ parent->GetEventHandler()->ProcessEvent(le);
}
else if (event.MiddleDown())
{
- // notify cell about middle click
- // cell->...
}
if (event.LeftDown() || forceClick)
{
wxFAIL_MSG( _T("how did we get here?") );
}
}
-
+
if (m_currentRow != oldCurrentRow)
RefreshRow( oldCurrentRow );
m_lastOnSame = !forceClick && ((col == oldCurrentCol) &&
(current == oldCurrentRow)) && oldWasSelected;
+
+ // Call LeftClick after everything else as under GTK+
+ if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
+ {
+ // notify cell about right click
+ wxVariant value;
+ model->GetValue( value, item, col->GetModelColumn() );
+ cell->SetValue( value );
+ wxRect cell_rect( xpos, current * m_lineHeight,
+ col->GetWidth(), m_lineHeight );
+ /* ignore ret */ cell->LeftClick( event.GetPosition(), cell_rect, model, item, col->GetModelColumn());
+ }
}
}
{
if (m_notifier)
GetModel()->RemoveNotifier( m_notifier );
+
+ wxDataViewColumnList::const_iterator iter;
+ for (iter = m_cols.begin(); iter!=m_cols.end(); iter++)
+ {
+ delete *iter;
+ }
}
void wxDataViewCtrl::Init()
const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator )
{
+ if ( (style & wxBORDER_MASK) == 0)
+ style |= wxBORDER_SUNKEN;
+
if (!wxControl::Create( parent, id, pos, size,
- style | wxScrolledWindowStyle|wxBORDER_SUNKEN, validator))
+ style | wxScrolledWindowStyle, validator))
return false;
SetInitialSize(size);
model->AddNotifier( m_notifier );
m_clientArea->DestroyTree();
-
+
m_clientArea->BuildTree(model);
m_clientArea->UpdateDisplay();
return NULL;
}
+void wxDataViewCtrl::ColumnMoved( wxDataViewColumn* col, unsigned int new_pos )
+{
+ if (new_pos > m_cols.GetCount()) return;
+ m_cols.DeleteObject( col );
+ m_cols.Insert( new_pos, col );
+
+ m_clientArea->UpdateDisplay();
+}
+
bool wxDataViewCtrl::DeleteColumn( wxDataViewColumn *column )
{
wxDataViewColumnList::compatibility_iterator ret = m_cols.Find( column );
projects / wxWidgets.git / blobdiff