Backport: Use forward class definitions of XPM and RGBAImage so only code that uses them needs to #include "XPM.h".

Move definition of standard methods on LineMarker from header to implementation
to reduce included text and further isolate use of XPM and RGBAImage.

Backport of changeset 6624:32adac0930bb.

1 files changed, 39 insertions, 0 deletions

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;