ScintillaGTK.cxx (scintilla445.tgz) | : | ScintillaGTK.cxx (scintilla446.tgz) | ||
---|---|---|---|---|
skipping to change at line 45 | skipping to change at line 45 | |||
#define NOMINMAX | #define NOMINMAX | |||
#include <windows.h> | #include <windows.h> | |||
#endif | #endif | |||
#include "Platform.h" | #include "Platform.h" | |||
#include "ILoader.h" | #include "ILoader.h" | |||
#include "ILexer.h" | #include "ILexer.h" | |||
#include "Scintilla.h" | #include "Scintilla.h" | |||
#include "ScintillaWidget.h" | #include "ScintillaWidget.h" | |||
#include "StringCopy.h" | ||||
#include "CharacterCategory.h" | #include "CharacterCategory.h" | |||
#include "Position.h" | #include "Position.h" | |||
#include "UniqueString.h" | #include "UniqueString.h" | |||
#include "SplitVector.h" | #include "SplitVector.h" | |||
#include "Partitioning.h" | #include "Partitioning.h" | |||
#include "RunStyles.h" | #include "RunStyles.h" | |||
#include "ContractionState.h" | #include "ContractionState.h" | |||
#include "CellBuffer.h" | #include "CellBuffer.h" | |||
#include "CallTip.h" | #include "CallTip.h" | |||
#include "KeyMap.h" | #include "KeyMap.h" | |||
skipping to change at line 129 | skipping to change at line 128 | |||
TARGET_TEXT, | TARGET_TEXT, | |||
TARGET_COMPOUND_TEXT, | TARGET_COMPOUND_TEXT, | |||
TARGET_UTF8_STRING, | TARGET_UTF8_STRING, | |||
TARGET_URI | TARGET_URI | |||
}; | }; | |||
static const GtkTargetEntry clipboardCopyTargets[] = { | static const GtkTargetEntry clipboardCopyTargets[] = { | |||
{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, | { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, | |||
{ (gchar *) "STRING", 0, TARGET_STRING }, | { (gchar *) "STRING", 0, TARGET_STRING }, | |||
}; | }; | |||
static constexpr gint nClipboardCopyTargets = ELEMENTS(clipboardCopyTargets); | static constexpr gint nClipboardCopyTargets = std::size(clipboardCopyTargets); | |||
static const GtkTargetEntry clipboardPasteTargets[] = { | static const GtkTargetEntry clipboardPasteTargets[] = { | |||
{ (gchar *) "text/uri-list", 0, TARGET_URI }, | { (gchar *) "text/uri-list", 0, TARGET_URI }, | |||
{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, | { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, | |||
{ (gchar *) "STRING", 0, TARGET_STRING }, | { (gchar *) "STRING", 0, TARGET_STRING }, | |||
}; | }; | |||
static constexpr gint nClipboardPasteTargets = ELEMENTS(clipboardPasteTargets); | static constexpr gint nClipboardPasteTargets = std::size(clipboardPasteTargets); | |||
static const GdkDragAction actionCopyOrMove = static_cast<GdkDragAction>(GDK_ACT ION_COPY | GDK_ACTION_MOVE); | static const GdkDragAction actionCopyOrMove = static_cast<GdkDragAction>(GDK_ACT ION_COPY | GDK_ACTION_MOVE); | |||
static GtkWidget *PWidget(const Window &w) noexcept { | static GtkWidget *PWidget(const Window &w) noexcept { | |||
return static_cast<GtkWidget *>(w.GetID()); | return static_cast<GtkWidget *>(w.GetID()); | |||
} | } | |||
ScintillaGTK *ScintillaGTK::FromWidget(GtkWidget *widget) noexcept { | ScintillaGTK *ScintillaGTK::FromWidget(GtkWidget *widget) noexcept { | |||
ScintillaObject *scio = SCINTILLA(widget); | ScintillaObject *scio = SCINTILLA(widget); | |||
return static_cast<ScintillaGTK *>(scio->pscin); | return static_cast<ScintillaGTK *>(scio->pscin); | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |