X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.h;h=24baba1f1dd8d963f09a8ed860500b3c15508d0b;hb=20d7381ffb3b7b918c0f6120cce8c0343a50ce83;hp=c59a2e95d33e90c2248782980329696dbb52c47d;hpb=57fb41c8060eaa2f29b25b08e3813b3dc140f165;p=chaz%2Fopenbox

diff --git a/src/Screen.h b/src/Screen.h
index c59a2e95..24baba1f 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -55,10 +55,6 @@
 
 #include <list>
 #include <vector>
-typedef std::list<Rootmenu *> menuList;
-typedef std::list<Netizen *> netList;
-typedef std::vector<Workspace *> wkspList;
-typedef std::vector<std::string> wkspNameList;
 
 // forward declaration
 class BScreen;
@@ -116,8 +112,11 @@ private:
   Iconmenu *iconmenu;
   Rootmenu *rootmenu;
 
+  typedef std::list<Rootmenu *> menuList;
   menuList rootmenuList;
+  typedef std::list<Netizen *> netList;
   netList netizenList;
+  typedef std::list<OpenboxWindow *> winList;
   winList iconList;     // winList is declared in Workspace.h
 
 #ifdef    SLIT
@@ -131,7 +130,9 @@ private:
   unsigned int geom_w, geom_h;
   unsigned long event_mask;
 
+  typedef std::vector<std::string> wkspNameList;
   wkspNameList workspaceNames;
+  typedef std::vector<Workspace *> wkspList;
   wkspList workspacesList;
 
   struct resource {
@@ -196,7 +197,7 @@ public:
 
   Rect availableArea() const;
   
-  inline Workspace *getWorkspace(int w) {
+  inline Workspace *getWorkspace(unsigned int w) {
     ASSERT(w < workspacesList.size());
     return workspacesList[w];
   }