X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/382fe6404170cbabd05b78bea643ca886a1d315a..bceff574a860c4ecd9bb2d5a1a3f8889fef9306a:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 25edc65c6d..bf48fe1669 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -14,11 +14,11 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include +#include "wx/wx.h" +#include "wx/textbuf.h" +#include "wx/dataobj.h" +#include "wx/clipbrd.h" +#include "wx/dnd.h" #include "ScintillaWX.h" #include "ExternalLexer.h" @@ -27,7 +27,7 @@ #ifdef __WXMSW__ // GetHwndOf() - #include + #include "wx/msw/private.h" #endif //---------------------------------------------------------------------- @@ -49,6 +49,21 @@ private: #if wxUSE_DRAG_AND_DROP +class wxStartDragTimer : public wxTimer { +public: + wxStartDragTimer(ScintillaWX* swx) { + this->swx = swx; + } + + void Notify() { + swx->DoStartDrag(); + } + +private: + ScintillaWX* swx; +}; + + bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) { return swx->DoDropText(x, y, data); } @@ -64,7 +79,7 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def void wxSTCDropTarget::OnLeave() { swx->DoDragLeave(); } -#endif +#endif // wxUSE_DRAG_AND_DROP #if wxUSE_POPUPWIN && wxSTC_USE_POPUP @@ -154,6 +169,7 @@ END_EVENT_TABLE() //---------------------------------------------------------------------- +#if wxUSE_DATAOBJ static wxTextFileType wxConvertEOLMode(int scintillaMode) { wxTextFileType type; @@ -177,6 +193,7 @@ static wxTextFileType wxConvertEOLMode(int scintillaMode) } return type; } +#endif // wxUSE_DATAOBJ //---------------------------------------------------------------------- @@ -195,10 +212,16 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { sysCaretWidth = 0; sysCaretHeight = 0; #endif +#if wxUSE_DRAG_AND_DROP + startDragTimer = new wxStartDragTimer(this); +#endif // wxUSE_DRAG_AND_DROP } ScintillaWX::~ScintillaWX() { +#if wxUSE_DRAG_AND_DROP + delete startDragTimer; +#endif // wxUSE_DRAG_AND_DROP Finalise(); } @@ -212,7 +235,7 @@ void ScintillaWX::Initialise() { dropTarget = new wxSTCDropTarget; dropTarget->SetScintilla(this); stc->SetDropTarget(dropTarget); -#endif +#endif // wxUSE_DRAG_AND_DROP #ifdef __WXMAC__ vs.extraFontFlag = false; // UseAntiAliasing #else @@ -230,6 +253,15 @@ void ScintillaWX::Finalise() { void ScintillaWX::StartDrag() { +#if wxUSE_DRAG_AND_DROP + // We defer the starting of the DnD, otherwise the LeftUp of a normal + // click could be lost and the STC will think it is doing a DnD when the + // user just wanted a normal click. + startDragTimer->Start(200, true); +#endif // wxUSE_DRAG_AND_DROP +} + +void ScintillaWX::DoStartDrag() { #if wxUSE_DRAG_AND_DROP wxString dragText = stc2wx(drag.s, drag.len); @@ -243,7 +275,7 @@ void ScintillaWX::StartDrag() { stc->GetEventHandler()->ProcessEvent(evt); dragText = evt.GetDragText(); - if (dragText.Length()) { + if (dragText.length()) { wxDropSource source(stc); wxTextDataObject data(dragText); wxDragResult result; @@ -256,7 +288,7 @@ void ScintillaWX::StartDrag() { inDragDrop = false; SetDragPosition(invalidPosition); } -#endif +#endif // wxUSE_DRAG_AND_DROP } @@ -439,6 +471,7 @@ void ScintillaWX::Paste() { pdoc->BeginUndoAction(); ClearSelection(); +#if wxUSE_DATAOBJ wxTextDataObject data; bool gotData = false; @@ -451,10 +484,17 @@ void ScintillaWX::Paste() { wxString text = wxTextBuffer::Translate(data.GetText(), wxConvertEOLMode(pdoc->eolMode)); wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); - int len = strlen(buf); + +#if wxUSE_UNICODE + // free up the old character buffer in case the text is real big + data.SetText(wxEmptyString); + text = wxEmptyString; +#endif + int len = strlen(buf); pdoc->InsertString(currentPos, buf, len); SetEmptySelection(currentPos + len); } +#endif // wxUSE_DATAOBJ pdoc->EndUndoAction(); NotifyChange(); @@ -463,16 +503,21 @@ void ScintillaWX::Paste() { void ScintillaWX::CopyToClipboard(const SelectionText& st) { +#if wxUSE_CLIPBOARD if (wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(false); wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1)); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); } +#else + wxUnusedVar(st); +#endif // wxUSE_CLIPBOARD } bool ScintillaWX::CanPaste() { +#if wxUSE_CLIPBOARD bool canPaste = false; bool didOpen; @@ -489,6 +534,9 @@ bool ScintillaWX::CanPaste() { } } return canPaste; +#else + return false; +#endif // wxUSE_CLIPBOARD } void ScintillaWX::CreateCallTipWindow(PRectangle) { @@ -666,7 +714,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { PRectangle rcClient = GetClientRectangle(); paintingAllText = rcPaint.Contains(rcClient); - dc->BeginDrawing(); ClipChildren(*dc, rcPaint); Paint(surfaceWindow, rcPaint); @@ -677,7 +724,6 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { FullPaint(); } paintState = notPainting; - dc->EndDrawing(); } @@ -788,6 +834,14 @@ void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, b void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) { ButtonUp(pt, curTime, ctrl); +#if wxUSE_DRAG_AND_DROP + if (startDragTimer->IsRunning()) { + startDragTimer->Stop(); + SetDragPosition(invalidPosition); + SetEmptySelection(PositionFromLocation(pt)); + ShowCaretAtCurrentPosition(); + } +#endif // wxUSE_DRAG_AND_DROP } void ScintillaWX::DoLeftButtonMove(Point pt) { @@ -851,7 +905,7 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) ctrl = evt.ControlDown(), alt = evt.AltDown(); - if (ctrl && key >= 1 && key <= 26) + if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK) key += 'A' - 1; switch (key) { @@ -861,10 +915,16 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) case WXK_RIGHT: key = SCK_RIGHT; break; case WXK_HOME: key = SCK_HOME; break; case WXK_END: key = SCK_END; break; - case WXK_PAGEUP: // fall through - case WXK_PRIOR: key = SCK_PRIOR; break; - case WXK_PAGEDOWN: // fall through - case WXK_NEXT: key = SCK_NEXT; break; + case WXK_PAGEUP: key = SCK_PRIOR; break; + case WXK_PAGEDOWN: key = SCK_NEXT; break; + case WXK_NUMPAD_DOWN: key = SCK_DOWN; break; + case WXK_NUMPAD_UP: key = SCK_UP; break; + case WXK_NUMPAD_LEFT: key = SCK_LEFT; break; + case WXK_NUMPAD_RIGHT: key = SCK_RIGHT; break; + case WXK_NUMPAD_HOME: key = SCK_HOME; break; + case WXK_NUMPAD_END: key = SCK_END; break; + case WXK_NUMPAD_PAGEUP: key = SCK_PRIOR; break; + case WXK_NUMPAD_PAGEDOWN: 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; @@ -989,7 +1049,7 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { void ScintillaWX::DoDragLeave() { SetDragPosition(invalidPosition); } -#endif +#endif // wxUSE_DRAG_AND_DROP //---------------------------------------------------------------------- // Force the whole window to be repainted