aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-09 22:16:40 (GMT)
committerfluxgen <fluxgen>2003-01-09 22:16:40 (GMT)
commit20037a89beec371ff8a6cba76d0e62ef342d9d83 (patch)
tree7af54389a2d5797c793fedfe1e5d958049ecea5a /src
parent2e40e38c426a247ee062ad725a2b5b1762d4a46c (diff)
downloadfluxbox-20037a89beec371ff8a6cba76d0e62ef342d9d83.zip
fluxbox-20037a89beec371ff8a6cba76d0e62ef342d9d83.tar.bz2
adjusted for FbTk Timer and ImageControl
Diffstat (limited to 'src')
-rw-r--r--src/Window.hh11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 65a02ce..2d77ef3 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.41 2003/01/07 01:33:18 fluxgen Exp $ 25// $Id: Window.hh,v 1.42 2003/01/09 22:16:40 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -53,10 +53,11 @@ class BScreen;
53 53
54namespace FbTk { 54namespace FbTk {
55class MenuTheme; 55class MenuTheme;
56class ImageControl;
56}; 57};
57 58
58/// Creates the window frame and handles any window event for it 59/// Creates the window frame and handles any window event for it
59class FluxboxWindow : public TimeoutHandler, public FbTk::EventHandler { 60class FluxboxWindow : public FbTk::TimeoutHandler, public FbTk::EventHandler {
60public: 61public:
61 /// layer bits 62 /// layer bits
62 enum WinLayer { 63 enum WinLayer {
@@ -102,7 +103,7 @@ public:
102 }; 103 };
103 104
104 /// create fluxbox window with parent win and screen connection 105 /// create fluxbox window with parent win and screen connection
105 FluxboxWindow(Window win, BScreen *scr, int screen_num, BImageControl &imgctrl, FbWinFrameTheme &tm, 106 FluxboxWindow(Window win, BScreen *scr, int screen_num, FbTk::ImageControl &imgctrl, FbWinFrameTheme &tm,
106 FbTk::MenuTheme &menutheme); 107 FbTk::MenuTheme &menutheme);
107 virtual ~FluxboxWindow(); 108 virtual ~FluxboxWindow();
108 109
@@ -313,8 +314,6 @@ private:
313 // state and hint signals 314 // state and hint signals
314 WinSubject m_hintsig, m_statesig, m_workspacesig, m_diesig; 315 WinSubject m_hintsig, m_statesig, m_workspacesig, m_diesig;
315 316
316 // BImageControl &image_ctrl; /// image control for rendering
317
318 std::string m_instance_name; /// instance name from WM_CLASS 317 std::string m_instance_name; /// instance name from WM_CLASS
319 std::string m_class_name; /// class name from WM_CLASS 318 std::string m_class_name; /// class name from WM_CLASS
320 319
@@ -323,7 +322,7 @@ private:
323 focused, stuck, modal, send_focus_message, m_managed; 322 focused, stuck, modal, send_focus_message, m_managed;
324 323
325 BScreen *screen; /// screen on which this window exist 324 BScreen *screen; /// screen on which this window exist
326 BTimer timer; 325 FbTk::Timer timer;
327 Display *display; /// display connection (obsolete by FbTk) 326 Display *display; /// display connection (obsolete by FbTk)
328 BaseDisplay::BlackboxAttributes blackbox_attrib; 327 BaseDisplay::BlackboxAttributes blackbox_attrib;
329 328