Index: Draw/Display.cpp =================================================================== --- Draw/Display.cpp (revision 9939) +++ Draw/Display.cpp (working copy) @@ -76,19 +76,6 @@ imgspc = 0; } -class StdDisplayClass : public Display -{ -public: - StdDisplayClass(int align = ALIGN_LEFT) : align(align) {} - - virtual void Paint0(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const; - virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const; - virtual Size GetStdSize(const Value& q) const; - -private: - int align; -}; - void Display::PaintBackground(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const { @@ -121,7 +108,7 @@ Color ink, Color paper, dword s) const { LLOG("StdDisplay::Paint0: " << q << " ink:" << ink << " paper:" << paper); WString txt; - Font font = StdFont(); + Font font = Std_Font; int a = align; int x = r.left; int width = r.GetWidth(); @@ -175,7 +162,7 @@ Size StdDisplayClass::GetStdSize(const Value& q) const { - Font font = StdFont(); + Font font = Std_Font; WString txt; Size isz(0, 0); if(IsType(q)) { Index: Draw/Display.h =================================================================== --- Draw/Display.h (revision 9939) +++ Draw/Display.h (working copy) @@ -19,6 +19,19 @@ virtual ~Display(); }; +class StdDisplayClass : public Display +{ +public: + Font Std_Font; + StdDisplayClass(int align = ALIGN_LEFT) : align(align) { Std_Font = StdFont(); } + + virtual void Paint0(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const; + virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const; + virtual Size GetStdSize(const Value& q) const; +private: + int align; +}; + struct AttrText : public ValueType > { WString text; Value value;