nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor stuff

Browse source
This commit is contained in:
fluxgen 2002-09-09 10:01:41 +00:00
parent 245f8390a5
commit a7dc6a68c9
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Basemenu.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Basemenu.cc,v 1.28 2002/08/04 15:19:34 fluxgen Exp $ // $Id: Basemenu.cc,v 1.29 2002/09/09 10:01:41 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -221,12 +221,11 @@ int Basemenu::insert(const char *label, Basemenu *submenu, int pos) {
int Basemenu::remove(unsigned int index) { int Basemenu::remove(unsigned int index) {
if (index >= menuitems.size()) { if (index >= menuitems.size()) {
#ifdef DEBUG #ifdef DEBUG
std::cout << "Bad index (" << index << ") given to Basemenu::remove()" std::cout << "Bad index (" << index << ") given to Basemenu::remove()"
<< " -- should be between 0 and " << menuitems.size()-1 << " -- should be between 0 and " << menuitems.size()
<< " inclusive." << " inclusive." << std::endl;
<< std::endl; #endif // DEBUG
#endif
return -1; return -1;
} }

12
src/Workspace.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.27 2002/09/08 19:38:48 fluxgen Exp $ // $Id: Workspace.cc,v 1.28 2002/09/09 10:00:24 fluxgen Exp $
#include "Workspace.hh" #include "Workspace.hh"
@ -164,10 +164,10 @@ int Workspace::removeWindow(FluxboxWindow *w) {
w->getTransientFor()->setInputFocus(); w->getTransientFor()->setInputFocus();
} else { } else {
FluxboxWindow *top = 0; FluxboxWindow *top = 0;
if (stackingList.size()!=0) if (stackingList.size() != 0)
top = stackingList.front(); top = stackingList.front();
if (!top || !top->setInputFocus()) { if (top == 0|| !top->setInputFocus()) {
Fluxbox::instance()->setFocusedWindow(0); // set focused window to none Fluxbox::instance()->setFocusedWindow(0); // set focused window to none
XSetInputFocus(Fluxbox::instance()->getXDisplay(), XSetInputFocus(Fluxbox::instance()->getXDisplay(),
screen->getToolbar()->getWindowID(), screen->getToolbar()->getWindowID(),
@ -210,11 +210,7 @@ void Workspace::showAll(void) {
WindowStack::iterator it = stackingList.begin(); WindowStack::iterator it = stackingList.begin();
WindowStack::iterator it_end = stackingList.end(); WindowStack::iterator it_end = stackingList.end();
for (; it != it_end; ++it) { for (; it != it_end; ++it) {
if ((*it) == 0) { (*it)->deiconify(false, false);
stackingList.erase(it);
} else {
(*it)->deiconify(False, False);
}
} }
} }