#if wxUSE_LISTCTRL
-// under Win32 we always use the native version and also may use the generic
-// one, however some things should be done only if we use only the generic
-// version
-#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXMAC__)
- #define HAVE_NATIVE_LISTCTRL
-#endif
-
-// if we have the native control, wx/listctrl.h declares it and not this one
#include "wx/listctrl.h"
-#ifndef HAVE_NATIVE_LISTCTRL
+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
// if we have a native version, its implementation file does all this
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxGenericListCtrl)
-#endif // HAVE_NATIVE_LISTCTRL/!HAVE_NATIVE_LISTCTRL
+#endif
#ifndef WX_PRECOMP
+ #include "wx/scrolwin.h"
+ #include "wx/timer.h"
+ #include "wx/settings.h"
#include "wx/dynarray.h"
- #include "wx/app.h"
+ #include "wx/dcclient.h"
#include "wx/dcscreen.h"
- #include "wx/textctrl.h"
- #include "wx/listbox.h"
#include "wx/math.h"
#endif
+#include "wx/imaglist.h"
#include "wx/selstore.h"
#include "wx/renderer.h"
static const int LINE_SPACING = 0;
// extra margins around the text label
+#ifdef __WXGTK__
+static const int EXTRA_WIDTH = 6;
+#else
static const int EXTRA_WIDTH = 4;
+#endif
static const int EXTRA_HEIGHT = 4;
// margin between the window and the items
// the space between the image and the text in the report mode
static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
+// the space between the image and the text in the report mode in header
+static const int HEADER_IMAGE_MARGIN_IN_REPORT_MODE = 2;
+
// ============================================================================
// private classes
// ============================================================================
// wxListItemData (internal)
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxListItemData
+class wxListItemData
{
public:
wxListItemData(wxListMainWindow *owner);
// wxListHeaderData (internal)
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxListHeaderData : public wxObject
+class wxListHeaderData : public wxObject
{
public:
wxListHeaderData();
void SetItem( const wxListItem &item );
void SetPosition( int x, int y );
void SetWidth( int w );
+ void SetState( int state );
void SetFormat( int format );
void SetHeight( int h );
bool HasImage() const;
int GetImage() const;
int GetWidth() const;
int GetFormat() const;
+ int GetState() const;
protected:
long m_mask;
int m_xpos,
m_ypos;
int m_height;
+ int m_state;
private:
void Init();
// wxListHeaderWindow (internal)
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxListHeaderWindow : public wxWindow
+class wxListHeaderWindow : public wxWindow
{
protected:
wxListMainWindow *m_owner;
// wxListRenameTimer (internal)
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxListRenameTimer: public wxTimer
+class wxListRenameTimer: public wxTimer
{
private:
wxListMainWindow *m_owner;
// wxListTextCtrlWrapper: wraps a wxTextCtrl to make it work for inline editing
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxListTextCtrlWrapper : public wxEvtHandler
+class wxListTextCtrlWrapper : public wxEvtHandler
{
public:
// NB: text must be a valid object but not Create()d yet
void OnChar( wxKeyEvent &event );
void OnKeyDown( wxKeyEvent &event );
+ void OnKeyUp( wxKeyEvent &event );
void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event );
void OnScroll( wxScrollWinEvent& event );
return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
}
+ bool HasFocus() const
+ {
+ return m_hasFocus;
+ }
+
//protected:
// the array of all line objects for a non virtual list control (for the
// virtual list control we only ever use m_lines[0])
if ( info.HasAttributes() )
{
if ( m_attr )
- *m_attr = *info.GetAttributes();
+ m_attr->AssignFrom(*info.GetAttributes());
else
m_attr = new wxListItemAttr(*info.GetAttributes());
}
m_xpos = 0;
m_ypos = 0;
m_height = 0;
+ m_state = 0;
}
wxListHeaderData::wxListHeaderData()
if ( m_mask & wxLIST_MASK_WIDTH )
SetWidth(item.m_width);
+
+ if ( m_mask & wxLIST_MASK_STATE )
+ SetState(item.m_state);
}
void wxListHeaderData::SetPosition( int x, int y )
m_width = w < 0 ? WIDTH_COL_DEFAULT : w;
}
+void wxListHeaderData::SetState( int flag )
+{
+ m_state = flag;
+}
+
void wxListHeaderData::SetFormat( int format )
{
m_format = format;
item.m_image = m_image;
item.m_format = m_format;
item.m_width = m_width;
+ item.m_state = m_state;
}
int wxListHeaderData::GetImage() const
return m_format;
}
+int wxListHeaderData::GetState() const
+{
+ return m_state;
+}
+
//-----------------------------------------------------------------------------
// wxListLineData
//-----------------------------------------------------------------------------
if ( item->HasText() )
{
if (m_gi->m_rectAll.width > spacing)
- m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+ m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/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 + (EXTRA_WIDTH/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;
{
m_gi->m_rectIcon.x = m_gi->m_rectAll.x + 2;
m_gi->m_rectIcon.y = m_gi->m_rectAll.y + 2;
- m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 6 + m_gi->m_rectIcon.width;
+ m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 4 + (EXTRA_WIDTH/2) + m_gi->m_rectIcon.width;
}
else
{
- m_gi->m_rectLabel.x = m_gi->m_rectAll.x + 2;
+ m_gi->m_rectLabel.x = m_gi->m_rectAll.x + (EXTRA_WIDTH/2);
}
break;
// arithmetics on wxColour, unfortunately)
wxColour colText;
if ( highlighted )
+#ifdef __WXMAC__
+ {
+ if (m_owner->HasFocus()
+#ifdef __WXMAC__
+ && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+ )
+ colText = *wxWHITE;
+ else
+ colText = *wxBLACK;
+ }
+#else
colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+#endif
else if ( attr && attr->HasTextColour() )
colText = attr->GetTextColour();
else
wxListItemAttr *attr = GetAttr();
if ( SetAttributes(dc, attr, highlighted) )
+#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )
+ {
dc->DrawRectangle( m_gi->m_rectHighlight );
+ }
+#else
+ {
+ if (highlighted)
+ {
+ int flags = wxCONTROL_SELECTED;
+ if (m_owner->HasFocus()
+#ifdef __WXMAC__
+ && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+ )
+ flags |= wxCONTROL_FOCUSED;
+ wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, m_gi->m_rectHighlight, flags );
+
+ }
+ else
+ {
+ dc->DrawRectangle( m_gi->m_rectHighlight );
+ }
+ }
+#endif
// just for debugging to better see where the items are
#if 0
// GetAttr() and move these lines into the loop below
wxListItemAttr *attr = GetAttr();
if ( SetAttributes(dc, attr, highlighted) )
+#if ( !defined(__WXGTK20__) && !defined(__WXMAC__) )
+ {
dc->DrawRectangle( rectHL );
+ }
+#else
+ {
+ if (highlighted)
+ {
+ int flags = wxCONTROL_SELECTED;
+ if (m_owner->HasFocus()
+#ifdef __WXMAC__
+ && IsControlActive( (ControlRef)m_owner->GetHandle() )
+#endif
+ )
+ flags |= wxCONTROL_FOCUSED;
+ wxRendererNative::Get().DrawItemSelectionRect( m_owner, *dc, rectHL, flags );
+ }
+ else
+ {
+ dc->DrawRectangle( rectHL );
+ }
+ }
+#endif
wxCoord x = rect.x + HEADER_OFFSET_X,
yMid = rect.y + rect.height/2;
+#ifdef __WXGTK__
+ // This probably needs to be done
+ // on all platforms as the icons
+ // otherwise nearly touch the border
+ x += 2;
+#endif
size_t col = 0;
for ( wxListItemDataList::compatibility_iterator node = m_items.GetFirst();
}
void wxListLineData::DrawTextFormatted(wxDC *dc,
- const wxString &text,
+ const wxString& textOrig,
int col,
int x,
int yMid,
int width)
{
+ // we don't support displaying multiple lines currently (and neither does
+ // wxMSW FWIW) so just merge all the lines
+ wxString text(textOrig);
+ text.Replace(_T("\n"), _T(" "));
+
wxCoord w, h;
dc->GetTextExtent(text, &w, &h);
int ch = h - 2;
#endif
+ int flags = 0;
+ if (!m_parent->IsEnabled())
+ flags |= wxCONTROL_DISABLED;
+
+// NB: The code below is not really Mac-specific, but since we are close
+// to 2.8 release and I don't have time to test on other platforms, I
+// defined this only for wxMac. If this behavior is desired on
+// other platforms, please go ahead and revise or remove the #ifdef.
+#ifdef __WXMAC__
+ if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) &&
+ (item.m_state & wxLIST_STATE_SELECTED) )
+ flags |= wxCONTROL_SELECTED;
+#endif
+
wxRendererNative::Get().DrawHeaderButton
(
this,
dc,
wxRect(x, HEADER_OFFSET_Y, cw, ch),
- m_parent->IsEnabled() ? 0
- : (int)wxCONTROL_DISABLED
+ flags
);
// see if we have enough space for the column label
wLabel += 2 * EXTRA_WIDTH;
// and the width of the icon, if any
- static const int MARGIN_BETWEEN_TEXT_AND_ICON = 2;
int ix = 0, iy = 0; // init them just to suppress the compiler warnings
const int image = item.m_image;
wxImageList *imageList;
if ( imageList )
{
imageList->GetSize(image, ix, iy);
- wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON;
+ wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
}
}
else
break;
}
+ // draw the text and image clipping them so that they
+ // don't overwrite the column boundary
+ wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
+
// if we have an image, draw it on the right of the label
if ( imageList )
{
(
image,
dc,
- xAligned + wLabel - ix - MARGIN_BETWEEN_TEXT_AND_ICON,
+ xAligned + wLabel - ix - HEADER_IMAGE_MARGIN_IN_REPORT_MODE,
HEADER_OFFSET_Y + (h - 4 - iy)/2,
wxIMAGELIST_DRAW_TRANSPARENT
);
-
- cw -= ix + MARGIN_BETWEEN_TEXT_AND_ICON;
}
- // draw the text clipping it so that it doesn't overwrite the column
- // boundary
- wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
-
dc.DrawText( item.GetText(),
xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );
}
else // click on a column
{
+ // record the selected state of the columns
+ if (event.LeftDown())
+ {
+ for (int i=0; i < m_owner->GetColumnCount(); i++)
+ {
+ wxListItem colItem;
+ m_owner->GetColumn(i, colItem);
+ long state = colItem.GetState();
+ if (i == m_column)
+ colItem.SetState(state | wxLIST_STATE_SELECTED);
+ else
+ colItem.SetState(state & ~wxLIST_STATE_SELECTED);
+ m_owner->SetColumn(i, colItem);
+ }
+ }
+
SendListEvent( event.LeftDown()
? wxEVT_COMMAND_LIST_COL_CLICK
: wxEVT_COMMAND_LIST_COL_RIGHT_CLICK,
{
const wxString value = m_text->GetValue();
- if ( value == m_startValue )
- // nothing changed, always accept
- return true;
-
+ // notice that we should always call OnRenameAccept() to generate the "end
+ // label editing" event, even if the user hasn't really changed anything
if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
+ {
// vetoed by the user
return false;
+ }
- // accepted, do rename the item
- m_owner->SetItemText(m_itemEdited, value);
+ // accepted, do rename the item (unless nothing changed)
+ if ( value != m_startValue )
+ m_owner->SetItemText(m_itemEdited, value);
return true;
}
EVT_MOUSE_EVENTS (wxListMainWindow::OnMouse)
EVT_CHAR (wxListMainWindow::OnChar)
EVT_KEY_DOWN (wxListMainWindow::OnKeyDown)
+ EVT_KEY_UP (wxListMainWindow::OnKeyUp)
EVT_SET_FOCUS (wxListMainWindow::OnSetFocus)
EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus)
EVT_SCROLLWIN (wxListMainWindow::OnScroll)
Init();
m_highlightBrush = new wxBrush
- (
+ (
wxSystemSettings::GetColour
(
wxSYS_COLOUR_HIGHLIGHT
),
wxSOLID
- );
+ );
m_highlightUnfocusedBrush = new wxBrush
- (
- wxSystemSettings::GetColour
- (
- wxSYS_COLOUR_BTNSHADOW
- ),
- wxSOLID
- );
+ (
+ wxSystemSettings::GetColour
+ (
+ wxSYS_COLOUR_BTNSHADOW
+ ),
+ wxSOLID
+ );
SetScrollbars( 0, 0, 0, 0, 0, 0 );
if ( !InReportView() )
return GetLine(line)->m_gi->m_rectLabel;
+ int image_x = 0;
+ wxListLineData *data = GetLine(line);
+ wxListItemDataList::compatibility_iterator node = data->m_items.GetFirst();
+ if (node)
+ {
+ wxListItemData *item = node->GetData();
+ if ( item->HasImage() )
+ {
+ int ix, iy;
+ GetImageSize( item->GetImage(), ix, iy );
+ image_x = 3 + ix + IMAGE_MARGIN_IN_REPORT_MODE;
+ }
+ }
+
wxRect rect;
rect.x = HEADER_OFFSET_X;
rect.y = GetLineY(line);
wxRect rectLine;
int xOrig = dc.LogicalToDeviceX( 0 );
int yOrig = dc.LogicalToDeviceY( 0 );
-
+
// tell the caller cache to cache the data
if ( IsVirtual() )
{
wxPen pen(GetRuleColour(), 1, wxSOLID);
wxSize clientSize = GetClientSize();
- // Don't draw the first one
- for ( size_t i = visibleFrom + 1; i <= visibleTo; i++ )
+ size_t i = visibleFrom;
+ if (i == 0) i = 1; // Don't draw the first one
+ for ( ; i <= visibleTo; i++ )
{
dc.SetPen(pen);
dc.SetBrush( *wxTRANSPARENT_BRUSH );
{
int colWidth = GetColumnWidth(col);
x += colWidth;
- dc.DrawLine(x - dev_x - 2, firstItemRect.GetY() - 1 - dev_y,
- x - dev_x - 2, lastItemRect.GetBottom() + 1 - dev_y);
+ int x_pos = x - dev_x;
+ if (col < GetColumnCount()-1) x_pos -= 2;
+ dc.DrawLine(x_pos, firstItemRect.GetY() - 1 - dev_y,
+ x_pos, lastItemRect.GetBottom() + 1 - dev_y);
}
}
}
{
if ( m_hasFocus )
{
+ wxRect rect( GetLineHighlightRect( m_current ) );
+#ifndef __WXGTK20__
dc.SetPen( *wxBLACK_PEN );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
- dc.DrawRectangle( GetLineHighlightRect( m_current ) );
+ dc.DrawRectangle( rect );
+#else
+ wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, wxCONTROL_CURRENT|wxCONTROL_FOCUSED );
+
+#endif
}
}
#endif
{
wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
+
le.m_itemIndex = line;
// set only for events which have position
// program has it anyhow and if we did it would result in accessing all
// the lines, even those which are not visible now and this is precisely
// what we're trying to avoid
- if ( !IsVirtual() && (command != wxEVT_COMMAND_LIST_DELETE_ITEM) )
+ if ( !IsVirtual() )
{
if ( line != (size_t)-1 )
{
{
m_current = current;
+ // as the current item changed, we shouldn't start editing it when the
+ // "slow click" timer expires as the click happened on another item
+ if ( m_renameTimer->IsRunning() )
+ m_renameTimer->Stop();
+
SendNotify(current, wxEVT_COMMAND_LIST_ITEM_FOCUSED);
}
// 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();
+ // Pending events dispatched by wxSafeYield might have changed the item
+ // count
+ if ( (size_t)item >= GetItemCount() )
+ return NULL;
+ }
+
wxTextCtrl * const text = (wxTextCtrl *)textControlClass->CreateObject();
m_textctrlWrapper = new wxListTextCtrlWrapper(this, text, item);
return m_textctrlWrapper->GetText();
m_textctrlWrapper->AcceptChangesAndFinish();
#endif // __WXMAC__
+ if ( event.LeftDown() )
+ SetFocus();
+
event.SetEventObject( GetParent() );
if ( GetParent()->GetEventHandler()->ProcessEvent( event) )
return;
bool forceClick = false;
if (event.ButtonDClick())
{
- m_renameTimer->Stop();
+ if ( m_renameTimer->IsRunning() )
+ m_renameTimer->Stop();
+
m_lastOnSame = false;
if ( current == m_lineLastClicked )
(hitResult == wxLIST_HITTEST_ONITEMLABEL) &&
HasFlag(wxLC_EDIT_LABELS) )
{
- m_renameTimer->Start( 100, true );
+ if (InReportView())
+ {
+ wxRect label = GetLineLabelRect( current );
+ if (label.Contains( x, y ))
+ m_renameTimer->Start( 250, true );
+
+ }
+ else
+ m_renameTimer->Start( 250, true );
}
}
else // !shift
{
// all previously selected items are unselected unless ctrl is held
- if ( !event.ControlDown() )
+ // in a multiselection control
+ if ( !event.ControlDown() || IsSingleSel() )
HighlightAll(false);
ChangeCurrent(newCurrent);
// refresh the old focus to remove it
RefreshLine( oldCurrent );
- if ( !event.ControlDown() )
- {
+ // in single selection mode we must always have a selected item
+ if ( !event.ControlDown() || IsSingleSel() )
HighlightLine( m_current, true );
- }
}
RefreshLine( m_current );
event.Skip();
}
+void wxListMainWindow::OnKeyUp( wxKeyEvent &event )
+{
+ wxWindow *parent = GetParent();
+
+ // propagate the key event upwards
+ wxKeyEvent ke( wxEVT_KEY_UP );
+ ke.m_shiftDown = event.m_shiftDown;
+ ke.m_controlDown = event.m_controlDown;
+ ke.m_altDown = event.m_altDown;
+ ke.m_metaDown = event.m_metaDown;
+ ke.m_keyCode = event.m_keyCode;
+ ke.m_x = event.m_x;
+ ke.m_y = event.m_y;
+ ke.SetEventObject( parent );
+ if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+
+ event.Skip();
+}
+
void wxListMainWindow::OnChar( wxKeyEvent &event )
{
wxWindow *parent = GetParent();
case WXK_SPACE:
if ( IsSingleSel() )
{
- SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
-
- if ( IsHighlighted(m_current) )
+ if ( event.ControlDown() )
+ {
+ ReverseHighlight(m_current);
+ }
+ else // normal space press
{
- // don't unselect the item in single selection mode
- break;
+ SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED );
}
- //else: select it in ReverseHighlight() below if unselected
}
-
- ReverseHighlight(m_current);
+ else // multiple selection
+ {
+ ReverseHighlight(m_current);
+ }
break;
case WXK_RETURN:
if (width == wxLIST_AUTOSIZE_USEHEADER)
{
width = GetTextLength(column->GetText());
+ width += 2*EXTRA_WIDTH;
+
+ // check for column header's image availability
+ const int image = column->GetImage();
+ if ( image != -1 )
+ {
+ if ( m_small_image_list )
+ {
+ int ix = 0, iy = 0;
+ m_small_image_list->GetSize(image, ix, iy);
+ width += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE;
+ }
+ }
}
else if ( width == wxLIST_AUTOSIZE )
{
void wxListMainWindow::RecalculatePositions(bool noRefresh)
{
+ const int lineHeight = GetLineHeight();
+
wxClientDC dc( this );
dc.SetFont( GetFont() );
clientHeight;
GetSize( &clientWidth, &clientHeight );
- const int lineHeight = GetLineHeight();
-
if ( InReportView() )
{
// all lines have the same height and we scroll one line per step
if ( InReportView() )
{
- // mark the Column Max Width cache as dirty if the items in the line
- // we're deleting contain the Max Column Width
+ // 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;
ResetVisibleLinesRange();
}
+ SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition );
+
if ( IsVirtual() )
{
m_countVirt--;
// we need to refresh the (vert) scrollbar as the number of items changed
m_dirty = true;
- SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM );
-
RefreshAfter(index);
}
MoveToItem((size_t)index);
}
-long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )
+long wxListMainWindow::FindItem(long start, const wxString& str, bool partial )
{
+ if (str.empty())
+ return wxNOT_FOUND;
+
long pos = start;
- wxString tmp = str;
+ wxString str_upper = str.Upper();
if (pos < 0)
pos = 0;
for ( size_t i = (size_t)pos; i < count; i++ )
{
wxListLineData *line = GetLine(i);
- if ( line->GetText(0) == tmp )
- return i;
+ wxString line_upper = line->GetText(0).Upper();
+ if (!partial)
+ {
+ if (line_upper == str_upper )
+ return i;
+ }
+ else
+ {
+ if (line_upper.find(str_upper) == 0)
+ return i;
+ }
}
return wxNOT_FOUND;
void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
{
+ // selections won't make sense any more after sorting the items so reset
+ // them
+ HighlightAll(false);
+ ResetCurrent();
+
list_ctrl_compare_func_2 = fn;
list_ctrl_compare_data = data;
m_lines.Sort( list_ctrl_compare_func_1 );
void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
{
- // update our idea of which lines are shown when we redraw the window the
- // next time
- ResetVisibleLinesRange();
-
// FIXME
#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)
wxScrolledWindow::OnScroll(event);
HandleOnScroll( event );
#endif
+ // update our idea of which lines are shown when we redraw the window the
+ // next time
+ ResetVisibleLinesRange();
+
if ( event.GetOrientation() == wxHORIZONTAL && HasHeader() )
{
wxGenericListCtrl* lc = GetListCtrl();
if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
return false;
+ // this window itself shouldn't get the focus, only m_mainWin should
+ SetCanFocus(false);
+
// don't create the inner window with the border
style &= ~wxBORDER_MASK;
m_headerWin->Show( false );
}
- SetBestSize(size);
+ SetInitialSize(size);
return true;
}
return info.m_data;
}
-bool wxGenericListCtrl::SetItemData( long item, long data )
+bool wxGenericListCtrl::SetItemPtrData( long item, wxUIntPtr data )
{
wxListItem info;
info.m_mask = wxLIST_MASK_DATA;
return info.GetBackgroundColour();
}
+int wxGenericListCtrl::GetScrollPos( int orient ) const
+{
+ return m_mainWin->GetScrollPos( orient );
+}
+
+void wxGenericListCtrl::SetScrollPos( int orient, int pos, bool refresh )
+{
+ m_mainWin->SetScrollPos( orient, pos, refresh );
+}
+
void wxGenericListCtrl::SetItemFont( long item, const wxFont &f )
{
wxListItem info;
projects / wxWidgets.git / blobdiff