aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-23 00:50:02 (GMT)
committerfluxgen <fluxgen>2003-02-23 00:50:02 (GMT)
commitf3be5a9d0626a57bf33ecdbcc983454159bb2931 (patch)
tree75edb803730a1c884787c8690a35bcc6373b01e8 /src
parent19f4dc774c19a8b9ebe06aa41a41c4e3fc23b05f (diff)
downloadfluxbox_pavel-f3be5a9d0626a57bf33ecdbcc983454159bb2931.zip
fluxbox_pavel-f3be5a9d0626a57bf33ecdbcc983454159bb2931.tar.bz2
removed some pointers
Diffstat (limited to 'src')
-rw-r--r--src/Toolbar.hh19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 21faadb..2b9668d 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.hh,v 1.24 2003/02/18 15:11:10 rathnor Exp $ 25// $Id: Toolbar.hh,v 1.25 2003/02/23 00:50:02 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -40,6 +40,7 @@
40 40
41#include <memory> 41#include <memory>
42 42
43
43namespace FbTk { 44namespace FbTk {
44class ImageControl; 45class ImageControl;
45}; 46};
@@ -73,13 +74,15 @@ public:
73 74
74 inline const FbTk::Menu &menu() const { return m_toolbarmenu; } 75 inline const FbTk::Menu &menu() const { return m_toolbarmenu; }
75 inline FbTk::Menu &menu() { return m_toolbarmenu; } 76 inline FbTk::Menu &menu() { return m_toolbarmenu; }
77 inline FbTk::Menu &placementMenu() { return m_placementmenu; }
78 inline const FbTk::Menu &placementMenu() const { return m_placementmenu; }
76 79
77 inline FbTk::Menu *layermenu() { return m_layermenu; } 80 inline FbTk::Menu &layermenu() { return m_layermenu; }
78 inline const FbTk::Menu *layermenu() const { return m_layermenu; } 81 inline const FbTk::Menu &layermenu() const { return m_layermenu; }
79 82
80 void moveToLayer(int layernum) { m_layeritem->moveToLayer(layernum); } 83 void moveToLayer(int layernum) { m_layeritem.moveToLayer(layernum); }
81 84
82 FbTk::XLayerItem &getLayerItem() { return *m_layeritem; } 85 FbTk::XLayerItem &getLayerItem() { return m_layeritem; }
83 86
84 /// are we in workspacename editing? 87 /// are we in workspacename editing?
85 inline bool isEditing() const { return editing; } 88 inline bool isEditing() const { return editing; }
@@ -158,7 +161,8 @@ private:
158 FbTk::Timer clock_timer; ///< timer to update clock 161 FbTk::Timer clock_timer; ///< timer to update clock
159 FbTk::Timer hide_timer; ///< timer to for auto hide toolbar 162 FbTk::Timer hide_timer; ///< timer to for auto hide toolbar
160 FbTk::Menu m_toolbarmenu; 163 FbTk::Menu m_toolbarmenu;
161 LayerMenu<Toolbar> *m_layermenu; 164 FbTk::Menu m_placementmenu;
165 LayerMenu<Toolbar> m_layermenu;
162 std::auto_ptr<IconBar> m_iconbar; 166 std::auto_ptr<IconBar> m_iconbar;
163 167
164 std::string new_workspace_name; ///< temp variable in edit workspace name mode 168 std::string new_workspace_name; ///< temp variable in edit workspace name mode
@@ -178,7 +182,8 @@ private:
178 182
179 ThemeListener m_themelistener; 183 ThemeListener m_themelistener;
180 184
181 FbTk::XLayerItem *m_layeritem; 185 FbTk::XLayerItem m_layeritem;
186
182}; 187};
183 188
184 189