X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a29a241fd60b5df7506e2dd4d8b89eb483da90e8..fb29dcac01af849053d8f85b69aae7e7ca8c7d26:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 023a0f92d0..12ad21dafe 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -14,17 +14,10 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include #include "ScintillaWX.h" #include "wx/stc/stc.h" - - -//---------------------------------------------------------------------- - -const int H_SCROLL_MAX = 2000; -const int H_SCROLL_STEP = 20; -const int H_SCROLL_PAGE = 200; +#include "PlatWX.h" //---------------------------------------------------------------------- // Helper classes @@ -44,7 +37,7 @@ private: }; - +#if wxUSE_DRAG_AND_DROP bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) { return swx->DoDropText(x, y, data); } @@ -60,38 +53,92 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def void wxSTCDropTarget::OnLeave() { swx->DoDragLeave(); } +#endif + + +#ifdef __WXGTK__ +#undef wxSTC_USE_POPUP +#define wxSTC_USE_POPUP 0 +#endif +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP +#include +#define wxSTCCallTipBase wxPopupWindow +#define param2 wxBORDER_NONE // popup's 2nd param is flags +#else +#define wxSTCCallTipBase wxWindow +#define param2 -1 // wxWindows 2nd param is ID +#endif -class wxSTCCallTip : public wxWindow { +class wxSTCCallTip : public wxSTCCallTipBase { public: - wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct) - : wxWindow(parent, ID) + wxSTCCallTip(wxWindow* parent, CallTip* ct) + : wxSTCCallTipBase(parent, param2) { m_ct = ct; } + ~wxSTCCallTip() { + if (HasCapture()) ReleaseMouse(); + } + void OnPaint(wxPaintEvent& evt) { wxPaintDC dc(this); - Surface surfaceWindow; - surfaceWindow.Init(&dc); - m_ct->PaintCT(&surfaceWindow); - surfaceWindow.Release(); + Surface* surfaceWindow = Surface::Allocate(); + surfaceWindow->Init(&dc); + m_ct->PaintCT(surfaceWindow); + delete surfaceWindow; } + void OnFocus(wxFocusEvent& event) { + GetParent()->SetFocus(); + event.Skip(); + } + +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO) { + if (x != -1) + GetParent()->ClientToScreen(&x, NULL); + if (y != -1) + GetParent()->ClientToScreen(NULL, &y); + wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags); + } + + virtual bool Show( bool show = TRUE ) { + bool retval = wxSTCCallTipBase::Show(show); + if (show) + CaptureMouse(); + else + if (HasCapture()) ReleaseMouse(); + return retval; + } + + void OnLeftDown(wxMouseEvent& ) { + Show(FALSE); + } +#endif + +private: CallTip* m_ct; DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow) +BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase) EVT_PAINT(wxSTCCallTip::OnPaint) + EVT_SET_FOCUS(wxSTCCallTip::OnFocus) +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP + EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown) +#endif END_EVENT_TABLE() + //---------------------------------------------------------------------- // Constructor/Destructor ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { - capturedMouse = false; wMain = win; stc = win; wheelRotation = 0; @@ -109,9 +156,11 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); +#if wxUSE_DRAG_AND_DROP dropTarget = new wxSTCDropTarget; dropTarget->SetScintilla(this); stc->SetDropTarget(dropTarget); +#endif } @@ -121,7 +170,8 @@ void ScintillaWX::Finalise() { void ScintillaWX::StartDrag() { - wxString dragText(drag.s, drag.len); +#if wxUSE_DRAG_AND_DROP + wxString dragText = stc2wx(drag.s, drag.len); // Send an event to allow the drag text to be changed wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId()); @@ -134,7 +184,7 @@ void ScintillaWX::StartDrag() { dragText = evt.GetDragText(); if (dragText.Length()) { - wxDropSource source(wMain.GetID()); + wxDropSource source(stc); wxTextDataObject data(dragText); wxDragResult result; @@ -146,6 +196,7 @@ void ScintillaWX::StartDrag() { inDragDrop = FALSE; SetDragPosition(invalidPosition); } +#endif } @@ -156,7 +207,7 @@ void ScintillaWX::SetTicking(bool on) { if (timer.ticking) { steTimer = new wxSTCTimer(this); steTimer->Start(timer.tickSize); - timer.tickerID = (int)steTimer; + timer.tickerID = steTimer; } else { steTimer = (wxSTCTimer*)timer.tickerID; steTimer->Stop(); @@ -169,52 +220,102 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { - if (on && !capturedMouse) - wMain.GetID()->CaptureMouse(); - else if (!on && capturedMouse) - wMain.GetID()->ReleaseMouse(); - capturedMouse = on; + if (on && !stc->HasCapture()) + stc->CaptureMouse(); + else if (!on && stc->HasCapture()) + stc->ReleaseMouse(); } bool ScintillaWX::HaveMouseCapture() { - return capturedMouse; + return stc->HasCapture(); } void ScintillaWX::ScrollText(int linesToMove) { int dy = vs.lineHeight * (linesToMove); - wMain.GetID()->ScrollWindow(0, dy); - wMain.GetID()->Update(); + stc->ScrollWindow(0, dy); + stc->Update(); } void ScintillaWX::SetVerticalScrollPos() { - wMain.GetID()->SetScrollPos(wxVERTICAL, topLine); + if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar + stc->SetScrollPos(wxVERTICAL, topLine); + } + else { // otherwise use the one that's been given to us + stc->m_vScrollBar->SetThumbPosition(topLine); + } } void ScintillaWX::SetHorizontalScrollPos() { - wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset); + if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar + stc->SetScrollPos(wxHORIZONTAL, xOffset); + } + else { // otherwise use the one that's been given to us + stc->m_hScrollBar->SetThumbPosition(xOffset); + } } +const int H_SCROLL_STEP = 20; bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool modified = false; - int sbMax = wMain.GetID()->GetScrollRange(wxVERTICAL); - int sbThumb = wMain.GetID()->GetScrollThumb(wxVERTICAL); - int sbPos = wMain.GetID()->GetScrollPos(wxVERTICAL); - - if (sbMax != nMax || sbThumb != nPage) { - wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); - modified = true; + // Check the vertical scrollbar + if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar + int sbMax = stc->GetScrollRange(wxVERTICAL); + int sbThumb = stc->GetScrollThumb(wxVERTICAL); + int sbPos = stc->GetScrollPos(wxVERTICAL); + if (sbMax != nMax || sbThumb != nPage) { + stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1); + modified = true; + } } + else { // otherwise use the one that's been given to us + int sbMax = stc->m_vScrollBar->GetRange(); + int sbPage = stc->m_vScrollBar->GetPageSize(); + int sbPos = stc->m_vScrollBar->GetThumbPosition(); + if (sbMax != nMax || sbPage != nPage) { + stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage); + modified = true; + } + } + - sbMax = wMain.GetID()->GetScrollRange(wxHORIZONTAL); - sbThumb = wMain.GetID()->GetScrollThumb(wxHORIZONTAL); - if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) { - wMain.GetID()->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX); - modified = true; + // Check the horizontal scrollbar + PRectangle rcText = GetTextRectangle(); + int horizEnd = scrollWidth; + if (horizEnd < 0) + horizEnd = 0; + if (!horizontalScrollBarVisible || (wrapState != eWrapNone)) + horizEnd = 0; + int pageWidth = rcText.Width(); + + if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar + int sbMax = stc->GetScrollRange(wxHORIZONTAL); + int sbThumb = stc->GetScrollThumb(wxHORIZONTAL); + int sbPos = stc->GetScrollPos(wxHORIZONTAL); + if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) { + stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); + } + } + } + else { // otherwise use the one that's been given to us + int sbMax = stc->m_hScrollBar->GetRange(); + int sbThumb = stc->m_hScrollBar->GetPageSize(); + int sbPos = stc->m_hScrollBar->GetThumbPosition(); + if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) { + stc->m_hScrollBar->SetScrollbar(0, pageWidth, horizEnd, pageWidth); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); + } + } } + return modified; } @@ -234,9 +335,12 @@ void ScintillaWX::Copy() { if (currentPos != anchor) { SelectionText st; CopySelectionRange(&st); - wxTheClipboard->Open(); - wxTheClipboard->SetData(new wxTextDataObject(wxString(st.s, st.len))); - wxTheClipboard->Close(); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(FALSE); + wxString text = stc2wx(st.s, st.len); + wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->Close(); + } } } @@ -246,15 +350,17 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool canPaste; - - wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); - if (canPaste) { - wxString str = data.GetText(); - int len = str.Length(); - pdoc->InsertString(currentPos, str.c_str(), len); + bool gotData = FALSE; + + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(FALSE); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->Close(); + } + if (gotData) { + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText()); + int len = strlen(buf); + pdoc->InsertString(currentPos, buf, len); SetEmptySelection(currentPos + len); } @@ -265,35 +371,60 @@ void ScintillaWX::Paste() { bool ScintillaWX::CanPaste() { - wxTextDataObject data; - bool canPaste; + bool canPaste = FALSE; + bool didOpen; - wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); + if ( (didOpen = !wxTheClipboard->IsOpened()) ) + wxTheClipboard->Open(); + if (wxTheClipboard->IsOpened()) { + wxTheClipboard->UsePrimarySelection(FALSE); + canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); + if (didOpen) + wxTheClipboard->Close(); + } return canPaste; } void ScintillaWX::CreateCallTipWindow(PRectangle) { - ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct); + ct.wCallTip = new wxSTCCallTip(stc, &ct); ct.wDraw = ct.wCallTip; } void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { if (!label[0]) - popup.GetID()->AppendSeparator(); + ((wxMenu*)popup.GetID())->AppendSeparator(); else - popup.GetID()->Append(cmd, label); + ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label)); if (!enabled) - popup.GetID()->Enable(cmd, enabled); + ((wxMenu*)popup.GetID())->Enable(cmd, enabled); } +// This is called by the Editor base class whenever something is selected void ScintillaWX::ClaimSelection() { - +#if 0 + // Until wxGTK is able to support using both the primary selection and the + // clipboard at the same time I think it causes more problems than it is + // worth to implement this method. Selecting text should not clear the + // clipboard. --Robin +#ifdef __WXGTK__ + // Put the selected text in the PRIMARY selection + if (currentPos != anchor) { + SelectionText st; + CopySelectionRange(&st); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(TRUE); + wxString text = stc2wx(st.s, st.len); + wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->Close(); + } + } +#endif +#endif } @@ -302,13 +433,45 @@ long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/ } 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; + switch (iMessage) { + case SCI_CALLTIPSHOW: { + // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx + // because of the little tweak that needs done below. When updating + // new versions double check that this is still needed, and that any + // new code there is copied here too. + AutoCompleteCancel(); + if (!ct.wCallTip.Created()) { + Point pt = LocationFromPosition(wParam); + pt.y += vs.lineHeight; + PRectangle rc = ct.CallTipStart(currentPos, pt, + reinterpret_cast(lParam), + vs.styles[STYLE_DEFAULT].fontName, + vs.styles[STYLE_DEFAULT].sizeZoomed, + IsUnicodeMode()); + // If the call-tip window would be out of the client + // space, adjust so it displays above the text. + PRectangle rcClient = GetClientRectangle(); + if (rc.bottom > rcClient.bottom) { +#ifdef __WXGTK__ + int offset = int(vs.lineHeight * 1.25) + rc.Height(); +#else + int offset = vs.lineHeight + rc.Height(); +#endif + rc.top -= offset; + rc.bottom -= offset; + } + // Now display the window. + CreateCallTipWindow(rc); + ct.wCallTip.SetPositionRelative(rc, wMain); + ct.wCallTip.Show(); + } + } + break; + + default: + return ScintillaBase::WndProc(iMessage, wParam, lParam); + } + return 0; } @@ -319,13 +482,13 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { paintState = painting; - Surface surfaceWindow; - surfaceWindow.Init(dc); + Surface* surfaceWindow = Surface::Allocate(); + surfaceWindow->Init(dc); PRectangle rcPaint = PRectangleFromwxRect(rect); dc->BeginDrawing(); - Paint(&surfaceWindow, rcPaint); + Paint(surfaceWindow, rcPaint); dc->EndDrawing(); - surfaceWindow.Release(); + delete surfaceWindow; if (paintState == paintAbandoned) { // Painting area was insufficient to cover new styling or brace highlight positions FullPaint(); @@ -341,19 +504,25 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { void ScintillaWX::DoHScroll(int type, int pos) { int xPos = xOffset; - if (type == wxEVT_SCROLLWIN_LINEUP) + PRectangle rcText = GetTextRectangle(); + int pageWidth = rcText.Width() * 2 / 3; + if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) xPos -= H_SCROLL_STEP; - else if (type == wxEVT_SCROLLWIN_LINEDOWN) + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) xPos += H_SCROLL_STEP; - else if (type == wxEVT_SCROLLWIN_PAGEUP) - xPos -= H_SCROLL_PAGE; - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) - xPos += H_SCROLL_PAGE; - else if (type == wxEVT_SCROLLWIN_TOP) + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) + xPos -= pageWidth; + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) { + xPos += pageWidth; + if (xPos > scrollWidth - rcText.Width()) { + xPos = scrollWidth - rcText.Width(); + } + } + else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) xPos = 0; - else if (type == wxEVT_SCROLLWIN_BOTTOM) - xPos = H_SCROLL_MAX; - else if (type == wxEVT_SCROLLWIN_THUMBTRACK) + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) + xPos = scrollWidth; + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) xPos = pos; HorizontalScrollTo(xPos); @@ -361,26 +530,27 @@ void ScintillaWX::DoHScroll(int type, int pos) { void ScintillaWX::DoVScroll(int type, int pos) { int topLineNew = topLine; - if (type == wxEVT_SCROLLWIN_LINEUP) + if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) topLineNew -= 1; - else if (type == wxEVT_SCROLLWIN_LINEDOWN) + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) topLineNew += 1; - else if (type == wxEVT_SCROLLWIN_PAGEUP) + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) topLineNew -= LinesToScroll(); - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) topLineNew += LinesToScroll(); - else if (type == wxEVT_SCROLLWIN_TOP) + else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) topLineNew = 0; - else if (type == wxEVT_SCROLLWIN_BOTTOM) + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) topLineNew = MaxScrollPos(); - else if (type == wxEVT_SCROLLWIN_THUMBTRACK) + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) topLineNew = pos; ScrollTo(topLineNew); } - -void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) { +void ScintillaWX::DoMouseWheel(int rotation, int delta, + int linesPerAction, int ctrlDown, + bool isPageScroll ) { int topLineNew = topLine; int lines; @@ -393,11 +563,16 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int } } else { // otherwise just scroll the window + if ( !delta ) + delta = 120; wheelRotation += rotation; lines = wheelRotation / delta; wheelRotation -= lines * delta; if (lines != 0) { - lines *= linesPerAction; + if (isPageScroll) + lines = lines * LinesOnScreen(); // lines is either +1 or -1 + else + lines *= linesPerAction; topLineNew -= lines; ScrollTo(topLineNew); } @@ -406,9 +581,10 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int void ScintillaWX::DoSize(int width, int height) { - PRectangle rcClient(0,0,width,height); - SetScrollBarsTo(rcClient); - DropGraphics(); +// PRectangle rcClient(0,0,width,height); +// SetScrollBarsTo(rcClient); +// DropGraphics(); + ChangeSize(); } void ScintillaWX::DoLoseFocus(){ @@ -423,58 +599,97 @@ void ScintillaWX::DoSysColourChange() { InvalidateStyleData(); } -void ScintillaWX::DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) { +void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) { ButtonDown(pt, curTime, shift, ctrl, alt); } -void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) { +void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) { ButtonUp(pt, curTime, ctrl); } -void ScintillaWX::DoButtonMove(Point pt) { +void ScintillaWX::DoLeftButtonMove(Point pt) { ButtonMove(pt); } +void ScintillaWX::DoMiddleButtonUp(Point pt) { +#ifdef __WXGTK__ + // Set the current position to the mouse click point and + // then paste in the PRIMARY selection, if any. wxGTK only. + int newPos = PositionFromLocation(pt); + MovePositionTo(newPos, 0, 1); -void ScintillaWX::DoAddChar(char ch) { - AddChar(ch); + pdoc->BeginUndoAction(); + wxTextDataObject data; + bool gotData = FALSE; + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(TRUE); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->Close(); + } + if (gotData) { + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText()); + int len = strlen(buf); + pdoc->InsertString(currentPos, buf, len); + SetEmptySelection(currentPos + len); + } + pdoc->EndUndoAction(); + NotifyChange(); + Redraw(); + + ShowCaretAtCurrentPosition(); + EnsureCaretVisible(); +#endif +} + + +void ScintillaWX::DoAddChar(int key) { +#if wxUSE_UNICODE + wxChar wszChars[2]; + wszChars[0] = key; + wszChars[1] = 0; + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars); + AddCharUTF((char*)buf.data(), strlen(buf)); +#else + AddChar(key); +#endif } + int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) { -#ifdef __WXGTK__ +#if defined(__WXGTK__) || defined(__WXMAC__) // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK... if (ctrl && key >= 1 && key <= 26) key += 'A' - 1; #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_PAGEUP: // fall through + case WXK_PRIOR: key = SCK_PRIOR; break; + case WXK_PAGEDOWN: // fall through + 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); @@ -492,7 +707,8 @@ void ScintillaWX::DoCommand(int ID) { void ScintillaWX::DoContextMenu(Point pt) { - ContextMenu(pt); + if (displayPopupMenu) + ContextMenu(pt); } void ScintillaWX::DoOnListBox() { @@ -501,6 +717,7 @@ void ScintillaWX::DoOnListBox() { //---------------------------------------------------------------------- +#if wxUSE_DRAG_AND_DROP bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { SetDragPosition(invalidPosition); @@ -517,7 +734,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { dragResult = evt.GetDragResult(); if (dragResult == wxDragMove || dragResult == wxDragCopy) { DropAt(evt.GetPosition(), - evt.GetDragText(), + wx2stc(evt.GetDragText()), dragResult == wxDragMove, FALSE); // TODO: rectangular? return TRUE; @@ -552,7 +769,7 @@ wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { void ScintillaWX::DoDragLeave() { SetDragPosition(invalidPosition); } - +#endif //---------------------------------------------------------------------- // Redraw all of text area. This paint will not be abandoned. @@ -560,13 +777,13 @@ void ScintillaWX::FullPaint() { paintState = painting; rcPaint = GetTextRectangle(); paintingAllText = true; - wxClientDC dc(wMain.GetID()); - Surface surfaceWindow; - surfaceWindow.Init(&dc); - Paint(&surfaceWindow, rcPaint); - surfaceWindow.Release(); + wxClientDC dc(stc); + Surface* surfaceWindow = Surface::Allocate(); + surfaceWindow->Init(&dc); + Paint(surfaceWindow, rcPaint); + delete surfaceWindow; -// wMain.GetID()->Refresh(FALSE); +// stc->Refresh(FALSE); paintState = notPainting; }