AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conflicts markers removed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-02-15 09:50:19 +00:00
parent 6148d1e6e9
commit 9e91a33c46
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/event.cpp
View File

@ -205,19 +205,6 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
{
m_extraLong = orient;
m_commandInt = pos;
<<<<<<< event.cpp
m_isScrolling = TRUE;
}
void wxScrollEvent::CopyObject(wxObject& obj_d) const
{
wxScrollEvent *obj = (wxScrollEvent*)&obj_d;
wxCommandEvent::CopyObject(obj_d);
obj->m_isScrolling = m_isScrolling;
=======
>>>>>>> 1.69
}
/*