diff options
author | rathnor <rathnor> | 2003-07-18 15:40:55 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-07-18 15:40:55 (GMT) |
commit | 7e1733c4352befe577150bad63d362dd7c1a94b9 (patch) | |
tree | 1f339ae234f85aaa98529e9c511117dcb620a9f1 /src/ToolbarHandler.cc | |
parent | 06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6 (diff) | |
download | fluxbox_pavel-7e1733c4352befe577150bad63d362dd7c1a94b9.zip fluxbox_pavel-7e1733c4352befe577150bad63d362dd7c1a94b9.tar.bz2 |
reorganise operation of ResourceManager
plus fix initialisation of layer for slit and toolbar
Diffstat (limited to 'src/ToolbarHandler.cc')
-rw-r--r-- | src/ToolbarHandler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc index b9cf8d2..f5e9255 100644 --- a/src/ToolbarHandler.cc +++ b/src/ToolbarHandler.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: ToolbarHandler.cc,v 1.22 2003/07/10 11:53:44 fluxgen Exp $ | 23 | // $Id: ToolbarHandler.cc,v 1.23 2003/07/18 15:40:55 rathnor Exp $ |
24 | 24 | ||
25 | /** | 25 | /** |
26 | * The ToolbarHandler class acts as a rough interface to the toolbar. | 26 | * The ToolbarHandler class acts as a rough interface to the toolbar. |
@@ -142,6 +142,7 @@ void setupModeMenu(FbTk::Menu &menu, ToolbarHandler &handler) { | |||
142 | 142 | ||
143 | ToolbarHandler::ToolbarHandler(BScreen &screen) | 143 | ToolbarHandler::ToolbarHandler(BScreen &screen) |
144 | : m_screen(screen), | 144 | : m_screen(screen), |
145 | // no need to lock since only one resource | ||
145 | m_rc_mode(screen.resourceManager(), ToolbarHandler::ICONS, | 146 | m_rc_mode(screen.resourceManager(), ToolbarHandler::ICONS, |
146 | screen.name() + ".toolbar.mode", screen.altName() + ".Toolbar.Mode"), | 147 | screen.name() + ".toolbar.mode", screen.altName() + ".Toolbar.Mode"), |
147 | m_toolbar(0), | 148 | m_toolbar(0), |