X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49e74855afcc26c9f9f4ab07a962a20ae7a31b13..9a958328220b25226d259e43791eee4b06fe86ef:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 8cd3701243..3243cf941a 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -23,36 +23,29 @@ #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__) - #define HAVE_NATIVE_LISTCTRL -#endif - -// if we have the native control, wx/listctrl.h declares it and not this one -#ifdef HAVE_NATIVE_LISTCTRL - #include "wx/generic/listctrl.h" -#else // !HAVE_NATIVE_LISTCTRL - #include "wx/listctrl.h" +#include "wx/listctrl.h" +#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" + #include "wx/settings.h" #endif +#include "wx/imaglist.h" #include "wx/selstore.h" #include "wx/renderer.h" @@ -66,35 +59,6 @@ #define _USE_VISATTR 0 -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT) -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) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT) - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -108,7 +72,11 @@ static const int SCROLL_UNIT_X = 15; 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 @@ -116,8 +84,8 @@ static const int EXTRA_BORDER_X = 2; static const int EXTRA_BORDER_Y = 2; // offset for the header window -static const int HEADER_OFFSET_X = 1; -static const int HEADER_OFFSET_Y = 1; +static const int HEADER_OFFSET_X = 0; +static const int HEADER_OFFSET_Y = 0; // margin between rows of icons in [small] icon view static const int MARGIN_BETWEEN_ROWS = 6; @@ -131,6 +99,9 @@ static const int WIDTH_COL_DEFAULT = 80; // 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 // ============================================================================ @@ -158,7 +129,7 @@ WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray); // wxListItemData (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListItemData +class wxListItemData { public: wxListItemData(wxListMainWindow *owner); @@ -228,7 +199,7 @@ protected: // wxListHeaderData (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListHeaderData : public wxObject +class wxListHeaderData : public wxObject { public: wxListHeaderData(); @@ -236,6 +207,7 @@ public: 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; @@ -250,6 +222,7 @@ public: int GetImage() const; int GetWidth() const; int GetFormat() const; + int GetState() const; protected: long m_mask; @@ -260,6 +233,7 @@ protected: int m_xpos, m_ypos; int m_height; + int m_state; private: void Init(); @@ -409,7 +383,7 @@ WX_DEFINE_OBJARRAY(wxListLineDataArray) // wxListHeaderWindow (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListHeaderWindow : public wxWindow +class wxListHeaderWindow : public wxWindow { protected: wxListMainWindow *m_owner; @@ -466,7 +440,7 @@ private: // wxListRenameTimer (internal) //----------------------------------------------------------------------------- -class WXDLLEXPORT wxListRenameTimer: public wxTimer +class wxListRenameTimer: public wxTimer { private: wxListMainWindow *m_owner; @@ -480,7 +454,7 @@ public: // 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 @@ -606,6 +580,8 @@ public: // bring the selected item into view, scrolling to it if necessary void MoveToItem(size_t item); + bool ScrollList( int WXUNUSED(dx), int dy ); + // bring the current item into view void MoveToFocus() { MoveToItem(m_current); } @@ -624,9 +600,9 @@ public: SetFocusIgnoringChildren(); } - // suspend/resume redrawing the control - void Freeze(); - void Thaw(); + // we don't draw anything while we're frozen so we must refresh ourselves + // when we're thawed to make sure the changes are displayed correctly + virtual void DoThaw() { Refresh(); } void OnRenameTimer(); bool OnRenameAccept(size_t itemEdit, const wxString& value); @@ -639,6 +615,7 @@ public: void OnChar( wxKeyEvent &event ); void OnKeyDown( wxKeyEvent &event ); + void OnKeyUp( wxKeyEvent &event ); void OnSetFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event ); void OnScroll( wxScrollWinEvent& event ); @@ -649,7 +626,7 @@ public: void GetImageSize( int index, int &width, int &height ) const; int GetTextLength( const wxString &s ) const; - void SetImageList( wxImageListType *imageList, int which ); + void SetImageList( wxImageList *imageList, int which ); void SetItemSpacing( int spacing, bool isSmall = false ); int GetItemSpacing( bool isSmall = false ); @@ -758,6 +735,11 @@ public: 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]) @@ -781,8 +763,8 @@ public: bool m_dirty; wxColour *m_highlightColour; - wxImageListType *m_small_image_list; - wxImageListType *m_normal_image_list; + wxImageList *m_small_image_list; + wxImageList *m_normal_image_list; int m_small_spacing; int m_normal_spacing; bool m_hasFocus; @@ -868,9 +850,6 @@ private: wxBrush *m_highlightBrush, *m_highlightUnfocusedBrush; - // if this is > 0, the control is frozen and doesn't redraw itself - size_t m_freezeCount; - // wrapper around the text control currently used for in place editing or // NULL if no item is being edited wxListTextCtrlWrapper *m_textctrlWrapper; @@ -925,7 +904,7 @@ void wxListItemData::SetItem( const wxListItem &info ) if ( info.HasAttributes() ) { if ( m_attr ) - *m_attr = *info.GetAttributes(); + m_attr->AssignFrom(*info.GetAttributes()); else m_attr = new wxListItemAttr(*info.GetAttributes()); } @@ -1030,6 +1009,7 @@ void wxListHeaderData::Init() m_xpos = 0; m_ypos = 0; m_height = 0; + m_state = 0; } wxListHeaderData::wxListHeaderData() @@ -1059,6 +1039,9 @@ void wxListHeaderData::SetItem( const wxListItem &item ) 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 ) @@ -1077,6 +1060,11 @@ void wxListHeaderData::SetWidth( int w ) m_width = w < 0 ? WIDTH_COL_DEFAULT : w; } +void wxListHeaderData::SetState( int flag ) +{ + m_state = flag; +} + void wxListHeaderData::SetFormat( int format ) { m_format = format; @@ -1099,6 +1087,7 @@ void wxListHeaderData::GetItem( wxListItem& item ) item.m_image = m_image; item.m_format = m_format; item.m_width = m_width; + item.m_state = m_state; } int wxListHeaderData::GetImage() const @@ -1116,6 +1105,11 @@ int wxListHeaderData::GetFormat() const return m_format; } +int wxListHeaderData::GetState() const +{ + return m_state; +} + //----------------------------------------------------------------------------- // wxListLineData //----------------------------------------------------------------------------- @@ -1275,9 +1269,9 @@ void wxListLineData::SetPosition( int x, int y, int spacing ) 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; @@ -1301,11 +1295,11 @@ void wxListLineData::SetPosition( int x, int y, int spacing ) { 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; @@ -1417,7 +1411,20 @@ bool wxListLineData::SetAttributes(wxDC *dc, // arithmetics on wxColour, unfortunately) wxColour colText; if ( highlighted ) +#ifdef __WXMAC__ + { + if (m_owner->HasFocus() +#if !defined(__WXUNIVERSAL__) + && 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 @@ -1461,7 +1468,30 @@ void wxListLineData::Draw( wxDC *dc ) 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() +#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) + && 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 @@ -1501,10 +1531,34 @@ void wxListLineData::DrawInReportMode( wxDC *dc, // 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()) + 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(); @@ -1535,12 +1589,17 @@ void wxListLineData::DrawInReportMode( wxDC *dc, } 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); @@ -1698,11 +1757,26 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc) int xpix; m_owner->GetScrollPixelsPerUnit( &xpix, NULL ); - int x; - m_owner->GetViewStart( &x, NULL ); + int view_start; + m_owner->GetViewStart( &view_start, NULL ); + + + int org_x = 0; + int org_y = 0; + dc.GetDeviceOrigin( &org_x, &org_y ); // account for the horz scrollbar offset - dc.SetDeviceOrigin( -x * xpix, 0 ); +#ifdef __WXGTK__ + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + // Maybe we just have to check for m_signX + // in the DC, but I leave the #ifdef __WXGTK__ + // for now + dc.SetDeviceOrigin( org_x + (view_start * xpix), org_y ); + } + else +#endif + dc.SetDeviceOrigin( org_x - (view_start * xpix), org_y ); } void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) @@ -1730,14 +1804,21 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) m_owner->GetColumn( i, item ); int wCol = item.m_width; - // 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; + + 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 @@ -1745,8 +1826,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 @@ -1758,17 +1838,16 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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; - wxImageListType *imageList; + wxImageList *imageList; if ( image != -1 ) { imageList = m_owner->m_small_image_list; if ( imageList ) { imageList->GetSize(image, ix, iy); - wLabel += ix + MARGIN_BETWEEN_TEXT_AND_ICON; + wLabel += ix + HEADER_IMAGE_MARGIN_IN_REPORT_MODE; } } else @@ -1797,6 +1876,10 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 ) { @@ -1804,18 +1887,12 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) ( 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 ); @@ -1825,6 +1902,9 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxListHeaderWindow::DrawCurrent() { +#if 1 + m_owner->SetColumnWidth( m_column, m_currentX - m_minX ); +#else int x1 = m_currentX; int y1 = 0; m_owner->ClientToScreen( &x1, &y1 ); @@ -1847,6 +1927,7 @@ void wxListHeaderWindow::DrawCurrent() dc.SetPen( wxNullPen ); dc.SetBrush( wxNullBrush ); +#endif } void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) @@ -1942,6 +2023,22 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event ) } 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, @@ -2056,16 +2153,17 @@ bool wxListTextCtrlWrapper::AcceptChanges() { 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; } @@ -2147,6 +2245,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow) 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) @@ -2163,8 +2262,8 @@ void wxListMainWindow::Init() m_headerWidth = m_lineHeight = 0; - m_small_image_list = (wxImageListType *) NULL; - m_normal_image_list = (wxImageListType *) NULL; + m_small_image_list = (wxImageList *) NULL; + m_normal_image_list = (wxImageList *) NULL; m_small_spacing = 30; m_normal_spacing = 40; @@ -2181,8 +2280,6 @@ void wxListMainWindow::Init() m_lineLastClicked = m_lineSelectSingleOnUp = m_lineBeforeLastClicked = (size_t)-1; - - m_freezeCount = 0; } wxListMainWindow::wxListMainWindow() @@ -2205,22 +2302,22 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, 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 ); @@ -2344,10 +2441,24 @@ wxRect wxListMainWindow::GetLineLabelRect(size_t line) const 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.x = image_x + HEADER_OFFSET_X; rect.y = GetLineY(line); - rect.width = GetColumnWidth(0); + rect.width = GetColumnWidth(0) - image_x; rect.height = GetLineHeight(); return rect; @@ -2587,32 +2698,23 @@ void wxListMainWindow::RefreshSelected() } } -void wxListMainWindow::Freeze() -{ - m_freezeCount++; -} - -void wxListMainWindow::Thaw() -{ - wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen list control?") ); - - if ( --m_freezeCount == 0 ) - Refresh(); -} - void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { // Note: a wxPaintDC must be constructed even if no drawing is // done (a Windows requirement). wxPaintDC dc( this ); - if ( IsEmpty() || m_freezeCount ) + if ( IsEmpty() || IsFrozen() ) + { // 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 ); @@ -2629,8 +2731,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) GetVisibleLinesRange(&visibleFrom, &visibleTo); wxRect rectLine; - wxCoord xOrig, yOrig; - CalcUnscrolledPosition(0, 0, &xOrig, &yOrig); + int xOrig = dc.LogicalToDeviceX( 0 ); + int yOrig = dc.LogicalToDeviceY( 0 ); // tell the caller cache to cache the data if ( IsVirtual() ) @@ -2647,7 +2749,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { rectLine = GetLineRect(line); - if ( !IsExposed(rectLine.x - xOrig, rectLine.y - yOrig, + + if ( !IsExposed(rectLine.x + xOrig, rectLine.y + yOrig, rectLine.width, rectLine.height) ) { // don't redraw unaffected lines to avoid flicker @@ -2665,8 +2768,9 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) 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 ); @@ -2700,8 +2804,10 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { 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); } } } @@ -2720,9 +2826,15 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) { 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 @@ -2741,9 +2853,10 @@ void wxListMainWindow::HighlightAll( bool on ) RefreshLine(m_current); } } - else // multi sel + else // multi selection { - HighlightLines(0, GetItemCount() - 1, on); + if ( !IsEmpty() ) + HighlightLines(0, GetItemCount() - 1, on); } } @@ -2753,6 +2866,7 @@ void wxListMainWindow::SendNotify( size_t line, { wxListEvent le( command, GetParent()->GetId() ); le.SetEventObject( GetParent() ); + le.m_itemIndex = line; // set only for events which have position @@ -2763,7 +2877,7 @@ void wxListMainWindow::SendNotify( size_t line, // 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 ) { @@ -2780,6 +2894,11 @@ void wxListMainWindow::ChangeCurrent(size_t current) { 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); } @@ -2809,8 +2928,15 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass // 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(); @@ -2868,6 +2994,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) m_textctrlWrapper->AcceptChangesAndFinish(); #endif // __WXMAC__ + if ( event.LeftDown() ) + SetFocusIgnoringChildren(); + event.SetEventObject( GetParent() ); if ( GetParent()->GetEventHandler()->ProcessEvent( event) ) return; @@ -2884,8 +3013,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (event.RightDown()) { SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - // Allow generation of context menu event - event.Skip(); + + wxContextMenuEvent evtCtx( + wxEVT_CONTEXT_MENU, + GetParent()->GetId(), + ClientToScreen(event.GetPosition())); + evtCtx.SetEventObject(GetParent()); + GetParent()->GetEventHandler()->ProcessEvent(evtCtx); } return; } @@ -2962,8 +3096,13 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) if (event.RightDown()) { SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); - // Allow generation of context menu event - event.Skip(); + + wxContextMenuEvent evtCtx( + wxEVT_CONTEXT_MENU, + GetParent()->GetId(), + ClientToScreen(event.GetPosition())); + evtCtx.SetEventObject(GetParent()); + GetParent()->GetEventHandler()->ProcessEvent(evtCtx); } else { @@ -2977,7 +3116,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) bool forceClick = false; if (event.ButtonDClick()) { - m_renameTimer->Stop(); + if ( m_renameTimer->IsRunning() ) + m_renameTimer->Stop(); + m_lastOnSame = false; if ( current == m_lineLastClicked ) @@ -3009,7 +3150,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event ) (hitResult == wxLIST_HITTEST_ONITEMLABEL) && HasFlag(wxLC_EDIT_LABELS) ) { - m_renameTimer->Start( 100, true ); + if ( !InReportView() || + GetLineLabelRect(current).Contains(x, y) ) + { + int dclick = wxSystemSettings::GetMetric(wxSYS_DCLICK_MSEC); + m_renameTimer->Start(dclick > 0 ? dclick : 250, true); + } } } @@ -3135,28 +3281,65 @@ void wxListMainWindow::MoveToItem(size_t item) 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 ); + +#ifdef __WXMAC__ + // At least on Mac the visible lines value will get reset inside of + // Scroll *before* it actually scrolls the window because of the + // Update() that happens there, so it will still have the wrong value. + // So let's reset it again and wait for it to be recalculated in the + // next paint event. I would expect this problem to show up in wxGTK + // too but couldn't duplicate it there. Perhaps the order of events + // is different... --Robin + ResetVisibleLinesRange(); +#endif } else // !report { - if (GetLayoutDirection() == wxLayout_RightToLeft) - { -#if 0 - wxPrintf( wxT("rect %d %d %d %d view_x %d\n"), rect.x, rect.y, rect.width, rect.height, view_x ); - int virtual_width = GetVirtualSize().x; - view_x = virtual_width - view_x - client_w; - wxPrintf( wxT("virtual_width %d view_x = %d client_w = %d\n"), virtual_width, view_x, client_w ); -#endif - } - else - { - 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 ); - } + int sx = -1, + sy = -1; + + if (rect.x-view_x < 5) + sx = (rect.x - 5) / SCROLL_UNIT_X; + if (rect.x + rect.width - 5 > view_x + client_w) + sx = (rect.x + rect.width - client_w + SCROLL_UNIT_X) / SCROLL_UNIT_X; + + if (rect.y-view_y < 5) + sy = (rect.y - 5) / hLine; + if (rect.y + rect.height - 5 > view_y + client_h) + sy = (rect.y + rect.height - client_h + hLine) / hLine; + + Scroll(sx, sy); } } +bool wxListMainWindow::ScrollList(int WXUNUSED(dx), int dy) +{ + if ( !InReportView() ) + { + // TODO: this should work in all views but is not implemented now + return false; + } + + size_t top, bottom; + GetVisibleLinesRange(&top, &bottom); + + if ( bottom == (size_t)-1 ) + return 0; + + ResetVisibleLinesRange(); + + int hLine = GetLineHeight(); + + Scroll(-1, top + dy / hLine); + +#ifdef __WXMAC__ + // see comment in MoveToItem() for why we do this + ResetVisibleLinesRange(); +#endif + + return true; +} + // ---------------------------------------------------------------------------- // keyboard handling // ---------------------------------------------------------------------------- @@ -3189,7 +3372,8 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) 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); @@ -3197,10 +3381,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event) // 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 ); @@ -3227,6 +3410,25 @@ void wxListMainWindow::OnKeyDown( wxKeyEvent &event ) 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(); @@ -3361,17 +3563,19 @@ void wxListMainWindow::OnChar( wxKeyEvent &event ) case WXK_SPACE: if ( IsSingleSel() ) { - SendNotify( m_current, wxEVT_COMMAND_LIST_ITEM_ACTIVATED ); - - if ( IsHighlighted(m_current) ) + if ( event.ControlDown() ) { - // don't unselect the item in single selection mode - break; + ReverseHighlight(m_current); + } + else // normal space press + { + 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: @@ -3480,7 +3684,7 @@ int wxListMainWindow::GetTextLength( const wxString &s ) const return lw + AUTOSIZE_COL_MARGIN; } -void wxListMainWindow::SetImageList( wxImageListType *imageList, int which ) +void wxListMainWindow::SetImageList( wxImageList *imageList, int which ) { m_dirty = true; @@ -3567,6 +3771,19 @@ void wxListMainWindow::SetColumnWidth( int col, int width ) 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 ) { @@ -3979,6 +4196,8 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos) const void wxListMainWindow::RecalculatePositions(bool noRefresh) { + const int lineHeight = GetLineHeight(); + wxClientDC dc( this ); dc.SetFont( GetFont() ); @@ -4012,8 +4231,6 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh) clientHeight; GetSize( &clientWidth, &clientHeight ); - const int lineHeight = GetLineHeight(); - if ( InReportView() ) { // all lines have the same height and we scroll one line per step @@ -4258,8 +4475,8 @@ void wxListMainWindow::DeleteItem( long lindex ) 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; @@ -4281,6 +4498,8 @@ void wxListMainWindow::DeleteItem( long lindex ) ResetVisibleLinesRange(); } + SendNotify( index, wxEVT_COMMAND_LIST_DELETE_ITEM, wxDefaultPosition ); + if ( IsVirtual() ) { m_countVirt--; @@ -4294,8 +4513,6 @@ void wxListMainWindow::DeleteItem( long lindex ) // 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); } @@ -4398,10 +4615,13 @@ void wxListMainWindow::EnsureVisible( long 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; @@ -4409,8 +4629,17 @@ long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(p 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; @@ -4621,6 +4850,11 @@ int LINKAGEMODE list_ctrl_compare_func_1( wxListLineData **arg1, wxListLineData 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 ); @@ -4633,10 +4867,6 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) 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); @@ -4644,6 +4874,10 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& 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(); @@ -4715,9 +4949,9 @@ END_EVENT_TABLE() wxGenericListCtrl::wxGenericListCtrl() { - m_imageListNormal = (wxImageListType *) NULL; - m_imageListSmall = (wxImageListType *) NULL; - m_imageListState = (wxImageListType *) NULL; + m_imageListNormal = (wxImageList *) NULL; + m_imageListSmall = (wxImageList *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = @@ -4787,7 +5021,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent, { m_imageListNormal = m_imageListSmall = - m_imageListState = (wxImageListType *) NULL; + m_imageListState = (wxImageList *) NULL; m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false; @@ -4805,17 +5039,20 @@ bool wxGenericListCtrl::Create(wxWindow *parent, 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_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0, 0), size, style ); -#ifdef __WXMAC_CARBON__ +#ifdef __WXMAC__ // Human Interface Guidelines ask us for a special font in this case if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ) { wxFont font; - font.MacCreateThemeFont( kThemeViewsFont ); + font.MacCreateFromThemeFont( kThemeViewsFont ); SetFont( font ); } #endif @@ -4824,11 +5061,11 @@ bool wxGenericListCtrl::Create(wxWindow *parent, { CreateHeaderWindow(); -#ifdef __WXMAC_CARBON__ +#ifdef __WXMAC__ if (m_headerWin) { wxFont font; - font.MacCreateThemeFont( kThemeSmallSystemFont ); + font.MacCreateFromThemeFont( kThemeSmallSystemFont ); m_headerWin->SetFont( font ); CalculateAndSetHeaderHeight(); } @@ -4839,7 +5076,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent, m_headerWin->Show( false ); } - SetBestSize(size); + SetInitialSize(size); return true; } @@ -5015,7 +5252,7 @@ wxUIntPtr wxGenericListCtrl::GetItemData( long item ) const 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; @@ -5110,6 +5347,16 @@ wxColour wxGenericListCtrl::GetItemBackgroundColour( long item ) const 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; @@ -5153,7 +5400,7 @@ long wxGenericListCtrl::GetNextItem( long item, int geom, int state ) const return m_mainWin->GetNextItem( item, geom, state ); } -wxImageListType *wxGenericListCtrl::GetImageList(int which) const +wxImageList *wxGenericListCtrl::GetImageList(int which) const { if (which == wxIMAGE_LIST_NORMAL) return m_imageListNormal; @@ -5162,10 +5409,10 @@ wxImageListType *wxGenericListCtrl::GetImageList(int which) const else if (which == wxIMAGE_LIST_STATE) return m_imageListState; - return (wxImageListType *) NULL; + return (wxImageList *) NULL; } -void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which ) +void wxGenericListCtrl::SetImageList( wxImageList *imageList, int which ) { if ( which == wxIMAGE_LIST_NORMAL ) { @@ -5192,7 +5439,7 @@ void wxGenericListCtrl::SetImageList( wxImageListType *imageList, int which ) m_mainWin->SetImageList( imageList, which ); } -void wxGenericListCtrl::AssignImageList(wxImageListType *imageList, int which) +void wxGenericListCtrl::AssignImageList(wxImageList *imageList, int which) { SetImageList(imageList, which); if ( which == wxIMAGE_LIST_NORMAL ) @@ -5349,9 +5596,9 @@ long wxGenericListCtrl::InsertColumn( long col, const wxString &heading, return InsertColumn( col, item ); } -bool wxGenericListCtrl::ScrollList( int WXUNUSED(dx), int WXUNUSED(dy) ) +bool wxGenericListCtrl::ScrollList( int dx, int dy ) { - return 0; + return m_mainWin->ScrollList(dx, dy); } // Sort items. @@ -5659,12 +5906,12 @@ void wxGenericListCtrl::Refresh(bool eraseBackground, const wxRect *rect) } } -void wxGenericListCtrl::Freeze() +void wxGenericListCtrl::DoFreeze() { m_mainWin->Freeze(); } -void wxGenericListCtrl::Thaw() +void wxGenericListCtrl::DoThaw() { m_mainWin->Thaw(); }