Make wxToolBar accept first mouse clicks. That is, clicking on a toolbar

[wxWidgets.git] / src / stc / PlatWX.cpp

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 2e5309ef256b9d6fe163181416a32a2d5f45ed56..06497eb0dde6872351a1746f93a14ffebb83d4ab 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -403,8 +403,12 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
 #else
 
     // If not unicode then just use the widths we have
+#if wxUSE_STL
+    std::copy(tpos.begin(), tpos.end(), positions);
+#else
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif
+#endif
 }
 
 
@@ -588,7 +592,11 @@ void Window::SetCursor(Cursor curs) {
 #else
        wxCursor wc = wxCursor(cursorId) ;
 #endif
-       GETWIN(id)->SetCursor(wc);
+       if(curs != cursorLast)
+       {
+           GETWIN(id)->SetCursor(wc);
+           cursorLast = curs;
+       }
 }