diff options
Diffstat (limited to 'src/ToolbarHandler.cc')
-rw-r--r-- | src/ToolbarHandler.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc index f6fd015..4a8ff3d 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.28 2003/09/08 18:18:25 fluxgen Exp $ | 23 | // $Id: ToolbarHandler.cc,v 1.29 2003/10/06 06:22:43 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. |
@@ -33,7 +33,7 @@ | |||
33 | #include "Screen.hh" | 33 | #include "Screen.hh" |
34 | #include "Workspace.hh" | 34 | #include "Workspace.hh" |
35 | #include "MenuItem.hh" | 35 | #include "MenuItem.hh" |
36 | #include "Menu.hh" | 36 | #include "FbMenu.hh" |
37 | #include "FbCommands.hh" | 37 | #include "FbCommands.hh" |
38 | #include "RefCount.hh" | 38 | #include "RefCount.hh" |
39 | #include "SimpleCommand.hh" | 39 | #include "SimpleCommand.hh" |
@@ -51,9 +51,11 @@ ToolbarHandler::ToolbarHandler(BScreen &screen) | |||
51 | m_toolbar(0), | 51 | m_toolbar(0), |
52 | m_current_workspace(0), | 52 | m_current_workspace(0), |
53 | m_modemenu(*screen.menuTheme(), | 53 | m_modemenu(*screen.menuTheme(), |
54 | screen.screenNumber(), screen.imageControl()), | 54 | screen.screenNumber(), screen.imageControl(), |
55 | *screen.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), | ||
55 | m_toolbarmenu(*screen.menuTheme(), | 56 | m_toolbarmenu(*screen.menuTheme(), |
56 | screen.screenNumber(), screen.imageControl()) { | 57 | screen.screenNumber(), screen.imageControl(), |
58 | *screen.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())) { | ||
57 | m_modemenu.setInternalMenu(); | 59 | m_modemenu.setInternalMenu(); |
58 | m_toolbarmenu.setInternalMenu(); | 60 | m_toolbarmenu.setInternalMenu(); |
59 | 61 | ||