Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with wxUSE_CLIPBOARD==0

Browse Source
This commit is contained in:
Artur Wieczorek
2019-02-01 23:35:00 +01:00
parent cbbb9a28d9
commit 0183b47a45
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/stc/ScintillaWX.cpp
View File

@@ -520,7 +520,7 @@ void ScintillaWX::Paste() {
pdoc->BeginUndoAction(); pdoc->BeginUndoAction();
ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH);
#if wxUSE_DATAOBJ #if wxUSE_CLIPBOARD
wxTextDataObject data; wxTextDataObject data;
bool gotData = false; bool gotData = false;
bool isRectangularClipboard = false; bool isRectangularClipboard = false;
@@ -568,7 +568,7 @@ void ScintillaWX::Paste() {
InsertPaste(buf, len); InsertPaste(buf, len);
} }
} }
#endif // wxUSE_DATAOBJ #endif // wxUSE_CLIPBOARD
pdoc->EndUndoAction(); pdoc->EndUndoAction();
NotifyChange(); NotifyChange();
@@ -660,6 +660,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
// can paste with the middle button. // can paste with the middle button.
void ScintillaWX::ClaimSelection() { void ScintillaWX::ClaimSelection() {
#ifdef __WXGTK__ #ifdef __WXGTK__
#if wxUSE_CLIPBOARD
// Put the selected text in the PRIMARY selection // Put the selected text in the PRIMARY selection
if (!sel.Empty()) { if (!sel.Empty()) {
SelectionText st; SelectionText st;
@@ -672,6 +673,7 @@ void ScintillaWX::ClaimSelection() {
} }
wxTheClipboard->UsePrimarySelection(false); wxTheClipboard->UsePrimarySelection(false);
} }
#endif // wxUSE_CLIPBOARD
#endif #endif
} }
@@ -1073,6 +1075,7 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
int newPos = PositionFromLocation(pt); int newPos = PositionFromLocation(pt);
MovePositionTo(newPos, Selection::noSel, true); MovePositionTo(newPos, Selection::noSel, true);
#if wxUSE_CLIPBOARD
pdoc->BeginUndoAction(); pdoc->BeginUndoAction();
wxTextDataObject data; wxTextDataObject data;
bool gotData = false; bool gotData = false;
@@ -1094,6 +1097,7 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
pdoc->EndUndoAction(); pdoc->EndUndoAction();
NotifyChange(); NotifyChange();
Redraw(); Redraw();
#endif // wxUSE_CLIPBOARD
ShowCaretAtCurrentPosition(); ShowCaretAtCurrentPosition();
EnsureCaretVisible(); EnsureCaretVisible();