Merged fix for wrong snapping.

This commit is contained in:
Maciej Suminski 2014-02-06 17:31:24 +01:00
commit 61a76b2955
3 changed files with 9 additions and 2 deletions

View File

@ -229,7 +229,7 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
void WX_VIEW_CONTROLS::SetGrabMouse( bool aEnabled )
{
m_grabMouse = aEnabled;
VIEW_CONTROLS::SetGrabMouse( aEnabled );
if( aEnabled )
m_parentPanel->CaptureMouse();

View File

@ -60,7 +60,7 @@ public:
*
* @param aEnabled says whether the opion should be enabled or disabled.
*/
void SetSnapping( bool aEnabled )
virtual void SetSnapping( bool aEnabled )
{
m_snappingEnabled = aEnabled;
}

View File

@ -58,6 +58,13 @@ public:
void onEnter( wxMouseEvent& WXUNUSED( aEvent ) );
void onTimer( wxTimerEvent& WXUNUSED( aEvent ) );
///> @copydoc VIEW_CONTROLS::SetSnapping()
void SetSnapping( bool aEnabled )
{
VIEW_CONTROLS::SetSnapping( aEnabled );
updateCursor();
}
/**
* Function SetGrabMouse()
* Enables/disables mouse cursor grabbing (limits the movement field only to the panel area).