aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-03 13:50:35 (GMT)
committerfluxgen <fluxgen>2003-02-03 13:50:35 (GMT)
commitc6a8dfa99eb073522ef9a8589e82d415cd406e5f (patch)
treee1b8f0883f8d1faa59602c3ad2d9305aee6bcb37 /src
parent5bb2d4b9015c8ca854d21e1364ed5a2e90e34485 (diff)
downloadfluxbox-c6a8dfa99eb073522ef9a8589e82d415cd406e5f.zip
fluxbox-c6a8dfa99eb073522ef9a8589e82d415cd406e5f.tar.bz2
minor adjustments
Diffstat (limited to 'src')
-rw-r--r--src/Screen.hh15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index e92b346..2b6d56c 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.64 2003/02/02 16:32:38 rathnor Exp $ 25// $Id: Screen.hh,v 1.65 2003/02/03 13:50:35 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -74,7 +74,7 @@ public:
74 74
75 BScreen(ResourceManager &rm, 75 BScreen(ResourceManager &rm,
76 const std::string &screenname, const std::string &altscreenname, 76 const std::string &screenname, const std::string &altscreenname,
77 int scrn); 77 int scrn, int number_of_layers);
78 ~BScreen(); 78 ~BScreen();
79 79
80 inline bool isToolbarOnTop() const { return *resource.toolbar_on_top; } 80 inline bool isToolbarOnTop() const { return *resource.toolbar_on_top; }
@@ -235,6 +235,8 @@ public:
235 235
236 const Theme *getTheme() const { return theme; } 236 const Theme *getTheme() const { return theme; }
237 FluxboxWindow *getIcon(unsigned int index); 237 FluxboxWindow *getIcon(unsigned int index);
238 FbTk::MultLayers &layerManager() { return m_layermanager; }
239 const FbTk::MultLayers &layerManager() const { return m_layermanager; }
238 240
239 int addWorkspace(); 241 int addWorkspace();
240 int removeLastWorkspace(); 242 int removeLastWorkspace();
@@ -335,9 +337,9 @@ private:
335 m_workspacenames_sig, ///< workspace names signal 337 m_workspacenames_sig, ///< workspace names signal
336 m_currentworkspace_sig; ///< current workspace signal 338 m_currentworkspace_sig; ///< current workspace signal
337 339
338 FbTk::MultLayers *m_layermanager; 340 FbTk::MultLayers m_layermanager;
339 341 //!!
340 Theme *theme; 342 Theme *theme; ///< obsolete
341 343
342 Bool root_colormap_installed, managed, geom_visible; 344 Bool root_colormap_installed, managed, geom_visible;
343 GC opGC; 345 GC opGC;
@@ -407,8 +409,9 @@ private:
407 409
408 410
409 } resource; 411 } resource;
412
410 std::auto_ptr<RootTheme> m_root_theme; 413 std::auto_ptr<RootTheme> m_root_theme;
411}; 414};
412 415
413 416
414#endif // SCREEN_ 417#endif // SCREEN_HH