X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.hh;h=ec9f3f8d4263a40cb23d7e5a8b9b52ded00622fc;hb=5a139f7263e33b499836f5df9ac37400e02c32f9;hp=ccf4e49a1bb0e6451b74d19a1037ea2a33c79303;hpb=6f5e60f0337e60d904a8f549aeaa631afefc8033;p=chaz%2Fopenbox

diff --git a/otk/style.hh b/otk/style.hh
index ccf4e49a..ec9f3f8d 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;
@@ -65,9 +65,6 @@ public:
   Style(BImageControl *);
   ~Style();
 
-  void doJustify(const std::string &text, int &start_pos,
-                 unsigned int max_length, unsigned int modifier) const;
-
   void readDatabaseMask(const std::string &rname,
                         PixmapMask &pixmapMask,
                         const Configuration &style);
@@ -86,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; }
 
@@ -140,7 +132,7 @@ public:
 
   inline void setImageControl(BImageControl *c) {
     image_control = c;
-    screen_number = c->getScreenInfo()->getScreenNumber();
+    screen_number = c->getScreenInfo()->screen();
   }
   inline unsigned int getScreen(void) { return screen_number; }