#include "wx/listctrl.h"
#include "wx/generic/imaglist.h"
+#ifndef wxUSE_GENERIC_LIST_EXTENSIONS
+#define wxUSE_GENERIC_LIST_EXTENSIONS 0
+#endif
+
//-----------------------------------------------------------------------------
// wxListItemData
//-----------------------------------------------------------------------------
m_ypos = 0;
m_width = 0;
m_height = 0;
- m_colour = wxBLACK;
+ m_attr = NULL;
}
wxListItemData::wxListItemData( const wxListItem &info )
{
m_image = -1;
m_data = 0;
- m_colour = info.m_colour;
+ m_attr = NULL;
+
SetItem( info );
}
if (info.m_mask & wxLIST_MASK_TEXT) m_text = info.m_text;
if (info.m_mask & wxLIST_MASK_IMAGE) m_image = info.m_image;
if (info.m_mask & wxLIST_MASK_DATA) m_data = info.m_data;
- m_colour = info.m_colour;
+
+ if ( info.HasAttributes() )
+ {
+ if ( m_attr )
+ *m_attr = *info.GetAttributes();
+ else
+ m_attr = new wxListItemAttr(*info.GetAttributes());
+ }
+
m_xpos = 0;
m_ypos = 0;
m_width = info.m_width;
if (height != -1) m_height = height;
}
-void wxListItemData::SetColour( wxColour *col )
-{
- m_colour = col;
-}
-
bool wxListItemData::HasImage() const
{
return (m_image >= 0);
return m_image;
}
-void wxListItemData::GetItem( wxListItem &info )
+void wxListItemData::GetItem( wxListItem &info ) const
{
info.m_text = m_text;
info.m_image = m_image;
info.m_data = m_data;
- info.m_colour = m_colour;
-}
-wxColour *wxListItemData::GetColour()
-{
- return m_colour;
+ if ( m_attr )
+ {
+ if ( m_attr->HasTextColour() )
+ info.SetTextColour(m_attr->GetTextColour());
+ if ( m_attr->HasBackgroundColour() )
+ info.SetBackgroundColour(m_attr->GetBackgroundColour());
+ if ( m_attr->HasFont() )
+ info.SetFont(m_attr->GetFont());
+ }
}
//-----------------------------------------------------------------------------
if (node)
{
wxListItemData *item = (wxListItemData*)node->Data();
- wxString s;
- item->GetText( s );
- long lw,lh;
+ wxString s = item->GetText();
+ wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh );
if (lw > m_spacing) m_bound_all.width = lw;
}
if (node)
{
wxListItemData *item = (wxListItemData*)node->Data();
- wxString s;
- item->GetText( s );
- long lw,lh;
+ wxString s = item->GetText();
+ wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh );
m_bound_all.width = lw;
m_bound_all.height = lh;
if (item->HasImage())
{
+#ifdef __WIN16__
int w = 0;
int h = 0;
+#else
+ wxCoord w = 0;
+ wxCoord h = 0;
+#endif
m_owner->GetImageSize( item->GetImage(), w, h );
- m_bound_all.width += 4 + w;
- if (h > m_bound_all.height) m_bound_all.height = h;
- }
+ m_bound_all.width += 4 + w;
+ if (h > m_bound_all.height) m_bound_all.height = h;
+ }
}
break;
}
wxString s;
item->GetText( s );
if (s.IsNull()) s = "H";
- long lh;
- dc->GetTextExtent( s, (long*) NULL, &lh );
+ wxCoord lw,lh;
+ dc->GetTextExtent( s, &lw, &lh );
item->SetSize( item->GetWidth(), lh );
+ m_bound_all.width += lw;
m_bound_all.height = lh;
node = node->Next();
}
{
wxString s;
item->GetText( s );
- long lw,lh;
+ wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh );
if (m_bound_all.width > m_spacing)
m_bound_label.x = m_bound_all.x;
{
wxListItemData *item = (wxListItemData*)node->Data();
if (item->HasImage())
- {
+ {
m_bound_icon.x = m_bound_all.x + 2;
m_bound_icon.y = m_bound_all.y + 2;
- int w;
- int h;
+ int w;
+ int h;
m_owner->GetImageSize( item->GetImage(), w, h );
m_bound_icon.width = w;
m_bound_icon.height = h;
- m_bound_label.x += 4 + w;
- m_bound_label.width -= 4 + w;
- }
- }
+ m_bound_label.x += 4 + w;
+ m_bound_label.width -= 4 + w;
+ }
+ }
break;
}
case wxLC_REPORT:
{
- long lw,lh;
+ wxCoord lw,lh;
dc->GetTextExtent( "H", &lw, &lh );
m_bound_all.x = 0;
m_bound_all.y -= 0;
wxListItemData *item = (wxListItemData*)node->Data();
wxString s;
item->GetText( s );
- if (s.IsEmpty()) s = _T("H");
- long lw,lh;
+ if (s.IsEmpty()) s = wxT("H");
+ wxCoord lw,lh;
dc->GetTextExtent( s, &lw, &lh );
- m_bound_label.width = lw;
- m_bound_label.height = lh;
- if (item->HasImage())
- {
+ m_bound_label.width = lw;
+ m_bound_label.height = lh;
+ if (item->HasImage())
+ {
m_bound_icon.x = m_bound_all.x + 2;
m_bound_icon.y = m_bound_all.y + 2;
- int w;
- int h;
+ int w;
+ int h;
m_owner->GetImageSize( item->GetImage(), w, h );
m_bound_icon.width = w;
m_bound_icon.height = h;
- m_bound_label.x += 4 + w;
- }
- }
+ m_bound_label.x += 4 + w;
+ }
+ }
break;
}
}
void wxListLineData::SetColumnPosition( int index, int x )
{
- int i = index;
- wxNode *node = m_items.Nth( i );
+ wxNode *node = m_items.Nth( (size_t)index );
if (node)
{
wxListItemData *item = (wxListItemData*)node->Data();
return -1;
}
+void wxListLineData::SetAttributes(wxDC *dc,
+ const wxListItemAttr *attr,
+ const wxColour& colText,
+ const wxFont& font,
+ bool hilight)
+{
+ // don't use foregroud colour for drawing highlighted items - this might
+ // make them completely invisible (and there is no way to do bit
+ // arithmetics on wxColour, unfortunately)
+ if ( !hilight && attr && attr->HasTextColour() )
+ {
+ dc->SetTextForeground(attr->GetTextColour());
+ }
+ else
+ {
+ dc->SetTextForeground(colText);
+ }
+
+ if ( attr && attr->HasFont() )
+ {
+ dc->SetFont(attr->GetFont());
+ }
+ else
+ {
+ dc->SetFont(font);
+ }
+}
+
void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG )
{
- long dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
- long dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
- long dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
- long dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
-
+ wxCoord dev_x = dc->LogicalToDeviceX( m_bound_all.x-2 );
+ wxCoord dev_y = dc->LogicalToDeviceY( m_bound_all.y-2 );
+ wxCoord dev_w = dc->LogicalToDeviceXRel( m_bound_all.width+4 );
+ wxCoord dev_h = dc->LogicalToDeviceYRel( m_bound_all.height+4 );
+
if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h ))
- {
+ {
return;
}
- if (paintBG)
+ wxWindow *listctrl = m_owner->GetParent();
+
+ // default foreground colour
+ wxColour colText;
+ if ( hilight )
+ {
+ colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
+ }
+ else
+ {
+ colText = listctrl->GetForegroundColour();
+ }
+
+ // default font
+ wxFont font = listctrl->GetFont();
+
+ // VZ: currently we set the colours/fonts only once, but like this (i.e.
+ // using SetAttributes() inside the loop), it will be trivial to
+ // customize the subitems (in report mode) too.
+ wxListItemData *item = (wxListItemData*)m_items.First()->Data();
+ wxListItemAttr *attr = item->GetAttributes();
+ SetAttributes(dc, attr, colText, font, hilight);
+
+ bool hasBgCol = attr && attr->HasBackgroundColour();
+ if ( paintBG || hasBgCol )
{
if (hilight)
{
dc->SetBrush( * m_hilightBrush );
- dc->SetPen( * wxTRANSPARENT_PEN );
}
else
{
- dc->SetBrush( * wxWHITE_BRUSH );
- dc->SetPen( * wxTRANSPARENT_PEN );
+ if ( hasBgCol )
+ dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+ else
+ dc->SetBrush( * wxWHITE_BRUSH );
}
+
+ dc->SetPen( * wxTRANSPARENT_PEN );
dc->DrawRectangle( m_bound_hilight.x, m_bound_hilight.y,
m_bound_hilight.width, m_bound_hilight.height );
}
-
- dc->SetBackgroundMode(wxTRANSPARENT);
+
if (m_mode == wxLC_REPORT)
{
- wxString s;
wxNode *node = m_items.First();
while (node)
{
}
if (item->HasText())
{
- item->GetText( s );
- if (hilight)
- dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
- else
- dc->SetTextForeground( *item->GetColour() );
- dc->DrawText( s, x, item->GetY() );
+ dc->DrawText( item->GetText(), x, item->GetY() );
}
dc->DestroyClippingRegion();
node = node->Next();
}
if (item->HasText())
{
- wxString s;
- item->GetText( s );
- if (hilight)
- dc->SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
- else
- dc->SetTextForeground( * item->GetColour() );
- dc->DrawText( s, m_bound_label.x, m_bound_label.y );
+ dc->DrawText( item->GetText(), m_bound_label.x, m_bound_label.y );
}
}
}
void wxListLineData::Hilight( bool on )
{
if (on == m_hilighted) return;
+ m_hilighted = on;
if (on)
m_owner->SelectLine( this );
else
m_owner->DeselectLine( this );
- m_hilighted = on;
}
void wxListLineData::ReverseHilight( void )
bool wxListLineData::IsInRect( int x, int y, const wxRect &rect )
{
- return ((x >= rect.x) && (x <= rect.x+rect.width) &&
+ return ((x >= rect.x) && (x <= rect.x+rect.width) &&
(y >= rect.y) && (y <= rect.y+rect.height));
}
dc->DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer)
wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
-
+
dc->SetPen( pen );
dc->DrawLine( x+w-m_corner, y, x+w-1, y+h ); // right (inner)
dc->DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner)
{
wxPaintDC dc( this );
PrepareDC( dc );
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ if ( m_owner->GetMode() & wxLC_REPORT )
+ {
+ int x , y ;
+ int xpix , ypix ;
+ m_owner->GetScrollPixelsPerUnit( &xpix , &ypix ) ;
+ m_owner->ViewStart( &x, &y ) ;
+ dc.SetDeviceOrigin( -x * xpix, 0 );
+ }
+#endif
dc.BeginDrawing();
dc.SetFont( GetFont() );
dc.SetBackgroundMode(wxTRANSPARENT);
dc.SetTextForeground( *wxBLACK );
- if (m_foregroundColour.Ok()) dc.SetTextForeground( m_foregroundColour );
+
+ // do *not* use the listctrl colour for headers - one day we will have a
+ // function to set it separately
x = 1;
y = 1;
{
m_owner->GetColumn( i, item );
int cw = item.m_width-2;
- if ((i+1 == numColumns) || (x+item.m_width > w-5)) cw = w-x-1;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ if ((i+1 == numColumns) || ( dc.LogicalToDeviceX(x+item.m_width) > w-5))
+ cw = dc.DeviceToLogicalX(w)-x-1;
+#else
+ if ((i+1 == numColumns) || (x+item.m_width > w-5))
+ cw = w-x-1;
+#endif
dc.SetPen( *wxWHITE_PEN );
DoDrawRect( &dc, x, y, cw, h-2 );
dc.DrawText( item.m_text, x+4, y+3 );
dc.DestroyClippingRegion();
x += item.m_width;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ if (dc.LogicalToDeviceX(x) > w+5) break;
+#else
if (x > w+5) break;
+#endif
}
dc.EndDrawing();
}
void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
{
- int x = event.GetX();
- int y = event.GetY();
+ wxCoord x = (wxCoord)event.GetX();
+ wxCoord y = (wxCoord)event.GetY();
if (m_isDragging)
{
DrawCurrent();
m_minX = 0;
bool hit_border = FALSE;
int xpos = 0;
- for (int j = 0; j < m_owner->GetColumnCount(); j++)
+ for (int j = 0; j < m_owner->GetColumnCount()-1; j++)
{
xpos += m_owner->GetColumnWidth( j );
m_column = j;
hit_border = TRUE;
break;
}
- if (x-xpos < 0)
- {
- break;
- }
+ if (x-xpos < 0)
+ {
+ break;
+ }
m_minX = xpos;
}
if (event.LeftDown())
{
if (hit_border)
- {
+ {
m_isDragging = TRUE;
m_currentX = x;
DrawCurrent();
CaptureMouse();
return;
- }
- else
- {
+ }
+ else
+ {
wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() );
le.SetEventObject( GetParent() );
- le.m_col = m_column;
+ le.m_col = m_column;
GetParent()->GetEventHandler()->ProcessEvent( le );
- return;
- }
+ return;
+ }
}
if (event.Moving())
EVT_KILL_FOCUS (wxListTextCtrl::OnKillFocus)
END_EVENT_TABLE()
-wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
- bool *accept, wxString *res, wxListMainWindow *owner,
- const wxString &value, const wxPoint &pos, const wxSize &size,
- int style, const wxValidator& validator, const wxString &name ) :
- wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
+ const wxWindowID id,
+ bool *accept,
+ wxString *res,
+ wxListMainWindow *owner,
+ const wxString &value,
+ const wxPoint &pos,
+ const wxSize &size,
+ int style,
+ const wxValidator& validator,
+ const wxString &name )
+ : wxTextCtrl( parent, id, value, pos, size, style, validator, name )
{
m_res = res;
m_accept = accept;
{
(*m_accept) = TRUE;
(*m_res) = GetValue();
- m_owner->SetFocus();
+ m_owner->SetFocus();
return;
}
if (event.m_keyCode == WXK_ESCAPE)
{
(*m_accept) = FALSE;
(*m_res) = "";
- m_owner->SetFocus();
+ m_owner->SetFocus();
return;
}
event.Skip();
if (wxPendingDelete.Member(this)) return;
wxPendingDelete.Append(this);
-
+
if ((*m_accept) && ((*m_res) != m_startValue))
m_owner->OnRenameAccept();
}
EVT_KEY_DOWN (wxListMainWindow::OnKeyDown)
EVT_SET_FOCUS (wxListMainWindow::OnSetFocus)
EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus)
+ EVT_SCROLLWIN (wxListMainWindow::OnScroll)
END_EVENT_TABLE()
wxListMainWindow::wxListMainWindow()
if (m_mode & wxLC_REPORT)
{
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ m_xScroll = 15;
+#else
m_xScroll = 0;
+#endif
m_yScroll = 15;
}
else
wxListMainWindow::~wxListMainWindow()
{
if (m_hilightBrush) delete m_hilightBrush;
-
+
delete m_renameTimer;
}
void wxListMainWindow::RefreshLine( wxListLineData *line )
{
+ if (m_dirty) return;
+
int x = 0;
int y = 0;
int w = 0;
PrepareDC( dc );
if (m_dirty) return;
-
+
if (m_lines.GetCount() == 0) return;
dc.BeginDrawing();
dc.SetFont( GetFont() );
-
+
if (m_mode & wxLC_REPORT)
{
int lineSpacing = 0;
int dummy = 0;
line->GetSize( dummy, lineSpacing );
lineSpacing += 1;
-
+
int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
-
+
wxNode *node = m_lines.Nth( y_s / lineSpacing );
- for (int i = 0; i < m_visibleLines+2; i++)
- {
- if (!node) break;
-
+ for (int i = 0; i < m_visibleLines+2; i++)
+ {
+ if (!node) break;
+
line = (wxListLineData*)node->Data();
line->Draw( &dc );
node = node->Next();
- }
+ }
}
else
{
node = node->Next();
}
}
-
+
if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus );
dc.EndDrawing();
le.m_itemIndex = GetIndexOfLine( line );
line->GetItem( 0, le.m_item );
GetParent()->GetEventHandler()->ProcessEvent( le );
+// GetParent()->GetEventHandler()->AddPendingEvent( le );
}
void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) )
void wxListMainWindow::EditLabel( long item )
{
- wxNode *node = m_lines.Nth( item );
- wxCHECK_RET( node, _T("wrong index in wxListCtrl::Edit()") );
-
+ wxNode *node = m_lines.Nth( (size_t)item );
+ wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") );
+
m_currentEdit = (wxListLineData*) node->Data();
wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.m_itemIndex = GetIndexOfLine( m_currentEdit );
m_currentEdit->GetItem( 0, le.m_item );
GetParent()->GetEventHandler()->ProcessEvent( le );
-
+
if (!le.IsAllowed())
return;
-
+
// We have to call this here because the label in
// question might just have been added and no screen
// update taken place.
int w = 0;
int h = 0;
m_currentEdit->GetLabelExtent( x, y, w, h );
-
+
wxClientDC dc(this);
PrepareDC( dc );
x = dc.LogicalToDeviceX( x );
void wxListMainWindow::OnRenameTimer()
{
- wxCHECK_RET( m_current, _T("invalid m_current") );
-
+ wxCHECK_RET( m_current, wxT("invalid m_current") );
+
Edit( m_lines.IndexOf( m_current ) );
}
m_currentEdit->GetItem( 0, le.m_item );
le.m_item.m_text = m_renameRes;
GetParent()->GetEventHandler()->ProcessEvent( le );
-
+
if (!le.IsAllowed()) return;
-
+
wxListItem info;
info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = le.m_itemIndex;
info.m_text = m_renameRes;
- info.m_colour = le.m_item.m_colour;
+ info.SetTextColour(le.m_item.GetTextColour());
SetItem( info );
}
wxClientDC dc(this);
PrepareDC(dc);
- long x = dc.DeviceToLogicalX( (long)event.GetX() );
- long y = dc.DeviceToLogicalY( (long)event.GetY() );
-
+ wxCoord x = dc.DeviceToLogicalX( (wxCoord)event.GetX() );
+ wxCoord y = dc.DeviceToLogicalY( (wxCoord)event.GetY() );
+
/* Did we actually hit an item ? */
long hitResult = 0;
wxNode *node = m_lines.First();
if (event.Dragging())
{
if (m_dragCount == 0)
- m_dragStart = wxPoint(x,y);
-
+ m_dragStart = wxPoint(x,y);
+
m_dragCount++;
-
- if (m_dragCount != 3) return;
-
- int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
- if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-
+
+ if (m_dragCount != 3) return;
+
+ int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
+ if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
+
wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
- le.m_pointDrag = m_dragStart;
- GetParent()->GetEventHandler()->ProcessEvent( le );
-
- return;
+ le.m_pointDrag = m_dragStart;
+ GetParent()->GetEventHandler()->ProcessEvent( le );
+
+ return;
}
else
{
m_usedKeys = FALSE;
m_lastOnSame = FALSE;
m_renameTimer->Stop();
-
+
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
-
+
return;
}
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK );
return;
}
-
+
if (event.MiddleDown())
{
SendNotify( line, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK );
return;
}
-
+
if (event.LeftDown())
{
m_usedKeys = FALSE;
else if (event.ControlDown())
{
m_current = line;
-
+
int numOfCurrent = -1;
node = m_lines.First();
while (node)
if (test_line == oldCurrent) break;
node = node->Next();
}
-
+
int numOfLine = -1;
node = m_lines.First();
while (node)
}
if (numOfLine < numOfCurrent)
- {
- int i = numOfLine;
- numOfLine = numOfCurrent;
- numOfCurrent = i;
- }
-
+ {
+ int i = numOfLine;
+ numOfLine = numOfCurrent;
+ numOfCurrent = i;
+ }
+
wxNode *node = m_lines.Nth( numOfCurrent );
for (int i = 0; i <= numOfLine-numOfCurrent; i++)
{
void wxListMainWindow::MoveToFocus()
{
if (!m_current) return;
-
- int x = 0;
- int y = 0;
- int w = 0;
- int h = 0;
- m_current->GetExtent( x, y, w, h );
-
- int w_p = 0;
- int h_p = 0;
- GetClientSize( &w_p, &h_p );
+
+ int item_x = 0;
+ int item_y = 0;
+ int item_w = 0;
+ int item_h = 0;
+ m_current->GetExtent( item_x, item_y, item_w, item_h );
+
+ int client_w = 0;
+ int client_h = 0;
+ GetClientSize( &client_w, &client_h );
+ int view_x = m_xScroll*GetScrollPos( wxHORIZONTAL );
+ int view_y = m_yScroll*GetScrollPos( wxVERTICAL );
+
if (m_mode & wxLC_REPORT)
{
- int y_s = m_yScroll*GetScrollPos( wxVERTICAL );
- if ((y > y_s) && (y+h < y_s+h_p)) return;
- if (y-y_s < 5) { Scroll( -1, (y-5-h_p/2)/m_yScroll ); }
- if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); }
+ if (item_y-5 < view_y )
+ Scroll( -1, (item_y-5)/m_yScroll );
+ if (item_y+item_h+5 > view_y+client_h)
+ Scroll( -1, (item_y+item_h-client_h+15)/m_yScroll );
}
else
{
- int x_s = m_xScroll*GetScrollPos( wxHORIZONTAL );
- if ((x > x_s) && (x+w < x_s+w_p)) return;
- if (x-x_s < 5) { Scroll( (x-5)/m_xScroll, -1 ); }
- if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); }
+ if (item_x-view_x < 5)
+ Scroll( (item_x-5)/m_xScroll, -1 );
+ if (item_x+item_w-5 > view_x+client_w)
+ Scroll( (item_x+item_w-client_w+15)/m_xScroll, -1 );
}
}
if ((m_mode & wxLC_SINGLE_SEL) || (m_usedKeys == FALSE)) m_current->Hilight( FALSE );
wxListLineData *oldCurrent = m_current;
m_current = newCurrent;
- MoveToFocus();
if (shiftDown || (m_mode & wxLC_SINGLE_SEL)) m_current->Hilight( TRUE );
RefreshLine( m_current );
RefreshLine( oldCurrent );
FocusLine( m_current );
UnfocusLine( oldCurrent );
+ MoveToFocus();
}
void wxListMainWindow::OnKeyDown( wxKeyEvent &event )
{
wxWindow *parent = GetParent();
-
+
/* we propagate the key event up */
wxKeyEvent ke( wxEVT_KEY_DOWN );
ke.m_shiftDown = event.m_shiftDown;
ke.m_y = event.m_y;
ke.SetEventObject( parent );
if (parent->GetEventHandler()->ProcessEvent( ke )) return;
-
+
event.Skip();
}
-
+
void wxListMainWindow::OnChar( wxKeyEvent &event )
{
wxWindow *parent = GetParent();
-
+
/* we send a list_key event up */
wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
- le.m_code = event.KeyCode();
+ le.m_code = (int)event.KeyCode();
le.SetEventObject( parent );
parent->GetEventHandler()->ProcessEvent( le );
ke.m_y = event.m_y;
ke.SetEventObject( parent );
if (parent->GetEventHandler()->ProcessEvent( ke )) return;
-
+
if (event.KeyCode() == WXK_TAB)
{
wxNavigationKeyEvent nevent;
nevent.SetCurrentFocus( m_parent );
if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return;
}
-
+
/* no item -> nothing to do */
if (!m_current)
{
case WXK_PRIOR:
{
int steps = 0;
- if (m_mode & wxLC_REPORT)
- {
- steps = m_visibleLines-1;
- }
+ if (m_mode & wxLC_REPORT)
+ {
+ steps = m_visibleLines-1;
+ }
else
{
int pos = 0;
case WXK_NEXT:
{
int steps = 0;
- if (m_mode & wxLC_REPORT)
- {
- steps = m_visibleLines-1;
- }
+ if (m_mode & wxLC_REPORT)
+ {
+ steps = m_visibleLines-1;
+ }
else
{
int pos = 0; wxNode *node = m_lines.First();
m_current->ReverseHilight();
wxNode *node = m_lines.Member( m_current )->Next();
if (node) m_current = (wxListLineData*)node->Data();
- MoveToFocus();
RefreshLine( oldCurrent );
RefreshLine( m_current );
UnfocusLine( oldCurrent );
FocusLine( m_current );
+ MoveToFocus();
}
break;
}
RefreshLine( m_current );
if (!GetParent()) return;
-
+
#ifdef __WXGTK__
g_focusWindow = GetParent();
#endif
{
/*
We don't even allow the wxScrolledWindow::AdjustScrollbars() call
-
+
*/
}
int wxListMainWindow::GetTextLength( wxString &s )
{
wxClientDC dc( this );
- long lw = 0;
- long lh = 0;
+ wxCoord lw = 0;
+ wxCoord lh = 0;
dc.GetTextExtent( s, &lw, &lh );
return lw + 6;
}
if (n)
{
wxListItemData *item = (wxListItemData*)n->Data();
- int current = 0, ix = 0, iy = 0;
- long lx = 0, ly = 0;
- if (item->HasImage())
- {
+ int current = 0, ix = 0, iy = 0;
+ wxCoord lx = 0, ly = 0;
+ if (item->HasImage())
+ {
GetImageSize( item->GetImage(), ix, iy );
- current = ix + 5;
- }
- if (item->HasText())
- {
- wxString str;
- item->GetText( str );
- dc.GetTextExtent( str, &lx, &ly );
- current += lx;
- }
- if (current > max) max = current;
+ current = ix + 5;
+ }
+ if (item->HasText())
+ {
+ wxString str;
+ item->GetText( str );
+ dc.GetTextExtent( str, &lx, &ly );
+ current += lx;
+ }
+ if (current > max) max = current;
}
node = node->Next();
}
- width = max+10;
+ width = max+10;
}
node = m_columns.Nth( col );
}
else
{
- return 0;
+ return 0;
}
}
void wxListMainWindow::SetItem( wxListItem &item )
{
m_dirty = TRUE;
- wxNode *node = m_lines.Nth( item.m_itemId );
+ wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
if (stateMask & wxLIST_STATE_FOCUSED)
{
- wxNode *node = m_lines.Nth( item );
+ wxNode *node = m_lines.Nth( (size_t)item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
if (stateMask & wxLIST_STATE_SELECTED)
{
- bool on = state & wxLIST_STATE_SELECTED;
+ bool on = (state & wxLIST_STATE_SELECTED) != 0;
if (!on && (m_mode & wxLC_SINGLE_SEL)) return;
- wxNode *node = m_lines.Nth( item );
+ wxNode *node = m_lines.Nth( (size_t)item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
RefreshLine( m_current );
if (oldCurrent) RefreshLine( oldCurrent );
}
- bool on = state & wxLIST_STATE_SELECTED;
- if (on != line->IsHilighted())
- {
+ bool on = (state & wxLIST_STATE_SELECTED) != 0;
+ if (on != line->IsHilighted())
+ {
line->Hilight( on );
RefreshLine( line );
- }
+ }
}
}
}
int ret = wxLIST_STATE_DONTCARE;
if (stateMask & wxLIST_STATE_FOCUSED)
{
- wxNode *node = m_lines.Nth( item );
+ wxNode *node = m_lines.Nth( (size_t)item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
}
if (stateMask & wxLIST_STATE_SELECTED)
{
- wxNode *node = m_lines.Nth( item );
+ wxNode *node = m_lines.Nth( (size_t)item );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
void wxListMainWindow::GetItem( wxListItem &item )
{
- wxNode *node = m_lines.Nth( item.m_itemId );
+ wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
void wxListMainWindow::GetItemRect( long index, wxRect &rect )
{
- wxNode *node = m_lines.Nth( index );
+ wxNode *node = m_lines.Nth( (size_t)index );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
{
- wxNode *node = m_lines.Nth( item );
+ wxNode *node = m_lines.Nth( (size_t)item );
if (node)
{
wxRect rect;
if (m_mode & wxLC_REPORT)
{
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ m_xScroll = 15;
+#else
m_xScroll = 0;
+#endif
m_yScroll = 15;
}
else
int iconSpacing = 0;
if (m_mode & wxLC_ICON) iconSpacing = m_normal_spacing;
if (m_mode & wxLC_SMALL_ICON) iconSpacing = m_small_spacing;
-
+
// we take the first line (which also can be an icon or
// an a text item in wxLC_ICON and wxLC_LIST modes) to
// measure the size of the line
-
+
int lineWidth = 0;
int lineHeight = 0;
int lineSpacing = 0;
int y = 1;
int entireHeight = m_lines.Number() * lineSpacing + 2;
int scroll_pos = GetScrollPos( wxVERTICAL );
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ int x_scroll_pos = GetScrollPos( wxHORIZONTAL );
+#else
SetScrollbars( m_xScroll, m_yScroll, 0, (entireHeight+15) / m_yScroll, 0, scroll_pos, TRUE );
+#endif
GetClientSize( &clientWidth, &clientHeight );
wxNode* node = m_lines.First();
+ int entireWidth = 0 ;
while (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
line->SetColumnPosition( i, col_x );
col_x += GetColumnWidth( i );
}
+ entireWidth = wxMax( entireWidth , col_x ) ;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ line->SetPosition( &dc, x, y, col_x );
+#endif
y += lineSpacing; // one pixel blank line between items
node = node->Next();
}
- m_visibleLines = clientHeight / lineSpacing;
+ m_visibleLines = clientHeight / lineSpacing;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+ SetScrollbars( m_xScroll, m_yScroll, entireWidth / m_xScroll , (entireHeight+15) / m_yScroll, x_scroll_pos , scroll_pos, TRUE );
+#endif
}
else
{
// at first we try without any scrollbar. if the items don't
// fit into the window, we recalculate after subtracting an
// approximated 15 pt for the horizontal scrollbar
-
+
GetSize( &clientWidth, &clientHeight );
- clientHeight -= 4; // sunken frame
+ clientHeight -= 4; // sunken frame
int entireWidth = 0;
int y = 5; // painting is done at y-2
int maxWidth = 0;
m_visibleLines = 0;
- int m_currentVisibleLines = 0;
+ int m_currentVisibleLines = 0;
wxNode *node = m_lines.First();
while (node)
{
- m_currentVisibleLines++;
+ m_currentVisibleLines++;
wxListLineData *line = (wxListLineData*)node->Data();
line->CalculateSize( &dc, iconSpacing );
line->SetPosition( &dc, x, y, clientWidth );
line->GetSize( lineWidth, lineHeight );
if (lineWidth > maxWidth) maxWidth = lineWidth;
y += lineSpacing;
+ if (m_currentVisibleLines > m_visibleLines)
+ m_visibleLines = m_currentVisibleLines;
if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking"
{
- if (m_currentVisibleLines > m_visibleLines)
- m_visibleLines = m_currentVisibleLines;
- m_currentVisibleLines = 0;
+ m_currentVisibleLines = 0;
y = 5;
x += maxWidth+6;
entireWidth += maxWidth+6;
{
clientHeight -= 15; // scrollbar height
m_visibleLines = 0;
- m_currentVisibleLines = 0;
+ m_currentVisibleLines = 0;
break;
}
if (!node) tries = 1; // everything fits, no second try required
}
}
-// m_visibleLines = (5+clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking"
-
+
int scroll_pos = GetScrollPos( wxHORIZONTAL );
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+15) / m_xScroll, 0, scroll_pos, 0, TRUE );
}
long ret = 0;
if (item > 0) ret = item;
if(ret >= GetItemCount()) return -1;
- wxNode *node = m_lines.Nth( ret );
+ wxNode *node = m_lines.Nth( (size_t)++ret );
while (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
void wxListMainWindow::DeleteItem( long index )
{
m_dirty = TRUE;
- wxNode *node = m_lines.Nth( index );
+ wxNode *node = m_lines.Nth( (size_t)index );
if (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
void wxListMainWindow::DeleteColumn( int col )
{
wxCHECK_RET( col < (int)m_columns.GetCount(),
- _T("attempting to delete inexistent column in wxListView") );
+ wxT("attempting to delete inexistent column in wxListView") );
m_dirty = TRUE;
wxNode *node = m_columns.Nth( col );
{
m_dirty = TRUE;
m_current = (wxListLineData *) NULL;
+
+ // to make the deletion of all items faster, we don't send the
+ // notifications in this case: this is compatible with wxMSW and
+ // documented in DeleteAllItems() description
+#if 0
wxNode *node = m_lines.First();
while (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
+
DeleteLine( line );
+
node = node->Next();
}
+#endif // 0
+
m_lines.Clear();
}
wxListLineData *oldCurrent = m_current;
m_current = (wxListLineData *) NULL;
- int i = index;
- wxNode *node = m_lines.Nth( i );
+ wxNode *node = m_lines.Nth( (size_t)index );
if (node) m_current = (wxListLineData*)node->Data();
if (m_current) MoveToFocus();
m_current = oldCurrent;
long pos = start;
wxString tmp = str;
if (pos < 0) pos = 0;
- wxNode *node = m_lines.Nth( pos );
+ wxNode *node = m_lines.Nth( (size_t)pos );
while (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
{
long pos = start;
if (pos < 0) pos = 0;
- wxNode *node = m_lines.Nth( pos );
+ wxNode *node = m_lines.Nth( (size_t)pos );
while (node)
{
wxListLineData *line = (wxListLineData*)node->Data();
long ret = line->IsHit( x, y );
if (ret & flags)
{
- flags = ret;
+ flags = (int)ret;
return count;
}
node = node->Next();
else if (m_mode & wxLC_LIST) mode = wxLC_LIST;
else if (m_mode & wxLC_ICON) mode = wxLC_ICON;
else if (m_mode & wxLC_SMALL_ICON) mode = wxLC_ICON; // no typo
-
+
wxListLineData *line = new wxListLineData( this, mode, m_hilightBrush );
-
+
if (m_mode & wxLC_REPORT)
{
line->InitItems( GetColumnCount() );
{
line->InitItems( 1 );
}
-
+
line->SetItem( 0, item );
if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount()))
{
- wxNode *node = m_lines.Nth( item.m_itemId );
+ wxNode *node = m_lines.Nth( (size_t)item.m_itemId );
if (node) m_lines.Insert( node, line );
}
else
wxListHeaderData *column = new wxListHeaderData( item );
if ((col >= 0) && (col < (int)m_columns.GetCount()))
{
- wxNode *node = m_columns.Nth( col );
+ wxNode *node = m_columns.Nth( (size_t)col );
if (node)
m_columns.Insert( node, column );
}
wxListCtrlCompare list_ctrl_compare_func_2;
long list_ctrl_compare_data;
-int list_ctrl_compare_func_1( const void *arg1, const void *arg2 )
+int LINKAGEMODE list_ctrl_compare_func_1( const void *arg1, const void *arg2 )
{
wxListLineData *line1 = *((wxListLineData**)arg1);
wxListLineData *line2 = *((wxListLineData**)arg2);
m_lines.Sort( list_ctrl_compare_func_1 );
}
+void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
+{
+ wxScrolledWindow::OnScroll( event ) ;
+#if wxUSE_GENERIC_LIST_EXTENSIONS
+
+ if (event.GetOrientation() == wxHORIZONTAL && ( m_mode & wxLC_REPORT ))
+ {
+ wxListCtrl* lc = wxDynamicCast( GetParent() , wxListCtrl ) ;
+ if ( lc )
+ {
+ lc->m_headerWin->Refresh() ;
+#ifdef __WXMAC__
+ lc->m_headerWin->MacUpdateImmediately() ;
+#endif
+ }
+ }
+#endif
+}
+
// -------------------------------------------------------------------------------------
// wxListItem
// -------------------------------------------------------------------------------------
m_data = 0;
m_format = wxLIST_FORMAT_CENTRE;
m_width = 0;
- m_colour = wxBLACK;
+
+ m_attr = NULL;
+}
+
+void wxListItem::Clear()
+{
+ m_mask = 0;
+ m_itemId = 0;
+ m_col = 0;
+ m_state = 0;
+ m_stateMask = 0;
+ m_image = 0;
+ m_data = 0;
+ m_format = wxLIST_FORMAT_CENTRE;
+ m_width = 0;
+ m_text = wxEmptyString;
+
+ if (m_attr) delete m_attr;
+ m_attr = NULL;
+}
+
+void wxListItem::ClearAttributes()
+{
+ if (m_attr) delete m_attr;
+ m_attr = NULL;
}
// -------------------------------------------------------------------------------------
m_pointDrag.y = 0;
}
+void wxListEvent::CopyObject(wxObject& object_dest) const
+{
+ wxListEvent *obj = (wxListEvent *)&object_dest;
+
+ wxNotifyEvent::CopyObject(object_dest);
+
+ obj->m_code = m_code;
+ obj->m_itemIndex = m_itemIndex;
+ obj->m_oldItemIndex = m_oldItemIndex;
+ obj->m_col = m_col;
+ obj->m_cancelled = m_cancelled;
+ obj->m_pointDrag = m_pointDrag;
+ obj->m_item.m_mask = m_item.m_mask;
+ obj->m_item.m_itemId = m_item.m_itemId;
+ obj->m_item.m_col = m_item.m_col;
+ obj->m_item.m_state = m_item.m_state;
+ obj->m_item.m_stateMask = m_item.m_stateMask;
+ obj->m_item.m_text = m_item.m_text;
+ obj->m_item.m_image = m_item.m_image;
+ obj->m_item.m_data = m_item.m_data;
+ obj->m_item.m_format = m_item.m_format;
+ obj->m_item.m_width = m_item.m_width;
+
+ if ( m_item.HasAttributes() )
+ {
+ obj->m_item.SetTextColour(m_item.GetTextColour());
+ }
+}
+
// -------------------------------------------------------------------------------------
// wxListCtrl
// -------------------------------------------------------------------------------------
{
}
-bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size,
- long style, const wxValidator &validator,
- const wxString &name )
+bool wxListCtrl::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos,
+ const wxSize &size,
+ long style,
+ const wxValidator &validator,
+ const wxString &name)
{
m_imageListNormal = (wxImageList *) NULL;
m_imageListSmall = (wxImageList *) NULL;
m_mainWin = (wxListMainWindow*) NULL;
m_headerWin = (wxListHeaderWindow*) NULL;
- long s = style;
-
- if ((s & wxLC_REPORT == 0) &&
- (s & wxLC_LIST == 0) &&
- (s & wxLC_ICON == 0))
+ if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) )
{
- s = s | wxLC_LIST;
+ style = style | wxLC_LIST;
}
-
- bool ret = wxControl::Create( parent, id, pos, size, s, name );
-
-#if wxUSE_VALIDATORS
- SetValidator( validator );
-#endif
- if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
+ bool ret = wxControl::Create( parent, id, pos, size, style, validator, name );
+
+
+ if (style & wxSUNKEN_BORDER)
+ style -= wxSUNKEN_BORDER;
- m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );
+ m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
if (HasFlag(wxLC_REPORT))
+ {
m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );
+ if (HasFlag(wxLC_NO_HEADER))
+ m_headerWin->Show( FALSE );
+ }
else
+ {
m_headerWin = (wxListHeaderWindow *) NULL;
+ }
SetBackgroundColour( *wxWHITE );
{
if (!m_headerWin)
{
- m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
- wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
- if (HasFlag(wxLC_NO_HEADER))
- m_headerWin->Show( FALSE );
+ m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin,
+ wxPoint(0,0), wxSize(width,23), wxTAB_TRAVERSAL );
+ if (HasFlag(wxLC_NO_HEADER))
+ m_headerWin->Show( FALSE );
}
else
- {
- if (flag & wxLC_NO_HEADER)
- m_headerWin->Show( FALSE );
- else
+ {
+ if (flag & wxLC_NO_HEADER)
+ m_headerWin->Show( FALSE );
+ else
m_headerWin->Show( TRUE );
- }
+ }
}
}
else
{
m_headerWin->Show( FALSE );
}
- }
+ }
}
-
+
wxWindow::SetWindowStyleFlag( flag );
}
return m_mainWin->GetSelectedItemCount();
}
-/*
wxColour wxListCtrl::GetTextColour() const
{
+ return GetForegroundColour();
}
-void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
+void wxListCtrl::SetTextColour(const wxColour& col)
{
+ SetForegroundColour(col);
}
-*/
long wxListCtrl::GetTopItem() const
{
{
for ( size_t n = 0; n < m_mainWin->m_columns.GetCount(); n++ )
DeleteColumn(n);
-
+
return TRUE;
}
long wxListCtrl::InsertColumn( long col, wxListItem &item )
{
+ wxASSERT( m_headerWin );
m_mainWin->InsertColumn( col, item );
+ m_headerWin->Refresh();
+
return 0;
}
m_mainWin->SetBackgroundColour( colour );
m_mainWin->m_dirty = TRUE;
}
-
+
if (m_headerWin)
{
// m_headerWin->SetBackgroundColour( colour );
{
if ( !wxWindow::SetForegroundColour( colour ) )
return FALSE;
-
+
if (m_mainWin)
{
m_mainWin->SetForegroundColour( colour );
m_mainWin->m_dirty = TRUE;
}
-
+
if (m_headerWin)
{
m_headerWin->SetForegroundColour( colour );
{
if ( !wxWindow::SetFont( font ) )
return FALSE;
-
+
if (m_mainWin)
{
m_mainWin->SetFont( font );
m_mainWin->m_dirty = TRUE;
}
-
+
if (m_headerWin)
{
m_headerWin->SetFont( font );
projects / wxWidgets.git / blobdiff