// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-/*
- TODO
+// TODO
+//
+// 1. we need to implement searching/sorting for virtual controls somehow
+// 2. when changing selection the lines are refreshed twice
- 1. we need to implement searching/sorting for virtual controls somehow
- ?2. when changing selection the lines are refreshed twice
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "listctrl.h"
- #pragma implementation "listctrlbase.h"
-#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
-
#include "wx/dynarray.h"
-
#include "wx/dcscreen.h"
-
#include "wx/textctrl.h"
#endif
#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
#include "wx/selstore.h"
-
#include "wx/renderer.h"
+#include "wx/math.h"
#ifdef __WXMAC__
#include "wx/mac/private.h"
#endif
-#include <math.h>
-
// NOTE: If using the wxListBox visual attributes works everywhere then this can
// be removed, as well as the #else case below.
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+#if WXWIN_COMPATIBILITY_2_4
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+#endif
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
// when autosizing the columns, add some slack
static const int AUTOSIZE_COL_MARGIN = 10;
-// default and minimal widths for the header columns
+// default width for the header columns
static const int WIDTH_COL_DEFAULT = 80;
-static const int WIDTH_COL_MIN = 10;
// the space between the image and the text in the report mode
static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
// 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)
//-----------------------------------------------------------------------------
void SetItem( const wxListItem &info );
void SetImage( int image ) { m_image = image; }
- void SetData( long data ) { m_data = data; }
+ void SetData( wxUIntPtr data ) { m_data = data; }
void SetPosition( int x, int y );
void SetSize( int width, int height );
int m_image;
// user data associated with the item
- long m_data;
+ wxUIntPtr m_data;
- // the item coordinates are not used in report mode, instead this pointer
- // is NULL and the owner window is used to retrieve the item position and
- // size
+ // the item coordinates are not used in report mode; instead this pointer is
+ // NULL and the owner window is used to retrieve the item position and size
wxRect *m_rect;
// the list ctrl we are in
WX_DECLARE_LIST(wxListItemData, wxListItemDataList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListItemDataList);
+WX_DEFINE_LIST(wxListItemDataList)
class wxListLineData
{
// 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,
_T("width can only be increased") );
m_rectAll.width = w;
- m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width)/2;
- m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width)/2;
- m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width)/2;
+ m_rectLabel.x = m_rectAll.x + (w - m_rectLabel.width) / 2;
+ m_rectIcon.x = m_rectAll.x + (w - m_rectIcon.width) / 2;
+ m_rectHighlight.x = m_rectAll.x + (w - m_rectHighlight.width) / 2;
}
- } *m_gi;
+ }
+ *m_gi;
// is this item selected? [NB: not used in virtual mode]
bool m_highlighted;
void SetImage( int image ) { SetImage(0, image); }
int GetImage() const { return GetImage(0); }
+ void SetImage( int index, int image );
+ int GetImage( int index ) const;
+
bool HasImage() const { return GetImage() != -1; }
bool HasText() const { return !GetText(0).empty(); }
void GetItem( int index, wxListItem &info );
wxString GetText(int index) const;
- void SetText( int index, const wxString s );
+ void SetText( int index, const wxString& s );
wxListItemAttr *GetAttr() const;
void SetAttr(wxListItemAttr *attr);
// draw the text on the DC with the correct justification; also add an
// ellipsis if the text is too large to fit in the current width
void DrawTextFormatted(wxDC *dc, const wxString &text, int col, int x, int y, int width);
-
- // these are only used by GetImage/SetImage above, we don't support images
- // with subitems at the public API level yet
- void SetImage( int index, int image );
- int GetImage( int index ) const;
};
WX_DECLARE_EXPORTED_OBJARRAY(wxListLineData, wxListLineDataArray);
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxListLineDataArray);
+WX_DEFINE_OBJARRAY(wxListLineDataArray)
//-----------------------------------------------------------------------------
// wxListHeaderWindow (internal)
// divider line position in logical (unscrolled) coords
int m_currentX;
- // minimal position beyond which the divider line can't be dragged in
- // logical coords
+ // minimal position beyond which the divider line
+ // can't be dragged in logical coords
int m_minX;
public:
virtual ~wxListHeaderWindow();
void DrawCurrent();
- void AdjustDC(wxDC& dc);
+ void AdjustDC( wxDC& dc );
void OnPaint( wxPaintEvent &event );
void OnMouse( wxMouseEvent &event );
// generate and process the list event of the given type, return true if
// it wasn't vetoed, i.e. if we should proceed
- bool SendListEvent(wxEventType type, wxPoint pos);
+ bool SendListEvent(wxEventType type, const wxPoint& pos);
DECLARE_DYNAMIC_CLASS(wxListHeaderWindow)
DECLARE_EVENT_TABLE()
public:
wxListTextCtrl(wxListMainWindow *owner, size_t itemEdit);
+ void AcceptChangesAndFinish();
+
protected:
void OnChar( wxKeyEvent &event );
void OnKeyUp( wxKeyEvent &event );
wxString m_startValue;
size_t m_itemEdited;
bool m_finished;
+ bool m_aboutToFinish;
DECLARE_EVENT_TABLE()
};
WX_DECLARE_LIST(wxListHeaderData, wxListHeaderDataList);
#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxListHeaderDataList);
+WX_DEFINE_LIST(wxListHeaderDataList)
class wxListMainWindow : public wxScrolledWindow
{
virtual ~wxListMainWindow();
+ wxWindow *GetMainWindowOfCompositeControl() { return GetParent(); }
+
bool HasFlag(int flag) const { return m_parent->HasFlag(flag); }
// return true if this is a virtual list control
void Freeze();
void Thaw();
- void SetFocus();
-
void OnRenameTimer();
bool OnRenameAccept(size_t itemEdit, const wxString& value);
void OnRenameCancelled(size_t itemEdit);
void OnKeyDown( wxKeyEvent &event );
void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event );
- void OnScroll(wxScrollWinEvent& event) ;
+ void OnScroll( wxScrollWinEvent& event );
void OnPaint( wxPaintEvent &event );
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;
wxString GetItemText(long item) const
{
wxListItem info;
+ info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = item;
GetItem( info );
return info.m_text;
void DeleteEverything();
void EnsureVisible( long index );
long FindItem( long start, const wxString& str, bool partial = false );
- long FindItem( long start, long data);
+ long FindItem( long start, wxUIntPtr data);
long FindItem( const wxPoint& pt );
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;
// send out a wxListEvent
void SendNotify( size_t line,
wxEventType command,
- wxPoint point = wxDefaultPosition );
+ const wxPoint& point = wxDefaultPosition );
// override base class virtual to reset m_lineHeight when the font changes
virtual bool SetFont(const wxFont& font)
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;
+
+ wxListTextCtrl* m_textctrl;
protected:
// the total count of items in a virtual list control
if ( IsVirtual() )
{
wxConstCast(this, wxListMainWindow)->CacheLineData(n);
-
n = 0;
}
// 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:
friend class wxGenericListCtrl;
};
-// ============================================================================
-// implementation
-// ============================================================================
-
-//-----------------------------------------------------------------------------
-// wxListItemData
-//-----------------------------------------------------------------------------
wxListItemData::~wxListItemData()
{
// in the virtual list control the attributes are managed by the main
// program, so don't delete them
if ( !m_owner->IsVirtual() )
- {
delete m_attr;
- }
delete m_rect;
}
m_owner = owner;
if ( owner->InReportView() )
- {
m_rect = NULL;
- }
else
- {
m_rect = new wxRect;
- }
}
void wxListItemData::SetItem( const wxListItem &info )
void wxListItemData::GetItem( wxListItem &info ) const
{
- info.m_text = m_text;
- info.m_image = m_image;
- info.m_data = m_data;
+ long mask = info.m_mask;
+ if ( !mask )
+ // by default, get everything for backwards compatibility
+ mask = -1;
+
+ if ( mask & wxLIST_MASK_TEXT )
+ info.m_text = m_text;
+ if ( mask & wxLIST_MASK_IMAGE )
+ info.m_image = m_image;
+ if ( mask & wxLIST_MASK_DATA )
+ info.m_data = m_data;
if ( m_attr )
{
void wxListHeaderData::SetWidth( int w )
{
- m_width = w;
- if (m_width < 0)
- m_width = WIDTH_COL_DEFAULT;
- else if (m_width < WIDTH_COL_MIN)
- m_width = WIDTH_COL_MIN;
+ m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
}
void wxListHeaderData::SetFormat( int format )
m_owner = owner;
if ( InReportView() )
- {
m_gi = NULL;
- }
else // !report
- {
m_gi = new GeometryInfo;
- }
m_highlighted = false;
default:
wxFAIL_MSG( _T("unknown mode") );
+ break;
}
}
if (m_gi->m_rectAll.width > spacing)
m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
else
- m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing/2) - (m_gi->m_rectLabel.width/2);
+ m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2 + (spacing / 2) - (m_gi->m_rectLabel.width / 2);
m_gi->m_rectLabel.y = m_gi->m_rectAll.y + m_gi->m_rectAll.height + 2 - m_gi->m_rectLabel.height;
m_gi->m_rectHighlight.x = m_gi->m_rectLabel.x - 2;
m_gi->m_rectHighlight.y = m_gi->m_rectLabel.y - 2;
default:
wxFAIL_MSG( _T("unknown mode") );
+ break;
}
}
return s;
}
-void wxListLineData::SetText( int index, const wxString s )
+void wxListLineData::SetText( int index, const wxString& s )
{
wxListItemDataList::compatibility_iterator node = m_items.Item( index );
if (node)
// arithmetics on wxColour, unfortunately)
wxColour colText;
if ( highlighted )
- {
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
- }
+ else if ( attr && attr->HasTextColour() )
+ colText = attr->GetTextColour();
else
- {
- if ( attr && attr->HasTextColour() )
- {
- colText = attr->GetTextColour();
- }
- else
- {
- colText = listctrl->GetForegroundColour();
- }
- }
+ colText = listctrl->GetForegroundColour();
dc->SetTextForeground(colText);
// font
wxFont font;
if ( attr && attr->HasFont() )
- {
font = attr->GetFont();
- }
else
- {
font = listctrl->GetFont();
- }
dc->SetFont(font);
if ( highlighted || hasBgCol )
{
if ( highlighted )
- {
dc->SetBrush( *m_owner->GetHighlightBrush() );
- }
else
- {
dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
- }
dc->SetPen( *wxTRANSPARENT_PEN );
wxListItemAttr *attr = GetAttr();
if ( SetAttributes(dc, attr, highlighted) )
- {
dc->DrawRectangle( m_gi->m_rectHighlight );
- }
// just for debugging to better see where the items are
#if 0
dc->DrawRectangle( m_gi->m_rectAll );
dc->SetPen(*wxGREEN_PEN);
dc->DrawRectangle( m_gi->m_rectIcon );
-#endif // 0
+#endif
wxListItemData *item = node->GetData();
if (item->HasImage())
// GetAttr() and move these lines into the loop below
wxListItemAttr *attr = GetAttr();
if ( SetAttributes(dc, attr, highlighted) )
- {
dc->DrawRectangle( rectHL );
- }
wxCoord x = rect.x + HEADER_OFFSET_X,
y = rect.y + (LINE_SPACING + EXTRA_HEIGHT) / 2;
wxDCClipper clipper(*dc, xOld, y, width - 8, rect.height);
if ( item->HasText() )
- {
DrawTextFormatted(dc, item->GetText(), col, xOld, y, width - 8);
- }
}
}
m_owner->GetColumn(col, item);
switch ( item.GetAlign() )
{
- default:
- wxFAIL_MSG( _T("unknown list item format") );
- // fall through
-
case wxLIST_FORMAT_LEFT:
// nothing to do
break;
case wxLIST_FORMAT_CENTER:
x += (width - w) / 2;
break;
+
+ default:
+ wxFAIL_MSG( _T("unknown list item format") );
+ break;
}
dc->DrawText(text, x, y);
m_owner->CalcUnscrolledPosition(w, 0, &w, NULL);
dc.SetBackgroundMode(wxTRANSPARENT);
-
dc.SetTextForeground(GetForegroundColour());
int x = HEADER_OFFSET_X;
-
int numColumns = m_owner->GetColumnCount();
wxListItem item;
for ( int i = 0; i < numColumns && x < w; i++ )
// 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
wxCoord wLabel;
wxCoord hLabel;
dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);
- wLabel += 2*EXTRA_WIDTH;
+ wLabel += 2 * EXTRA_WIDTH;
// and the width of the icon, if any
static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
- int ix = 0, // init them just to suppress the compiler warnings
- iy = 0;
+ int ix = 0, iy = 0; // init them just to suppress the compiler warnings
const int image = item.m_image;
wxImageListType *imageList;
if ( image != -1 )
break;
}
-
// if we have an image, draw it on the right of the label
if ( imageList )
{
// end of the current column
int xpos = 0;
- // find the column where this event occured
+ // find the column where this event occurred
int col,
countCol = m_owner->GetColumnCount();
for (col = 0; col < countCol; col++)
m_owner->Update();
}
-bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
+bool wxListHeaderWindow::SendListEvent(wxEventType type, const wxPoint& pos)
{
wxWindow *parent = GetParent();
wxListEvent le( type, parent->GetId() );
{
m_owner = owner;
m_finished = false;
+ m_aboutToFinish = false;
wxRect rectLabel = owner->GetLineLabelRect(itemEdit);
if ( !m_finished )
{
wxPendingDelete.Append(this);
+ m_owner->m_textctrl = NULL;
m_finished = true;
- m_owner->SetFocus();
+ m_owner->SetFocusIgnoringChildren();
}
}
const wxString value = GetValue();
if ( value == m_startValue )
- {
// nothing changed, always accept
return true;
- }
if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
- {
// vetoed by the user
return false;
- }
// accepted, do rename the item
m_owner->SetItemText(m_itemEdited, value);
return true;
}
+void wxListTextCtrl::AcceptChangesAndFinish()
+{
+ m_aboutToFinish = true;
+
+ // Notify the owner about the changes
+ AcceptChanges();
+
+ // Even if vetoed, close the control (consistent with MSW)
+ Finish();
+}
+
void wxListTextCtrl::OnChar( wxKeyEvent &event )
{
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
-
+ AcceptChangesAndFinish();
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_lastOnSame = false;
m_renameTimer = new wxListRenameTimer( this );
+ m_textctrl = NULL;
m_current =
m_lineLastClicked =
+ m_lineSelectSingleOnUp =
m_lineBeforeLastClicked = (size_t)-1;
m_freezeCount = 0;
wxSOLID
);
- wxSize sz = size;
- sz.y = 25;
-
SetScrollbars( 0, 0, 0, 0, 0, 0 );
wxVisualAttributes attr = wxGenericListCtrl::GetClassDefaultAttributes();
{
DoDeleteAllItems();
WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
+ WX_CLEAR_ARRAY(m_aColWidths);
delete m_highlightBrush;
delete m_highlightUnfocusedBrush;
-
delete m_renameTimer;
}
for ( size_t col = 0; col < countCol; col++ )
{
ld->SetText(col, listctrl->OnGetItemText(line, col));
+ ld->SetImage(col, listctrl->OnGetItemColumnImage(line, col));
}
- ld->SetImage(listctrl->OnGetItemImage(line));
ld->SetAttr(listctrl->OnGetItemAttr(line));
}
wxListLineData *wxListMainWindow::GetDummyLine() const
{
wxASSERT_MSG( !IsEmpty(), _T("invalid line index") );
-
wxASSERT_MSG( IsVirtual(), _T("GetDummyLine() shouldn't be called") );
wxListMainWindow *self = wxConstCast(this, wxListMainWindow);
if ( m_small_image_list && m_small_image_list->GetImageCount() )
{
- int iw = 0;
- int ih = 0;
+ int iw = 0, ih = 0;
m_small_image_list->GetSize(0, iw, ih);
y = wxMax(y, ih);
}
{
wxASSERT_MSG( InReportView(), _T("only works in report mode") );
- return LINE_SPACING + line*GetLineHeight();
+ return LINE_SPACING + line * GetLineHeight();
}
wxRect wxListMainWindow::GetLineRect(size_t line) const
for ( size_t line = lineFrom; line <= lineTo; line++ )
{
if ( HighlightLine(line, highlight) )
- {
RefreshLine(line);
- }
}
}
}
wxSize size = GetClientSize();
rect.width = size.x;
+
// refresh till the bottom of the window
rect.height = size.y - rect.y;
}
if ( HasCurrent() && m_current >= from && m_current <= to )
- {
RefreshLine(m_current);
- }
for ( size_t line = from; line <= to; line++ )
{
// NB: the test works as expected even if m_current == -1
if ( line != m_current && IsHighlighted(line) )
- {
RefreshLine(line);
- }
}
}
wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") );
if ( !--m_freezeCount )
- {
Refresh();
- }
}
void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxPaintDC dc( this );
if ( IsEmpty() || m_freezeCount )
- {
// nothing to draw or not the moment to draw it
return;
- }
if ( m_dirty )
- {
// delay the repainting until we calculate all the items positions
return;
- }
PrepareDC( dc );
wxSize clientSize = GetClientSize();
// Don't draw the first one
- for ( size_t i = visibleFrom+1; i <= visibleTo; i++ )
+ for ( size_t i = visibleFrom + 1; i <= visibleTo; i++ )
{
dc.SetPen(pen);
dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawLine(0 - dev_x, i*lineHeight,
- clientSize.x - dev_x, i*lineHeight);
+ dc.DrawLine(0 - dev_x, i * lineHeight,
+ clientSize.x - dev_x, i * lineHeight);
}
// Draw last horizontal rule
if ( visibleTo == GetItemCount() - 1 )
{
- dc.SetPen(pen);
+ dc.SetPen( pen );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
- clientSize.x - dev_x , (m_lineTo+1)*lineHeight );
+ dc.DrawLine(0 - dev_x, (m_lineTo + 1) * lineHeight,
+ clientSize.x - dev_x , (m_lineTo + 1) * lineHeight );
}
}
if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
{
wxPen pen(GetRuleColour(), 1, wxSOLID);
+ wxRect firstItemRect, lastItemRect;
- wxRect firstItemRect;
- wxRect lastItemRect;
GetItemRect(visibleFrom, firstItemRect);
GetItemRect(visibleTo, lastItemRect);
int x = firstItemRect.GetX();
dc.SetPen(pen);
dc.SetBrush(* wxTRANSPARENT_BRUSH);
+
for (int col = 0; col < GetColumnCount(); col++)
{
int colWidth = GetColumnWidth(col);
{
dc.SetPen( *wxBLACK_PEN );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawRectangle( GetLineHighlightRect(m_current) );
+ dc.DrawRectangle( GetLineHighlightRect( m_current ) );
}
}
#endif
{
if ( IsSingleSel() )
{
- wxASSERT_MSG( !on, _T("can't do this in a single sel control") );
+ wxASSERT_MSG( !on, _T("can't do this in a single selection control") );
// we just have one item to turn off
if ( HasCurrent() && IsHighlighted(m_current) )
void wxListMainWindow::SendNotify( size_t line,
wxEventType command,
- wxPoint point )
+ const wxPoint& point )
{
wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
wxListLineData *data = GetLine(itemEdit);
wxCHECK_RET( data, _T("invalid index in EditLabel()") );
data->GetItem( 0, le.m_item );
+
if ( GetParent()->GetEventHandler()->ProcessEvent( le ) && !le.IsAllowed() )
- {
// vetoed by user code
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 )
wxSafeYield();
- wxListTextCtrl *text = new wxListTextCtrl(this, itemEdit);
-
- text->SetFocus();
+ m_textctrl = new wxListTextCtrl(this, itemEdit);
+ m_textctrl->SetFocus();
}
void wxListMainWindow::OnRenameTimer()
le.m_itemIndex = itemEdit;
wxListLineData *data = GetLine(itemEdit);
+
wxCHECK_MSG( data, false, _T("invalid index in OnRenameAccept()") );
data->GetItem( 0, le.m_item );
wxCHECK_RET( data, _T("invalid index in OnRenameCancelled()") );
data->GetItem( 0, le.m_item );
-
GetEventHandler()->ProcessEvent( le );
}
void wxListMainWindow::OnMouse( wxMouseEvent &event )
{
+#ifdef __WXMAC__
+ // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
+ // shutdown the edit control when the mouse is clicked elsewhere on the
+ // listctrl because the order of events is different (or something like
+ // that), so explicitly end the edit if it is active.
+ if ( event.LeftDown() && m_textctrl)
+ m_textctrl->AcceptChangesAndFinish();
+#endif
+
event.SetEventObject( GetParent() );
if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
return;
+ if (event.GetEventType() == wxEVT_MOUSEWHEEL)
+ {
+ // let the base handle mouse wheel events.
+ event.Skip();
+ return;
+ }
+
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)
{
- m_renameTimer->Start( 100, true );
+ // select single line
+ HighlightAll( false );
+ ReverseHighlight(m_lineSelectSingleOnUp);
+ }
+
+ if (m_lastOnSame)
+ {
+ 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
{
- SendNotify( current, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
- event.GetPosition() );
+ // This is necessary, 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())
{
m_lineLastClicked = current;
size_t oldCurrent = m_current;
+ bool oldWasSelected = IsHighlighted(m_current);
+
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
{
}
if (m_current != oldCurrent)
- {
RefreshLine( oldCurrent );
- }
// forceClick is only set if the previous click was on another item
- m_lastOnSame = !forceClick && (m_current == oldCurrent);
+ m_lastOnSame = !forceClick && (m_current == oldCurrent) && oldWasSelected;
}
}
const int hLine = GetLineHeight();
- int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
- int view_y = hLine*GetScrollPos( wxVERTICAL );
+ int view_x = SCROLL_UNIT_X * GetScrollPos( wxHORIZONTAL );
+ int view_y = hLine * GetScrollPos( wxVERTICAL );
if ( InReportView() )
{
- // the next we need the range of lines shown it might be different, so
- // recalculate it
+ // the next we need the range of lines shown it might be different,
+ // so recalculate it
ResetVisibleLinesRange();
- if (rect.y < view_y )
- Scroll( -1, rect.y/hLine );
- if (rect.y+rect.height+5 > view_y+client_h)
- Scroll( -1, (rect.y+rect.height-client_h+hLine)/hLine );
+ if (rect.y < view_y)
+ Scroll( -1, rect.y / hLine );
+ if (rect.y + rect.height + 5 > view_y + client_h)
+ Scroll( -1, (rect.y + rect.height - client_h + hLine) / hLine );
}
else // !report
{
if (rect.x-view_x < 5)
- Scroll( (rect.x-5)/SCROLL_UNIT_X, -1 );
- if (rect.x+rect.width-5 > view_x+client_w)
- Scroll( (rect.x+rect.width-client_w+SCROLL_UNIT_X)/SCROLL_UNIT_X, -1 );
+ Scroll( (rect.x - 5) / SCROLL_UNIT_X, -1 );
+ if (rect.x + rect.width - 5 > view_x + client_w)
+ Scroll( (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X, -1 );
}
}
{
wxWindow *parent = GetParent();
- /* we propagate the key event up */
+ // propagate the key event upwards
wxKeyEvent ke( wxEVT_KEY_DOWN );
ke.m_shiftDown = event.m_shiftDown;
ke.m_controlDown = event.m_controlDown;
{
wxWindow *parent = GetParent();
- /* we send a list_key event up */
+ // send a list_key event up
if ( HasCurrent() )
{
wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetParent()->GetId() );
parent->GetEventHandler()->ProcessEvent( le );
}
- /* we propagate the char event up */
+ // propagate the char event upwards
wxKeyEvent ke( wxEVT_CHAR );
ke.m_shiftDown = event.m_shiftDown;
ke.m_controlDown = event.m_controlDown;
return;
}
- /* no item -> nothing to do */
+ // no item -> nothing to do
if (!HasCurrent())
{
event.Skip();
// focus handling
// ----------------------------------------------------------------------------
-void wxListMainWindow::SetFocus()
-{
- // VS: wxListMainWindow derives from wxPanel (via wxScrolledWindow) and wxPanel
- // overrides SetFocus in such way that it does never change focus from
- // panel's child to the panel itself. Unfortunately, we must be able to change
- // focus to the panel from wxListTextCtrl because the text control should
- // disappear when the user clicks outside it.
-
- wxWindow *oldFocus = FindFocus();
-
- if ( oldFocus && oldFocus->GetParent() == this )
- {
- wxWindow::SetFocus();
- }
- else
- {
- wxScrolledWindow::SetFocus();
- }
-}
-
void wxListMainWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
{
if ( GetParent() )
if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
return;
}
+
m_hasFocus = false;
RefreshSelected();
}
m_dirty = true;
// calc the spacing from the icon size
- int width = 0,
- height = 0;
+ int width = 0, height = 0;
+
if ((imageList) && (imageList->GetImageCount()) )
- {
imageList->GetSize(0, width, height);
- }
if (which == wxIMAGE_LIST_NORMAL)
{
{
m_dirty = true;
if (isSmall)
- {
m_small_spacing = spacing;
- }
else
- {
m_normal_spacing = spacing;
- }
}
int wxListMainWindow::GetItemSpacing( bool isSmall )
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 );
+
+ // Set item state if user wants
+ if ( item.m_mask & wxLIST_MASK_STATE )
+ SetItemState( item.m_itemId, item.m_state, item.m_state );
+
+ 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 )
{
- wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
- _T("invalid list ctrl item index in SetItem") );
+ if ( litem == -1 )
+ {
+ SetItemStateAll(state, stateMask);
+ return;
+ }
+
+ wxCHECK_RET( litem >= 0 && (size_t)litem < GetItemCount(),
+ _T("invalid list ctrl item index in SetItem") );
size_t oldCurrent = m_current;
size_t item = (size_t)litem; // safe because of the check above
wxListLineData *line = GetLine((size_t)item.m_itemId);
line->GetItem( item.m_col, item );
+
+ // Get item state if user wants it
+ if ( item.m_mask & wxLIST_MASK_STATE )
+ item.m_state = GetItemState( item.m_itemId, wxLIST_STATE_SELECTED |
+ wxLIST_STATE_FOCUSED );
}
// ----------------------------------------------------------------------------
{
// deal with the quick case first
if ( IsSingleSel() )
- {
return HasCurrent() ? IsHighlighted(m_current) : false;
- }
// virtual controls remmebers all its selections itself
if ( IsVirtual() )
_T("wxListCtrl::GetViewRect() only works in icon mode") );
// we need to find the longest/tallest label
- wxCoord xMax = 0,
- yMax = 0;
+ wxCoord xMax = 0, yMax = 0;
const int count = GetItemCount();
if ( count )
{
}
// some fudge needed to make it look prettier
- xMax += 2*EXTRA_BORDER_X;
- yMax += 2*EXTRA_BORDER_Y;
+ xMax += 2 * EXTRA_BORDER_X;
+ yMax += 2 * EXTRA_BORDER_Y;
// account for the scrollbars if necessary
const wxSize sizeAll = GetClientSize();
iconSpacing = 0;
// Note that we do not call GetClientSize() here but
- // GetSize() and substract the border size for sunken
+ // GetSize() and subtract the border size for sunken
// borders manually. This is technically incorrect,
// but we need to know the client area's size WITHOUT
// scrollbars here. Since we don't know if there are
if ( InReportView() )
{
// all lines have the same height and we scroll one line per step
- int entireHeight = count*lineHeight + LINE_SPACING;
+ int entireHeight = count * lineHeight + LINE_SPACING;
m_linesPerPage = clientHeight / lineHeight;
}
}
-
SetScrollbars
(
SCROLL_UNIT_X,
for (int tries = 0; tries < 2; tries++)
{
- entireWidth = 2*EXTRA_BORDER_X;
+ entireWidth = 2 * EXTRA_BORDER_X;
if (tries == 1)
{
for (size_t i = 0; i < count; i++)
{
currentlyVisibleLines++;
- wxListLineData *line = GetLine(i);
+ wxListLineData *line = GetLine( i );
line->CalculateSize( &dc, iconSpacing );
line->SetPosition( x, y, iconSpacing );
- wxSize sizeLine = GetLineSize(i);
+ wxSize sizeLine = GetLineSize( i );
if ( maxWidthInThisRow < sizeLine.x )
maxWidthInThisRow = sizeLine.x;
void wxListMainWindow::UpdateCurrent()
{
if ( !HasCurrent() && !IsEmpty() )
- {
ChangeCurrent(0);
- }
}
long wxListMainWindow::GetNextItem( long item,
// all selected items
ret++;
if ( ret == max )
- {
- // this is not an error because the index was ok initially, just no
- // such item
+ // this is not an error because the index was OK initially,
+ // just no such item
return -1;
- }
if ( !state )
- {
// any will do
return (size_t)ret;
- }
size_t count = GetItemCount();
for ( size_t line = (size_t)ret; line < count; line++ )
// become selected - unless there is no next one - so don't adjust
// m_current in this case
if ( m_current != index || m_current == count - 1 )
- {
m_current--;
- }
}
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 ( IsVirtual() )
{
m_countVirt--;
-
m_selStore.OnItemDelete(index);
}
else
}
}
+ 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;
}
void wxListMainWindow::DoDeleteAllItems()
{
if ( IsEmpty() )
- {
// nothing to do - in particular, don't send the event
return;
- }
ResetCurrent();
if ( IsVirtual() )
{
m_countVirt = 0;
-
m_selStore.Clear();
}
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();
}
// We have to call this here because the label in question might just have
// been added and its position is not known yet
if ( m_dirty )
- {
RecalculatePositions(true /* no refresh */);
- }
MoveToItem((size_t)index);
}
return wxNOT_FOUND;
}
-long wxListMainWindow::FindItem(long start, long data)
+long wxListMainWindow::FindItem(long start, wxUIntPtr data)
{
long pos = start;
if (pos < 0)
long wxListMainWindow::FindItem( const wxPoint& pt )
{
size_t topItem;
- GetVisibleLinesRange(&topItem, NULL);
+ GetVisibleLinesRange( &topItem, NULL );
wxPoint p;
- GetItemPosition( GetItemCount()-1, p );
- if( p.y == 0 )
+ GetItemPosition( GetItemCount() - 1, p );
+ if ( p.y == 0 )
return topItem;
- long id = (long) floor( pt.y*double(GetItemCount()-topItem-1)/p.y+topItem );
- if( id >= 0 && id < (long)GetItemCount() )
+
+ long id = (long)floor( pt.y * double(GetItemCount() - topItem - 1) / p.y + topItem );
+ if ( id >= 0 && id < (long)GetItemCount() )
return id;
return wxNOT_FOUND;
if (item.m_itemId > count)
item.m_itemId = count;
-
+
size_t id = item.m_itemId;
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);
- line->SetItem( 0, item );
+ line->SetItem( item.m_col, item );
m_lines.Insert( line, id );
// increment the member variables because the current row's index has gone
// up by one
if ( HasCurrent() && m_current >= id )
- {
m_current++;
- }
SendNotify(id, wxEVT_COMMAND_LIST_INSERT_ITEM);
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
// ----------------------------------------------------------------------------
wxListLineData *line2 = *arg2;
wxListItem item;
line1->GetItem( 0, item );
- long data1 = item.m_data;
+ wxUIntPtr data1 = item.m_data;
line2->GetItem( 0, item );
- long data2 = item.m_data;
+ wxUIntPtr data2 = item.m_data;
return list_ctrl_compare_func_2( data1, data2, list_ctrl_compare_data );
}
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
);
// don't create the inner window with the border
style &= ~wxBORDER_MASK;
- m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
+ m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style );
-#if defined( __WXMAC__ ) && __WXMAC_CARBON__
- wxFont font ;
- font.MacCreateThemeFont( kThemeViewsFont ) ;
- SetFont( font ) ;
+#ifdef __WXMAC_CARBON__
+ // Human Interface Guidelines ask us for a special font in this case
+ if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
+ {
+ wxFont font;
+ font.MacCreateThemeFont( kThemeViewsFont );
+ SetFont( font );
+ }
#endif
+
if ( InReportView() )
{
CreateHeaderWindow();
- if ( HasFlag(wxLC_NO_HEADER) )
+#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?
m_headerWin->Show( false );
- }
}
SetBestSize(size);
}
if (add)
- {
flag |= style;
- }
else
- {
flag &= ~style;
- }
SetWindowStyleFlag( flag );
}
{
info.m_image = imageId;
info.m_mask |= wxLIST_MASK_IMAGE;
- };
+ }
+
m_mainWin->SetItem(info);
return true;
}
return true;
}
-bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
+bool
+wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
{
wxListItem info;
info.m_image = image;
m_mainWin->SetItemText(item, str);
}
-long wxGenericListCtrl::GetItemData( long item ) const
+wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const
{
wxListItem info;
+ info.m_mask = wxLIST_MASK_DATA;
info.m_itemId = item;
m_mainWin->GetItem( info );
return info.m_data;
return m_mainWin->GetViewRect();
}
-bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const
+bool wxGenericListCtrl::GetItemRect( long item, wxRect &rect, int WXUNUSED(code) ) const
{
m_mainWin->GetItemRect( item, rect );
if ( m_mainWin->HasHeader() )
return info.GetBackgroundColour();
}
+void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
+{
+ wxListItem info;
+ info.m_itemId = item;
+ info.SetFont( f );
+ m_mainWin->SetItem( info );
+}
+
+wxFont wxGenericListCtrl::GetItemFont( long item ) const
+{
+ wxListItem info;
+ info.m_itemId = item;
+ m_mainWin->GetItem( info );
+ return info.GetFont();
+}
+
int wxGenericListCtrl::GetSelectedItemCount() const
{
return m_mainWin->GetSelectedItemCount();
wxImageListType *wxGenericListCtrl::GetImageList(int which) const
{
if (which == wxIMAGE_LIST_NORMAL)
- {
return m_imageListNormal;
- }
else if (which == wxIMAGE_LIST_SMALL)
- {
return m_imageListSmall;
- }
else if (which == wxIMAGE_LIST_STATE)
- {
return m_imageListState;
- }
+
return (wxImageListType *) NULL;
}
{
if ( which == wxIMAGE_LIST_NORMAL )
{
- if (m_ownsImageListNormal) delete m_imageListNormal;
+ if (m_ownsImageListNormal)
+ delete m_imageListNormal;
m_imageListNormal = imageList;
m_ownsImageListNormal = false;
}
else if ( which == wxIMAGE_LIST_SMALL )
{
- if (m_ownsImageListSmall) delete m_imageListSmall;
+ if (m_ownsImageListSmall)
+ delete m_imageListSmall;
m_imageListSmall = imageList;
m_ownsImageListSmall = false;
}
else if ( which == wxIMAGE_LIST_STATE )
{
- if (m_ownsImageListState) delete m_imageListState;
+ if (m_ownsImageListState)
+ delete m_imageListState;
m_imageListState = imageList;
m_ownsImageListState = false;
}
{
size_t count = m_mainWin->m_columns.GetCount();
for ( size_t n = 0; n < count; n++ )
- DeleteColumn(0);
-
+ DeleteColumn( 0 );
return true;
}
// if we don't have the header any longer, we need to relayout the window
if ( !GetColumnCount() )
- {
ResizeReportView(false /* no header */);
- }
-
return true;
}
return true;
}
-long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial )
+long wxGenericListCtrl::FindItem( long start, const wxString& str, bool partial )
{
return m_mainWin->FindItem( start, str, partial );
}
-long wxGenericListCtrl::FindItem( long start, long data )
+long wxGenericListCtrl::FindItem( long start, wxUIntPtr data )
{
return m_mainWin->FindItem( start, data );
}
m_mainWin->InsertColumn( col, item );
- // if we hadn't had header before and have it now we need to relayout the
- // window
+ // if we hadn't had a header before but have one now
+ // then we need to relayout the window
if ( GetColumnCount() == 1 && m_mainWin->HasHeader() )
- {
ResizeReportView(true /* have header */);
- }
m_headerWin->Refresh();
item.m_mask |= wxLIST_MASK_WIDTH;
item.m_width = width;
}
+
item.m_format = format;
return InsertColumn( col, item );
return;
ResizeReportView(m_mainWin->HasHeader());
-
m_mainWin->RecalculatePositions();
}
}
if (m_headerWin)
- {
m_headerWin->SetForegroundColour( colour );
- }
return true;
}
return true;
}
-
-
#if _USE_VISATTR
#include "wx/listbox.h"
#endif
-//static
+// static
wxVisualAttributes
wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
{
return m_mainWin->GetDropTarget();
}
-#endif // wxUSE_DRAG_AND_DROP
+#endif
bool wxGenericListCtrl::SetCursor( const wxCursor &cursor )
{
return m_mainWin->PopupMenu( menu, x, y );
#else
return false;
-#endif // wxUSE_MENUS
+#endif
}
void wxGenericListCtrl::SetFocus()
{
- /* The test in window.cpp fails as we are a composite
- window, so it checks against "this", but not m_mainWin. */
- if ( FindFocus() != this )
+ // The test in window.cpp fails as we are a composite
+ // window, so it checks against "this", but not m_mainWin.
+ if ( DoFindFocus() != this )
m_mainWin->SetFocus();
}
// Something is better than nothing...
// 100x80 is what the MSW version will get from the default
// wxControl::DoGetBestSize
- return wxSize(100,80);
+ return wxSize(100, 80);
}
// ----------------------------------------------------------------------------
int wxGenericListCtrl::OnGetItemImage(long WXUNUSED(item)) const
{
- // same as above
- wxFAIL_MSG( _T("wxGenericListCtrl::OnGetItemImage not supposed to be called") );
-
+ wxCHECK_MSG(!GetImageList(wxIMAGE_LIST_SMALL),
+ -1,
+ wxT("List control has an image list, OnGetItemImage or OnGetItemColumnImage should be overridden."));
return -1;
}
+int wxGenericListCtrl::OnGetItemColumnImage(long item, long column) const
+{
+ if (!column)
+ return OnGetItemImage(item);
+
+ return -1;
+}
+
wxListItemAttr *
wxGenericListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
{
m_mainWin->RefreshLines(itemFrom, itemTo);
}
-/*
- * Generic wxListCtrl is more or less a container for two other
- * windows which drawings are done upon. These are namely
- * 'm_headerWin' and 'm_mainWin'.
- * Here we override 'virtual wxWindow::Refresh()' to mimic the
- * behaviour wxListCtrl has under wxMSW.
- */
+// Generic wxListCtrl is more or less a container for two other
+// windows which drawings are done upon. These are namely
+// 'm_headerWin' and 'm_mainWin'.
+// Here we override 'virtual wxWindow::Refresh()' to mimic the
+// behaviour wxListCtrl has under wxMSW.
+//
void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect)
{
if (!rect)
rectHeader.Offset(-x, -y);
m_headerWin->Refresh(eraseBackground, &rectHeader);
}
-
}
// Refresh the main window
projects / wxWidgets.git / blobdiff