From 2bd0bae2f7baaf3acfbc32374e5935befba2b2d1 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 5 Sep 2019 20:48:31 +0200 Subject: [PATCH] Remove unneeded wxWidgets version checks in the code Now that the minimum version is 3.0.0, we don't need to actually check if the version is greater than 3.0.0 inside the code. (cherry picked from commit a37d8f2859ad93b1b85de121a28002cee43d3e79) --- common/view/wx_view_controls.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp index a61de549b1..b1857bea73 100644 --- a/common/view/wx_view_controls.cpp +++ b/common/view/wx_view_controls.cpp @@ -326,10 +326,8 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent ) return; } -#if wxCHECK_VERSION( 3, 0, 0 ) if( !m_parentPanel->HasFocus() ) break; -#endif double borderSize = std::min( m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().x, m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().y ); @@ -626,16 +624,9 @@ void WX_VIEW_CONTROLS::refreshMouse() moveEvent.SetY( msp.y ); // Set the modifiers state -#if wxCHECK_VERSION( 3, 0, 0 ) moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) ); moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) ); moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) ); -#else - // wx <3.0 do not have accessors, but the fields are exposed - moveEvent.m_controlDown = wxGetKeyState( WXK_CONTROL ); - moveEvent.m_shiftDown = wxGetKeyState( WXK_SHIFT ); - moveEvent.m_altDown = wxGetKeyState( WXK_ALT ); -#endif m_cursorPos = m_view->ToWorld( VECTOR2D( msp.x, msp.y ) ); wxPostEvent( m_parentPanel, moveEvent );