diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-11-06 08:06:54 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-11-06 08:06:54 +0000 |
| commit | d363f720a6b0d1c361bc2022d0e5fcd5a75fd04d (patch) | |
| tree | 468da3f0e2c52fb761cf3a89c6766dee6d15f45c /src/screen.hh | |
| parent | d3b7c84d4c640face48dfb54d70de2bff1551429 (diff) | |
fix compiling with the new strut (new namespace)
and fix general errors that broke compiling.
make xeventhandler find the OBClient for most events..
Diffstat (limited to 'src/screen.hh')
| -rw-r--r-- | src/screen.hh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/screen.hh b/src/screen.hh index 1c09c633..34963508 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -24,6 +24,7 @@ extern "C" { #include "otk/font.hh" #include "otk/texture.hh" #include "otk/image.hh" +#include "otk/strut.hh" #include "otk/property.hh" #include "timer.hh" #include "workspace.hh" @@ -31,8 +32,6 @@ extern "C" { namespace ob { -struct Strut; - enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify }; struct PixmapMask { @@ -83,7 +82,7 @@ private: RectList xineramaUsableArea; #endif // XINERAMA - typedef std::list<Strut*> StrutList; + typedef std::list<otk::Strut*> StrutList; StrutList strutList; typedef std::vector<Workspace*> WorkspaceList; WorkspaceList workspacesList; @@ -270,8 +269,8 @@ public: const RectList& allAvailableAreas(void) const; #endif // XINERAMA void updateAvailableArea(void); - void addStrut(Strut *strut); - void removeStrut(Strut *strut); + void addStrut(otk::Strut *strut); + void removeStrut(otk::Strut *strut); unsigned int addWorkspace(void); unsigned int removeLastWorkspace(void); |