X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03eccb8316756c462bc2dddbb9395a3d0c05d888..a87bf37838e09fb4634a887cc8a6055104b49a01:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index e285968484..066e416df9 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -72,6 +72,15 @@ #include "wx/renderer.h" +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif + +// NOTE: If using the wxListBox visual attributes works everywhere then this can +// be removed, as well as the #else case below. +#define _USE_VISATTR 0 + + // ---------------------------------------------------------------------------- // events // ---------------------------------------------------------------------------- @@ -112,7 +121,7 @@ static const int SCROLL_UNIT_X = 15; static const int LINE_SPACING = 0; // extra margins around the text label -static const int EXTRA_WIDTH = 3; +static const int EXTRA_WIDTH = 4; static const int EXTRA_HEIGHT = 4; // margin between the window and the items @@ -519,20 +528,20 @@ public: // do we have a header window? bool HasHeader() const - { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); } + { return InReportView() && !HasFlag(wxLC_NO_HEADER); } void HighlightAll( bool on ); // all these functions only do something if the line is currently visible - // change the line "selected" state, return TRUE if it really changed - bool HighlightLine( size_t line, bool highlight = TRUE); + // change the line "selected" state, return true if it really changed + bool HighlightLine( size_t line, bool highlight = true); // as HighlightLine() but do it for the range of lines: this is incredibly // more efficient for virtual list controls! // // NB: unlike HighlightLine() this one does refresh the lines on screen - void HighlightLines( size_t lineFrom, size_t lineTo, bool on = TRUE ); + void HighlightLines( size_t lineFrom, size_t lineTo, bool on = true ); // toggle the line state and refresh it void ReverseHighlight( size_t line ) @@ -614,8 +623,8 @@ public: int GetTextLength( const wxString &s ) const; void SetImageList( wxImageListType *imageList, int which ); - void SetItemSpacing( int spacing, bool isSmall = FALSE ); - int GetItemSpacing( bool isSmall = FALSE ); + void SetItemSpacing( int spacing, bool isSmall = false ); + int GetItemSpacing( bool isSmall = false ); void SetColumn( int col, wxListItem &item ); void SetColumnWidth( int col, int width ); @@ -655,7 +664,7 @@ public: } // set the scrollbars and update the positions of the items - void RecalculatePositions(bool noRefresh = FALSE); + void RecalculatePositions(bool noRefresh = false); // refresh the window and the header void RefreshAll(); @@ -666,7 +675,7 @@ public: void DeleteColumn( int col ); void DeleteEverything(); void EnsureVisible( long index ); - long FindItem( long start, const wxString& str, bool partial = FALSE ); + long FindItem( long start, const wxString& str, bool partial = false ); long FindItem( long start, long data); long HitTest( int x, int y, int &flags ); void InsertItem( wxListItem &item ); @@ -691,11 +700,11 @@ public: virtual bool SetFont(const wxFont& font) { if ( !wxScrolledWindow::SetFont(font) ) - return FALSE; + return false; m_lineHeight = 0; - return TRUE; + return true; } // these are for wxListLineData usage only @@ -928,7 +937,7 @@ void wxListItemData::SetSize( int width, int height ) bool wxListItemData::IsHit( int x, int y ) const { - wxCHECK_MSG( m_rect, FALSE, _T("can't be called in this mode") ); + wxCHECK_MSG( m_rect, false, _T("can't be called in this mode") ); return wxRect(GetX(), GetY(), GetWidth(), GetHeight()).Inside(x, y); } @@ -1113,7 +1122,7 @@ wxListLineData::wxListLineData( wxListMainWindow *owner ) m_gi = new GeometryInfo; } - m_highlighted = FALSE; + m_highlighted = false; InitItems( GetMode() == wxLC_REPORT ? m_owner->GetColumnCount() : 1 ); } @@ -1429,10 +1438,10 @@ bool wxListLineData::SetAttributes(wxDC *dc, dc->SetPen( *wxTRANSPARENT_PEN ); - return TRUE; + return true; } - return FALSE; + return false; } void wxListLineData::Draw( wxDC *dc ) @@ -1599,14 +1608,14 @@ void wxListLineData::DrawTextFormatted(wxDC *dc, bool wxListLineData::Highlight( bool on ) { - wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") ); + wxCHECK_MSG( !IsVirtual(), false, _T("unexpected call to Highlight") ); if ( on == m_highlighted ) - return FALSE; + return false; m_highlighted = on; - return TRUE; + return true; } void wxListLineData::ReverseHighlight( void ) @@ -1629,8 +1638,8 @@ END_EVENT_TABLE() void wxListHeaderWindow::Init() { m_currentCursor = (wxCursor *) NULL; - m_isDragging = FALSE; - m_dirty = FALSE; + m_isDragging = false; + m_dirty = false; } wxListHeaderWindow::wxListHeaderWindow() @@ -1655,7 +1664,18 @@ wxListHeaderWindow::wxListHeaderWindow( wxWindow *win, m_owner = owner; m_resizeCursor = new wxCursor( wxCURSOR_SIZEWE ); - SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); +#if _USE_VISATTR + wxVisualAttributes attr = wxPanel::GetClassDefaultAttributes(); + SetOwnForegroundColour( attr.colFg ); + SetOwnBackgroundColour( attr.colBg ); + if (!m_hasFont) + SetOwnFont( attr.font ); +#else + SetOwnForegroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + SetOwnBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); + if (!m_hasFont) + SetOwnFont( wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT )); +#endif } wxListHeaderWindow::~wxListHeaderWindow() @@ -1700,11 +1720,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetBackgroundMode(wxTRANSPARENT); - // do *not* use the listctrl colour for headers - one day we will have a - // function to set it separately - //dc.SetTextForeground( *wxBLACK ); - dc.SetTextForeground(wxSystemSettings:: - GetSystemColour( wxSYS_COLOUR_WINDOWTEXT )); + dc.SetTextForeground(GetForegroundColour()); int x = HEADER_OFFSET_X; @@ -1732,7 +1748,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) // for this we need the width of the text wxCoord wLabel; - wxCoord hLabel; + wxCoord hLabel; dc.GetTextExtent(item.GetText(), &wLabel, &hLabel); wLabel += 2*EXTRA_WIDTH; @@ -1857,8 +1873,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) if (event.ButtonUp()) { ReleaseMouse(); - m_isDragging = FALSE; - m_dirty = TRUE; + m_isDragging = false; + m_dirty = true; m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); SendListEvent(wxEVT_COMMAND_LIST_COL_END_DRAG, event.GetPosition()); } @@ -1877,7 +1893,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) else // not dragging { m_minX = 0; - bool hit_border = FALSE; + bool hit_border = false; // end of the current column int xpos = 0; @@ -1893,7 +1909,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) if ( (abs(x-xpos) < 3) && (y < 22) ) { // near the column border - hit_border = TRUE; + hit_border = true; break; } @@ -1916,7 +1932,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) if ( SendListEvent(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, event.GetPosition()) ) { - m_isDragging = TRUE; + m_isDragging = true; m_currentX = x; CaptureMouse(); DrawCurrent(); @@ -2003,7 +2019,7 @@ wxListTextCtrl::wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit) m_itemEdited(itemEdit) { m_owner = owner; - m_finished = FALSE; + m_finished = false; wxRect rectLabel = owner->GetLineLabelRect(itemEdit); @@ -2021,7 +2037,7 @@ void wxListTextCtrl::Finish() { wxPendingDelete.Append(this); - m_finished = TRUE; + m_finished = true; m_owner->SetFocus(); } @@ -2034,19 +2050,19 @@ bool wxListTextCtrl::AcceptChanges() if ( value == m_startValue ) { // nothing changed, always accept - return TRUE; + return true; } if ( !m_owner->OnRenameAccept(m_itemEdited, value) ) { // vetoed by the user - return FALSE; + return false; } // accepted, do rename the item m_owner->SetItemText(m_itemEdited, value); - return TRUE; + return true; } void wxListTextCtrl::OnChar( wxKeyEvent &event ) @@ -2089,7 +2105,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event ) sx = parentSize.x - myPos.x; if (mySize.x > sx) sx = mySize.x; - SetSize(sx, -1); + SetSize(sx, wxDefaultCoord); event.Skip(); } @@ -2126,7 +2142,7 @@ END_EVENT_TABLE() void wxListMainWindow::Init() { - m_dirty = TRUE; + m_dirty = true; m_countVirt = 0; m_lineFrom = m_lineTo = (size_t)-1; @@ -2141,11 +2157,11 @@ void wxListMainWindow::Init() m_small_spacing = 30; m_normal_spacing = 40; - m_hasFocus = FALSE; + m_hasFocus = false; m_dragCount = 0; - m_isCreated = FALSE; + m_isCreated = false; - m_lastOnSame = FALSE; + m_lastOnSame = false; m_renameTimer = new wxListRenameTimer( this ); m_current = @@ -2197,7 +2213,11 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, SetScrollbars( 0, 0, 0, 0, 0, 0 ); - SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX ) ); + wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes(); + SetOwnForegroundColour( attr.colFg ); + SetOwnBackgroundColour( attr.colBg ); + if (!m_hasFont) + SetOwnFont( attr.font ); } wxListMainWindow::~wxListMainWindow() @@ -2291,7 +2311,7 @@ wxCoord wxListMainWindow::GetLineHeight() const wxCoord wxListMainWindow::GetLineY(size_t line) const { - wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") ); + wxASSERT_MSG( InReportView(), _T("only works in report mode") ); return LINE_SPACING + line*GetLineHeight(); } @@ -2383,7 +2403,7 @@ bool wxListMainWindow::IsHighlighted(size_t line) const else // !virtual { wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, FALSE, _T("invalid index in IsHighlighted") ); + wxCHECK_MSG( ld, false, _T("invalid index in IsHighlighted") ); return ld->IsHighlighted(); } @@ -2434,7 +2454,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight ) else // !virtual { wxListLineData *ld = GetLine(line); - wxCHECK_MSG( ld, FALSE, _T("invalid index in HighlightLine") ); + wxCHECK_MSG( ld, false, _T("invalid index in HighlightLine") ); changed = ld->Highlight(highlight); } @@ -2450,7 +2470,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight ) void wxListMainWindow::RefreshLine( size_t line ) { - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { size_t visibleFrom, visibleTo; GetVisibleLinesRange(&visibleFrom, &visibleTo); @@ -2472,7 +2492,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo ) wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") ); - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { size_t visibleFrom, visibleTo; GetVisibleLinesRange(&visibleFrom, &visibleTo); @@ -2503,7 +2523,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo ) void wxListMainWindow::RefreshAfter( size_t lineFrom ) { - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { size_t visibleFrom, visibleTo; GetVisibleLinesRange(&visibleFrom, &visibleTo); @@ -2528,7 +2548,7 @@ void wxListMainWindow::RefreshAfter( size_t lineFrom ) else // !report { // TODO: how to do it more efficiently? - m_dirty = TRUE; + m_dirty = true; } } @@ -2605,7 +2625,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetFont( GetFont() ); - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { int lineHeight = GetLineHeight(); @@ -2698,22 +2718,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) } } +#ifndef __WXMAC__ + // Don't draw rect outline under Mac at all. if ( HasCurrent() ) { - // don't draw rect outline under Max if we already have the background - // color but under other platforms only draw it if we do: it is a bit - // silly to draw "focus rect" if we don't have focus! -#ifdef __WXMAC__ - if ( !m_hasFocus ) -#else // !__WXMAC__ if ( m_hasFocus ) -#endif // __WXMAC__/!__WXMAC__ { dc.SetPen( *wxBLACK_PEN ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.DrawRectangle( GetLineHighlightRect(m_current) ); } } +#endif dc.EndDrawing(); } @@ -2727,7 +2743,7 @@ void wxListMainWindow::HighlightAll( bool on ) // we just have one item to turn off if ( HasCurrent() && IsHighlighted(m_current) ) { - HighlightLine(m_current, FALSE); + HighlightLine(m_current, false); RefreshLine(m_current); } } @@ -2816,7 +2832,7 @@ bool wxListMainWindow::OnRenameAccept(size_t itemEdit, const wxString& value) le.m_itemIndex = itemEdit; wxListLineData *data = GetLine(itemEdit); - wxCHECK_MSG( data, FALSE, _T("invalid index in OnRenameAccept()") ); + wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") ); data->GetItem( 0, le.m_item ); le.m_item.m_text = value; @@ -2829,7 +2845,7 @@ void wxListMainWindow::OnRenameCancelled(size_t itemEdit) // let owner know that the edit was cancelled wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() ); - le.SetEditCanceled(TRUE); + le.SetEditCanceled(true); le.SetEventObject( GetParent() ); le.m_itemIndex = itemEdit; @@ -2868,7 +2884,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) size_t count = GetItemCount(), current; - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { current = y / GetLineHeight(); if ( current < count ) @@ -2923,11 +2939,11 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) return; } - bool forceClick = FALSE; + bool forceClick = false; if (event.ButtonDClick()) { m_renameTimer->Stop(); - m_lastOnSame = FALSE; + m_lastOnSame = false; if ( current == m_lineLastClicked ) { @@ -2939,7 +2955,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) { // the first click was on another item, so don't interpret this as // a double click, but as a simple click instead - forceClick = TRUE; + forceClick = true; } } @@ -2949,9 +2965,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) (hitResult == wxLIST_HITTEST_ONITEMLABEL) && HasFlag(wxLC_EDIT_LABELS) ) { - m_renameTimer->Start( 100, TRUE ); + m_renameTimer->Start( 100, true ); } - m_lastOnSame = FALSE; + m_lastOnSame = false; } else if (event.RightDown()) { @@ -2968,10 +2984,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) m_lineLastClicked = current; size_t oldCurrent = m_current; - - if ( IsSingleSel() || !(event.ControlDown() || event.ShiftDown()) ) + bool cmdModifierDown = event.CmdDown(); + if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) ) { - HighlightAll( FALSE ); + HighlightAll( false ); ChangeCurrent(current); @@ -2979,7 +2995,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) } else // multi sel & either ctrl or shift is down { - if (event.ControlDown()) + if (cmdModifierDown) { ChangeCurrent(current); @@ -3032,7 +3048,7 @@ void wxListMainWindow::MoveToItem(size_t item) int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL ); int view_y = hLine*GetScrollPos( wxVERTICAL ); - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { // the next we need the range of lines shown it might be different, so // recalculate it @@ -3069,6 +3085,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) { ChangeCurrent(newCurrent); + // refresh the old focus to remove it + RefreshLine( oldCurrent ); + // select all the items between the old and the new one if ( oldCurrent > newCurrent ) { @@ -3082,7 +3101,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) { // all previously selected items are unselected unless ctrl is held if ( !event.ControlDown() ) - HighlightAll(FALSE); + HighlightAll(false); ChangeCurrent(newCurrent); @@ -3091,7 +3110,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) if ( !event.ControlDown() ) { - HighlightLine( m_current, TRUE ); + HighlightLine( m_current, true ); } } @@ -3188,7 +3207,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) case WXK_PRIOR: { - int steps = HasFlag(wxLC_REPORT) ? m_linesPerPage - 1 : m_current % m_linesPerPage; + int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage; int index = m_current - steps; if (index < 0) @@ -3200,7 +3219,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) case WXK_NEXT: { - int steps = HasFlag(wxLC_REPORT) + int steps = InReportView() ? m_linesPerPage - 1 : m_linesPerPage - (m_current % m_linesPerPage) - 1; @@ -3214,7 +3233,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) break; case WXK_LEFT: - if ( !HasFlag(wxLC_REPORT) ) + if ( !InReportView() ) { int index = m_current - m_linesPerPage; if (index < 0) @@ -3225,7 +3244,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) break; case WXK_RIGHT: - if ( !HasFlag(wxLC_REPORT) ) + if ( !InReportView() ) { size_t index = m_current + m_linesPerPage; @@ -3303,7 +3322,7 @@ void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) // it if ( !m_hasFocus ) { - m_hasFocus = TRUE; + m_hasFocus = true; RefreshSelected(); } @@ -3318,7 +3337,7 @@ void wxListMainWindow::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) return; } - m_hasFocus = FALSE; + m_hasFocus = false; RefreshSelected(); } @@ -3336,7 +3355,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y ) { m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); } - else if ( HasFlag(wxLC_REPORT) && (m_small_image_list)) + else if ( InReportView() && (m_small_image_list)) { m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT ); } @@ -3356,7 +3375,7 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const { m_small_image_list->GetSize( index, width, height ); } - else if ( HasFlag(wxLC_REPORT) && m_small_image_list ) + else if ( InReportView() && m_small_image_list ) { m_small_image_list->GetSize( index, width, height ); } @@ -3380,7 +3399,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const void wxListMainWindow::SetImageList( wxImageListType *imageList, int which ) { - m_dirty = TRUE; + m_dirty = true; // calc the spacing from the icon size int width = 0, @@ -3406,7 +3425,7 @@ void wxListMainWindow::SetImageList( wxImageListType *imageList, int which ) void wxListMainWindow::SetItemSpacing( int spacing, bool isSmall ) { - m_dirty = TRUE; + m_dirty = true; if (isSmall) { m_small_spacing = spacing; @@ -3440,9 +3459,9 @@ void wxListMainWindow::SetColumn( int col, wxListItem &item ) wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin ) - headerWin->m_dirty = TRUE; + headerWin->m_dirty = true; - m_dirty = TRUE; + m_dirty = true; // invalidate it as it has to be recalculated m_headerWidth = 0; @@ -3453,13 +3472,13 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) wxCHECK_RET( col >= 0 && col < GetColumnCount(), _T("invalid column index") ); - wxCHECK_RET( HasFlag(wxLC_REPORT), + wxCHECK_RET( InReportView(), _T("SetColumnWidth() can only be called in report mode.") ); - m_dirty = TRUE; + m_dirty = true; wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin ) - headerWin->m_dirty = TRUE; + headerWin->m_dirty = true; wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col ); wxCHECK_RET( node, _T("no column?") ); @@ -3602,7 +3621,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) { if ( IsSingleSel() ) { - HighlightLine(oldCurrent, FALSE); + HighlightLine(oldCurrent, false); } RefreshLine(oldCurrent); @@ -3623,7 +3642,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) // we must unselect the old current item as well or we // might end up with more than one selected item in a // single selection control - HighlightLine(oldCurrent, FALSE); + HighlightLine(oldCurrent, false); } RefreshLine( oldCurrent ); @@ -3648,7 +3667,7 @@ void wxListMainWindow::SetItemState( long litem, long state, long stateMask ) if ( oldCurrent != (size_t)-1 ) { - HighlightLine( oldCurrent, FALSE ); + HighlightLine( oldCurrent, false ); RefreshLine( oldCurrent ); } } @@ -3716,7 +3735,7 @@ void wxListMainWindow::SetItemCount(long count) ResetVisibleLinesRange(); // scrollbars must be reset - m_dirty = TRUE; + m_dirty = true; } int wxListMainWindow::GetSelectedItemCount() const @@ -3724,7 +3743,7 @@ int wxListMainWindow::GetSelectedItemCount() const // deal with the quick case first if ( IsSingleSel() ) { - return HasCurrent() ? IsHighlighted(m_current) : FALSE; + return HasCurrent() ? IsHighlighted(m_current) : false; } // virtual controls remmebers all its selections itself @@ -3797,7 +3816,7 @@ void wxListMainWindow::GetItemRect( long index, wxRect &rect ) const if ( m_dirty ) { wxConstCast(this, wxListMainWindow)-> - RecalculatePositions(TRUE /* no refresh */); + RecalculatePositions(true /* no refresh */); } rect = GetLineRect((size_t)index); @@ -3813,7 +3832,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const pos.x = rect.x; pos.y = rect.y; - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -3857,7 +3876,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) const int lineHeight = GetLineHeight(); - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { // all lines have the same height and we scroll one line per step int entireHeight = count*lineHeight + LINE_SPACING; @@ -3871,7 +3890,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) (entireHeight + lineHeight - 1) / lineHeight, GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL), - TRUE ); + true ); } else // !report { @@ -3928,7 +3947,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) (y + lineHeight) / lineHeight, GetScrollPos( wxHORIZONTAL ), GetScrollPos( wxVERTICAL ), - TRUE + true ); } else // "flowed" arrangement, the most complicated case @@ -4009,7 +4028,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) 0, GetScrollPos( wxHORIZONTAL ), 0, - TRUE + true ); } } @@ -4025,13 +4044,13 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) void wxListMainWindow::RefreshAll() { - m_dirty = FALSE; + m_dirty = false; Refresh(); wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin; if ( headerWin && headerWin->m_dirty ) { - headerWin->m_dirty = FALSE; + headerWin->m_dirty = false; headerWin->Refresh(); } } @@ -4125,7 +4144,7 @@ void wxListMainWindow::DeleteItem( long lindex ) } // we need to refresh the (vert) scrollbar as the number of items changed - m_dirty = TRUE; + m_dirty = true; SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM ); @@ -4138,7 +4157,7 @@ void wxListMainWindow::DeleteColumn( int col ) wxCHECK_RET( node, wxT("invalid column index in DeleteColumn()") ); - m_dirty = TRUE; + m_dirty = true; delete node->GetData(); m_columns.Erase( node ); @@ -4219,7 +4238,7 @@ void wxListMainWindow::EnsureVisible( long index ) // been added and its position is not known yet if ( m_dirty ) { - RecalculatePositions(TRUE /* no refresh */); + RecalculatePositions(true /* no refresh */); } MoveToItem((size_t)index); @@ -4268,7 +4287,7 @@ long wxListMainWindow::HitTest( int x, int y, int &flags ) size_t count = GetItemCount(); - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { size_t current = y / GetLineHeight(); if ( current < count ) @@ -4301,19 +4320,21 @@ void wxListMainWindow::InsertItem( wxListItem &item ) { wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual control") ); - size_t count = GetItemCount(); - wxCHECK_RET( item.m_itemId >= 0 && (size_t)item.m_itemId <= count, - _T("invalid item index") ); + int count = GetItemCount(); + wxCHECK_RET( item.m_itemId >= 0, _T("invalid item index") ); + if (item.m_itemId > count) + item.m_itemId = count; + size_t id = item.m_itemId; - m_dirty = TRUE; + m_dirty = true; #if 0 // this is unused variable int mode = 0; #endif - if ( HasFlag(wxLC_REPORT) ) + if ( InReportView() ) { #if 0 // this is unused variable @@ -4353,7 +4374,7 @@ void wxListMainWindow::InsertItem( wxListItem &item ) m_lines.Insert( line, id ); - m_dirty = TRUE; + m_dirty = true; // If an item is selected at or below the point of insertion, we need to // increment the member variables because the current row's index has gone @@ -4370,8 +4391,8 @@ void wxListMainWindow::InsertItem( wxListItem &item ) void wxListMainWindow::InsertColumn( long col, wxListItem &item ) { - m_dirty = TRUE; - if ( HasFlag(wxLC_REPORT) ) + m_dirty = true; + if ( InReportView() ) { if (item.m_width == wxLIST_AUTOSIZE_USEHEADER) item.m_width = GetTextLength( item.m_text ); @@ -4431,7 +4452,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) list_ctrl_compare_func_2 = fn; list_ctrl_compare_data = data; m_lines.Sort( list_ctrl_compare_func_1 ); - m_dirty = TRUE; + m_dirty = true; } // ---------------------------------------------------------------------------- @@ -4474,7 +4495,7 @@ int wxListMainWindow::GetCountPerPage() const void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to) { - wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") ); + wxASSERT_MSG( InReportView(), _T("this is for report mode only") ); if ( m_lineFrom == (size_t)-1 ) { @@ -4528,7 +4549,7 @@ wxGenericListCtrl::wxGenericListCtrl() m_ownsImageListNormal = m_ownsImageListSmall = - m_ownsImageListState = FALSE; + m_ownsImageListState = false; m_mainWin = (wxListMainWindow*) NULL; m_headerWin = (wxListHeaderWindow*) NULL; @@ -4561,8 +4582,8 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight() m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight); - if ( HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER) ) - ResizeReportView(TRUE); + if ( HasHeader() ) + ResizeReportView(true); } } } @@ -4571,7 +4592,7 @@ void wxGenericListCtrl::CreateHeaderWindow() { m_headerWin = new wxListHeaderWindow ( - this, -1, m_mainWin, + this, wxID_ANY, m_mainWin, wxPoint(0, 0), wxSize(GetClientSize().x, m_headerHeight), wxTAB_TRAVERSAL @@ -4592,7 +4613,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent, m_imageListState = (wxImageListType *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = - m_ownsImageListState = FALSE; + m_ownsImageListState = false; m_mainWin = (wxListMainWindow*) NULL; m_headerWin = (wxListHeaderWindow*) NULL; @@ -4605,25 +4626,32 @@ bool wxGenericListCtrl::Create(wxWindow *parent, } if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) - return FALSE; + return false; // don't create the inner window with the border style &= ~wxBORDER_MASK; - m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style ); + m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style ); - if ( HasFlag(wxLC_REPORT) ) +#if defined( __WXMAC__ ) && __WXMAC_CARBON__ + wxFont font ; + font.MacCreateThemeFont( kThemeViewsFont ) ; + SetFont( font ) ; +#endif + if ( InReportView() ) { CreateHeaderWindow(); if ( HasFlag(wxLC_NO_HEADER) ) { // VZ: why do we create it at all then? - m_headerWin->Show( FALSE ); + m_headerWin->Show( false ); } } - return TRUE; + SetBestSize(size); + + return true; } void wxGenericListCtrl::SetSingleStyle( long style, bool add ) @@ -4662,8 +4690,8 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag ) m_mainWin->DeleteEverything(); // has the header visibility changed? - bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER), - willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER); + bool hasHeader = HasHeader(); + bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER); if ( hasHeader != willHaveHeader ) { @@ -4673,7 +4701,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag ) if ( m_headerWin ) { // don't delete, just hide, as we can reuse it later - m_headerWin->Show(FALSE); + m_headerWin->Show(false); } //else: nothing to do } @@ -4685,7 +4713,7 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag ) } else // already have it, just show { - m_headerWin->Show( TRUE ); + m_headerWin->Show( true ); } } @@ -4699,13 +4727,13 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag ) bool wxGenericListCtrl::GetColumn(int col, wxListItem &item) const { m_mainWin->GetColumn( col, item ); - return TRUE; + return true; } bool wxGenericListCtrl::SetColumn( int col, wxListItem& item ) { m_mainWin->SetColumn( col, item ); - return TRUE; + return true; } int wxGenericListCtrl::GetColumnWidth( int col ) const @@ -4716,7 +4744,7 @@ int wxGenericListCtrl::GetColumnWidth( int col ) const bool wxGenericListCtrl::SetColumnWidth( int col, int width ) { m_mainWin->SetColumnWidth( col, width ); - return TRUE; + return true; } int wxGenericListCtrl::GetCountPerPage() const @@ -4727,13 +4755,13 @@ int wxGenericListCtrl::GetCountPerPage() const bool wxGenericListCtrl::GetItem( wxListItem &info ) const { m_mainWin->GetItem( info ); - return TRUE; + return true; } bool wxGenericListCtrl::SetItem( wxListItem &info ) { m_mainWin->SetItem( info ); - return TRUE; + return true; } long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int imageId ) @@ -4749,7 +4777,7 @@ long wxGenericListCtrl::SetItem( long index, int col, const wxString& label, int info.m_mask |= wxLIST_MASK_IMAGE; }; m_mainWin->SetItem(info); - return TRUE; + return true; } int wxGenericListCtrl::GetItemState( long item, long stateMask ) const @@ -4760,7 +4788,7 @@ int wxGenericListCtrl::GetItemState( long item, long stateMask ) const bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask ) { m_mainWin->SetItemState( item, state, stateMask ); - return TRUE; + return true; } bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) @@ -4770,7 +4798,7 @@ bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImag info.m_mask = wxLIST_MASK_IMAGE; info.m_itemId = item; m_mainWin->SetItem( info ); - return TRUE; + return true; } wxString wxGenericListCtrl::GetItemText( long item ) const @@ -4798,7 +4826,7 @@ bool wxGenericListCtrl::SetItemData( long item, long data ) info.m_itemId = item; info.m_data = data; m_mainWin->SetItem( info ); - return TRUE; + return true; } wxRect wxGenericListCtrl::GetViewRect() const @@ -4811,13 +4839,13 @@ bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code m_mainWin->GetItemRect( item, rect ); if ( m_mainWin->HasHeader() ) rect.y += m_headerHeight + 1; - return TRUE; + return true; } bool wxGenericListCtrl::GetItemPosition( long item, wxPoint& pos ) const { m_mainWin->GetItemPosition( item, pos ); - return TRUE; + return true; } bool wxGenericListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(pos) ) @@ -4934,19 +4962,19 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which ) { if (m_ownsImageListNormal) delete m_imageListNormal; m_imageListNormal = imageList; - m_ownsImageListNormal = FALSE; + m_ownsImageListNormal = false; } else if ( which == wxIMAGE_LIST_SMALL ) { if (m_ownsImageListSmall) delete m_imageListSmall; m_imageListSmall = imageList; - m_ownsImageListSmall = FALSE; + m_ownsImageListSmall = false; } else if ( which == wxIMAGE_LIST_STATE ) { if (m_ownsImageListState) delete m_imageListState; m_imageListState = imageList; - m_ownsImageListState = FALSE; + m_ownsImageListState = false; } m_mainWin->SetImageList( imageList, which ); @@ -4956,11 +4984,11 @@ void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL ) - m_ownsImageListNormal = TRUE; + m_ownsImageListNormal = true; else if ( which == wxIMAGE_LIST_SMALL ) - m_ownsImageListSmall = TRUE; + m_ownsImageListSmall = true; else if ( which == wxIMAGE_LIST_STATE ) - m_ownsImageListState = TRUE; + m_ownsImageListState = true; } bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) ) @@ -4971,13 +4999,13 @@ bool wxGenericListCtrl::Arrange( int WXUNUSED(flag) ) bool wxGenericListCtrl::DeleteItem( long item ) { m_mainWin->DeleteItem( item ); - return TRUE; + return true; } bool wxGenericListCtrl::DeleteAllItems() { m_mainWin->DeleteAllItems(); - return TRUE; + return true; } bool wxGenericListCtrl::DeleteAllColumns() @@ -4986,7 +5014,7 @@ bool wxGenericListCtrl::DeleteAllColumns() for ( size_t n = 0; n < count; n++ ) DeleteColumn(0); - return TRUE; + return true; } void wxGenericListCtrl::ClearAll() @@ -5001,10 +5029,10 @@ bool wxGenericListCtrl::DeleteColumn( int col ) // if we don't have the header any longer, we need to relayout the window if ( !GetColumnCount() ) { - ResizeReportView(FALSE /* no header */); + ResizeReportView(false /* no header */); } - return TRUE; + return true; } void wxGenericListCtrl::Edit( long item ) @@ -5015,7 +5043,7 @@ void wxGenericListCtrl::Edit( long item ) bool wxGenericListCtrl::EnsureVisible( long item ) { m_mainWin->EnsureVisible( item ); - return TRUE; + return true; } long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial ) @@ -5083,7 +5111,7 @@ long wxGenericListCtrl::InsertColumn( long col, wxListItem &item ) // window if ( GetColumnCount() == 1 && m_mainWin->HasHeader() ) { - ResizeReportView(TRUE /* have header */); + ResizeReportView(true /* have header */); } m_headerWin->Refresh(); @@ -5125,7 +5153,7 @@ bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) bool wxGenericListCtrl::SortItems( wxListCtrlCompare fn, long data ) { m_mainWin->SortItems( fn, data ); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -5178,21 +5206,21 @@ bool wxGenericListCtrl::SetBackgroundColour( const wxColour &colour ) if (m_mainWin) { m_mainWin->SetBackgroundColour( colour ); - m_mainWin->m_dirty = TRUE; + m_mainWin->m_dirty = true; } - return TRUE; + return true; } bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour ) { if ( !wxWindow::SetForegroundColour( colour ) ) - return FALSE; + return false; if (m_mainWin) { m_mainWin->SetForegroundColour( colour ); - m_mainWin->m_dirty = TRUE; + m_mainWin->m_dirty = true; } if (m_headerWin) @@ -5200,18 +5228,18 @@ bool wxGenericListCtrl::SetForegroundColour( const wxColour &colour ) m_headerWin->SetForegroundColour( colour ); } - return TRUE; + return true; } bool wxGenericListCtrl::SetFont( const wxFont &font ) { if ( !wxWindow::SetFont( font ) ) - return FALSE; + return false; if (m_mainWin) { m_mainWin->SetFont( font ); - m_mainWin->m_dirty = TRUE; + m_mainWin->m_dirty = true; } if (m_headerWin) @@ -5222,7 +5250,30 @@ bool wxGenericListCtrl::SetFont( const wxFont &font ) Refresh(); - return TRUE; + return true; +} + + + +#if _USE_VISATTR +#include "wx/listbox.h" +#endif + +//static +wxVisualAttributes +wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant) +{ +#if _USE_VISATTR + // Use the same color scheme as wxListBox + return wxListBox::GetClassDefaultAttributes(variant); +#else + wxUnusedVar(variant); + wxVisualAttributes attr; + attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX); + attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + return attr; +#endif } // ---------------------------------------------------------------------------- @@ -5245,7 +5296,7 @@ wxDropTarget *wxGenericListCtrl::GetDropTarget() const bool wxGenericListCtrl::SetCursor( const wxCursor &cursor ) { - return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : FALSE; + return m_mainWin ? m_mainWin->wxWindow::SetCursor(cursor) : false; } wxColour wxGenericListCtrl::GetBackgroundColour() const @@ -5263,7 +5314,7 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y ) #if wxUSE_MENUS return m_mainWin->PopupMenu( menu, x, y ); #else - return FALSE; + return false; #endif // wxUSE_MENUS }