X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fwindow.hh;h=6c84a17638a171b6f9473b72ad176dfd10329a29;hb=1824e6b1006397ae3233dc164d3d026c54a20bb3;hp=e8249b0840b5a2ee0aa63c95a88dd28813fb52ce;hpb=db451d95bf97b8a8e995f031ac98da50606fd3a0;p=chaz%2Fopenbox

diff --git a/src/window.hh b/src/window.hh
index e8249b08..6c84a176 100644
--- a/src/window.hh
+++ b/src/window.hh
@@ -1,26 +1,4 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-// Window.hh for Blackbox - an X11 Window manager
-// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
 #ifndef   __Window_hh
 #define   __Window_hh
 
@@ -37,7 +15,6 @@ extern "C" {
 #include "basedisplay.hh"
 #include "timer.hh"
 #include "util.hh"
-#include "windowmenu.hh"
 
 #define MwmHintsFunctions     (1l << 0)
 #define MwmHintsDecorations   (1l << 1)
@@ -130,7 +107,6 @@ private:
   BlackboxAttributes blackbox_attrib;
 
   Time lastButtonPressTime;  // used for double clicks, when were we clicked
-  Windowmenu *windowmenu;
 
   unsigned int window_number;
   unsigned long current_state;
@@ -290,11 +266,11 @@ private:
   void redrawWindowFrame(void) const;
   void redrawLabel(void) const;
   void redrawAllButtons(void) const;
-  void BlackboxWindow::redrawButton(bool pressed, Window win,
-                                    Pixmap fppix, unsigned long fppixel,
-                                    Pixmap uppix, unsigned long uppixel,
-                                    Pixmap fpix, unsigned long fpixel,
-                                    Pixmap upix, unsigned long upixel) const;
+  void redrawButton(bool pressed, Window win,
+                    Pixmap fppix, unsigned long fppixel,
+                    Pixmap uppix, unsigned long uppixel,
+                    Pixmap fpix, unsigned long fpixel,
+                    Pixmap upix, unsigned long upixel) const;
   void redrawCloseButton(bool pressed) const;
   void redrawIconifyButton(bool pressed) const;
   void redrawMaximizeButton(bool pressed) const;
@@ -353,8 +329,6 @@ public:
   inline Window getClientWindow(void) const { return client.window; }
   inline Window getGroupWindow(void) const { return client.window_group; }
 
-  inline Windowmenu * getWindowmenu(void) const { return windowmenu; }
-
   inline const char *getTitle(void) const
   { return client.title.c_str(); }
   inline const char *getIconTitle(void) const