new root dir based on bb-cvs

[chaz/openbox] / src / Rootmenu.cc

diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc
index b8c8f2dd924fec056bb43eb4ac55f29769efc8e6..4728f5075b8a02095b27f05a10de34fea0caeb12 100644 (file)
--- a/src/Rootmenu.cc
+++ b/src/Rootmenu.cc
@@ -38,10 +38,13 @@
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
 #ifdef    HAVE_SYS_PARAM_H
 #  include <sys/param.h>
@@ -52,8 +55,8 @@
 #endif // MAXPATHLEN
 
 
-Rootmenu::Rootmenu(BScreen &scrn) : Basemenu(scrn), screen(scrn),
-  openbox(scrn.getOpenbox())
+Rootmenu::Rootmenu(BScreen &scrn) : Basemenu(scrn), openbox(scrn.getOpenbox()),
+  screen(scrn)  
 {
 }
 
@@ -99,7 +102,7 @@ void Rootmenu::itemSelected(int button, int index) {
 
   case BScreen::SetStyle:
     if (item->exec())
-      openbox.saveStyleFilename(item->exec());
+      openbox.setStyleFilename(item->exec());
 
   case BScreen::Reconfigure:
     openbox.reconfigure();