diff options
Diffstat (limited to 'src/ToolFactory.cc')
-rw-r--r-- | src/ToolFactory.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc index d94105d..007cabf 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc | |||
@@ -49,7 +49,7 @@ public: | |||
49 | 49 | ||
50 | m_tbar.screen() | 50 | m_tbar.screen() |
51 | .placementStrategy() | 51 | .placementStrategy() |
52 | .placeAndShowMenu(m_tbar.menu(), e.xbutton.x_root, e.xbutton.y_root, false); | 52 | .placeAndShowMenu(*m_tbar.menu(), e.xbutton.x_root, e.xbutton.y_root, false); |
53 | } | 53 | } |
54 | private: | 54 | private: |
55 | Toolbar &m_tbar; | 55 | Toolbar &m_tbar; |
@@ -85,11 +85,11 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow & | |||
85 | witem->button().setOnClick(showmenu); | 85 | witem->button().setOnClick(showmenu); |
86 | item = witem; | 86 | item = witem; |
87 | } else if (name == "iconbar") { | 87 | } else if (name == "iconbar") { |
88 | item = new IconbarTool(parent, m_iconbar_theme, m_focused_iconbar_theme, m_unfocused_iconbar_theme, screen(), tbar.menu()); | 88 | item = new IconbarTool(parent, m_iconbar_theme, m_focused_iconbar_theme, m_unfocused_iconbar_theme, screen(), *tbar.menu()); |
89 | } else if (name == "systemtray") { | 89 | } else if (name == "systemtray") { |
90 | item = new SystemTray(parent, dynamic_cast<ButtonTheme &>(*m_systray_theme), screen()); | 90 | item = new SystemTray(parent, dynamic_cast<ButtonTheme &>(*m_systray_theme), screen()); |
91 | } else if (name == "clock") { | 91 | } else if (name == "clock") { |
92 | item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu()); | 92 | item = new ClockTool(parent, m_clock_theme, screen(), *tbar.menu()); |
93 | } else { | 93 | } else { |
94 | FbTk::RefCount<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(name)); | 94 | FbTk::RefCount<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(name)); |
95 | if (cmd == 0) // we need a command | 95 | if (cmd == 0) // we need a command |