X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cbc57f086cee690f397ac5622d3f1d7153b300e..a2615ebc22a402b1badb46475f94ab6aa3a64018:/contrib/src/fl/bardragpl.cpp

diff --git a/contrib/src/fl/bardragpl.cpp b/contrib/src/fl/bardragpl.cpp
index 83ac65f395..50ee1a43af 100644
--- a/contrib/src/fl/bardragpl.cpp
+++ b/contrib/src/fl/bardragpl.cpp
@@ -651,9 +651,7 @@ void cbBarDragPlugin::OnMouseMove( cbMotionEvent& event )
 		else
 			mpCurCursor = mpLayout->mpNECursor;
 	}
-
 	if ( pPrevCurs != mpCurCursor )
-
 		mpLayout->GetParentFrame().SetCursor( *mpCurCursor );
 }
 
@@ -695,7 +693,13 @@ void cbBarDragPlugin::OnLButtonUp( cbLeftUpEvent& event )
 	
 		mHintRect.width = -1;
 
-		mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
+        // In Windows, at least, the frame needs to have a null cursor
+        // else child windows (such as text windows) inherit the cursor
+#if 1
+        mpLayout->GetParentFrame().SetCursor( wxNullCursor );
+#else
+        mpLayout->GetParentFrame().SetCursor( *mpLayout->mpNormalCursor );
+#endif
 
 		mpLayout->ReleaseEventsFromPane( event.mpPane );
 		mpLayout->ReleaseEventsFromPlugin( this );