X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b9337da0c597d9ba18f731a4e641bda25437224..7e48d7d9fb4b546e6a68239e8a77ce7ef79df3b0:/src/stc/ScintillaWX.cpp?ds=inline diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 10859100d6..5a256340ed 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -63,6 +63,11 @@ void wxSTCDropTarget::OnLeave() { #endif +#ifdef __WXGTK__ +#undef wxSTC_USE_POPUP +#define wxSTC_USE_POPUP 0 +#endif + #if wxUSE_POPUPWIN && wxSTC_USE_POPUP #include #define wxSTCCallTipBase wxPopupWindow @@ -80,6 +85,10 @@ public: m_ct = ct; } + ~wxSTCCallTip() { + if (HasCapture()) ReleaseMouse(); + } + void OnPaint(wxPaintEvent& evt) { wxPaintDC dc(this); Surface* surfaceWindow = Surface::Allocate(); @@ -106,12 +115,10 @@ public: virtual bool Show( bool show = TRUE ) { bool retval = wxSTCCallTipBase::Show(show); - if (show) { + if (show) CaptureMouse(); - } - else { + else if (HasCapture()) ReleaseMouse(); - } return retval; } @@ -319,11 +326,12 @@ void ScintillaWX::Copy() { if (currentPos != anchor) { SelectionText st; CopySelectionRange(&st); - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - wxString text = stc2wx(st.s, st.len); - wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->Close(); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(); + wxString text = stc2wx(st.s, st.len); + wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->Close(); + } } } @@ -333,12 +341,13 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool gotData; + bool gotData = FALSE; - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - gotData = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->Close(); + } if (gotData) { wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText()); int len = strlen(buf); @@ -353,13 +362,18 @@ void ScintillaWX::Paste() { bool ScintillaWX::CanPaste() { - bool canPaste; + bool canPaste = FALSE; + bool didOpen; - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); - wxTheClipboard->Close(); + if ( (didOpen = !wxTheClipboard->IsOpened()) ) + wxTheClipboard->Open(); + if (wxTheClipboard->IsOpened()) { + wxTheClipboard->UsePrimarySelection(); + canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); + if (didOpen) + wxTheClipboard->Close(); + } return canPaste; }