X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b9dfbc00e0251cdabc4c1a8d5c67bf28e8b28b2..17a2c5a10faebcf476fdb0c3637605cf0e84ea73:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index f7336a7196..10859100d6 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -63,7 +63,7 @@ void wxSTCDropTarget::OnLeave() { #endif -#if wxUSE_POPUPWIN +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP #include <wx/popupwin.h> #define wxSTCCallTipBase wxPopupWindow #define param2 wxBORDER_NONE // popup's 2nd param is flags @@ -88,7 +88,12 @@ public: delete surfaceWindow; } -#if wxUSE_POPUPWIN + 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) { @@ -98,6 +103,21 @@ public: 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: @@ -107,6 +127,10 @@ private: 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() @@ -148,7 +172,7 @@ void ScintillaWX::Finalise() { void ScintillaWX::StartDrag() { #if wxUSE_DRAG_AND_DROP - wxString dragText(drag.s, wxConvUTF8, drag.len); + 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()); @@ -296,7 +320,8 @@ void ScintillaWX::Copy() { SelectionText st; CopySelectionRange(&st); wxTheClipboard->Open(); - wxString text(st.s, wxConvUTF8, st.len); + wxTheClipboard->UsePrimarySelection(); + wxString text = stc2wx(st.s, st.len); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); } @@ -311,10 +336,11 @@ void ScintillaWX::Paste() { bool gotData; wxTheClipboard->Open(); + wxTheClipboard->UsePrimarySelection(); gotData = wxTheClipboard->GetData(data); wxTheClipboard->Close(); if (gotData) { - wxWX2MBbuf buf = (wxWX2MBbuf)data.GetText().mb_str(wxConvUTF8); + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText()); int len = strlen(buf); pdoc->InsertString(currentPos, buf, len); SetEmptySelection(currentPos + len); @@ -330,6 +356,7 @@ bool ScintillaWX::CanPaste() { bool canPaste; wxTheClipboard->Open(); + wxTheClipboard->UsePrimarySelection(); canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); wxTheClipboard->Close(); @@ -346,7 +373,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { if (!label[0]) ((wxMenu*)popup.GetID())->AppendSeparator(); else - ((wxMenu*)popup.GetID())->Append(cmd, wxString(label, *wxConvCurrent)); + ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label)); if (!enabled) ((wxMenu*)popup.GetID())->Enable(cmd, enabled); @@ -440,8 +467,9 @@ void ScintillaWX::DoVScroll(int type, int 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; @@ -458,7 +486,10 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int 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); } @@ -503,7 +534,7 @@ void ScintillaWX::DoAddChar(int key) { } 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; @@ -551,7 +582,8 @@ void ScintillaWX::DoCommand(int ID) { void ScintillaWX::DoContextMenu(Point pt) { - ContextMenu(pt); + if (displayPopupMenu) + ContextMenu(pt); } void ScintillaWX::DoOnListBox() { @@ -577,7 +609,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { dragResult = evt.GetDragResult(); if (dragResult == wxDragMove || dragResult == wxDragCopy) { DropAt(evt.GetPosition(), - evt.GetDragText().mb_str(wxConvUTF8), + wx2stc(evt.GetDragText()), dragResult == wxDragMove, FALSE); // TODO: rectangular? return TRUE;