diff options
author | fluxgen <fluxgen> | 2002-03-19 00:16:44 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-03-19 00:16:44 (GMT) |
commit | 02466ab04056d9275e7351400be111a9c4580f26 (patch) | |
tree | eb8c9fbe5edd7859c8a2d8dd000f1cd974952c18 /src/fluxbox.hh | |
parent | f666e3cd77cddea837b3f8810540f061390749c1 (diff) | |
download | fluxbox-02466ab04056d9275e7351400be111a9c4580f26.zip fluxbox-02466ab04056d9275e7351400be111a9c4580f26.tar.bz2 |
Fixed timer pointer
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r-- | src/fluxbox.hh | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh index 4ba3e67..361b1f8 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.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: fluxbox.hh,v 1.13 2002/03/01 15:28:56 fluxgen Exp $ | 25 | // $Id: fluxbox.hh,v 1.14 2002/03/19 00:16:44 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FLUXBOX_HH | 27 | #ifndef FLUXBOX_HH |
28 | #define FLUXBOX_HH | 28 | #define FLUXBOX_HH |
@@ -45,42 +45,15 @@ | |||
45 | # endif // HAVE_SYS_TIME_H | 45 | # endif // HAVE_SYS_TIME_H |
46 | #endif // TIME_WITH_SYS_TIME | 46 | #endif // TIME_WITH_SYS_TIME |
47 | 47 | ||
48 | #ifndef _RESOURCE_HH_ | ||
49 | #include "Resource.hh" | 48 | #include "Resource.hh" |
50 | #endif | ||
51 | |||
52 | #ifndef _KEYS_HH_ | ||
53 | #include "Keys.hh" | 49 | #include "Keys.hh" |
54 | #endif | ||
55 | |||
56 | #ifndef _BASEDISPLAY_HH_ | ||
57 | #include "BaseDisplay.hh" | 50 | #include "BaseDisplay.hh" |
58 | #endif | ||
59 | |||
60 | #ifndef _IMAGE_HH_ | ||
61 | #include "Image.hh" | 51 | #include "Image.hh" |
62 | #endif | ||
63 | |||
64 | #ifndef _LINKEDLIST_HH_ | ||
65 | #include "LinkedList.hh" | 52 | #include "LinkedList.hh" |
66 | #endif | ||
67 | |||
68 | #ifndef _TIMER_HH_ | ||
69 | #include "Timer.hh" | 53 | #include "Timer.hh" |
70 | #endif | ||
71 | |||
72 | #ifndef _WINDOW_HH_ | ||
73 | #include "Window.hh" | 54 | #include "Window.hh" |
74 | #endif | ||
75 | |||
76 | #ifndef _TAB_HH_ | ||
77 | #include "Tab.hh" | 55 | #include "Tab.hh" |
78 | #endif | ||
79 | |||
80 | #ifndef _TOOLBAR_HH_ | ||
81 | #include "Toolbar.hh" | 56 | #include "Toolbar.hh" |
82 | #endif | ||
83 | |||
84 | #ifdef SLIT | 57 | #ifdef SLIT |
85 | # include "Slit.hh" | 58 | # include "Slit.hh" |
86 | #endif // SLIT | 59 | #endif // SLIT |
@@ -264,7 +237,7 @@ private: | |||
264 | LinkedList<BScreen> *screenList; | 237 | LinkedList<BScreen> *screenList; |
265 | 238 | ||
266 | FluxboxWindow *focused_window, *masked_window; | 239 | FluxboxWindow *focused_window, *masked_window; |
267 | BTimer *timer; | 240 | BTimer timer; |
268 | 241 | ||
269 | #ifdef HAVE_GETPID | 242 | #ifdef HAVE_GETPID |
270 | Atom fluxbox_pid; | 243 | Atom fluxbox_pid; |