X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce192d417eb9eb614bcf8510e91dac318706249..4d0986499b16895f5a25555ae0d3626a3d27e840:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 5b82473a49..56ac221558 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -14,6 +14,8 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +#include + #include "ScintillaWX.h" #include "wx/stc/stc.h" @@ -60,6 +62,29 @@ void wxSTCDropTarget::OnLeave() { } +class wxSTCCallTip : public wxWindow { +public: + wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct) + : wxWindow(parent, ID) + { + m_ct = ct; + } + + void OnPaint(wxPaintEvent& evt) { + wxPaintDC dc(this); + Surface surfaceWindow; + surfaceWindow.Init(&dc); + m_ct->PaintCT(&surfaceWindow); + surfaceWindow.Release(); + } + + CallTip* m_ct; + DECLARE_EVENT_TABLE() +}; + +BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow) + EVT_PAINT(wxSTCCallTip::OnPaint) +END_EVENT_TABLE() //---------------------------------------------------------------------- // Constructor/Destructor @@ -84,8 +109,9 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); - dropTarget.SetScintilla(this); - stc->SetDropTarget(&dropTarget); + dropTarget = new wxSTCDropTarget; + dropTarget->SetScintilla(this); + stc->SetDropTarget(dropTarget); } @@ -95,7 +121,7 @@ void ScintillaWX::Finalise() { void ScintillaWX::StartDrag() { - wxDropSource source; + wxDropSource source(wMain.GetID()); wxTextDataObject data(dragChars); wxDragResult result; @@ -128,9 +154,9 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { - if (on) + if (on && !capturedMouse) wMain.GetID()->CaptureMouse(); - else + else if (!on && capturedMouse) wMain.GetID()->ReleaseMouse(); capturedMouse = on; } @@ -192,9 +218,8 @@ void ScintillaWX::NotifyParent(SCNotification scn) { void ScintillaWX::Copy() { if (currentPos != anchor) { char* text = CopySelectionRange(); - textDO.SetText(text); wxTheClipboard->Open(); - wxTheClipboard->SetData(&textDO); + wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); } } @@ -235,7 +260,7 @@ bool ScintillaWX::CanPaste() { } void ScintillaWX::CreateCallTipWindow(PRectangle) { - ct.wCallTip = new wxWindow(wDraw.GetID(), -1); + ct.wCallTip = new wxSTCCallTip(wDraw.GetID(), -1, &ct); ct.wDraw = ct.wCallTip; } @@ -383,7 +408,10 @@ void ScintillaWX::DoButtonMove(Point pt) { void ScintillaWX::DoAddChar(char ch) { + //bool acActiveBeforeCharAdded = ac.Active(); AddChar(ch); + //if (acActiveBeforeCharAdded) + // AutoCompleteChanged(ch); } int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) { @@ -400,6 +428,9 @@ void ScintillaWX::DoContextMenu(Point pt) { ContextMenu(pt); } +void ScintillaWX::DoOnListBox() { + AutoCompleteCompleted(); +} //---------------------------------------------------------------------- @@ -432,12 +463,13 @@ void ScintillaWX::DoDragLeave() { // Redraw all of text area. This paint will not be abandoned. void ScintillaWX::FullPaint() { paintState = painting; - rcPaint = GetTextRectangle(); - wxClientDC dc(wMain.GetID()); - Surface surfaceWindow; - surfaceWindow.Init(&dc); - Paint(&surfaceWindow, rcPaint); - surfaceWindow.Release(); +// rcPaint = GetTextRectangle(); +// wxClientDC dc(wMain.GetID()); +// Surface surfaceWindow; +// surfaceWindow.Init(&dc); +// Paint(&surfaceWindow, rcPaint); +// surfaceWindow.Release(); + wMain.GetID()->Refresh(FALSE); paintState = notPainting; }