X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a2fb4cd61069956c046e9721fda447ba1a743d7..c8b751aa27764b6deb21e56f09c5403f230b0ce3:/src/stc/ScintillaWX.cpp

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 1b65391a59..f7336a7196 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -148,7 +148,7 @@ void ScintillaWX::Finalise() {
 
 void ScintillaWX::StartDrag() {
 #if wxUSE_DRAG_AND_DROP
-    wxString dragText(drag.s, drag.len);
+    wxString dragText(drag.s, wxConvUTF8, drag.len);
 
     // Send an event to allow the drag text to be changed
     wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId());
@@ -296,7 +296,8 @@ void ScintillaWX::Copy() {
         SelectionText st;
         CopySelectionRange(&st);
         wxTheClipboard->Open();
-        wxTheClipboard->SetData(new wxTextDataObject(wxString(st.s, st.len)));
+        wxString text(st.s, wxConvUTF8, st.len);
+        wxTheClipboard->SetData(new wxTextDataObject(text));
         wxTheClipboard->Close();
     }
 }
@@ -313,9 +314,9 @@ void ScintillaWX::Paste() {
     gotData = wxTheClipboard->GetData(data);
     wxTheClipboard->Close();
     if (gotData) {
-        wxString str = data.GetText();
-        int      len = str.Length();
-        pdoc->InsertString(currentPos, str.c_str(), len);
+        wxWX2MBbuf buf = (wxWX2MBbuf)data.GetText().mb_str(wxConvUTF8);
+        int        len = strlen(buf);
+        pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);
     }
 
@@ -329,7 +330,7 @@ bool ScintillaWX::CanPaste() {
     bool canPaste;
 
     wxTheClipboard->Open();
-    canPaste = wxTheClipboard->IsSupported( wxDF_TEXT );
+    canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
     wxTheClipboard->Close();
 
     return canPaste;
@@ -345,7 +346,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
     if (!label[0])
         ((wxMenu*)popup.GetID())->AppendSeparator();
     else
-        ((wxMenu*)popup.GetID())->Append(cmd, label);
+        ((wxMenu*)popup.GetID())->Append(cmd, wxString(label, *wxConvCurrent));
 
     if (!enabled)
         ((wxMenu*)popup.GetID())->Enable(cmd, enabled);
@@ -497,8 +498,8 @@ void ScintillaWX::DoButtonMove(Point pt) {
 }
 
 
-void ScintillaWX::DoAddChar(char ch) {
-    AddChar(ch);
+void ScintillaWX::DoAddChar(int key) {
+    AddChar(key);
 }
 
 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
@@ -509,33 +510,30 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons
 #endif
 
     switch (key) {
-    case WXK_DOWN: key = SCK_DOWN; break;
-    case WXK_UP: key = SCK_UP; break;
-    case WXK_LEFT: key = SCK_LEFT; break;
-    case WXK_RIGHT: key = SCK_RIGHT; break;
-    case WXK_HOME: key = SCK_HOME; break;
-    case WXK_END: key = SCK_END; break;
-    case WXK_PRIOR: key = SCK_PRIOR; break;
-    case WXK_NEXT: key = SCK_NEXT; break;
-    case WXK_DELETE: key = SCK_DELETE; break;
-    case WXK_INSERT: key = SCK_INSERT; break;
-    case WXK_ESCAPE: key = SCK_ESCAPE; break;
-    case WXK_BACK: key = SCK_BACK; break;
-    case WXK_TAB: key = SCK_TAB; break;
-    case WXK_RETURN: key = SCK_RETURN; break;
-    case WXK_ADD:
-    case WXK_NUMPAD_ADD:
-        key = SCK_ADD; break;
-    case WXK_SUBTRACT:
-    case WXK_NUMPAD_SUBTRACT:
-        key = SCK_SUBTRACT; break;
-    case WXK_DIVIDE:
-    case WXK_NUMPAD_DIVIDE:
-        key = SCK_DIVIDE; break;
-    case WXK_CONTROL: key = 0; break;
-    case WXK_ALT: key = 0; break;
-    case WXK_SHIFT: key = 0; break;
-    case WXK_MENU: key = 0; break;
+    case WXK_DOWN:              key = SCK_DOWN;     break;
+    case WXK_UP:                key = SCK_UP;       break;
+    case WXK_LEFT:              key = SCK_LEFT;     break;
+    case WXK_RIGHT:             key = SCK_RIGHT;    break;
+    case WXK_HOME:              key = SCK_HOME;     break;
+    case WXK_END:               key = SCK_END;      break;
+    case WXK_PRIOR:             key = SCK_PRIOR;    break;
+    case WXK_NEXT:              key = SCK_NEXT;     break;
+    case WXK_DELETE:            key = SCK_DELETE;   break;
+    case WXK_INSERT:            key = SCK_INSERT;   break;
+    case WXK_ESCAPE:            key = SCK_ESCAPE;   break;
+    case WXK_BACK:              key = SCK_BACK;     break;
+    case WXK_TAB:               key = SCK_TAB;      break;
+    case WXK_RETURN:            key = SCK_RETURN;   break;
+    case WXK_ADD:               // fall through
+    case WXK_NUMPAD_ADD:        key = SCK_ADD;      break;
+    case WXK_SUBTRACT:          // fall through
+    case WXK_NUMPAD_SUBTRACT:   key = SCK_SUBTRACT; break;
+    case WXK_DIVIDE:            // fall through
+    case WXK_NUMPAD_DIVIDE:     key = SCK_DIVIDE;   break;
+    case WXK_CONTROL:           key = 0; break;
+    case WXK_ALT:               key = 0; break;
+    case WXK_SHIFT:             key = 0; break;
+    case WXK_MENU:              key = 0; break;
     }
 
     int rv = KeyDown(key, shift, ctrl, alt, consumed);
@@ -579,7 +577,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
     dragResult = evt.GetDragResult();
     if (dragResult == wxDragMove || dragResult == wxDragCopy) {
         DropAt(evt.GetPosition(),
-               evt.GetDragText(),
+               evt.GetDragText().mb_str(wxConvUTF8),
                dragResult == wxDragMove,
                FALSE); // TODO: rectangular?
         return TRUE;