use the widget's bevel width

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index bd74aa94fde064de2addd49ffb3545276d41a89b..f45ee71d7718a61a02be94cb04ad05dc9259e10e 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -37,7 +37,7 @@ void FocusLabel::fitString(const std::string &str)
 
 void FocusLabel::fitSize(int w, int h)
 {
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
   resize(w + sidemargin * 2, h);
 }
 
@@ -46,7 +46,7 @@ void FocusLabel::update()
   if (_dirty) {
     int w = _rect.width(), h = _rect.height();
     const Font *ft = style()->labelFont();
-    unsigned int sidemargin = style()->bevelWidth() * 2;
+    unsigned int sidemargin = _bevel_width * 2;
     if (!_fixed_width)
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)
@@ -72,7 +72,7 @@ void FocusLabel::renderForeground()
   const Font *ft = style()->labelFont();
   RenderColor *text_color = (isFocused() ? style()->textFocusColor()
                              : style()->textUnfocusColor());
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text

diff --git a/otk/label.cc b/otk/label.cc
index f0a4b66566b31749b3e0e82829cda4ba07913c82..824cc81d938cf9aca6b2b6f35132d52163c61249 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -33,7 +33,7 @@ void Label::fitString(const std::string &str)
 
 void Label::fitSize(int w, int h)
 {
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
   resize(w + sidemargin * 2, h);
 }
 
@@ -42,7 +42,7 @@ void Label::update()
   if (_dirty) {
     int w = _rect.width(), h = _rect.height();
     const Font *ft = style()->labelFont();
-    unsigned int sidemargin = style()->bevelWidth() * 2;
+    unsigned int sidemargin = _bevel_width * 2;
     if (!_fixed_width)
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)
@@ -66,7 +66,7 @@ void Label::renderForeground(void)
   Widget::renderForeground();
 
   const Font *ft = style()->labelFont();
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text