X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..4304b42f1a1a586e96c645cb47d1cd3c98e3dec6:/src/generic/listctrl.cpp diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index ead089a205..ec4f79d94a 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -981,11 +981,7 @@ wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id, bool *accept, wxString *res, wxListMainWindow *owner, const wxString &value, const wxPoint &pos, const wxSize &size, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - int style, const wxValidator* validator, const wxString &name ) : -# else int style, const wxValidator& validator, const wxString &name ) : -# endif #endif wxTextCtrl( parent, id, value, pos, size, style, validator, name ) { @@ -1211,7 +1207,8 @@ void wxListMainWindow::SendNotify( wxListLineData *line, wxEventType command ) le.SetEventObject( GetParent() ); le.m_itemIndex = GetIndexOfLine( line ); line->GetItem( 0, le.m_item ); - GetParent()->GetEventHandler()->ProcessEvent( le ); +// GetParent()->GetEventHandler()->ProcessEvent( le ); + GetParent()->GetEventHandler()->AddPendingEvent( le ); } void wxListMainWindow::FocusLine( wxListLineData *WXUNUSED(line) ) @@ -2549,6 +2546,31 @@ wxListEvent::wxListEvent( wxEventType commandType, int id ): m_pointDrag.y = 0; } +void wxListEvent::CopyObject(wxObject& object_dest) const +{ + wxListEvent *obj = (wxListEvent *)&object_dest; + + wxNotifyEvent::CopyObject(object_dest); + + obj->m_code = m_code; + obj->m_itemIndex = m_itemIndex; + obj->m_oldItemIndex = m_oldItemIndex; + obj->m_col = m_col; + obj->m_cancelled = m_cancelled; + obj->m_pointDrag = m_pointDrag; + obj->m_item.m_mask = m_item.m_mask; + obj->m_item.m_itemId = m_item.m_itemId; + obj->m_item.m_col = m_item.m_col; + obj->m_item.m_state = m_item.m_state; + obj->m_item.m_stateMask = m_item.m_stateMask; + obj->m_item.m_text = m_item.m_text; + obj->m_item.m_image = m_item.m_image; + obj->m_item.m_data = m_item.m_data; + obj->m_item.m_format = m_item.m_format; + obj->m_item.m_width = m_item.m_width; + obj->m_item.m_colour = m_item.m_colour; +} + // ------------------------------------------------------------------------------------- // wxListCtrl // ------------------------------------------------------------------------------------- @@ -2576,11 +2598,7 @@ wxListCtrl::~wxListCtrl() bool wxListCtrl::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - long style, const wxValidator *validator, -# else long style, const wxValidator &validator, -# endif #endif const wxString &name ) {