diff options
author | fluxgen <fluxgen> | 2002-02-17 10:28:18 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-02-17 10:28:18 (GMT) |
commit | 21d5810f1d7350f527e9f8d3c3c625f26f80c1b8 (patch) | |
tree | d5d39cc3cb15bd6bc9e900088424837eac63e800 | |
parent | c6a79f9e42c404da631faafbb0d09a5e5548b7bd (diff) | |
download | fluxbox-21d5810f1d7350f527e9f8d3c3c625f26f80c1b8.zip fluxbox-21d5810f1d7350f527e9f8d3c3c625f26f80c1b8.tar.bz2 |
changed include guard and added gnome_win
-rw-r--r-- | src/Screen.hh | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 147bcef..77710d8 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -22,41 +22,21 @@ | |||
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.16 2002/02/08 13:35:20 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.17 2002/02/17 10:28:18 fluxgen Exp $ |
26 | |||
27 | #ifndef _SCREEN_HH_ | ||
28 | #define _SCREEN_HH_ | ||
29 | 26 | ||
27 | #ifndef SCREEN_HH | ||
28 | #define SCREEN_HH | ||
30 | 29 | ||
31 | #include "Theme.hh" | 30 | #include "Theme.hh" |
32 | |||
33 | #ifndef _BASEDISPLAY_HH_ | ||
34 | #include "BaseDisplay.hh" | 31 | #include "BaseDisplay.hh" |
35 | #endif | ||
36 | #ifndef _CONFIGMENU_HH_ | ||
37 | #include "Configmenu.hh" | 32 | #include "Configmenu.hh" |
38 | #endif | ||
39 | #ifndef _ICON_HH_ | ||
40 | #include "Icon.hh" | 33 | #include "Icon.hh" |
41 | #endif | ||
42 | #ifndef _NETIZEN_HH_ | ||
43 | #include "Netizen.hh" | 34 | #include "Netizen.hh" |
44 | #endif | ||
45 | #ifndef _ROOTMENU_HH_ | ||
46 | #include "Rootmenu.hh" | 35 | #include "Rootmenu.hh" |
47 | #endif | ||
48 | #ifndef _TIMER_HH_ | ||
49 | #include "Timer.hh" | 36 | #include "Timer.hh" |
50 | #endif | ||
51 | #ifndef _WORKSPACE_HH_ | ||
52 | #include "Workspace.hh" | 37 | #include "Workspace.hh" |
53 | #endif | ||
54 | #ifndef _WORKSPACEMENU_HH_ | ||
55 | #include "Workspacemenu.hh" | 38 | #include "Workspacemenu.hh" |
56 | #endif | ||
57 | #ifndef _FLUXBOX_HH_ | ||
58 | #include "fluxbox.hh" | 39 | #include "fluxbox.hh" |
59 | #endif | ||
60 | 40 | ||
61 | #ifdef SLIT | 41 | #ifdef SLIT |
62 | # include "Slit.hh" | 42 | # include "Slit.hh" |
@@ -206,8 +186,8 @@ public: | |||
206 | //scroll workspaces | 186 | //scroll workspaces |
207 | void nextWorkspace(); | 187 | void nextWorkspace(); |
208 | void prevWorkspace(); | 188 | void prevWorkspace(); |
209 | void rightWorkspace(); | 189 | void rightWorkspace(); |
210 | void leftWorkspace(); | 190 | void leftWorkspace(); |
211 | 191 | ||
212 | void removeWorkspaceNames(void); | 192 | void removeWorkspaceNames(void); |
213 | void updateWorkspaceNamesAtom(void); | 193 | void updateWorkspaceNamesAtom(void); |
@@ -251,6 +231,7 @@ public: | |||
251 | private: | 231 | private: |
252 | #ifdef GNOME | 232 | #ifdef GNOME |
253 | void initGnomeAtoms(); | 233 | void initGnomeAtoms(); |
234 | Window gnome_win; | ||
254 | #endif | 235 | #endif |
255 | Theme *theme; | 236 | Theme *theme; |
256 | 237 | ||