X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ffocuslabel.cc;h=136eb742c08c9498edf5c46d75e8907f1025b719;hb=54524ace9779d90ae3c4a18eeb70193daea2fb0a;hp=c4f124e682d1d989fd459f17ac592e9907a6675c;hpb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;p=chaz%2Fopenbox

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index c4f124e6..136eb742 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -13,9 +13,9 @@ namespace otk {
 OtkFocusLabel::OtkFocusLabel(OtkWidget *parent)
   : OtkFocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = OBDisplay::screenInfo(getScreen());
-  _xftdraw = XftDrawCreate(OBDisplay::display, getWindow(), info->getVisual(),
-                           info->getColormap());
+  const ScreenInfo *info = OBDisplay::screenInfo(screen());
+  _xftdraw = XftDrawCreate(OBDisplay::display, window(), info->visual(),
+                           info->colormap());
 }
 
 OtkFocusLabel::~OtkFocusLabel()
@@ -28,18 +28,18 @@ void OtkFocusLabel::setStyle(Style *style)
 {
   OtkFocusWidget::setStyle(style);
   
-  setTexture(getStyle()->getLabelFocus());
-  setUnfocusTexture(getStyle()->getLabelUnfocus());
+  setTexture(style->getLabelFocus());
+  setUnfocusTexture(style->getLabelUnfocus());
 }
 
 
 void OtkFocusLabel::update(void)
 {
   if (_dirty) {
-    const BFont &ft = getStyle()->getFont();
-    BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
-                          : getStyle()->getTextUnfocus());
-    unsigned int sidemargin = getStyle()->getBevelWidth() * 2;
+    const BFont &ft = style()->getFont();
+    BColor *text_color = (isFocused() ? style()->getTextFocus()
+                          : style()->getTextUnfocus());
+    unsigned int sidemargin = style()->getBevelWidth() * 2;
 
     std::string t = _text; // the actual text to draw
     int x = sidemargin;    // x coord for the text
@@ -58,7 +58,7 @@ void OtkFocusLabel::update(void)
       } while (length > max_length && text_len-- > 0);
 
       // justify the text
-      switch (getStyle()->textJustify()) {
+      switch (style()->textJustify()) {
       case Style::RightJustify:
         x += max_length - length;
         break;