Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 2e5309ef256b9d6fe163181416a32a2d5f45ed56..81f172cd71c0c449f534dd379258fc7b0b51aa5b 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -6,12 +6,12 @@
 
 #include <ctype.h>
 
 
 #include <ctype.h>
 

-#include <wx/wx.h>
-#include <wx/encconv.h>
-#include <wx/listctrl.h>
-#include <wx/mstream.h>
-#include <wx/image.h>
-#include <wx/imaglist.h>
+#include "wx/wx.h"
+#include "wx/encconv.h"
+#include "wx/listctrl.h"
+#include "wx/mstream.h"
+#include "wx/image.h"
+#include "wx/imaglist.h"

 
 #include "Platform.h"
 #include "PlatWX.h"
 
 #include "Platform.h"
 #include "PlatWX.h"


@@ -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
 #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
     memcpy(positions, tpos.begin(), len * sizeof(int));
 #endif

+#endif

 }
 
 
 }
 
 


@@ -588,12 +592,16 @@ void Window::SetCursor(Cursor curs) {
 #else
        wxCursor wc = wxCursor(cursorId) ;
 #endif
 #else
        wxCursor wc = wxCursor(cursorId) ;
 #endif

-       GETWIN(id)->SetCursor(wc);
+       if(curs != cursorLast)
+       {
+           GETWIN(id)->SetCursor(wc);
+           cursorLast = curs;
+       }

 }
 
 
 void Window::SetTitle(const char *s) {
 }
 
 
 void Window::SetTitle(const char *s) {

-    GETWIN(id)->SetTitle(stc2wx(s));
+    GETWIN(id)->SetLabel(stc2wx(s));

 }
 
 
 }