From e61e83ec205a5d283675095c0b9dfcc9085d2bd8 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 30 Oct 2006 18:56:22 +0000 Subject: [PATCH] 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 --- src/frontends/Painter.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h index da59eee1f1..ceb6724ce9 100644 --- a/src/frontends/Painter.h +++ b/src/frontends/Painter.h @@ -148,23 +148,23 @@ public: * the given color. If frame is specified, a thin frame is drawn * around the text with the given color. */ - virtual void rectText(int x, int baseline, + void rectText(int x, int baseline, docstring const & str, LyXFont const & font, LColor_color back, LColor_color 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); protected: /// 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); /// 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. bool isDrawingEnabled() const { return drawing_enabled_; }