Work around a possible gcc bug: Since Abde'ls recent changes gcc does not

like virtual methods in the base class anymore even if they are implemented.
	* src/frontends/Painter.h
	(rectText): remove the virtual qualifier
	(buttonText): ditto
	(underline): ditto
	(buttonFrame): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15625 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-10-30 18:56:22 +00:00
parent 4d814f3e73
commit e61e83ec20

View File

@ -148,23 +148,23 @@ public:
* the given color. If frame is specified, a thin frame is drawn * the given color. If frame is specified, a thin frame is drawn
* around the text with the given color. * around the text with the given color.
*/ */
virtual void rectText(int x, int baseline, void rectText(int x, int baseline,
docstring const & str, docstring const & str,
LyXFont const & font, LyXFont const & font,
LColor_color back, LColor_color back,
LColor_color frame); LColor_color frame);
/// draw a string and enclose it inside a button frame /// draw a string and enclose it inside a button frame
virtual void buttonText(int x, void buttonText(int x,
int baseline, docstring const & s, LyXFont const & font); int baseline, docstring const & s, LyXFont const & font);
protected: protected:
/// check the font, and if set, draw an underline /// check the font, and if set, draw an underline
virtual void underline(LyXFont const & f, void underline(LyXFont const & f,
int x, int y, int width); int x, int y, int width);
/// draw a bevelled button border /// draw a bevelled button border
virtual void buttonFrame(int x, int y, int w, int h); void buttonFrame(int x, int y, int w, int h);
/// Indicate wether real screen drawing shall be done or not. /// Indicate wether real screen drawing shall be done or not.
bool isDrawingEnabled() const { return drawing_enabled_; } bool isDrawingEnabled() const { return drawing_enabled_; }