haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ian McInerney 2019-09-05 20:48:31 +02:00 committed by Wayne Stambaugh
parent d68dd09f63
commit a37d8f2859
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/view/wx_view_controls.cpp
View File

@ -353,10 +353,8 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
return; return;
} }
#if wxCHECK_VERSION( 3, 0, 0 )
if( !m_parentPanel->HasFocus() ) if( !m_parentPanel->HasFocus() )
break; break;
#endif
double borderSize = std::min( m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().x, double borderSize = std::min( m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().x,
m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().y ); m_settings.m_autoPanMargin * m_view->GetScreenPixelSize().y );
@ -653,16 +651,9 @@ void WX_VIEW_CONTROLS::refreshMouse()
moveEvent.SetY( msp.y ); moveEvent.SetY( msp.y );
// Set the modifiers state // Set the modifiers state
#if wxCHECK_VERSION( 3, 0, 0 )
moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) ); moveEvent.SetControlDown( wxGetKeyState( WXK_CONTROL ) );
moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) ); moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) );
moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) ); 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 ) ); m_cursorPos = m_view->ToWorld( VECTOR2D( msp.x, msp.y ) );
wxPostEvent( m_parentPanel, moveEvent ); wxPostEvent( m_parentPanel, moveEvent );