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 5da2777..35a0162 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc | |||
@@ -51,7 +51,7 @@ public: | |||
51 | 51 | ||
52 | m_tbar.screen() | 52 | m_tbar.screen() |
53 | .placementStrategy() | 53 | .placementStrategy() |
54 | .placeAndShowMenu(m_tbar.menu(), e.xbutton.x_root, e.xbutton.y_root, false); | 54 | .placeAndShowMenu(*m_tbar.menu(), e.xbutton.x_root, e.xbutton.y_root, false); |
55 | } | 55 | } |
56 | private: | 56 | private: |
57 | Toolbar &m_tbar; | 57 | Toolbar &m_tbar; |
@@ -87,13 +87,13 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow & | |||
87 | witem->button().setOnClick(showmenu); | 87 | witem->button().setOnClick(showmenu); |
88 | item = witem; | 88 | item = witem; |
89 | } else if (name == "iconbar") { | 89 | } else if (name == "iconbar") { |
90 | item = new IconbarTool(parent, m_iconbar_theme, m_focused_iconbar_theme, m_unfocused_iconbar_theme, screen(), tbar.menu()); | 90 | item = new IconbarTool(parent, m_iconbar_theme, m_focused_iconbar_theme, m_unfocused_iconbar_theme, screen(), *tbar.menu()); |
91 | } else if (name == "systemtray") { | 91 | } else if (name == "systemtray") { |
92 | #ifdef USE_SYSTRAY | 92 | #ifdef USE_SYSTRAY |
93 | item = new SystemTray(parent, dynamic_cast<ButtonTheme &>(*m_systray_theme), screen()); | 93 | item = new SystemTray(parent, dynamic_cast<ButtonTheme &>(*m_systray_theme), screen()); |
94 | #endif | 94 | #endif |
95 | } else if (name == "clock") { | 95 | } else if (name == "clock") { |
96 | item = new ClockTool(parent, m_clock_theme, screen(), tbar.menu()); | 96 | item = new ClockTool(parent, m_clock_theme, screen(), *tbar.menu()); |
97 | } else { | 97 | } else { |
98 | 98 | ||
99 | std::string cmd_str = name; | 99 | std::string cmd_str = name; |