aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarHandler.cc
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-05-24 13:13:22 (GMT)
committerrathnor <rathnor>2003-05-24 13:13:22 (GMT)
commitbbaca5b43b1ef51c516f4fd1a75f5659767649c5 (patch)
treedb0d3acab130123951aa6e41aa0c787ec08837f1 /src/ToolbarHandler.cc
parent292f5c550f2286ef89530ba376b12b25d71338b3 (diff)
downloadfluxbox_pavel-bbaca5b43b1ef51c516f4fd1a75f5659767649c5.zip
fluxbox_pavel-bbaca5b43b1ef51c516f4fd1a75f5659767649c5.tar.bz2
mark a bunch of menus as internal
Diffstat (limited to 'src/ToolbarHandler.cc')
-rw-r--r--src/ToolbarHandler.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ToolbarHandler.cc b/src/ToolbarHandler.cc
index a60a050..eda54c9 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.13 2003/05/15 23:30:05 fluxgen Exp $ 23// $Id: ToolbarHandler.cc,v 1.14 2003/05/24 13:13:22 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.
@@ -96,6 +96,7 @@ ToolbarHandler::ToolbarHandler(BScreen &screen, ToolbarMode mode)
96 screen.screenNumber(), screen.imageControl()) 96 screen.screenNumber(), screen.imageControl())
97{ 97{
98 m_modemenu.setInternalMenu(); 98 m_modemenu.setInternalMenu();
99 m_toolbarmenu.setInternalMenu();
99 setupModeMenu(m_modemenu, *this); 100 setupModeMenu(m_modemenu, *this);
100 setMode(mode, false); // the atomhandler part will initialise it shortly 101 setMode(mode, false); // the atomhandler part will initialise it shortly
101} 102}
@@ -116,9 +117,9 @@ void ToolbarHandler::setMode(ToolbarMode mode, bool initialise) {
116 return; 117 return;
117 } else if (!m_toolbar.get()) { 118 } else if (!m_toolbar.get()) {
118 m_toolbarmenu.removeAll(); 119 m_toolbarmenu.removeAll();
119
120 m_toolbar.reset(new Toolbar(m_screen, 120 m_toolbar.reset(new Toolbar(m_screen,
121 *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu)); 121 *m_screen.layerManager().getLayer(m_screen.getToolbarLayerNum()), m_toolbarmenu));
122
122 m_toolbarmenu.insert("Mode...", &m_modemenu); 123 m_toolbarmenu.insert("Mode...", &m_modemenu);
123 m_toolbarmenu.update(); 124 m_toolbarmenu.update();
124 } 125 }