X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.hh;h=f7584c3ef8642f5c619a635948748f1c249bc517;hb=3827c1a76e27865a9e2cc9da43c42399ea354e18;hp=c0e0bbd9daeefc5eacd197b58d40ea029e6779db;hpb=06de24ec6666578759eff2b348e50f5e8e20f3bd;p=chaz%2Fopenbox

diff --git a/otk/style.hh b/otk/style.hh
index c0e0bbd9..f7584c3e 100644
--- a/otk/style.hh
+++ b/otk/style.hh
@@ -13,6 +13,11 @@
 
 namespace otk {
 
+struct PixmapMask {
+  Pixmap mask;
+  unsigned int w, h;
+};
+
 class Style {
 public:
 
@@ -23,11 +28,6 @@ public:
   enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
   enum BulletType { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
 
-  struct PixmapMask {
-    Pixmap mask;
-    unsigned int w, h;
-  };
-
 // private:
 
   BImageControl *image_control;
@@ -83,17 +83,12 @@ public:
 
   void load(const Configuration &style);
 
-  inline BColor *getBorderColor(void) { return &border_color; }
-
   inline BColor *getTextFocus(void) { return &l_text_focus; }
   inline BColor *getTextUnfocus(void) { return &l_text_unfocus; }
 
   inline BColor *getButtonPicFocus(void) { return &b_pic_focus; }
   inline BColor *getButtonPicUnfocus(void) { return &b_pic_unfocus; }
 
-  inline BTexture *getFrameFocus(void) { return &f_focus; }
-  inline BTexture *getFrameUnfocus(void) { return &f_unfocus; }
-
   inline BTexture *getTitleFocus(void) { return &t_focus; }
   inline BTexture *getTitleUnfocus(void) { return &t_unfocus; }
 
@@ -130,10 +125,10 @@ public:
   inline TextJustify textJustify(void) { return justify; }
   inline BulletType bulletType(void) { return bullet_type; }
 
-  inline const BColor &getBorderColor() const { return border_color; }
+  inline const BColor *getBorderColor() const { return &border_color; }
 
-  inline const BTexture &getFrameFocus() const { return f_focus; }
-  inline const BTexture &getFrameUnfocus() const { return f_unfocus; }
+  inline const BTexture *getFrameFocus() const { return &f_focus; }
+  inline const BTexture *getFrameUnfocus() const { return &f_unfocus; }
 
   inline void setImageControl(BImageControl *c) {
     image_control = c;