render code fixes

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 24f3ff52d27bbf60bc9a5869a03e80576e60eb96..712fce37cb5a9755f6e7d36376dab16499040c4c 100644 (file)
--- 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 e5fd4529a395c5800f09ebd8f75726b18434ff84..eca8fff1711399ee82941ad973dfc264a17891c7 100644 (file)
--- 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 06de3a16fff35181d94245b6720435cc0c740345..97e6caea17d26c23bd601e5cf5a06361244b2081 100644 (file)
--- 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 90229d88c7db765ff98398a9e82338ec583a6485..1bb59c80cf7e2099c24e9240acca1ca8aa2d2c4e 100644 (file)
--- 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 2b0300939cbcaf988b8bc949b8d4c2e6019555ad..698e856bd2bf838282bb20bb9547fdeb6c02ac7a 100644 (file)
--- 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;