X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/813c20a67e8a82d16700344625b8fdfb32e04833..3f2711d5c119962a9fcb7198ebf351930d646e23:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 65f568eb3b..9c67a8be91 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -29,7 +29,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject); -wxListItemData::wxListItemData(void) +wxListItemData::wxListItemData() { m_image = -1; m_data = 0; @@ -92,12 +92,12 @@ void wxListItemData::SetColour( wxColour *col ) m_colour = col; } -bool wxListItemData::HasImage(void) const +bool wxListItemData::HasImage() const { return (m_image >= 0); } -bool wxListItemData::HasText(void) const +bool wxListItemData::HasText() const { return (!m_text.IsNull()); } @@ -112,27 +112,27 @@ void wxListItemData::GetText( wxString &s ) s = m_text; } -int wxListItemData::GetX( void ) const +int wxListItemData::GetX() const { return m_xpos; } -int wxListItemData::GetY( void ) const +int wxListItemData::GetY() const { return m_ypos; } -int wxListItemData::GetWidth(void) const +int wxListItemData::GetWidth() const { return m_width; } -int wxListItemData::GetHeight(void) const +int wxListItemData::GetHeight() const { return m_height; } -int wxListItemData::GetImage(void) const +int wxListItemData::GetImage() const { return m_image; } @@ -142,9 +142,10 @@ void wxListItemData::GetItem( wxListItem &info ) info.m_text = m_text; info.m_image = m_image; info.m_data = m_data; + info.m_colour = m_colour; } -wxColour *wxListItemData::GetColour(void) +wxColour *wxListItemData::GetColour() { return m_colour; } @@ -155,7 +156,7 @@ wxColour *wxListItemData::GetColour(void) IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject); -wxListHeaderData::wxListHeaderData(void) +wxListHeaderData::wxListHeaderData() { m_mask = 0; m_image = 0; @@ -208,12 +209,12 @@ void wxListHeaderData::SetFormat( int format ) m_format = format; } -bool wxListHeaderData::HasImage(void) const +bool wxListHeaderData::HasImage() const { return (m_image != 0); } -bool wxListHeaderData::HasText(void) const +bool wxListHeaderData::HasText() const { return (m_text.Length() > 0); } @@ -237,17 +238,17 @@ void wxListHeaderData::GetText( wxString &s ) s = m_text; } -int wxListHeaderData::GetImage(void) const +int wxListHeaderData::GetImage() const { return m_image; } -int wxListHeaderData::GetWidth(void) const +int wxListHeaderData::GetWidth() const { return m_width; } -int wxListHeaderData::GetFormat(void) const +int wxListHeaderData::GetFormat() const { return m_format; } @@ -301,6 +302,14 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) dc->GetTextExtent( s, &lw, &lh ); m_bound_all.width = lw; m_bound_all.height = lh; + if (item->HasImage()) + { + int w = 0; + int h = 0; + m_owner->GetImageSize( item->GetImage(), w, h ); + m_bound_all.width += 4 + w; + if (h > m_bound_all.height) m_bound_all.height = h; + } } break; } @@ -315,10 +324,9 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) wxString s; item->GetText( s ); if (s.IsNull()) s = "H"; - long lw,lh; - dc->GetTextExtent( s, &lw, &lh ); + long lh; + dc->GetTextExtent( s, (long*) NULL, &lh ); item->SetSize( item->GetWidth(), lh ); - m_bound_all.width += lw; m_bound_all.height = lh; node = node->Next(); } @@ -329,85 +337,125 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing ) void wxListLineData::SetPosition( wxDC *dc, int x, int y, int window_width ) { - m_bound_all.x = x; - m_bound_all.y = y; - switch (m_mode) - { - case wxLC_ICON: - { - AssignRect( m_bound_icon, 0, 0, 0, 0 ); - AssignRect( m_bound_label, 0, 0, 0, 0 ); - AssignRect( m_bound_hilight, m_bound_all ); - wxNode *node = m_items.First(); - if (node) - { - wxListItemData *item = (wxListItemData*)node->Data(); - if (item->HasImage()) + m_bound_all.x = x; + m_bound_all.y = y; + switch (m_mode) + { + case wxLC_ICON: { - wxListItemData *item = (wxListItemData*)node->Data(); - int w = 0; - int h = 0; - m_owner->GetImageSize( item->GetImage(), w, h ); - m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2); - m_bound_icon.y = m_bound_all.y + m_spacing - h - 5; - m_bound_icon.width = w; - m_bound_icon.height = h; - if (!item->HasText()) - { - AssignRect( m_bound_hilight, m_bound_icon ); - m_bound_hilight.x -= 5; - m_bound_hilight.y -= 5; - m_bound_hilight.width += 9; - m_bound_hilight.height += 9; - } + AssignRect( m_bound_icon, 0, 0, 0, 0 ); + AssignRect( m_bound_label, 0, 0, 0, 0 ); + AssignRect( m_bound_hilight, m_bound_all ); + wxNode *node = m_items.First(); + if (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + if (item->HasImage()) + { + wxListItemData *item = (wxListItemData*)node->Data(); + int w = 0; + int h = 0; + m_owner->GetImageSize( item->GetImage(), w, h ); + m_bound_icon.x = m_bound_all.x + (m_spacing/2) - (w/2); + m_bound_icon.y = m_bound_all.y + m_spacing - h - 5; + m_bound_icon.width = w; + m_bound_icon.height = h; + if (!item->HasText()) + { + AssignRect( m_bound_hilight, m_bound_icon ); + m_bound_hilight.x -= 5; + m_bound_hilight.y -= 5; + m_bound_hilight.width += 9; + m_bound_hilight.height += 9; + } + } + if (item->HasText()) + { + wxString s; + item->GetText( s ); + long lw,lh; + dc->GetTextExtent( s, &lw, &lh ); + if (m_bound_all.width > m_spacing) + m_bound_label.x = m_bound_all.x; + else + m_bound_label.x = m_bound_all.x + (m_spacing/2) - lw/2; + m_bound_label.y = m_bound_all.y + m_bound_all.height - lh; + m_bound_label.width = lw; + m_bound_label.height = lh; + AssignRect( m_bound_hilight, m_bound_label ); + m_bound_hilight.x -= 2; + m_bound_hilight.y -= 2; + m_bound_hilight.width += 4; + m_bound_hilight.height += 4; + } + } + break; } - if (item->HasText()) + case wxLC_LIST: { - wxString s; - item->GetText( s ); - long lw,lh; - dc->GetTextExtent( s, &lw, &lh ); - if (m_bound_all.width > m_spacing) - m_bound_label.x = m_bound_all.x; - else - m_bound_label.x = m_bound_all.x + (m_spacing/2) - lw/2; - m_bound_label.y = m_bound_all.y + m_bound_all.height - lh; - m_bound_label.width = lw; - m_bound_label.height = lh; - AssignRect( m_bound_hilight, m_bound_label ); - m_bound_hilight.x -= 2; - m_bound_hilight.y -= 2; - m_bound_hilight.width += 4; - m_bound_hilight.height += 4; + AssignRect( m_bound_label, m_bound_all ); + m_bound_all.x -= 2; + m_bound_all.y -= 2; + m_bound_all.width += 4; + m_bound_all.height += 3; + AssignRect( m_bound_hilight, m_bound_all ); + AssignRect( m_bound_icon, 0, 0, 0, 0 ); + wxNode *node = m_items.First(); + if (node) + { + 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; + 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; + } + } + break; + } + case wxLC_REPORT: + { + long lw,lh; + dc->GetTextExtent( "H", &lw, &lh ); + m_bound_all.x = 0; + m_bound_all.y -= 0; + m_bound_all.height = lh+3; + m_bound_all.width = window_width; + AssignRect( m_bound_hilight, m_bound_all ); + AssignRect( m_bound_label, m_bound_all ); + AssignRect( m_bound_icon, 0, 0, 0, 0 ); + wxNode *node = m_items.First(); + if (node) + { + wxListItemData *item = (wxListItemData*)node->Data(); + wxString s; + item->GetText( s ); + if (s.IsEmpty()) s = wxT("H"); + long lw,lh; + dc->GetTextExtent( s, &lw, &lh ); + 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; + m_owner->GetImageSize( item->GetImage(), w, h ); + m_bound_icon.width = w; + m_bound_icon.height = h; + m_bound_label.x += 4 + w; + } + } + break; } - } - break; - } - case wxLC_LIST: - { - AssignRect( m_bound_label, m_bound_all ); - m_bound_all.x -= 2; - m_bound_all.y -= 2; - m_bound_all.width += 4; - m_bound_all.height += 3; - AssignRect( m_bound_hilight, m_bound_all ); - AssignRect( m_bound_icon, 0, 0, 0, 0 ); - break; - } - case wxLC_REPORT: - { - long lw,lh; - dc->GetTextExtent( "H", &lw, &lh ); - m_bound_all.x = 0; - m_bound_all.y -= 0; - m_bound_all.height = lh+3; - m_bound_all.width = window_width; - AssignRect( m_bound_hilight, m_bound_all ); - AssignRect( m_bound_label, 0, 0, 0 ,0 ); - AssignRect( m_bound_icon, 0, 0, 0, 0 ); - break; } - } } void wxListLineData::SetColumnPosition( int index, int x ) @@ -530,9 +578,9 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) 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 ); - + if (!m_owner->IsExposed( dev_x, dev_y, dev_w, dev_h )) - { + { return; } @@ -551,7 +599,7 @@ void wxListLineData::DoDraw( wxDC *dc, bool hilight, bool paintBG ) 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) { @@ -643,7 +691,7 @@ void wxListLineData::Draw( wxDC *dc ) 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)); } @@ -717,7 +765,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) 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) @@ -827,22 +875,37 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) for (int j = 0; j < m_owner->GetColumnCount(); j++) { xpos += m_owner->GetColumnWidth( j ); + m_column = j; if ((abs(x-xpos) < 3) && (y < 22)) { hit_border = TRUE; - m_column = j; break; } + if (x-xpos < 0) + { + break; + } m_minX = xpos; } - if (event.LeftDown() && hit_border) + if (event.LeftDown()) { - m_isDragging = TRUE; - m_currentX = x; - DrawCurrent(); - CaptureMouse(); - return; + if (hit_border) + { + m_isDragging = TRUE; + m_currentX = x; + DrawCurrent(); + CaptureMouse(); + return; + } + else + { + wxListEvent le( wxEVT_COMMAND_LIST_COL_CLICK, GetParent()->GetId() ); + le.SetEventObject( GetParent() ); + le.m_col = m_column; + GetParent()->GetEventHandler()->ProcessEvent( le ); + return; + } } if (event.Moving()) @@ -893,7 +956,13 @@ 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, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + int style, const wxValidator* validator, const wxString &name ) : +# else int style, const wxValidator& validator, const wxString &name ) : +# endif +#endif wxTextCtrl( parent, id, value, pos, size, style, validator, name ) { m_res = res; @@ -928,7 +997,7 @@ void wxListTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) if (wxPendingDelete.Member(this)) return; wxPendingDelete.Append(this); - + if ((*m_accept) && ((*m_res) != m_startValue)) m_owner->OnRenameAccept(); } @@ -949,7 +1018,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus) END_EVENT_TABLE() -wxListMainWindow::wxListMainWindow( void ) +wxListMainWindow::wxListMainWindow() { m_mode = 0; m_lines.DeleteContents( TRUE ); @@ -1014,10 +1083,10 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id, SetBackgroundColour( *wxWHITE ); } -wxListMainWindow::~wxListMainWindow( void ) +wxListMainWindow::~wxListMainWindow() { if (m_hilightBrush) delete m_hilightBrush; - + delete m_renameTimer; } @@ -1049,13 +1118,13 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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; @@ -1070,7 +1139,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) for (int i = 0; i < m_visibleLines+2; i++) { if (!node) break; - + line = (wxListLineData*)node->Data(); line->Draw( &dc ); node = node->Next(); @@ -1086,7 +1155,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) node = node->Next(); } } - + if (m_current) m_current->DrawRubberBand( &dc, m_hasFocus ); dc.EndDrawing(); @@ -1146,19 +1215,24 @@ void wxListMainWindow::DeleteLine( wxListLineData *line ) void wxListMainWindow::EditLabel( long item ) { wxNode *node = m_lines.Nth( item ); - wxCHECK_RET( node, _T("wrong index in wxListCtrl::Edit()") ); - + wxCHECK_RET( node, wxT("wrong index in wxListCtrl::Edit()") ); + m_currentEdit = (wxListLineData*) node->Data(); - wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() ); + wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() ); le.SetEventObject( GetParent() ); 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. + if (m_dirty) wxYield(); + wxString s; m_currentEdit->GetText( 0, s ); int x = 0; @@ -1179,8 +1253,8 @@ void wxListMainWindow::EditLabel( long item ) 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 ) ); } @@ -1192,13 +1266,14 @@ void wxListMainWindow::OnRenameAccept() 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; SetItem( info ); } @@ -1208,12 +1283,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (!m_current) return; if (m_dirty) return; + if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp() || event.ButtonDClick()) ) return; wxClientDC dc(this); PrepareDC(dc); long x = dc.DeviceToLogicalX( (long)event.GetX() ); long y = dc.DeviceToLogicalY( (long)event.GetY() ); - + /* Did we actually hit an item ? */ long hitResult = 0; wxNode *node = m_lines.First(); @@ -1227,23 +1303,29 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) node = node->Next(); } - if (!event.Dragging()) - m_dragCount = 0; - else - m_dragCount++; - - if (event.Dragging() && (m_dragCount > 3)) + if (event.Dragging()) { - m_dragCount = 0; + if (m_dragCount == 0) + m_dragStart = wxPoint(x,y); + + m_dragCount++; + + if (m_dragCount != 3) return; - wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_DRAG, GetParent()->GetId() ); + 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.x = x; - le.m_pointDrag.y = y; + le.m_pointDrag = m_dragStart; GetParent()->GetEventHandler()->ProcessEvent( le ); return; } + else + { + m_dragCount = 0; + } if (!line) return; @@ -1252,9 +1334,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) m_usedKeys = FALSE; m_lastOnSame = FALSE; m_renameTimer->Stop(); - + SendNotify( line, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); - + return; } @@ -1276,13 +1358,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) 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; @@ -1327,12 +1409,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) } 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++) { @@ -1364,30 +1446,30 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) 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 ); - + 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 ); Refresh(); } - if (y+h+5 > y_s+h_p) { Scroll( -1, (y+h-h_p/2+h+15)/m_yScroll); Refresh(); } + 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); } } 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 ); Refresh(); } - if (x+w-5 > x_s+w_p) { Scroll( (x+w-w_p+15)/m_xScroll, -1 ); Refresh(); } + 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 ); } } } @@ -1407,7 +1489,7 @@ void wxListMainWindow::OnArrowChar( wxListLineData *newCurrent, bool shiftDown ) 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; @@ -1419,14 +1501,14 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) 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(); @@ -1444,7 +1526,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) ke.m_y = event.m_y; ke.SetEventObject( parent ); if (parent->GetEventHandler()->ProcessEvent( ke )) return; - + if (event.KeyCode() == WXK_TAB) { wxNavigationKeyEvent nevent; @@ -1452,7 +1534,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) nevent.SetCurrentFocus( m_parent ); if (m_parent->GetEventHandler()->ProcessEvent( nevent )) return; } - + /* no item -> nothing to do */ if (!m_current) { @@ -1489,9 +1571,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) 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 { @@ -1508,9 +1590,9 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) 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 { @@ -1584,6 +1666,10 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) m_usedKeys = TRUE; } +#ifdef __WXGTK__ +extern wxWindow *g_focusWindow; +#endif + void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = TRUE; @@ -1591,6 +1677,10 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) if (!GetParent()) return; +#ifdef __WXGTK__ + g_focusWindow = GetParent(); +#endif + wxFocusEvent event( wxEVT_SET_FOCUS, GetParent()->GetId() ); event.SetEventObject( GetParent() ); GetParent()->GetEventHandler()->ProcessEvent( event ); @@ -1606,7 +1696,7 @@ void wxListMainWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) { /* We don't even allow the wxScrolledWindow::AdjustScrollbars() call - + */ } @@ -1621,6 +1711,10 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) { m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); } + if ((m_mode & wxLC_LIST) && (m_small_image_list)) + { + m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); + } if ((m_mode & wxLC_REPORT) && (m_small_image_list)) { m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); @@ -1640,6 +1734,11 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) m_small_image_list->GetSize( index, width, height ); return; } + if ((m_mode & wxLC_LIST) && (m_small_image_list)) + { + m_small_image_list->GetSize( index, width, height ); + return; + } if ((m_mode & wxLC_REPORT) && (m_small_image_list)) { m_small_image_list->GetSize( index, width, height ); @@ -1805,7 +1904,7 @@ int wxListMainWindow::GetColumnWidth( int col ) } else { - return 0; + return 0; } } @@ -2008,11 +2107,11 @@ void wxListMainWindow::CalculatePositions() 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; @@ -2057,7 +2156,7 @@ void wxListMainWindow::CalculatePositions() // 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 @@ -2069,9 +2168,12 @@ void wxListMainWindow::CalculatePositions() int x = 5; // painting is done at x-2 int y = 5; // painting is done at y-2 int maxWidth = 0; + m_visibleLines = 0; + int m_currentVisibleLines = 0; wxNode *node = m_lines.First(); while (node) { + m_currentVisibleLines++; wxListLineData *line = (wxListLineData*)node->Data(); line->CalculateSize( &dc, iconSpacing ); line->SetPosition( &dc, x, y, clientWidth ); @@ -2080,6 +2182,9 @@ void wxListMainWindow::CalculatePositions() y += lineSpacing; if (y+lineSpacing-6 >= clientHeight) // -6 for earlier "line breaking" { + if (m_currentVisibleLines > m_visibleLines) + m_visibleLines = m_currentVisibleLines; + m_currentVisibleLines = 0; y = 5; x += maxWidth+6; entireWidth += maxWidth+6; @@ -2090,12 +2195,14 @@ void wxListMainWindow::CalculatePositions() if ((tries == 0) && (entireWidth > clientWidth)) { clientHeight -= 15; // scrollbar height + m_visibleLines = 0; + m_currentVisibleLines = 0; break; } if (!node) tries = 1; // everything fits, no second try required } } - m_visibleLines = (clientHeight+6) / (lineSpacing); // +6 for earlier "line breaking" +// 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 ); @@ -2150,7 +2257,7 @@ void wxListMainWindow::DeleteItem( long index ) 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 ); @@ -2189,6 +2296,11 @@ void wxListMainWindow::DeleteEverything( void ) void wxListMainWindow::EnsureVisible( long index ) { + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxListLineData *oldCurrent = m_current; m_current = (wxListLineData *) NULL; int i = index; @@ -2260,9 +2372,9 @@ void wxListMainWindow::InsertItem( wxListItem &item ) 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() ); @@ -2272,7 +2384,7 @@ void wxListMainWindow::InsertItem( wxListItem &item ) { line->InitItems( 1 ); } - + line->SetItem( 0, item ); if ((item.m_itemId >= 0) && (item.m_itemId < (int)m_lines.GetCount())) { @@ -2308,7 +2420,7 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item ) 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); @@ -2333,7 +2445,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject) -wxListItem::wxListItem(void) +wxListItem::wxListItem() { m_mask = 0; m_itemId = 0; @@ -2376,7 +2488,7 @@ BEGIN_EVENT_TABLE(wxListCtrl,wxControl) EVT_IDLE (wxListCtrl::OnIdle) END_EVENT_TABLE() -wxListCtrl::wxListCtrl(void) +wxListCtrl::wxListCtrl() { m_imageListNormal = (wxImageList *) NULL; m_imageListSmall = (wxImageList *) NULL; @@ -2385,13 +2497,19 @@ wxListCtrl::wxListCtrl(void) m_headerWin = (wxListHeaderWindow*) NULL; } -wxListCtrl::~wxListCtrl(void) +wxListCtrl::~wxListCtrl() { } bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + long style, const wxValidator *validator, +# else long style, const wxValidator &validator, +# endif +#endif const wxString &name ) { m_imageListNormal = (wxImageList *) NULL; @@ -2414,7 +2532,7 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, #if wxUSE_VALIDATORS SetValidator( validator ); #endif - + if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER; m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s ); @@ -2477,24 +2595,29 @@ void wxListCtrl::SetWindowStyleFlag( long flag ) { if (!m_headerWin) { - m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, + 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 - { - m_headerWin->Show( TRUE ); - } + { + if (flag & wxLC_NO_HEADER) + m_headerWin->Show( FALSE ); + else + m_headerWin->Show( TRUE ); + } } } else { - if (HasFlag(wxLC_REPORT)) + if (HasFlag(wxLC_REPORT) && !(HasFlag(wxLC_NO_HEADER))) { m_headerWin->Show( FALSE ); } } } - + wxWindow::SetWindowStyleFlag( flag ); } @@ -2521,7 +2644,7 @@ bool wxListCtrl::SetColumnWidth( int col, int width ) return TRUE; } -int wxListCtrl::GetCountPerPage(void) const +int wxListCtrl::GetCountPerPage() const { return m_mainWin->GetCountPerPage(); // different from Windows ? } @@ -2627,12 +2750,12 @@ bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(p return 0; } -int wxListCtrl::GetItemCount(void) const +int wxListCtrl::GetItemCount() const { return m_mainWin->GetItemCount(); } -int wxListCtrl::GetColumnCount(void) const +int wxListCtrl::GetColumnCount() const { return m_mainWin->GetColumnCount(); } @@ -2647,13 +2770,13 @@ int wxListCtrl::GetItemSpacing( bool isSmall ) const return m_mainWin->GetItemSpacing( isSmall ); } -int wxListCtrl::GetSelectedItemCount(void) const +int wxListCtrl::GetSelectedItemCount() const { return m_mainWin->GetSelectedItemCount(); } /* -wxColour wxListCtrl::GetTextColour(void) const +wxColour wxListCtrl::GetTextColour() const { } @@ -2662,7 +2785,7 @@ void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col)) } */ -long wxListCtrl::GetTopItem(void) const +long wxListCtrl::GetTopItem() const { return 0; } @@ -2705,7 +2828,7 @@ bool wxListCtrl::DeleteItem( long item ) return TRUE; } -bool wxListCtrl::DeleteAllItems(void) +bool wxListCtrl::DeleteAllItems() { m_mainWin->DeleteAllItems(); return TRUE; @@ -2765,7 +2888,7 @@ long wxListCtrl::HitTest( const wxPoint &point, int &flags ) long wxListCtrl::InsertItem( wxListItem& info ) { m_mainWin->InsertItem( info ); - return 0; + return info.m_itemId; } long wxListCtrl::InsertItem( long index, const wxString &label ) @@ -2852,7 +2975,7 @@ void wxListCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) int w = 0; int h = 0; - if (HasFlag(wxLC_REPORT)) + if (HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER)) { m_headerWin->GetPosition( &x, &y ); m_headerWin->GetSize( &w, &h ); @@ -2888,7 +3011,7 @@ bool wxListCtrl::SetBackgroundColour( const wxColour &colour ) m_mainWin->SetBackgroundColour( colour ); m_mainWin->m_dirty = TRUE; } - + if (m_headerWin) { // m_headerWin->SetBackgroundColour( colour ); @@ -2901,13 +3024,13 @@ bool wxListCtrl::SetForegroundColour( const wxColour &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 ); @@ -2920,13 +3043,13 @@ bool wxListCtrl::SetFont( const wxFont &font ) { 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 );