aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/ScintillaCocoa.h1
-rw-r--r--gtk/ScintillaGTK.cxx1
-rw-r--r--gtk/ScintillaGTKAccessible.cxx1
-rw-r--r--qt/ScintillaEdit/ScintillaDocument.cpp1
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.h1
-rw-r--r--src/EditModel.cxx1
-rw-r--r--src/EditView.cxx1
-rw-r--r--src/Editor.cxx1
-rw-r--r--src/LineMarker.cxx39
-rw-r--r--src/LineMarker.h42
-rw-r--r--src/MarginView.cxx1
-rw-r--r--src/PositionCache.cxx1
-rw-r--r--src/ScintillaBase.cxx1
-rw-r--r--win32/ScintillaWin.cxx1
14 files changed, 46 insertions, 47 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 9673b1b50..ae8c2451a 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -43,7 +43,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 48aa30a71..6a9af496b 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -56,7 +56,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 05d6b768c..89854c416 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -105,7 +105,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index 7a5f00786..d19fcc683 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -24,7 +24,6 @@
#include "CellBuffer.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h
index 37a5e1bbe..cd0c26277 100644
--- a/qt/ScintillaEditBase/ScintillaQt.h
+++ b/qt/ScintillaEditBase/ScintillaQt.h
@@ -40,7 +40,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "AutoComplete.h"
diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index f7f73e178..7a6c098ed 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -34,7 +34,6 @@
#include "CellBuffer.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/src/EditView.cxx b/src/EditView.cxx
index f3df80dc9..be935b0ca 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -39,7 +39,6 @@
#include "PerLine.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 2c32d671c..bbffc97b6 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -38,7 +38,6 @@
#include "PerLine.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/src/LineMarker.cxx b/src/LineMarker.cxx
index 152b1c010..851f7b620 100644
--- a/src/LineMarker.cxx
+++ b/src/LineMarker.cxx
@@ -24,6 +24,45 @@
using namespace Scintilla;
+LineMarker::~LineMarker() {
+}
+
+LineMarker::LineMarker() {
+ markType = SC_MARK_CIRCLE;
+ fore = ColourDesired(0, 0, 0);
+ back = ColourDesired(0xff, 0xff, 0xff);
+ backSelected = ColourDesired(0xff, 0x00, 0x00);
+ alpha = SC_ALPHA_NOALPHA;
+ customDraw = nullptr;
+}
+
+LineMarker::LineMarker(const LineMarker &) {
+ // Defined to avoid pxpm and image being blindly copied, not as a complete copy constructor.
+ markType = SC_MARK_CIRCLE;
+ fore = ColourDesired(0, 0, 0);
+ back = ColourDesired(0xff, 0xff, 0xff);
+ backSelected = ColourDesired(0xff, 0x00, 0x00);
+ alpha = SC_ALPHA_NOALPHA;
+ pxpm.reset();
+ image.reset();
+ customDraw = nullptr;
+}
+
+LineMarker &LineMarker::operator=(const LineMarker &other) {
+ // Defined to avoid pxpm and image being blindly copied, not as a complete assignment operator.
+ if (this != &other) {
+ markType = SC_MARK_CIRCLE;
+ fore = ColourDesired(0, 0, 0);
+ back = ColourDesired(0xff, 0xff, 0xff);
+ backSelected = ColourDesired(0xff, 0x00, 0x00);
+ alpha = SC_ALPHA_NOALPHA;
+ pxpm.reset();
+ image.reset();
+ customDraw = nullptr;
+ }
+ return *this;
+}
+
void LineMarker::SetXPM(const char *textForm) {
pxpm.reset(new XPM(textForm));
markType = SC_MARK_PIXMAP;
diff --git a/src/LineMarker.h b/src/LineMarker.h
index 6b66e03e8..28a63cd3b 100644
--- a/src/LineMarker.h
+++ b/src/LineMarker.h
@@ -10,6 +10,9 @@
namespace Scintilla {
+class XPM;
+class RGBAImage;
+
typedef void (*DrawLineMarkerFn)(Surface *surface, PRectangle &rcWhole, Font &fontForCharacter, int tFold, int marginStyle, const void *lineMarker);
/**
@@ -30,41 +33,10 @@ public:
* it instead of creating a new method(s) in the Surface class that existing
* platforms must implement as empty. */
DrawLineMarkerFn customDraw;
- LineMarker() {
- markType = SC_MARK_CIRCLE;
- fore = ColourDesired(0,0,0);
- back = ColourDesired(0xff,0xff,0xff);
- backSelected = ColourDesired(0xff,0x00,0x00);
- alpha = SC_ALPHA_NOALPHA;
- customDraw = nullptr;
- }
- LineMarker(const LineMarker &) {
- // Defined to avoid pxpm and image being blindly copied, not as a complete copy constructor.
- markType = SC_MARK_CIRCLE;
- fore = ColourDesired(0,0,0);
- back = ColourDesired(0xff,0xff,0xff);
- backSelected = ColourDesired(0xff,0x00,0x00);
- alpha = SC_ALPHA_NOALPHA;
- pxpm.reset();
- image.reset();
- customDraw = nullptr;
- }
- ~LineMarker() {
- }
- LineMarker &operator=(const LineMarker &other) {
- // Defined to avoid pxpm and image being blindly copied, not as a complete assignment operator.
- if (this != &other) {
- markType = SC_MARK_CIRCLE;
- fore = ColourDesired(0,0,0);
- back = ColourDesired(0xff,0xff,0xff);
- backSelected = ColourDesired(0xff,0x00,0x00);
- alpha = SC_ALPHA_NOALPHA;
- pxpm.reset();
- image.reset();
- customDraw = nullptr;
- }
- return *this;
- }
+ LineMarker();
+ LineMarker(const LineMarker &);
+ virtual ~LineMarker();
+ LineMarker &operator=(const LineMarker &other);
void SetXPM(const char *textForm);
void SetXPM(const char *const *linesForm);
void SetRGBAImage(Point sizeRGBAImage, float scale, const unsigned char *pixelsRGBAImage);
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index ff19840c4..5a56b28ad 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -36,7 +36,6 @@
#include "CellBuffer.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx
index cb83cf3ef..bf28223d5 100644
--- a/src/PositionCache.cxx
+++ b/src/PositionCache.cxx
@@ -32,7 +32,6 @@
#include "CellBuffer.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx
index 46804e7b3..3b0cd1a73 100644
--- a/src/ScintillaBase.cxx
+++ b/src/ScintillaBase.cxx
@@ -44,7 +44,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 06589f210..e35012b19 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -65,7 +65,6 @@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
-#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "ViewStyle.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 12:30:54 +0000