merged changes from pre-devel

1 files changed, 0 insertions, 38 deletions

diff --git a/src/IconMenu.hh b/src/IconMenu.hh
deleted file mode 100644
index 43351d1..0000000
--- a/src/IconMenu.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-// IconMenu.hh for Fluxbox
-// Copyright (c) 2004 Henrik Kinnunen (fluxgen at fluxbox dot org)
-//
-// 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.
-
-// $Id$
-
-#ifndef ICONMENU_HH
-#define ICONMENU_HH
-
-#include "FbMenu.hh"
-
-class BScreen;
-
-class IconMenu: public FbMenu {
-public:
-    explicit IconMenu(BScreen &screen);
-    virtual ~IconMenu() { }
-    void update(FbTk::Subject *subj);
-};
-
-#endif // ICONMENU_HH