From 307da13fff916694f870ecb77aaf3ce0cf51d09e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 17 Apr 2002 23:07:11 +0000 Subject: menus update their values when they are reconfigure()d. the screen, toolbar and slit rc values are reloaded in BScreen::reconfigure() before the menus. the toolbar and slit rc values are explicitly loaded in their constructors, as is BScreen's. --- src/Screen.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/Screen.cc') diff --git a/src/Screen.cc b/src/Screen.cc index 251faadd..50bc4ceb 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -249,9 +249,6 @@ BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn), openbox.getSessionCursor()); workspaceNames = new LinkedList; - - load(); // load config options from Resources - workspacesList = new LinkedList; rootmenuList = new LinkedList; netizenList = new LinkedList; @@ -265,6 +262,7 @@ BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn), image_control->setDither(resource.image_dither); + load(); // load config options from Resources LoadStyle(); XGCValues gcv; @@ -1040,7 +1038,8 @@ void BScreen::save() { #ifdef HAVE_STRFTIME // it deletes the current value before setting the new one, so we have to // duplicate the current value. - setStrftimeFormat(bstrdup(resource.strftime_format)); + std::string s = resource.strftime_format; + setStrftimeFormat(s.c_str()); #else // !HAVE_STRFTIME setDateFormat(resource.date_format); setClock24Hour(resource.clock24hour); @@ -1211,6 +1210,10 @@ void BScreen::load() { void BScreen::reconfigure(void) { load(); + toolbar->load(); +#ifdef SLIT + slit->load(); +#endif // SLIT LoadStyle(); XGCValues gcv; -- cgit v1.2.3