Cleaned up handling of what things should be drawn by using the DrawWhat enumeration type.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1072 0fc631ac-6414-0410-93d0-97cfa31319b6

src/render/text/compound.cpp

@@ -39,17 +39,19 @@ void AtomTextElement::draw(RotatedDC& dc, double scale, const RealRect& rect, co
 
 void ErrorTextElement::draw(RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const {
 	// Draw wavy underline
-	dc.SetPen(*wxRED_PEN);
-	RealPoint pos = rect.bottomLeft() - dc.trInvS(RealSize(0,2));
-	RealSize  dx(dc.trInvS(2), 0), dy(0, dc.trInvS(1));
-	while (pos.x + 1 < rect.right()) {
-		dc.DrawLine(pos - dy, pos + dx + dy);
-		pos += dx;
-		dy  = -dy;
-	}
-	if (pos.x < rect.right()) {
-		// final piece
-		dc.DrawLine(pos - dy, pos + dx / 2);
+	if (what & DRAW_ERRORS) {
+		dc.SetPen(*wxRED_PEN);
+		RealPoint pos = rect.bottomLeft() - dc.trInvS(RealSize(0,2));
+		RealSize  dx(dc.trInvS(2), 0), dy(0, dc.trInvS(1));
+		while (pos.x + 1 < rect.right()) {
+			dc.DrawLine(pos - dy, pos + dx + dy);
+			pos += dx;
+			dy  = -dy;
+		}
+		if (pos.x < rect.right()) {
+			// final piece
+			dc.DrawLine(pos - dy, pos + dx / 2);
+		}
 	}
 	// Draw the contents
 	CompoundTextElement::draw(dc, scale, rect, xs, what, start, end);

src/render/text/element.hpp

@@ -13,6 +13,7 @@
 #include <util/rotation.hpp>
 #include <util/real_point.hpp>
 #include <data/font.hpp>
+#include <data/draw_what.hpp>
 
 DECLARE_POINTER_TYPE(TextElement);
 DECLARE_POINTER_TYPE(Font);
@@ -22,14 +23,6 @@ class SymbolFontRef;
 
 // ----------------------------------------------------------------------------- : TextElement
 
-/// What should be drawn?
-enum DrawWhat
-{	DRAW_NOTHING = 0x00
-,	DRAW_NORMAL  = 0x01 // draw normal things, like the text
-,	DRAW_BORDERS = 0x02 // draw editor stuff, such as borders/lines
-,	DRAW_ACTIVE  = 0x04 // draw active editor stuff, such as hidden separators and atom highlights
-};
-
 /// Information on a linebreak
 enum LineBreak
 {	BREAK_NO		// no line break ever

src/render/text/viewer.cpp

@@ -70,6 +70,8 @@ TextViewer::~TextViewer() {}
 
 void TextViewer::draw(RotatedDC& dc, const TextStyle& style, DrawWhat what) {
 	assert(!lines.empty());
+	// draw anything?
+	if (what == DRAW_NOTHING) return;
 	// separator lines?
 	// do this first, so pen is still set from drawing the field border
 	if (what & DRAW_BORDERS) {