Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index a48c084f6510e5d927bf28160c742de2a1878e3b..46d478e701323eac44c006e730d70cd14ffa64bc 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -35,7 +35,7 @@ wxRect wxRectFromPRectangle(PRectangle prc) {
 
 PRectangle PRectangleFromwxRect(wxRect rc) {
     return PRectangle(rc.GetLeft(), rc.GetTop(),
-                      rc.GetRight(), rc.GetBottom());
+                      rc.GetRight()+1, rc.GetBottom()+1);
 }
 
 wxColour wxColourFromCA(const ColourAllocated& ca) {
@@ -1233,7 +1233,7 @@ wxString stc2wx(const char* str, size_t len)
     strncpy(buffer, str, len);
     buffer[len]=0;
 
-    wxString cstr(buffer, wxConvUTF8);
+    wxString cstr(buffer, wxConvUTF8, len);
 
     delete[] buffer;
     return cstr;