X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce192d417eb9eb614bcf8510e91dac318706249..496beb3fc0244c36bdb0e37055aa868012b52a23:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 5b82473a49..127c172a90 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 @@ -68,8 +93,8 @@ void wxSTCDropTarget::OnLeave() { ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { capturedMouse = false; wMain = win; - wDraw = win; stc = win; + wheelRotation = 0; Initialise(); } @@ -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; } @@ -143,8 +169,8 @@ bool ScintillaWX::HaveMouseCapture() { void ScintillaWX::ScrollText(int linesToMove) { int dy = vs.lineHeight * (linesToMove); - // TODO: calculate the rectangle to refreshed... wMain.GetID()->ScrollWindow(0, dy); + wMain.GetID()->Update(); } void ScintillaWX::SetVerticalScrollPos() { @@ -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(wMain.GetID(), -1, &ct); ct.wDraw = ct.wCallTip; } @@ -248,8 +273,6 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { if (!enabled) popup.GetID()->Enable(cmd, enabled); - - // TODO: need to create event handler mappings for the cmd ID } @@ -258,18 +281,18 @@ void ScintillaWX::ClaimSelection() { } -LRESULT ScintillaWX::DefWndProc(UINT /*iMessage*/, WPARAM /*wParam*/, LPARAM /*lParam*/) { +long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { return 0; } -LRESULT ScintillaWX::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) { - switch (iMessage) { - case EM_CANPASTE: - return CanPaste(); - default: +long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { +// switch (iMessage) { +// case EM_CANPASTE: +// return CanPaste(); +// default: return ScintillaBase::WndProc(iMessage, wParam, lParam); - } - return 0; +// } +// return 0; } @@ -292,65 +315,80 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { FullPaint(); } paintState = notPainting; +#ifdef __WXGTK__ + // On wxGTK the editor window paints can overwrite the listbox... + if (ac.Active()) + ((wxWindow*)ac.lb.GetID())->Refresh(TRUE); +#endif } void ScintillaWX::DoHScroll(int type, int pos) { int xPos = xOffset; - switch (type) { - case wxEVT_SCROLLWIN_LINEUP: + if (type == wxEVT_SCROLLWIN_LINEUP) xPos -= H_SCROLL_STEP; - break; - case wxEVT_SCROLLWIN_LINEDOWN: + else if (type == wxEVT_SCROLLWIN_LINEDOWN) xPos += H_SCROLL_STEP; - break; - case wxEVT_SCROLLWIN_PAGEUP: + else if (type == wxEVT_SCROLLWIN_PAGEUP) xPos -= H_SCROLL_PAGE; - break; - case wxEVT_SCROLLWIN_PAGEDOWN: + else if (type == wxEVT_SCROLLWIN_PAGEDOWN) xPos += H_SCROLL_PAGE; - break; - case wxEVT_SCROLLWIN_TOP: + else if (type == wxEVT_SCROLLWIN_TOP) xPos = 0; - break; - case wxEVT_SCROLLWIN_BOTTOM: + else if (type == wxEVT_SCROLLWIN_BOTTOM) xPos = H_SCROLL_MAX; - break; - case wxEVT_SCROLLWIN_THUMBTRACK: + else if (type == wxEVT_SCROLLWIN_THUMBTRACK) xPos = pos; - break; - } + HorizontalScrollTo(xPos); } void ScintillaWX::DoVScroll(int type, int pos) { int topLineNew = topLine; - switch (type) { - case wxEVT_SCROLLWIN_LINEUP: + if (type == wxEVT_SCROLLWIN_LINEUP) topLineNew -= 1; - break; - case wxEVT_SCROLLWIN_LINEDOWN: + else if (type == wxEVT_SCROLLWIN_LINEDOWN) topLineNew += 1; - break; - case wxEVT_SCROLLWIN_PAGEUP: + else if (type == wxEVT_SCROLLWIN_PAGEUP) topLineNew -= LinesToScroll(); - break; - case wxEVT_SCROLLWIN_PAGEDOWN: + else if (type == wxEVT_SCROLLWIN_PAGEDOWN) topLineNew += LinesToScroll(); - break; - case wxEVT_SCROLLWIN_TOP: + else if (type == wxEVT_SCROLLWIN_TOP) topLineNew = 0; - break; - case wxEVT_SCROLLWIN_BOTTOM: + else if (type == wxEVT_SCROLLWIN_BOTTOM) topLineNew = MaxScrollPos(); - break; - case wxEVT_SCROLLWIN_THUMBTRACK: + else if (type == wxEVT_SCROLLWIN_THUMBTRACK) topLineNew = pos; - break; - } + ScrollTo(topLineNew); } + +void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) { + int topLineNew = topLine; + int lines; + + if (ctrlDown) { // Zoom the fonts if Ctrl key down + if (rotation < 0) { + KeyCommand(SCI_ZOOMIN); + } + else { + KeyCommand(SCI_ZOOMOUT); + } + } + else { // otherwise just scroll the window + wheelRotation += rotation; + lines = wheelRotation / delta; + wheelRotation -= lines * delta; + if (lines != 0) { + lines *= linesPerAction; + topLineNew -= lines; + ScrollTo(topLineNew); + } + } +} + + void ScintillaWX::DoSize(int width, int height) { PRectangle rcClient(0,0,width,height); SetScrollBarsTo(rcClient); @@ -358,11 +396,11 @@ void ScintillaWX::DoSize(int width, int height) { } void ScintillaWX::DoLoseFocus(){ - DropCaret(); + SetFocusState(false); } void ScintillaWX::DoGainFocus(){ - ShowCaretAtCurrentPosition(); + SetFocusState(true); } void ScintillaWX::DoSysColourChange() { @@ -383,11 +421,37 @@ 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, bool* consumed) { + 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: key = SCK_ADD; break; + case WXK_SUBTRACT: key = SCK_SUBTRACT; break; + case WXK_DIVIDE: key = SCK_DIVIDE; break; + case WXK_CONTROL: key = 0; break; + case WXK_ALT: key = 0; break; + case WXK_SHIFT: key = 0; break; + } -int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) { - return KeyDown(key, shift, ctrl, alt); + return KeyDown(key, shift, ctrl, alt, consumed); } @@ -400,6 +464,9 @@ void ScintillaWX::DoContextMenu(Point pt) { ContextMenu(pt); } +void ScintillaWX::DoOnListBox() { + AutoCompleteCompleted(); +} //---------------------------------------------------------------------- @@ -433,11 +500,15 @@ void ScintillaWX::DoDragLeave() { void ScintillaWX::FullPaint() { paintState = painting; rcPaint = GetTextRectangle(); + paintingAllText = true; wxClientDC dc(wMain.GetID()); Surface surfaceWindow; surfaceWindow.Init(&dc); Paint(&surfaceWindow, rcPaint); surfaceWindow.Release(); + +// wMain.GetID()->Refresh(FALSE); + paintState = notPainting; }