Commit 61a76b29 authored by Maciej Suminski's avatar Maciej Suminski

Merged fix for wrong snapping.

parents 45f55fb8 0f026bbe
...@@ -229,7 +229,7 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent ) ...@@ -229,7 +229,7 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
void WX_VIEW_CONTROLS::SetGrabMouse( bool aEnabled ) void WX_VIEW_CONTROLS::SetGrabMouse( bool aEnabled )
{ {
m_grabMouse = aEnabled; VIEW_CONTROLS::SetGrabMouse( aEnabled );
if( aEnabled ) if( aEnabled )
m_parentPanel->CaptureMouse(); m_parentPanel->CaptureMouse();
......
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
* *
* @param aEnabled says whether the opion should be enabled or disabled. * @param aEnabled says whether the opion should be enabled or disabled.
*/ */
void SetSnapping( bool aEnabled ) virtual void SetSnapping( bool aEnabled )
{ {
m_snappingEnabled = aEnabled; m_snappingEnabled = aEnabled;
} }
......
...@@ -58,6 +58,13 @@ public: ...@@ -58,6 +58,13 @@ public:
void onEnter( wxMouseEvent& WXUNUSED( aEvent ) ); void onEnter( wxMouseEvent& WXUNUSED( aEvent ) );
void onTimer( wxTimerEvent& WXUNUSED( aEvent ) ); void onTimer( wxTimerEvent& WXUNUSED( aEvent ) );
///> @copydoc VIEW_CONTROLS::SetSnapping()
void SetSnapping( bool aEnabled )
{
VIEW_CONTROLS::SetSnapping( aEnabled );
updateCursor();
}
/** /**
* Function SetGrabMouse() * Function SetGrabMouse()
* Enables/disables mouse cursor grabbing (limits the movement field only to the panel area). * Enables/disables mouse cursor grabbing (limits the movement field only to the panel area).
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment