fixed bugs, got otkapp to select on a fd, modded widget to make use of otkapp, press...

[chaz/openbox] / otk / style.hh

diff --git a/otk/style.hh b/otk/style.hh
index d13a1282c3e8dc59d50f51121ed8a9004c97516e..ccf4e49a1bb0e6451b74d19a1037ea2a33c79303 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; }
 
@@ -124,6 +123,11 @@ public:
   inline unsigned int getBorderWidth(void) const { return border_width; }
 
   inline const BFont &getFont() const { return *font; }
+
+  inline void setShadowFonts(bool fonts) { shadow_fonts = fonts; }
+  inline bool hasShadowFonts(void) const { return shadow_fonts; }
+
+  inline void setAAFonts(bool fonts) { aa_fonts = fonts; }
   inline bool hasAAFonts(void) const { return aa_fonts; }
 
   inline TextJustify textJustify(void) { return justify; }
@@ -134,8 +138,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