diff options
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index cabc1f3f3..0dd0ec9d5 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1406,10 +1406,10 @@ void ScintillaGTK::ClaimSelection() { void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText) { char *data = reinterpret_cast<char *>(selectionData->data); int len = selectionData->length; - GdkAtom selectionType = selectionData->type; + GdkAtom selectionTypeData = selectionData->type; // Return empty string if selection is not a string - if ((selectionType != GDK_TARGET_STRING) && (selectionType != atomUTF8)) { + if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8)) { char *empty = new char[1]; empty[0] = '\0'; selText.Set(empty, 0, SC_CP_UTF8, 0, false, false); @@ -1425,7 +1425,7 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio #endif char *dest; - if (selectionType == GDK_TARGET_STRING) { + if (selectionTypeData == GDK_TARGET_STRING) { dest = Document::TransformLineEnds(&len, data, len, pdoc->eolMode); if (IsUnicodeMode()) { // Unknown encoding so assume in Latin1 |