aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/PlatGTK.cxx126
-rw-r--r--gtk/ScintillaGTK.cxx4
-rw-r--r--gtk/ScintillaGTKAccessible.cxx2
-rw-r--r--src/CaseConvert.cxx2
-rw-r--r--src/Document.cxx12
-rw-r--r--src/Editor.cxx2
-rw-r--r--src/ScintillaBase.cxx2
-rw-r--r--win32/PlatWin.cxx206
-rw-r--r--win32/ScintillaWin.cxx84
9 files changed, 220 insertions, 220 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index fe207cece..1fcafa2fb 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -162,49 +162,49 @@ class SurfaceImpl : public Surface {
void SetConverter(int characterSet_);
public:
SurfaceImpl();
- virtual ~SurfaceImpl();
-
- void Init(WindowID wid);
- void Init(SurfaceID sid, WindowID wid);
- void InitPixMap(int width, int height, Surface *surface_, WindowID wid);
-
- void Release();
- bool Initialised();
- void PenColour(ColourDesired fore);
- int LogPixelsY();
- int DeviceHeightFont(int points);
- void MoveTo(int x_, int y_);
- void LineTo(int x_, int y_);
- void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back);
- void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
- void FillRectangle(PRectangle rc, ColourDesired back);
- void FillRectangle(PRectangle rc, Surface &surfacePattern);
- void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ ~SurfaceImpl() override;
+
+ void Init(WindowID wid) override;
+ void Init(SurfaceID sid, WindowID wid) override;
+ void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
+
+ void Release() override;
+ bool Initialised() override;
+ void PenColour(ColourDesired fore) override;
+ int LogPixelsY() override;
+ int DeviceHeightFont(int points) override;
+ void MoveTo(int x_, int y_) override;
+ void LineTo(int x_, int y_) override;
+ void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) override;
+ void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+ void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) override;
void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
- ColourDesired outline, int alphaOutline, int flags);
- void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
- void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
- void Copy(PRectangle rc, Point from, Surface &surfaceSource);
+ ColourDesired outline, int alphaOutline, int flags) override;
+ void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+ void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
void DrawTextBase(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
- void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
- void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
- XYPOSITION WidthText(Font &font_, const char *s, int len);
- XYPOSITION WidthChar(Font &font_, char ch);
- XYPOSITION Ascent(Font &font_);
- XYPOSITION Descent(Font &font_);
- XYPOSITION InternalLeading(Font &font_);
- XYPOSITION ExternalLeading(Font &font_);
- XYPOSITION Height(Font &font_);
- XYPOSITION AverageCharWidth(Font &font_);
-
- void SetClip(PRectangle rc);
- void FlushCachedState();
-
- void SetUnicodeMode(bool unicodeMode_);
- void SetDBCSMode(int codePage);
+ void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override;
+ void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) override;
+ XYPOSITION WidthText(Font &font_, const char *s, int len) override;
+ XYPOSITION WidthChar(Font &font_, char ch) override;
+ XYPOSITION Ascent(Font &font_) override;
+ XYPOSITION Descent(Font &font_) override;
+ XYPOSITION InternalLeading(Font &font_) override;
+ XYPOSITION ExternalLeading(Font &font_) override;
+ XYPOSITION Height(Font &font_) override;
+ XYPOSITION AverageCharWidth(Font &font_) override;
+
+ void SetClip(PRectangle rc) override;
+ void FlushCachedState() override;
+
+ void SetUnicodeMode(bool unicodeMode_) override;
+ void SetDBCSMode(int codePage) override;
};
#ifdef SCI_NAMESPACE
}
@@ -1239,7 +1239,7 @@ public:
#endif
doubleClickAction(NULL), doubleClickActionData(NULL) {
}
- virtual ~ListBoxX() {
+ ~ListBoxX() override {
if (pixhash) {
g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL);
g_hash_table_destroy((GHashTable *) pixhash);
@@ -1255,30 +1255,30 @@ public:
}
#endif
}
- virtual void SetFont(Font &font);
- virtual void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_);
- virtual void SetAverageCharWidth(int width);
- virtual void SetVisibleRows(int rows);
- virtual int GetVisibleRows() const;
+ void SetFont(Font &font) override;
+ void Create(Window &parent, int ctrlID, Point location_, int lineHeight_, bool unicodeMode_, int technology_) override;
+ void SetAverageCharWidth(int width) override;
+ void SetVisibleRows(int rows) override;
+ int GetVisibleRows() const override;
int GetRowHeight();
- virtual PRectangle GetDesiredRect();
- virtual int CaretFromEdge();
- virtual void Clear();
- virtual void Append(char *s, int type = -1);
- virtual int Length();
- virtual void Select(int n);
- virtual int GetSelection();
- virtual int Find(const char *prefix);
- virtual void GetValue(int n, char *value, int len);
+ PRectangle GetDesiredRect() override;
+ int CaretFromEdge() override;
+ void Clear() override;
+ void Append(char *s, int type = -1) override;
+ int Length() override;
+ void Select(int n) override;
+ int GetSelection() override;
+ int Find(const char *prefix) override;
+ void GetValue(int n, char *value, int len) override;
void RegisterRGBA(int type, RGBAImage *image);
- virtual void RegisterImage(int type, const char *xpm_data);
- virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage);
- virtual void ClearRegisteredImages();
- virtual void SetDoubleClickAction(CallBackAction action, void *data) {
+ void RegisterImage(int type, const char *xpm_data) override;
+ void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override;
+ void ClearRegisteredImages() override;
+ void SetDoubleClickAction(CallBackAction action, void *data) override {
doubleClickAction = action;
doubleClickActionData = data;
}
- virtual void SetList(const char *listText, char separator, char typesep);
+ void SetList(const char *listText, char separator, char typesep) override;
};
ListBox *ListBox::Allocate() {
@@ -1965,13 +1965,13 @@ public:
m = g_module_open(modulePath, G_MODULE_BIND_LAZY);
}
- virtual ~DynamicLibraryImpl() {
+ ~DynamicLibraryImpl() override {
if (m != NULL)
g_module_close(m);
}
// Use g_module_symbol to get a pointer to the relevant function.
- virtual Function FindFunction(const char *name) {
+ Function FindFunction(const char *name) override {
if (m != NULL) {
gpointer fn_address = NULL;
gboolean status = g_module_symbol(m, name, &fn_address);
@@ -1984,7 +1984,7 @@ public:
}
}
- virtual bool IsValid() {
+ bool IsValid() override {
return m != NULL;
}
};
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index f201b5cfe..1da8ebd4e 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1133,7 +1133,7 @@ public:
explicit CaseFolderDBCS(const char *charSet_) : charSet(charSet_) {
StandardASCII();
}
- virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
+ size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
if ((lenMixed == 1) && (sizeFolded > 0)) {
folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
return 1;
@@ -1278,7 +1278,7 @@ void ScintillaGTK::Paste() {
class Helper : GObjectWatcher {
ScintillaGTK *sci;
- virtual void Destroyed() {
+ void Destroyed() override {
sci = 0;
}
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 11966bf20..1c2ed88ff 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -736,7 +736,7 @@ void ScintillaGTKAccessible::PasteText(int charPosition) {
ScintillaGTKAccessible *scia;
Position bytePosition;
- virtual void Destroyed() {
+ void Destroyed() override {
scia = 0;
}
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index 4fb755903..d4b351783 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -410,7 +410,7 @@ public:
else
return 0;
}
- size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) {
+ size_t CaseConvertString(char *converted, size_t sizeConverted, const char *mixed, size_t lenMixed) override {
size_t lenConverted = 0;
size_t mixedPos = 0;
unsigned char bytes[UTF8MaxBytes + 1];
diff --git a/src/Document.cxx b/src/Document.cxx
index fea4bb17a..74c152e85 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2481,14 +2481,14 @@ class BuiltinRegex : public RegexSearchBase {
public:
explicit BuiltinRegex(CharClassify *charClassTable) : search(charClassTable) {}
- virtual ~BuiltinRegex() {
+ ~BuiltinRegex() override {
}
- virtual long FindText(Document *doc, int minPos, int maxPos, const char *s,
+ long FindText(Document *doc, int minPos, int maxPos, const char *s,
bool caseSensitive, bool word, bool wordStart, int flags,
- int *length);
+ int *length) override;
- virtual const char *SubstituteByPosition(Document *doc, const char *text, int *length);
+ const char *SubstituteByPosition(Document *doc, const char *text, int *length) override;
private:
RESearch search;
@@ -2559,10 +2559,10 @@ public:
pdoc(pdoc_), end(end_) {
}
- virtual ~DocumentIndexer() {
+ ~DocumentIndexer() override {
}
- virtual char CharAt(int index) {
+ char CharAt(int index) override {
if (index < 0 || index >= end)
return 0;
else
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 9366619ce..cee9cebd7 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3934,7 +3934,7 @@ public:
CaseFolderASCII() {
StandardASCII();
}
- ~CaseFolderASCII() {
+ ~CaseFolderASCII() override {
}
};
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index ac1a46655..678dd1487 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -535,7 +535,7 @@ public:
int lexLanguage;
explicit LexState(Document *pdoc_);
- virtual ~LexState();
+ ~LexState() override;
void SetLexer(uptr_t wParam);
void SetLexerLanguage(const char *languageName);
const char *DescribeWordListSets();
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index b9926a366..c79db58a3 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -306,9 +306,9 @@ class FontCached : Font {
int technology;
int hash;
explicit FontCached(const FontParameters &fp);
- ~FontCached() {}
+ ~FontCached() override {}
bool SameAs(const FontParameters &fp);
- virtual void Release();
+ void Release() override;
static FontCached *first;
public:
@@ -521,49 +521,49 @@ class SurfaceGDI : public Surface {
SurfaceGDI &operator=(const SurfaceGDI &);
public:
SurfaceGDI();
- virtual ~SurfaceGDI();
-
- void Init(WindowID wid);
- void Init(SurfaceID sid, WindowID wid);
- void InitPixMap(int width, int height, Surface *surface_, WindowID wid);
-
- void Release();
- bool Initialised();
- void PenColour(ColourDesired fore);
- int LogPixelsY();
- int DeviceHeightFont(int points);
- void MoveTo(int x_, int y_);
- void LineTo(int x_, int y_);
- void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back);
- void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
- void FillRectangle(PRectangle rc, ColourDesired back);
- void FillRectangle(PRectangle rc, Surface &surfacePattern);
- void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ ~SurfaceGDI() override;
+
+ void Init(WindowID wid) override;
+ void Init(SurfaceID sid, WindowID wid) override;
+ void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
+
+ void Release() override;
+ bool Initialised() override;
+ void PenColour(ColourDesired fore) override;
+ int LogPixelsY() override;
+ int DeviceHeightFont(int points) override;
+ void MoveTo(int x_, int y_) override;
+ void LineTo(int x_, int y_) override;
+ void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) override;
+ void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+ void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) override;
void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
- ColourDesired outline, int alphaOutline, int flags);
- void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
- void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
- void Copy(PRectangle rc, Point from, Surface &surfaceSource);
+ ColourDesired outline, int alphaOutline, int flags) override;
+ void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+ void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
void DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions);
- void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
- void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
- XYPOSITION WidthText(Font &font_, const char *s, int len);
- XYPOSITION WidthChar(Font &font_, char ch);
- XYPOSITION Ascent(Font &font_);
- XYPOSITION Descent(Font &font_);
- XYPOSITION InternalLeading(Font &font_);
- XYPOSITION ExternalLeading(Font &font_);
- XYPOSITION Height(Font &font_);
- XYPOSITION AverageCharWidth(Font &font_);
-
- void SetClip(PRectangle rc);
- void FlushCachedState();
-
- void SetUnicodeMode(bool unicodeMode_);
- void SetDBCSMode(int codePage_);
+ void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override;
+ void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) override;
+ XYPOSITION WidthText(Font &font_, const char *s, int len) override;
+ XYPOSITION WidthChar(Font &font_, char ch) override;
+ XYPOSITION Ascent(Font &font_) override;
+ XYPOSITION Descent(Font &font_) override;
+ XYPOSITION InternalLeading(Font &font_) override;
+ XYPOSITION ExternalLeading(Font &font_) override;
+ XYPOSITION Height(Font &font_) override;
+ XYPOSITION AverageCharWidth(Font &font_) override;
+
+ void SetClip(PRectangle rc) override;
+ void FlushCachedState() override;
+
+ void SetUnicodeMode(bool unicodeMode_) override;
+ void SetDBCSMode(int codePage_) override;
};
SurfaceGDI::SurfaceGDI() :
@@ -1086,54 +1086,54 @@ class SurfaceD2D : public Surface {
SurfaceD2D &operator=(const SurfaceD2D &);
public:
SurfaceD2D();
- virtual ~SurfaceD2D();
+ virtual ~SurfaceD2D() override;
void SetScale();
- void Init(WindowID wid);
- void Init(SurfaceID sid, WindowID wid);
- void InitPixMap(int width, int height, Surface *surface_, WindowID wid);
+ void Init(WindowID wid) override;
+ void Init(SurfaceID sid, WindowID wid) override;
+ void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override;
- void Release();
- bool Initialised();
+ void Release() override;
+ bool Initialised() override;
HRESULT FlushDrawing();
- void PenColour(ColourDesired fore);
+ void PenColour(ColourDesired fore) override;
void D2DPenColour(ColourDesired fore, int alpha=255);
- int LogPixelsY();
- int DeviceHeightFont(int points);
- void MoveTo(int x_, int y_);
- void LineTo(int x_, int y_);
- void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back);
- void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back);
- void FillRectangle(PRectangle rc, ColourDesired back);
- void FillRectangle(PRectangle rc, Surface &surfacePattern);
- void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back);
+ int LogPixelsY() override;
+ int DeviceHeightFont(int points) override;
+ void MoveTo(int x_, int y_) override;
+ void LineTo(int x_, int y_) override;
+ void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back) override;
+ void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, ColourDesired back) override;
+ void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
+ void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) override;
void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
- ColourDesired outline, int alphaOutline, int flags);
- void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
- void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back);
- void Copy(PRectangle rc, Point from, Surface &surfaceSource);
+ ColourDesired outline, int alphaOutline, int flags) override;
+ void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) override;
+ void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) override;
+ void Copy(PRectangle rc, Point from, Surface &surfaceSource) override;
void DrawTextCommon(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, UINT fuOptions);
- void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back);
- void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore);
- void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions);
- XYPOSITION WidthText(Font &font_, const char *s, int len);
- XYPOSITION WidthChar(Font &font_, char ch);
- XYPOSITION Ascent(Font &font_);
- XYPOSITION Descent(Font &font_);
- XYPOSITION InternalLeading(Font &font_);
- XYPOSITION ExternalLeading(Font &font_);
- XYPOSITION Height(Font &font_);
- XYPOSITION AverageCharWidth(Font &font_);
-
- void SetClip(PRectangle rc);
- void FlushCachedState();
-
- void SetUnicodeMode(bool unicodeMode_);
- void SetDBCSMode(int codePage_);
+ void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back) override;
+ void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override;
+ void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) override;
+ XYPOSITION WidthText(Font &font_, const char *s, int len) override;
+ XYPOSITION WidthChar(Font &font_, char ch) override;
+ XYPOSITION Ascent(Font &font_) override;
+ XYPOSITION Descent(Font &font_) override;
+ XYPOSITION InternalLeading(Font &font_) override;
+ XYPOSITION ExternalLeading(Font &font_) override;
+ XYPOSITION Height(Font &font_) override;
+ XYPOSITION AverageCharWidth(Font &font_) override;
+
+ void SetClip(PRectangle rc) override;
+ void FlushCachedState() override;
+
+ void SetUnicodeMode(bool unicodeMode_) override;
+ void SetDBCSMode(int codePage_) override;
};
SurfaceD2D::SurfaceD2D() :
@@ -2091,34 +2091,34 @@ public:
parent(NULL), ctrlID(0), doubleClickAction(NULL), doubleClickActionData(NULL),
widestItem(NULL), maxCharWidth(1), resizeHit(0), wheelDelta(0) {
}
- virtual ~ListBoxX() {
+ ~ListBoxX() override {
if (fontCopy) {
::DeleteObject(fontCopy);
fontCopy = 0;
}
}
- virtual void SetFont(Font &font);
- virtual void Create(Window &parent_, int ctrlID_, Point location_, int lineHeight_, bool unicodeMode_, int technology_);
- virtual void SetAverageCharWidth(int width);
- virtual void SetVisibleRows(int rows);
- virtual int GetVisibleRows() const;
- virtual PRectangle GetDesiredRect();
- virtual int CaretFromEdge();
- virtual void Clear();
- virtual void Append(char *s, int type = -1);
- virtual int Length();
- virtual void Select(int n);
- virtual int GetSelection();
- virtual int Find(const char *prefix);
- virtual void GetValue(int n, char *value, int len);
- virtual void RegisterImage(int type, const char *xpm_data);
- virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage);
- virtual void ClearRegisteredImages();
- virtual void SetDoubleClickAction(CallBackAction action, void *data) {
+ virtual void SetFont(Font &font) override;
+ virtual void Create(Window &parent_, int ctrlID_, Point location_, int lineHeight_, bool unicodeMode_, int technology_) override;
+ virtual void SetAverageCharWidth(int width) override;
+ virtual void SetVisibleRows(int rows) override;
+ virtual int GetVisibleRows() const override;
+ virtual PRectangle GetDesiredRect() override;
+ virtual int CaretFromEdge() override;
+ virtual void Clear() override;
+ virtual void Append(char *s, int type = -1) override;
+ virtual int Length() override;
+ virtual void Select(int n) override;
+ virtual int GetSelection() override;
+ virtual int Find(const char *prefix) override;
+ virtual void GetValue(int n, char *value, int len) override;
+ virtual void RegisterImage(int type, const char *xpm_data) override;
+ virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) override;
+ virtual void ClearRegisteredImages() override;
+ virtual void SetDoubleClickAction(CallBackAction action, void *data) override {
doubleClickAction = action;
doubleClickActionData = data;
}
- virtual void SetList(const char *list, char separator, char typesep);
+ virtual void SetList(const char *list, char separator, char typesep) override;
void Draw(DRAWITEMSTRUCT *pDrawItem);
LRESULT WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
static LRESULT PASCAL StaticWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam);
@@ -2983,13 +2983,13 @@ public:
h = ::LoadLibraryA(modulePath);
}
- virtual ~DynamicLibraryImpl() {
+ ~DynamicLibraryImpl() override {
if (h != NULL)
::FreeLibrary(h);
}
// Use GetProcAddress to get a pointer to the relevant function.
- virtual Function FindFunction(const char *name) {
+ Function FindFunction(const char *name) override {
if (h != NULL) {
// C++ standard doesn't like casts between function pointers and void pointers so use a union
union {
@@ -3003,7 +3003,7 @@ public:
}
}
- virtual bool IsValid() {
+ bool IsValid() override {
return h != NULL;
}
};
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index d189f226e..265789330 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -273,11 +273,11 @@ class ScintillaWin :
explicit ScintillaWin(HWND hwnd);
ScintillaWin(const ScintillaWin &);
- virtual ~ScintillaWin();
+ ~ScintillaWin() override;
ScintillaWin &operator=(const ScintillaWin &);
- virtual void Initialise();
- virtual void Finalise();
+ void Initialise() override;
+ void Finalise() override;
#if defined(USE_D2D)
void EnsureRenderTarget(HDC hdc);
void DropRenderTarget();
@@ -293,8 +293,8 @@ class ScintillaWin :
enum { invalidTimerID, standardTimerID, idleTimerID, fineTimerStart };
- virtual bool DragThreshold(Point ptStart, Point ptNow);
- virtual void StartDrag();
+ bool DragThreshold(Point ptStart, Point ptNow) override;
+ void StartDrag() override;
int TargetAsUTF8(char *text);
void AddCharUTF16(wchar_t const *wcs, unsigned int wclen);
int EncodedFromUTF8(char *utf8, char *encoded) const;
@@ -312,39 +312,39 @@ class ScintillaWin :
void AddWString(std::wstring wcs);
UINT CodePageOfDocument() const;
- virtual bool ValidCodePage(int codePage) const;
- virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
- virtual bool SetIdle(bool on);
+ bool ValidCodePage(int codePage) const override;
+ sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override;
+ bool SetIdle(bool on) override;
UINT_PTR timers[tickDwell+1];
- virtual bool FineTickerAvailable();
- virtual bool FineTickerRunning(TickReason reason);
- virtual void FineTickerStart(TickReason reason, int millis, int tolerance);
- virtual void FineTickerCancel(TickReason reason);
- virtual void SetMouseCapture(bool on);
- virtual bool HaveMouseCapture();
- virtual void SetTrackMouseLeaveEvent(bool on);
- virtual bool PaintContains(PRectangle rc);
- virtual void ScrollText(int linesToMove);
- virtual void NotifyCaretMove();
- virtual void UpdateSystemCaret();
- virtual void SetVerticalScrollPos();
- virtual void SetHorizontalScrollPos();
- virtual bool ModifyScrollBars(int nMax, int nPage);
- virtual void NotifyChange();
- virtual void NotifyFocus(bool focus);
- virtual void SetCtrlID(int identifier);
- virtual int GetCtrlID();
- virtual void NotifyParent(SCNotification scn);
- virtual void NotifyDoubleClick(Point pt, int modifiers);
- virtual CaseFolder *CaseFolderForEncoding();
- virtual std::string CaseMapString(const std::string &s, int caseMapping);
- virtual void Copy();
- virtual void CopyAllowLine();
- virtual bool CanPaste();
- virtual void Paste();
- virtual void CreateCallTipWindow(PRectangle rc);
- virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
- virtual void ClaimSelection();
+ bool FineTickerAvailable() override;
+ bool FineTickerRunning(TickReason reason) override;
+ void FineTickerStart(TickReason reason, int millis, int tolerance) override;
+ void FineTickerCancel(TickReason reason) override;
+ void SetMouseCapture(bool on) override;
+ bool HaveMouseCapture() override;
+ void SetTrackMouseLeaveEvent(bool on);
+ bool PaintContains(PRectangle rc) override;
+ void ScrollText(int linesToMove) override;
+ void NotifyCaretMove() override;
+ void UpdateSystemCaret() override;
+ void SetVerticalScrollPos() override;
+ void SetHorizontalScrollPos() override;
+ bool ModifyScrollBars(int nMax, int nPage) override;
+ void NotifyChange() override;
+ void NotifyFocus(bool focus) override;
+ void SetCtrlID(int identifier) override;
+ int GetCtrlID() override;
+ void NotifyParent(SCNotification scn) override;
+ void NotifyDoubleClick(Point pt, int modifiers) override;
+ CaseFolder *CaseFolderForEncoding() override;
+ std::string CaseMapString(const std::string &s, int caseMapping) override;
+ void Copy() override;
+ void CopyAllowLine() override;
+ bool CanPaste() override;
+ void Paste() override;
+ void CreateCallTipWindow(PRectangle rc) override;
+ void AddToPopUp(const char *label, int cmd = 0, bool enabled = true) override;
+ void ClaimSelection() override;
// DBCS
void ImeStartComposition();
@@ -352,7 +352,7 @@ class ScintillaWin :
LRESULT ImeOnReconvert(LPARAM lParam);
void GetIntelliMouseParameters();
- virtual void CopyToClipboard(const SelectionText &selectedText);
+ void CopyToClipboard(const SelectionText &selectedText) override;
void ScrollMessage(WPARAM wParam);
void HorizontalScrollMessage(WPARAM wParam);
void FullPaint();
@@ -360,15 +360,15 @@ class ScintillaWin :
bool IsCompatibleDC(HDC dc);
DWORD EffectFromState(DWORD grfKeyState) const;
- virtual int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw);
- virtual bool GetScrollInfo(int nBar, LPSCROLLINFO lpsi);
+ int SetScrollInfo(int nBar, LPCSCROLLINFO lpsi, BOOL bRedraw);
+ bool GetScrollInfo(int nBar, LPSCROLLINFO lpsi);
void ChangeScrollPos(int barType, int pos);
sptr_t GetTextLength();
sptr_t GetText(uptr_t wParam, sptr_t lParam);
public:
// Public for benefit of Scintilla_DirectFunction
- virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+ sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) override;
/// Implement IUnknown
STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv);
@@ -2012,7 +2012,7 @@ public:
explicit CaseFolderDBCS(UINT cp_) : cp(cp_) {
StandardASCII();
}
- virtual size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) {
+ size_t Fold(char *folded, size_t sizeFolded, const char *mixed, size_t lenMixed) override {
if ((lenMixed == 1) && (sizeFolded > 0)) {
folded[0] = mapping[static_cast<unsigned char>(mixed[0])];
return 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-13 01:11:51 +0000