X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d02625ccfecc288c28517d07c35edd9cbfaeb11..a38c9b4337656f5bd669908c3fff972a05aa8df2:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 2d793a9157..48655b2966 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -14,7 +14,21 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/wx.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_STC + +#ifndef WX_PRECOMP + #include "wx/scrolbar.h" + #include "wx/menu.h" + #include "wx/timer.h" +#endif // WX_PRECOMP + #include "wx/textbuf.h" #include "wx/dataobj.h" #include "wx/clipbrd.h" @@ -23,6 +37,7 @@ #include "ScintillaWX.h" #include "ExternalLexer.h" #include "wx/stc/stc.h" +#include "wx/stc/private.h" #include "PlatWX.h" #ifdef __WXMSW__ @@ -36,15 +51,15 @@ class wxSTCTimer : public wxTimer { public: wxSTCTimer(ScintillaWX* swx) { - this->swx = swx; + m_swx = swx; } void Notify() { - swx->DoTick(); + m_swx->DoTick(); } private: - ScintillaWX* swx; + ScintillaWX* m_swx; }; @@ -52,51 +67,63 @@ private: class wxStartDragTimer : public wxTimer { public: wxStartDragTimer(ScintillaWX* swx) { - this->swx = swx; + m_swx = swx; } void Notify() { - swx->DoStartDrag(); + m_swx->DoStartDrag(); } private: - ScintillaWX* swx; + ScintillaWX* m_swx; }; bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) { - return swx->DoDropText(x, y, data); + return m_swx->DoDropText(x, y, data); } wxDragResult wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) { - return swx->DoDragEnter(x, y, def); + return m_swx->DoDragEnter(x, y, def); } wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) { - return swx->DoDragOver(x, y, def); + return m_swx->DoDragOver(x, y, def); } void wxSTCDropTarget::OnLeave() { - swx->DoDragLeave(); + m_swx->DoDragLeave(); } #endif // wxUSE_DRAG_AND_DROP #if wxUSE_POPUPWIN && wxSTC_USE_POPUP -#include +#include "wx/popupwin.h" #define wxSTCCallTipBase wxPopupWindow #define param2 wxBORDER_NONE // popup's 2nd param is flags #else -#define wxSTCCallTipBase wxWindow +#include "wx/frame.h" +#define wxSTCCallTipBase wxFrame #define param2 -1 // wxWindow's 2nd param is ID #endif -#include +#include "wx/dcbuffer.h" class wxSTCCallTip : public wxSTCCallTipBase { public: - wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) - : wxSTCCallTipBase(parent, param2), + wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) : +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP + wxSTCCallTipBase(parent, wxBORDER_NONE), +#else + wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, + wxFRAME_NO_TASKBAR + | wxFRAME_FLOAT_ON_PARENT + | wxBORDER_NONE +#ifdef __WXMAC__ + | wxPOPUP_WINDOW +#endif + ), +#endif m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord) { } @@ -112,7 +139,8 @@ public: bool AcceptsFocus() const { return false; } - void OnPaint(wxPaintEvent& WXUNUSED(evt)) { + void OnPaint(wxPaintEvent& WXUNUSED(evt)) + { wxBufferedPaintDC dc(this); Surface* surfaceWindow = Surface::Allocate(); surfaceWindow->Init(&dc, m_ct->wDraw.GetID()); @@ -121,22 +149,25 @@ public: delete surfaceWindow; } - void OnFocus(wxFocusEvent& event) { + void OnFocus(wxFocusEvent& event) + { GetParent()->SetFocus(); event.Skip(); } - void OnLeftDown(wxMouseEvent& event) { + void OnLeftDown(wxMouseEvent& event) + { wxPoint pt = event.GetPosition(); Point p(pt.x, pt.y); m_ct->MouseClick(p); m_swx->CallTipClick(); } -#if wxUSE_POPUPWIN && wxSTC_USE_POPUP virtual void DoSetSize(int x, int y, int width, int height, - int sizeFlags = wxSIZE_AUTO) { + int sizeFlags = wxSIZE_AUTO) + { + // convert coords to screen coords since we're a top-level window if (x != wxDefaultCoord) { m_cx = x; GetParent()->ClientToScreen(&x, NULL); @@ -147,9 +178,27 @@ public: } wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags); } -#endif - wxPoint GetMyPosition() { +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP +#else + virtual bool Show( bool show = true ) + { + // Although we're a frame, we always want the parent to be active, so + // raise it whenever we get shown. + bool rv = wxSTCCallTipBase::Show(show); + if (rv && show) + { + wxTopLevelWindow *frame = wxDynamicCast( + wxGetTopLevelParent(GetParent()), wxTopLevelWindow); + if (frame) + frame->Raise(); + } + return rv; + } +#endif + + wxPoint GetMyPosition() + { return wxPoint(m_cx, m_cy); } @@ -285,7 +334,7 @@ void ScintillaWX::DoStartDrag() { result = source.DoDragDrop(evt.GetDragAllowMove()); if (result == wxDragMove && dropWentOutside) ClearSelection(); - inDragDrop = false; + inDragDrop = ddNone; SetDragPosition(invalidPosition); } #endif // wxUSE_DRAG_AND_DROP @@ -328,17 +377,16 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { if (mouseDownCaptures) { - if (on && !stc->HasCapture()) + if (on && !capturedMouse) stc->CaptureMouse(); - else if (!on && stc->HasCapture()) + else if (!on && capturedMouse && stc->HasCapture()) stc->ReleaseMouse(); - capturedMouse = stc->HasCapture(); + capturedMouse = on; } } bool ScintillaWX::HaveMouseCapture() { - capturedMouse = stc->HasCapture(); return capturedMouse; } @@ -476,8 +524,8 @@ void ScintillaWX::Paste() { wxTextDataObject data; bool gotData = false; + wxTheClipboard->UsePrimarySelection(false); if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(false); gotData = wxTheClipboard->GetData(data); wxTheClipboard->Close(); } @@ -485,7 +533,13 @@ 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); } @@ -499,8 +553,8 @@ void ScintillaWX::Paste() { void ScintillaWX::CopyToClipboard(const SelectionText& st) { #if wxUSE_CLIPBOARD + wxTheClipboard->UsePrimarySelection(false); if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(false); wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1)); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); @@ -517,12 +571,12 @@ bool ScintillaWX::CanPaste() { bool didOpen; if (Editor::CanPaste()) { + wxTheClipboard->UsePrimarySelection(false); didOpen = !wxTheClipboard->IsOpened(); if ( didOpen ) wxTheClipboard->Open(); if (wxTheClipboard->IsOpened()) { - wxTheClipboard->UsePrimarySelection(false); canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); if (didOpen) wxTheClipboard->Close(); @@ -553,28 +607,24 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { } -// This is called by the Editor base class whenever something is selected +// This is called by the Editor base class whenever something is selected. +// For wxGTK we can put this text in the primary selection and then other apps +// can paste with the middle button. 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); + wxTheClipboard->UsePrimarySelection(true); if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(true); wxString text = stc2wx(st.s, st.len); wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->UsePrimarySelection(false); wxTheClipboard->Close(); } + wxTheClipboard->UsePrimarySelection(false); } #endif -#endif } @@ -642,11 +692,11 @@ bool ScintillaWX::DestroySystemCaret() { //---------------------------------------------------------------------- -long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { +sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) { return 0; } -long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { +sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { switch (iMessage) { case SCI_CALLTIPSHOW: { // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx @@ -853,12 +903,12 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) { pdoc->BeginUndoAction(); wxTextDataObject data; bool gotData = false; + wxTheClipboard->UsePrimarySelection(true); if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(true); gotData = wxTheClipboard->GetData(data); - wxTheClipboard->UsePrimarySelection(false); wxTheClipboard->Close(); } + wxTheClipboard->UsePrimarySelection(false); if (gotData) { wxString text = wxTextBuffer::Translate(data.GetText(), wxConvertEOLMode(pdoc->eolMode)); @@ -912,8 +962,16 @@ int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) case WXK_END: key = SCK_END; 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_NUMPAD_DELETE: key = SCK_DELETE; break; + case WXK_NUMPAD_INSERT: key = SCK_INSERT; break; case WXK_DELETE: key = SCK_DELETE; break; case WXK_INSERT: key = SCK_INSERT; break; case WXK_ESCAPE: key = SCK_ESCAPE; break; @@ -1091,3 +1149,5 @@ bool ScintillaWX::GetUseAntiAliasing() { //---------------------------------------------------------------------- //---------------------------------------------------------------------- + +#endif // wxUSE_STC