summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-02-17 19:19:05 (GMT)
committerfluxgen <fluxgen>2002-02-17 19:19:05 (GMT)
commite953b30d9a12841cc0d6ed687410866465fdf45c (patch)
tree005d9179126da3ffbe3ef40cb1dbe95fb3ec4419
parent552f589c75750d4cf2896ebd86c30e4ccdc94285 (diff)
downloadfluxbox_lack-e953b30d9a12841cc0d6ed687410866465fdf45c.zip
fluxbox_lack-e953b30d9a12841cc0d6ed687410866465fdf45c.tar.bz2
fixed iconbar bug
-rw-r--r--src/Screen.cc17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index e90400e..8444480 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -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: Screen.cc,v 1.24 2002/02/17 18:56:14 fluxgen Exp $ 25// $Id: Screen.cc,v 1.25 2002/02/17 19:19:05 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -702,9 +702,18 @@ void BScreen::addIcon(FluxboxWindow *w) {
702 702
703void BScreen::removeIcon(FluxboxWindow *w) { 703void BScreen::removeIcon(FluxboxWindow *w) {
704 if (! w) return; 704 if (! w) return;
705 705 {
706 std::remove(iconList.begin(), iconList.end(), w); 706 Icons::iterator it = iconList.begin();
707 707 Icons::iterator it_end = iconList.end();
708 for (; it != it_end; ++it) {
709 if (*it == w) {
710 iconList.erase(it);
711 break;
712 }
713 }
714 }
715 //std::remove(iconList.begin(), iconList.end(), w);
716
708 iconmenu->remove(w->getWindowNumber()); 717 iconmenu->remove(w->getWindowNumber());
709 iconmenu->update(); 718 iconmenu->update();
710 toolbar->delIcon(w); 719 toolbar->delIcon(w);