aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormitchell <unknown>2020-03-29 19:31:21 -0400
committermitchell <unknown>2020-03-29 19:31:21 -0400
commit06ebb765d92471f94863043dc9597b411981ad37 (patch)
treec381ee97acb44db20e24cc986d2f8cf30e9b42ca
parent7ffaae978a096dd2a922a0a7b227a02439753d43 (diff)
downloadscintilla-mirror-06ebb765d92471f94863043dc9597b411981ad37.tar.gz
Fixed bad backport r8078:742f17c763a4.
Since C++11 does not support "static inline" initializers, the static members must still be defined elsewhere.
-rwxr-xr-xgtk/ScintillaGTK.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index feb2ec11b..a6b4f3aa8 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -121,6 +121,11 @@ enum {
TARGET_URI
};
+GdkAtom ScintillaGTK::atomUTF8 = nullptr;
+GdkAtom ScintillaGTK::atomString = nullptr;
+GdkAtom ScintillaGTK::atomUriList = nullptr;
+GdkAtom ScintillaGTK::atomDROPFILES_DND = nullptr;
+
static const GtkTargetEntry clipboardCopyTargets[] = {
{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
{ (gchar *) "STRING", 0, TARGET_STRING },