Take menu file from rc file if it isn't specified on the command line.

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index c96c973e0ce2ea635e4b504a29e741ecc5314f4f..c6044812897d0e09f9d8afa8a59f3d3637c839f1 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -72,7 +72,8 @@ struct WindowStyle {
   BColor l_text_focus, l_text_unfocus, b_pic_focus,
     b_pic_unfocus;
   BTexture f_focus, f_unfocus, t_focus, t_unfocus, l_focus, l_unfocus,
-    h_focus, h_unfocus, b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
+    h_focus, h_unfocus, b_focus, b_unfocus, b_pressed, b_pressed_focus,
+    b_pressed_unfocus, g_focus, g_unfocus;
 
 #ifdef    BITMAPBUTTONS
   PixmapMask close_button, max_button, icon_button, stick_button;
@@ -206,7 +207,8 @@ private:
   
   BTexture readDatabaseTexture(const std::string &rname,
                                const std::string &default_color,
-                               const Configuration &style);
+                               const Configuration &style, 
+                               bool allowNoTexture = false);
   BColor readDatabaseColor(const std::string &rname,
                            const std::string &default_color,
                            const Configuration &style);