From 11f59d7925068357e24ca743c23019f671e6a5d7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 22 Jan 2003 23:17:28 +0000 Subject: [PATCH] render code fixes --- otk/focuslabel.cc | 2 +- otk/focuslabel.hh | 2 +- otk/otk_test.cc | 8 ++++---- otk/rendercontrol.cc | 2 +- otk/widget.hh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc index 24f3ff52..712fce37 100644 --- a/otk/focuslabel.cc +++ b/otk/focuslabel.cc @@ -29,7 +29,7 @@ void FocusLabel::setStyle(RenderStyle *style) } -void FocusLabel::renderForeground(void) +void FocusLabel::renderForeground() { const Font *ft = style()->labelFont(); RenderColor *text_color = (isFocused() ? style()->textFocusColor() diff --git a/otk/focuslabel.hh b/otk/focuslabel.hh index e5fd4529..eca8fff1 100644 --- a/otk/focuslabel.hh +++ b/otk/focuslabel.hh @@ -16,7 +16,7 @@ public: inline const ustring &getText(void) const { return _text; } void setText(const ustring &text) { _text = text; _dirty = true; } - void renderForeground(void); + virtual void renderForeground(void); virtual void setStyle(RenderStyle *style); diff --git a/otk/otk_test.cc b/otk/otk_test.cc index 06de3a16..97e6caea 100644 --- a/otk/otk_test.cc +++ b/otk/otk_test.cc @@ -15,7 +15,7 @@ int main(int argc, char **argv) { otk::AppWidget foo(&app); foo.resize(600, 500); - foo.setTexture(app.getStyle()->titlebarFocusBackground()); +// foo.setTexture(app.getStyle()->titlebarFocusBackground()); // foo.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground()); foo.setBevelWidth(2); @@ -36,10 +36,10 @@ int main(int argc, char **argv) { right.setWidth(300); right.setTexture(app.getStyle()->titlebarFocusBackground()); right.setUnfocusTexture(app.getStyle()->titlebarUnfocusBackground()); - otk::Button iconb(&left); iconb.resize(40,20); - otk::FocusWidget label(&left); + +/* otk::FocusWidget label(&left); otk::Button maxb(&left); otk::Button closeb(&left); @@ -59,7 +59,7 @@ int main(int argc, char **argv) { // fixed size closeb.setText("fuubar"); - +*/ otk::FocusWidget rblef(&right); otk::Button rbutt1(&right); otk::Button rbutt2(&right); diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc index 90229d88..1bb59c80 100644 --- a/otk/rendercontrol.cc +++ b/otk/rendercontrol.cc @@ -99,7 +99,7 @@ void RenderControl::drawString(Surface& sf, const Font &font, int x, int y, else XftDrawString8(d, &c, font._xftfont, x, font._xftfont->ascent + y, (FcChar8*)string.c_str(), string.bytes()); - + printf("DRAW A STRING!: %s\n", string.c_str()); return; } diff --git a/otk/widget.hh b/otk/widget.hh index 2b030093..698e856b 100644 --- a/otk/widget.hh +++ b/otk/widget.hh @@ -133,7 +133,7 @@ protected: virtual void adjustVert(void); virtual void internalResize(int width, int height); virtual void render(void); - virtual void renderForeground(void) {} // for overriding + virtual void renderForeground() {} // for overriding Window _window; -- 2.45.2