Updated Attrib flags and struct

1 files changed, 8 insertions, 11 deletions

diff --git a/src/Window.hh b/src/Window.hh
index f08acb0..63d10e2 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -1,3 +1,6 @@
+// Window.hh for Fluxbox 
+// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) 
+//
 // Window.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,10 +22,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-//
-//Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org)
-// See LICENSE for copyright and license
-
 #ifndef   _WINDOW_HH_
 #define   _WINDOW_HH_
 
@@ -150,7 +149,7 @@ public:
   void restore(void);
   void configure(int dx, int dy, unsigned int dw, unsigned int dh);
   void setWorkspace(int n);
-  void changeBlackboxHints(BlackboxHints *);
+  void changeBlackboxHints(BaseDisplay::BlackboxHints *);
   void restoreAttributes(void);
 
   void buttonPressEvent(XButtonEvent *);
@@ -178,14 +177,13 @@ public:
 
 private:
   BImageControl *image_ctrl;
-        //Fluxbox *fluxbox;
         
   bool moving, resizing, shaded, maximized, visible, iconic, transient,
     focused, stuck, modal, send_focus_message, managed;
   BScreen *screen;
   BTimer *timer;
   Display *display;
-  BlackboxAttributes blackbox_attrib;
+  BaseDisplay::BlackboxAttributes blackbox_attrib;
 
   Time lastButtonPressTime;
   Windowmenu *windowmenu;
@@ -207,7 +205,7 @@ private:
                 unsigned long initial_state, normal_hint_flags, wm_hint_flags;
 
                 MwmHints *mwm_hint;
-                BlackboxHints *blackbox_hint;
+                BaseDisplay::BlackboxHints *blackbox_hint;
         } client;
 
         struct _decorations {
@@ -221,9 +219,8 @@ private:
   
         bool usetab;
         Tab *tab;
-        //Tab is also a friend
-        friend class Tab;       
-
+        friend class Tab;
+        
         typedef void (*ButtonDrawProc)(FluxboxWindow *, Window, bool);
         typedef void (*ButtonEventProc)(FluxboxWindow *, XButtonEvent *);