From 6284d4ef9036764d4e6f708ca5f38aa7c1749865 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 28 May 2002 09:38:40 +0000 Subject: [PATCH] fix bug where destroying the wrong windows in BlackboxWindow::positionButtons. make util/ directory use the new config.h too --- src/Window.cc | 10 +++++----- util/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Window.cc b/src/Window.cc index a1be1f7e..a876e110 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -684,12 +684,12 @@ void BlackboxWindow::positionButtons(bool redecorate_label) { } } } - if (! hasclose) - destroyCloseButton(); - if (! hasiconify) - destroyCloseButton(); - if (! hasmaximize) + if (! hasclose && frame.close_button) destroyCloseButton(); + if (! hasiconify && frame.iconify_button) + destroyIconifyButton(); + if (! hasmaximize && frame.maximize_button) + destroyMaximizeButton(); if (! haslabel) parsed += 'L'; // require that the label be in the layout diff --git a/util/Makefile.am b/util/Makefile.am index 886f19dc..e0f3ecc6 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -1,6 +1,6 @@ # util/Makefile.am for Blackbox - an X11 Window manager -CPPFLAGS= @CPPFLAGS@ @DEBUG@ @NLS@ @TIMEDCACHE@ @ORDEREDPSEUDO@ +CPPFLAGS= @CPPFLAGS@ @DEBUG@ bin_SCRIPTS = bsetbg bin_PROGRAMS = bsetroot -- 2.45.2