aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-13 14:06:45 (GMT)
committerfluxgen <fluxgen>2003-05-13 14:06:45 (GMT)
commitff5f444666948d8fbd345f1b32e7ffd54fecfaeb (patch)
treebae607be8c2ad6f7ff0edd67ef3e756d1a3a2f40 /src/Screen.hh
parent56af958aa5be9e624775bcae4a7dfb8535138547 (diff)
downloadfluxbox-ff5f444666948d8fbd345f1b32e7ffd54fecfaeb.zip
fluxbox-ff5f444666948d8fbd345f1b32e7ffd54fecfaeb.tar.bz2
removed ScreenInfo
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 53ad211..85d3ff7 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,18 +22,18 @@
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.94 2003/05/12 04:28:46 fluxgen Exp $ 25// $Id: Screen.hh,v 1.95 2003/05/13 14:02:48 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
29 29
30#include "ScreenInfo.hh"
31#include "Resource.hh" 30#include "Resource.hh"
32#include "Subject.hh" 31#include "Subject.hh"
33#include "MultLayers.hh" 32#include "MultLayers.hh"
34#include "ToolbarHandler.hh" 33#include "ToolbarHandler.hh"
35#include "Slit.hh" 34#include "Slit.hh"
36#include "FbRootWindow.hh" 35#include "FbRootWindow.hh"
36#include "NotCopyable.hh"
37 37
38#include <X11/Xlib.h> 38#include <X11/Xlib.h>
39#include <X11/Xresource.h> 39#include <X11/Xresource.h>
@@ -64,7 +64,7 @@ class XLayerItem;
64/** 64/**
65 Create a toolbar and workspaces, handles switching between workspaces and windows 65 Create a toolbar and workspaces, handles switching between workspaces and windows
66 */ 66 */
67class BScreen : public ScreenInfo { 67class BScreen : private FbTk::NotCopyable {
68public: 68public:
69 typedef std::vector<Workspace *> Workspaces; 69 typedef std::vector<Workspace *> Workspaces;
70 typedef std::vector<std::string> WorkspaceNames; 70 typedef std::vector<std::string> WorkspaceNames;
@@ -142,7 +142,7 @@ public:
142 142
143 inline unsigned int getWidth() const { return rootWindow().width(); } 143 inline unsigned int getWidth() const { return rootWindow().width(); }
144 inline unsigned int getHeight() const { return rootWindow().height(); } 144 inline unsigned int getHeight() const { return rootWindow().height(); }
145 145 inline unsigned int getScreenNumber() const { return rootWindow().screenNumber(); }
146 typedef std::vector<FluxboxWindow *> Icons; 146 typedef std::vector<FluxboxWindow *> Icons;
147 typedef std::list<WinClient *> FocusedWindows; 147 typedef std::list<WinClient *> FocusedWindows;
148 148