X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frenderstyle.hh;h=69c26a7fa189ecf5666e20c3dba0f01cde283462;hb=50002f2ceb4234145f3977bb14752dc930ada26c;hp=697455337c9cae067952d92cf037016ff7a7f32c;hpb=99cd843fc6dc7a7f55b6c90fd1162f233853aad2;p=chaz%2Fopenbox

diff --git a/otk/renderstyle.hh b/otk/renderstyle.hh
index 69745533..69c26a7f 100644
--- a/otk/renderstyle.hh
+++ b/otk/renderstyle.hh
@@ -5,8 +5,8 @@
 #include "rendertexture.hh"
 #include "rendercolor.hh"
 #include "font.hh"
+#include "ustring.hh"
 
-#include <string>
 #include <list>
 
 namespace otk {
@@ -34,6 +34,7 @@ public:
   static void registerNotify(int screen, StyleNotify *n);
   static void unregisterNotify(int screen, StyleNotify *n);
   static RenderStyle *style(int screen);
+  static bool setStyle(int screen, const ustring &stylefile);
   
   enum Justify {
     LeftTopJustify,
@@ -42,8 +43,11 @@ public:
   };
 
 private:
+  static bool loadStyle(RenderStyle *s, int screen, const ustring &stylefile);
+  static void defaultStyle(RenderStyle *s, int screen);
+  
   int _screen;
-  std::string _file;
+  ustring _file;
 
   RenderColor *_root_color;
   
@@ -89,7 +93,6 @@ private:
   int _bevel_width;
 
 public:
-  RenderStyle(int screen, const std::string &stylefile);
   virtual ~RenderStyle();
 
   inline int screen() const { return _screen; }