From ea59142b8c2ff487e36f736b403d762e08ff4ab9 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 13 Jan 2014 09:53:50 +0000
Subject: [PATCH] SDraw:: DrawEllipseOp, Core: NOI18N flag

git-svn-id: svn://ultimatepp.org/upp/trunk@6769 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/t.h       |  4 ++++
 uppsrc/Draw/SDraw.cpp | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/uppsrc/Core/t.h b/uppsrc/Core/t.h
index bd3316464..aec56c8a2 100644
--- a/uppsrc/Core/t.h
+++ b/uppsrc/Core/t.h
@@ -1,3 +1,5 @@
+#ifndef flagNOI18N
+
 #ifndef _Core_lng_h_
 #define _Core_lng_h_
 
@@ -298,3 +300,5 @@ INITBLOCK_(COMBINE3(LNG_MODULE, LNG_VERB, LNG_VERA))
 #undef T_
 
 #endif
+
+#endif
\ No newline at end of file
diff --git a/uppsrc/Draw/SDraw.cpp b/uppsrc/Draw/SDraw.cpp
index c06101304..f999a3872 100644
--- a/uppsrc/Draw/SDraw.cpp
+++ b/uppsrc/Draw/SDraw.cpp
@@ -14,7 +14,15 @@ void SDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color c
 
 void SDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor)
 {
-	// TODO
+	if(!IsNull(color)) {
+		docolor = color;
+		Polygon().Ellipse(r).Fill();
+	}
+	if(!IsNull(pen) && !IsNull(pencolor)) {
+		docolor = pencolor;
+		Width(pen);
+		Ellipse(r);
+	}
 }
 
 void SDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)