summaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-26 21:44:55 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-26 21:44:55 (GMT)
commitf3790fb3e4105b815308aee9249b2fd342e2d82b (patch)
tree56074207e3682811a1cee68bb9d46d2d934e88a0 /src/Window.hh
parentb2546389a50ff370036590d799cfb640329160c5 (diff)
downloadfluxbox_lack-f3790fb3e4105b815308aee9249b2fd342e2d82b.zip
fluxbox_lack-f3790fb3e4105b815308aee9249b2fd342e2d82b.tar.bz2
revert previous patch until it can be fixed
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 5dbe055..d0db606 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -27,7 +27,6 @@
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
29 29
30#include "FbTk/DefaultValue.hh"
31#include "FbTk/Timer.hh" 30#include "FbTk/Timer.hh"
32#include "FbTk/Subject.hh" 31#include "FbTk/Subject.hh"
33#include "FbTk/Observer.hh" 32#include "FbTk/Observer.hh"
@@ -50,7 +49,6 @@ class WinClient;
50class FbWinFrameTheme; 49class FbWinFrameTheme;
51class BScreen; 50class BScreen;
52class FbWinFrame; 51class FbWinFrame;
53class FocusControl;
54 52
55namespace FbTk { 53namespace FbTk {
56class TextButton; 54class TextButton;
@@ -611,10 +609,8 @@ private:
611 609
612 bool m_icon_hidden; ///< if the window is in the iconbar 610 bool m_icon_hidden; ///< if the window is in the iconbar
613 bool m_focus_hidden; ///< if the window is in the NextWindow list 611 bool m_focus_hidden; ///< if the window is in the NextWindow list
614 /// if the window is normally focused when mapped 612 bool m_focus_new; ///< if the window is normally focused when mapped
615 FbTk::DefaultAccessor<bool, FocusControl> m_focus_new; 613 bool m_mouse_focus; ///< if the window is focused with EnterNotify
616 /// if the window is focused with EnterNotify
617 FbTk::DefaultAccessor<bool, FocusControl> m_mouse_focus;
618 bool m_click_focus; ///< if the window is focused by clicking 614 bool m_click_focus; ///< if the window is focused by clicking
619 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized 615 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized
620 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state 616 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state