use the rect

[chaz/openbox] / otk / style.hh

diff --git a/otk/style.hh b/otk/style.hh
index d13a1282c3e8dc59d50f51121ed8a9004c97516e..4128d93ef7f549c1dec3d3c18ccd611810394d92 100644 (file)
--- a/otk/style.hh
+++ b/otk/style.hh
@@ -62,8 +62,7 @@ public:
 public:
 
   Style();
-  Style(unsigned int);
-  Style(unsigned int, BImageControl *);
+  Style(BImageControl *);
   ~Style();
 
   void doJustify(const std::string &text, int &start_pos,
@@ -85,7 +84,7 @@ public:
   BFont *readDatabaseFont(const std::string &rbasename,
                           const Configuration &style);
 
-  void load(Configuration &);
+  void load(const Configuration &style);
 
   inline BColor *getBorderColor(void) { return &border_color; }
 
@@ -111,7 +110,7 @@ public:
   inline BTexture *getButtonUnfocus(void) { return &b_unfocus; }
 
   inline BTexture *getButtonPressedFocus(void)
-  { return &b_pressed_focus; }
+  { return &b_pressed; }
   inline BTexture *getButtonPressedUnfocus(void)
   { return &b_pressed_unfocus; }
 
@@ -134,8 +133,10 @@ public:
   inline const BTexture &getFrameFocus() const { return f_focus; }
   inline const BTexture &getFrameUnfocus() const { return f_unfocus; }
 
-  inline void setImageControl(BImageControl *c) { image_control = c; }
-  inline void setScreenNumber(unsigned int scr) { screen_number = scr; }
+  inline void setImageControl(BImageControl *c) {
+    image_control = c;
+    screen_number = c->getScreenInfo()->getScreenNumber();
+  }
   inline unsigned int getScreen(void) { return screen_number; }
 
   // XXX add inline accessors for the rest of the bummy