// private classes
// ============================================================================
+//-----------------------------------------------------------------------------
+// wxColWidthInfo (internal)
+//-----------------------------------------------------------------------------
+
+struct wxColWidthInfo
+{
+ int nMaxWidth;
+ bool bNeedsUpdate; // only set to true when an item whose
+ // width == nMaxWidth is removed
+
+ wxColWidthInfo(int w = 0, bool needsUpdate = false)
+ {
+ nMaxWidth = w;
+ bNeedsUpdate = needsUpdate;
+ }
+};
+
+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
+
//-----------------------------------------------------------------------------
// wxListItemData (internal)
//-----------------------------------------------------------------------------
// the part to be highlighted
wxRect m_rectHighlight;
- // extend all our rects to be centered inside theo ne of given width
+ // extend all our rects to be centered inside the one of given width
void ExtendWidth(wxCoord w)
{
wxASSERT_MSG( m_rectAll.width <= w,
wxString m_startValue;
size_t m_itemEdited;
bool m_finished;
+ bool m_aboutToFinish;
DECLARE_EVENT_TABLE()
};
void SetItem( wxListItem &item );
void GetItem( wxListItem &item ) const;
void SetItemState( long item, long state, long stateMask );
+ void SetItemStateAll( long state, long stateMask );
int GetItemState( long item, long stateMask ) const;
void GetItemRect( long index, wxRect &rect ) const;
wxRect GetViewRect() const;
long HitTest( int x, int y, int &flags );
void InsertItem( wxListItem &item );
void InsertColumn( long col, wxListItem &item );
+ int GetItemWidthWithImage(wxListItem * item);
void SortItems( wxListCtrlCompare fn, long data );
size_t GetItemCount() const;
bool m_isCreated;
int m_dragCount;
wxPoint m_dragStart;
+ ColWidthArray m_aColWidths;
// for double click logic
size_t m_lineLastClicked,
- m_lineBeforeLastClicked;
+ m_lineBeforeLastClicked,
+ m_lineSelectSingleOnUp;
protected:
// the total count of items in a virtual list control
// get the colour to be used for drawing the rules
wxColour GetRuleColour() const
{
-#ifdef __WXMAC__
- return *wxWHITE;
-#else
return wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
-#endif
}
private:
// the width of the rect to draw: make it smaller to fit entirely
// inside the column rect
+#ifdef __WXMAC__
+ int cw = wCol ;
+ int ch = h ;
+#else
int cw = wCol - 2;
-
+ int ch = h-2 ;
+#endif
wxRendererNative::Get().DrawHeaderButton
(
this,
dc,
- wxRect(x, HEADER_OFFSET_Y, cw, h - 2),
+ wxRect(x, HEADER_OFFSET_Y, cw, ch),
m_parent->IsEnabled() ? 0
- : wxCONTROL_DISABLED
+ : (int)wxCONTROL_DISABLED
);
// see if we have enough space for the column label
{
m_owner = owner;
m_finished = false;
+ m_aboutToFinish = false;
wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
switch ( event.m_keyCode )
{
case WXK_RETURN:
- if ( AcceptChanges() )
- {
- // Close the text control, changes were accepted
- Finish();
- }
- // else do nothing, do not accept and do not close
-
+ m_aboutToFinish = true;
+ // Notify the owner about the changes
+ AcceptChanges();
+ // Even if vetoed, close the control (consistent with MSW)
+ Finish();
break;
case WXK_ESCAPE:
void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
{
- if ( !m_finished )
+ if ( !m_finished && !m_aboutToFinish )
{
// We must finish regardless of success, otherwise we'll get
// focus problems:
}
// We must let the native text control handle focus, too, otherwise
- // it could have problems with the cursor (e.g., in wxGTK):
+ // it could have problems with the cursor (e.g., in wxGTK).
event.Skip();
}
m_current =
m_lineLastClicked =
+ m_lineSelectSingleOnUp =
m_lineBeforeLastClicked = (size_t)-1;
m_freezeCount = 0;
{
DoDeleteAllItems();
WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
+ WX_CLEAR_ARRAY(m_aColWidths);
delete m_highlightBrush;
delete m_highlightUnfocusedBrush;
if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
return;
-#if wxUSE_MOUSEWHEEL
if (event.GetEventType() == wxEVT_MOUSEWHEEL)
{
// let the base handle mouse wheel events.
event.Skip();
return;
}
-#endif
-
+
if ( !HasCurrent() || IsEmpty() )
return;
wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
- le.m_itemIndex = current;
+ le.m_itemIndex = m_lineLastClicked;
le.m_pointDrag = m_dragStart;
GetParent()->GetEventHandler()->ProcessEvent( le );
}
else
{
- // the first click was on another item, so don't interpret this as
+ // The first click was on another item, so don't interpret this as
// a double click, but as a simple click instead
forceClick = true;
}
}
- if (event.LeftUp() && m_lastOnSame)
+ if (event.LeftUp())
{
- if ((current == m_current) &&
- (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
- HasFlag(wxLC_EDIT_LABELS) )
+ if(m_lineSelectSingleOnUp != (size_t) -1)
+ {
+ // select single line
+ HighlightAll( false );
+ ReverseHighlight(m_lineSelectSingleOnUp);
+ }
+ else if (m_lastOnSame)
{
- m_renameTimer->Start( 100, true );
+ if ((current == m_current) &&
+ (hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
+ HasFlag(wxLC_EDIT_LABELS) )
+ {
+ m_renameTimer->Start( 100, true );
+ }
}
m_lastOnSame = false;
+ m_lineSelectSingleOnUp = (size_t) -1;
}
- else if (event.RightDown())
+ else
+ {
+ // This is neccessary , because after a DnD operation in
+ // from and to ourself, the up event is swallowed by the
+ // DnD code. So on next non-up event (which means here and
+ // now) m_lineSelectSingleOnUp should be reset.
+ m_lineSelectSingleOnUp = (size_t) -1;
+ }
+ if (event.RightDown())
{
+ m_lineBeforeLastClicked = m_lineLastClicked;
+ m_lineLastClicked = current;
+ // If the item is already selected, do not update the selection.
+ // Multi-selections should not be cleared if a selected item is clicked.
+ if (!IsHighlighted(current))
+ {
+ HighlightAll(false);
+ ChangeCurrent(current);
+ ReverseHighlight(m_current);
+ }
SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
event.GetPosition() );
+ // Allow generation of context menu event
+ event.Skip();
}
else if (event.MiddleDown())
{
bool cmdModifierDown = event.CmdDown();
if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )
{
- HighlightAll( false );
+ if( IsSingleSel() || !IsHighlighted(current) )
+ {
+ HighlightAll( false );
- ChangeCurrent(current);
+ ChangeCurrent(current);
- ReverseHighlight(m_current);
+ ReverseHighlight(m_current);
+ }
+ else // multi sel & current is highlighted & no mod keys
+ {
+ m_lineSelectSingleOnUp = current;
+ ChangeCurrent(current); // change focus
+ }
}
else // multi sel & either ctrl or shift is down
{
int max = AUTOSIZE_COL_MARGIN;
- for ( size_t i = 0; i < count; i++ )
+ // if the cached column width isn't valid then recalculate it
+ if (m_aColWidths.Item(col)->bNeedsUpdate)
{
- wxListLineData *line = GetLine(i);
- wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
-
- wxCHECK_RET( n, _T("no subitem?") );
+ for (size_t i = 0; i < count; i++)
+ {
+ wxListLineData *line = GetLine(i);
+ wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
- wxListItemData *item = n->GetData();
- int current = 0;
+ wxCHECK_RET( n, _T("no subitem?") );
- if (item->HasImage())
- {
- int ix, iy;
- GetImageSize( item->GetImage(), ix, iy );
- current += ix + 5;
- }
+ wxListItemData *itemData = n->GetData();
+ wxListItem item;
- if (item->HasText())
- {
- wxCoord w;
- dc.GetTextExtent( item->GetText(), &w, NULL );
- current += w;
+ itemData->GetItem(item);
+ int itemWidth = GetItemWidthWithImage(&item);
+ if (itemWidth > max)
+ max = itemWidth;
}
- if (current > max)
- max = current;
+ m_aColWidths.Item(col)->bNeedsUpdate = false;
+ m_aColWidths.Item(col)->nMaxWidth = max;
}
+ max = m_aColWidths.Item(col)->nMaxWidth;
width = max + AUTOSIZE_COL_MARGIN;
}
}
{
wxListLineData *line = GetLine((size_t)id);
line->SetItem( item.m_col, item );
+
+ if (InReportView())
+ {
+ // update the Max Width Cache if needed
+ int width = GetItemWidthWithImage(&item);
+
+ if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
+ m_aColWidths.Item(item.m_col)->nMaxWidth = width;
+ }
}
// update the item on screen
RefreshRect(rectItem);
}
+void wxListMainWindow::SetItemStateAll(long state, long stateMask)
+{
+ if ( IsEmpty() )
+ return;
+
+ // first deal with selection
+ if ( stateMask & wxLIST_STATE_SELECTED )
+ {
+ // set/clear select state
+ if ( IsVirtual() )
+ {
+ // optimized version for virtual listctrl.
+ m_selStore.SelectRange(0, GetItemCount() - 1, state == wxLIST_STATE_SELECTED);
+ Refresh();
+ }
+ else if ( state & wxLIST_STATE_SELECTED )
+ {
+ const long count = GetItemCount();
+ for( long i = 0; i < count; i++ )
+ {
+ SetItemState( i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ }
+
+ }
+ else
+ {
+ // clear for non virtual (somewhat optimized by using GetNextItem())
+ long i = -1;
+ while ( (i = GetNextItem(i, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1 )
+ {
+ SetItemState( i, 0, wxLIST_STATE_SELECTED );
+ }
+ }
+ }
+
+ if ( HasCurrent() && (state == 0) && (stateMask & wxLIST_STATE_FOCUSED) )
+ {
+ // unfocus all: only one item can be focussed, so clearing focus for
+ // all items is simply clearing focus of the focussed item.
+ SetItemState(m_current, state, stateMask);
+ }
+ //(setting focus to all items makes no sense, so it is not handled here.)
+}
+
void wxListMainWindow::SetItemState( long litem, long state, long stateMask )
{
+ if ( litem == -1 )
+ {
+ SetItemStateAll(state, stateMask);
+ return;
+ }
+
wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
_T("invalid list ctrl item index in SetItem") );
if ( InReportView() )
{
+ // mark the Column Max Width cache as dirty if the items in the line
+ // we're deleting contain the Max Column Width
+ wxListLineData * const line = GetLine(index);
+ wxListItemDataList::compatibility_iterator n;
+ wxListItemData *itemData;
+ wxListItem item;
+ int itemWidth;
+
+ for (size_t i = 0; i < m_columns.GetCount(); i++)
+ {
+ n = line->m_items.Item( i );
+ itemData = n->GetData();
+ itemData->GetItem(item);
+
+ itemWidth = GetItemWidthWithImage(&item);
+
+ if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
+ m_aColWidths.Item(i)->bNeedsUpdate = true;
+ }
+
ResetVisibleLinesRange();
}
}
}
+ if ( InReportView() ) // we only cache max widths when in Report View
+ {
+ delete m_aColWidths.Item(col);
+ m_aColWidths.RemoveAt(col);
+ }
+
// invalidate it as it has to be recalculated
m_headerWidth = 0;
}
if ( InReportView() )
{
ResetVisibleLinesRange();
+ for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
+ {
+ m_aColWidths.Item(i)->bNeedsUpdate = true;
+ }
}
m_lines.Clear();
void wxListMainWindow::DeleteEverything()
{
WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
+ WX_CLEAR_ARRAY(m_aColWidths);
DeleteAllItems();
}
m_dirty = true;
- #if 0
- // this is unused variable
- int mode = 0;
- #endif
if ( InReportView() )
{
- #if 0
- // this is unused variable
- mode = wxLC_REPORT;
- #endif
ResetVisibleLinesRange();
- }
- else if ( HasFlag(wxLC_LIST) )
- #if 0
- // this is unused variable
- mode = wxLC_LIST;
- #else
- {}
- #endif
- else if ( HasFlag(wxLC_ICON) )
- #if 0
- // this is unused variable
- mode = wxLC_ICON;
- #else
- {}
- #endif
- else if ( HasFlag(wxLC_SMALL_ICON) )
- #if 0
- // this is unused variable
- mode = wxLC_ICON; // no typo
- #else
- {}
- #endif
- else
- {
- wxFAIL_MSG( _T("unknown mode") );
+
+ // calculate the width of the item and adjust the max column width
+ wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+ int width = GetItemWidthWithImage(&item);
+ item.SetWidth(width);
+ if (width > pWidthInfo->nMaxWidth)
+ pWidthInfo->nMaxWidth = width;
}
wxListLineData *line = new wxListLineData(this);
item.m_width = GetTextLength( item.m_text );
wxListHeaderData *column = new wxListHeaderData( item );
+ wxColWidthInfo *colWidthInfo = new wxColWidthInfo();
+
bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
if ( insert )
{
- wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
+ wxListHeaderDataList::compatibility_iterator
+ node = m_columns.Item( col );
m_columns.Insert( node, column );
+ m_aColWidths.Insert( colWidthInfo, col );
}
else
{
m_columns.Append( column );
+ m_aColWidths.Add( colWidthInfo );
}
if ( !IsVirtual() )
}
}
+int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
+{
+ int width = 0;
+ wxClientDC dc(this);
+
+ dc.SetFont( GetFont() );
+
+ if (item->GetImage() != -1)
+ {
+ int ix, iy;
+ GetImageSize( item->GetImage(), ix, iy );
+ width += ix + 5;
+ }
+
+ if (!item->GetText().empty())
+ {
+ wxCoord w;
+ dc.GetTextExtent( item->GetText(), &w, NULL );
+ width += w;
+ }
+
+ return width;
+}
+
// ----------------------------------------------------------------------------
// sorting
// ----------------------------------------------------------------------------
ResetVisibleLinesRange();
// FIXME
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
wxScrolledWindow::OnScroll(event);
#else
HandleOnScroll( event );
{
if ( m_headerWin )
{
+#ifdef __WXMAC__
+ SInt32 h ;
+ GetThemeMetric( kThemeMetricListHeaderHeight, &h );
+#else
// we use 'g' to get the descent, too
int w, h, d;
m_headerWin->GetTextExtent(wxT("Hg"), &w, &h, &d);
h += d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
-
+#endif
// only update if changed
if ( h != m_headerHeight )
{
m_headerWin = new wxListHeaderWindow
(
this, wxID_ANY, m_mainWin,
- wxPoint(0, 0),
+ wxPoint(0,0),
wxSize(GetClientSize().x, m_headerHeight),
wxTAB_TRAVERSAL
);
if ( InReportView() )
{
CreateHeaderWindow();
-
+#ifdef __WXMAC_CARBON__
+ if (m_headerWin)
+ {
+ wxFont font ;
+ font.MacCreateThemeFont( kThemeSmallSystemFont ) ;
+ m_headerWin->SetFont( font );
+ CalculateAndSetHeaderHeight();
+ }
+#endif
if ( HasFlag(wxLC_NO_HEADER) )
{
// VZ: why do we create it at all then?
projects / wxWidgets.git / blobdiff