Use event modifiers and accessors rather than m_ variables directly, which are now protected rather than public with 2.4 compatibility disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -371,7 +371,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
|
||||
if (!m_TimeInitialized)
|
||||
{
|
||||
m_TimeInitialized = 1;
|
||||
m_xsynct = event.m_timeStamp;
|
||||
m_xsynct = event.GetTimestamp();
|
||||
m_gsynct = wxStopWatch(&m_secbase);
|
||||
|
||||
m_Key = evkey;
|
||||
@@ -380,7 +380,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event )
|
||||
m_LastRedraw = 0;
|
||||
}
|
||||
|
||||
unsigned long currTime = event.m_timeStamp - m_xsynct;
|
||||
unsigned long currTime = event.GetTimestamp() - m_xsynct;
|
||||
|
||||
if (evkey != m_Key)
|
||||
{
|
||||
|
@@ -905,15 +905,15 @@ void MyAutoTimedScrollingWindow::OnScroll(wxScrollWinEvent& event)
|
||||
// FIXME: the cursor also moves when the scrollbar arrows are clicked
|
||||
if (HasCapture()) {
|
||||
if (event.GetOrientation() == wxHORIZONTAL) {
|
||||
if (event.m_eventType == wxEVT_SCROLLWIN_LINEUP) {
|
||||
if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP) {
|
||||
--m_cursor.x;
|
||||
} else if (event.m_eventType == wxEVT_SCROLLWIN_LINEDOWN) {
|
||||
} else if (event.GetEventType() == wxEVT_SCROLLWIN_LINEDOWN) {
|
||||
++m_cursor.x;
|
||||
}
|
||||
} else if (event.GetOrientation() == wxVERTICAL) {
|
||||
if (event.m_eventType == wxEVT_SCROLLWIN_LINEUP) {
|
||||
if (event.GetEventType() == wxEVT_SCROLLWIN_LINEUP) {
|
||||
--m_cursor.y;
|
||||
} else if (event.m_eventType == wxEVT_SCROLLWIN_LINEDOWN) {
|
||||
} else if (event.GetEventType() == wxEVT_SCROLLWIN_LINEDOWN) {
|
||||
++m_cursor.y;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user