aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 23:30:07 (GMT)
committerfluxgen <fluxgen>2003-05-15 23:30:07 (GMT)
commit5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f (patch)
treed016e4843c109352b3df01fc98780052a13fb7c2 /src/Screen.hh
parent988392b1eb89deaddfddfcb37a15e8f55d58bb70 (diff)
downloadfluxbox-5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f.zip
fluxbox-5bbc7662328c2f147ceec0b7e6c3367cfd0b7a5f.tar.bz2
minor cleaning
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index a5a9672..46f86c4 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.97 2003/05/15 12:00:44 fluxgen Exp $ 25// $Id: Screen.hh,v 1.98 2003/05/15 23:25:36 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -94,11 +94,11 @@ public:
94 inline bool doShowWindowPos() const { return *resource.show_window_pos; } 94 inline bool doShowWindowPos() const { return *resource.show_window_pos; }
95 bool antialias() const { return *resource.antialias; } 95 bool antialias() const { return *resource.antialias; }
96 96
97 inline FbTk::ImageControl *getImageControl() { return image_control; } 97 inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
98 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); } 98 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); }
99 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); } 99 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
100 const FbTk::Menu &getToolbarModemenu() const ; 100 const FbTk::Menu &toolbarModemenu() const;
101 FbTk::Menu &getToolbarModemenu() ; 101 FbTk::Menu &toolbarModemenu();
102 102
103 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 103 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
104 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; } 104 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; }
@@ -180,7 +180,7 @@ public:
180 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; } 180 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; }
181 inline Resource<int> &getToolbarWidthPercentResource() { return resource.toolbar_width_percent; } 181 inline Resource<int> &getToolbarWidthPercentResource() { return resource.toolbar_width_percent; }
182 inline const Resource<int> &getToolbarWidthPercentResource() const { return resource.toolbar_width_percent; } 182 inline const Resource<int> &getToolbarWidthPercentResource() const { return resource.toolbar_width_percent; }
183 inline ToolbarHandler::ToolbarMode getToolbarMode() const { return *resource.toolbar_mode; } 183 inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; }
184 inline int getPlacementPolicy() const { return resource.placement_policy; } 184 inline int getPlacementPolicy() const { return resource.placement_policy; }
185 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 185 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
186 inline int getRowPlacementDirection() const { return resource.row_direction; } 186 inline int getRowPlacementDirection() const { return resource.row_direction; }
@@ -349,7 +349,7 @@ private:
349 Pixmap geom_pixmap; 349 Pixmap geom_pixmap;
350 FbTk::FbWindow geom_window; 350 FbTk::FbWindow geom_window;
351 351
352 FbTk::ImageControl *image_control; 352 std::auto_ptr<FbTk::ImageControl> m_image_control;
353 std::auto_ptr<FbTk::Menu> m_configmenu; 353 std::auto_ptr<FbTk::Menu> m_configmenu;
354 354
355 std::auto_ptr<FbTk::Menu> m_rootmenu; 355 std::auto_ptr<FbTk::Menu> m_rootmenu;
@@ -424,7 +424,7 @@ private:
424 424
425 } resource; 425 } resource;
426 426
427 ToolbarHandler *m_toolbarhandler; 427 std::auto_ptr<ToolbarHandler> m_toolbarhandler;
428}; 428};
429 429
430 430