X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.hh;h=d3b5903e94222f3639459d45541a94e4a8fc4b5f;hb=b2079b56e4b2ea398d67fb5e15614797a0236f28;hp=f7584c3ef8642f5c619a635948748f1c249bc517;hpb=bf49e7642027f576716e5742544c282f4396f9ef;p=chaz%2Fopenbox

diff --git a/otk/style.hh b/otk/style.hh
index f7584c3e..d3b5903e 100644
--- a/otk/style.hh
+++ b/otk/style.hh
@@ -16,6 +16,7 @@ namespace otk {
 struct PixmapMask {
   Pixmap mask;
   unsigned int w, h;
+  PixmapMask() { mask = None; w = h = 0; }
 };
 
 class Style {
@@ -46,7 +47,7 @@ public:
     l_focus, l_unfocus,
     h_focus, h_unfocus,
     b_focus, b_unfocus,
-    b_pressed, b_pressed_focus, b_pressed_unfocus,
+    b_pressed_focus, b_pressed_unfocus,
     g_focus, g_unfocus;
 
   PixmapMask close_button, max_button, icon_button, stick_button;
@@ -102,7 +103,7 @@ public:
   inline BTexture *getButtonUnfocus(void) { return &b_unfocus; }
 
   inline BTexture *getButtonPressedFocus(void)
-  { return &b_pressed; }
+  { return &b_pressed_focus; }
   inline BTexture *getButtonPressedUnfocus(void)
   { return &b_pressed_unfocus; }
 
@@ -114,7 +115,7 @@ public:
   inline unsigned int getFrameWidth(void) const { return frame_width; }
   inline unsigned int getBorderWidth(void) const { return border_width; }
 
-  inline const BFont &getFont() const { return *font; }
+  inline const BFont *getFont() const { return font; }
 
   inline void setShadowFonts(bool fonts) { shadow_fonts = fonts; }
   inline bool hasShadowFonts(void) const { return shadow_fonts; }