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

Menu.cc: send debug output to cerr, make the output more sensible

Browse source
This commit is contained in:
Pavel Labath 2011-04-06 15:46:57 +02:00 committed by Mathias Gumz
parent b1d70e2c92
commit 91958279d3
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/FbTk/Menu.cc
View file

@ -67,7 +67,7 @@
#ifdef DEBUG #ifdef DEBUG
#include <iostream> #include <iostream>
using std::cout; using std::cerr;
using std::endl; using std::endl;
#endif // DEBUG #endif // DEBUG
@ -254,7 +254,8 @@ void Menu::fixMenuItemIndices() {
int Menu::remove(unsigned int index) { int Menu::remove(unsigned int index) {
if (index >= menuitems.size()) { if (index >= menuitems.size()) {
#ifdef DEBUG #ifdef DEBUG
cout << "Bad index (" << index << ") given to Menu::remove()" cerr << __FILE__ << "(" << __LINE__ << ") Bad index (" << index
<< ") given to Menu::remove()"
<< " -- should be between 0 and " << menuitems.size()-1 << " -- should be between 0 and " << menuitems.size()-1
<< " inclusive." << endl; << " inclusive." << endl;
#endif // DEBUG #endif // DEBUG
@ -705,7 +706,8 @@ void Menu::drawSubmenu(unsigned int index) {
// ensure we do not divide by 0 and thus cause a SIGFPE // ensure we do not divide by 0 and thus cause a SIGFPE
if (m_rows_per_column == 0) { if (m_rows_per_column == 0) {
#if DEBUG #if DEBUG
cout << "Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n"; cerr << __FILE__ << "(" << __LINE__
<< ") Error: m_rows_per_column == 0 in FbTk::Menu::drawSubmenu()\n";
#endif #endif
return; return;
} }
@ -780,7 +782,8 @@ int Menu::drawItem(FbDrawable &drawable, unsigned int index,
// ensure we do not divide by 0 and thus cause a SIGFPE // ensure we do not divide by 0 and thus cause a SIGFPE
if (m_rows_per_column == 0) { if (m_rows_per_column == 0) {
#if DEBUG #if DEBUG
cout << "Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n"; cerr << __FILE__ << "(" << __LINE__
<< ") Error: m_rows_per_column == 0 in FbTk::Menu::drawItem()\n";
#endif #endif
return 0; return 0;
} }
@ -1269,7 +1272,8 @@ void Menu::clearItem(int index, bool clear, int search_index) {
// ensure we do not divide by 0 and thus cause a SIGFPE // ensure we do not divide by 0 and thus cause a SIGFPE
if (m_rows_per_column == 0) { if (m_rows_per_column == 0) {
#if DEBUG #if DEBUG
cout << "Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n"; cerr << __FILE__ << "(" << __LINE__
<< ") Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n";
#endif #endif
return; return;
} }
@ -1313,7 +1317,8 @@ void Menu::highlightItem(int index) {
// ensure we do not divide by 0 and thus cause a SIGFPE // ensure we do not divide by 0 and thus cause a SIGFPE
if (m_rows_per_column == 0) { if (m_rows_per_column == 0) {
#if DEBUG #if DEBUG
cout << "Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n"; cerr << __FILE__ << "(" << __LINE__
<< ") Error: m_rows_per_column == 0 in FbTk::Menu::highlightItem()\n";
#endif #endif
return; return;
} }
@ -1378,7 +1383,8 @@ void Menu::drawLine(int index, int size){
// ensure we do not divide by 0 and thus cause a SIGFPE // ensure we do not divide by 0 and thus cause a SIGFPE
if (m_rows_per_column == 0) { if (m_rows_per_column == 0) {
#if DEBUG #if DEBUG
cout << "Error: m_rows_per_column == 0 in FbTk::Menu::clearItem()\n"; cerr << __FILE__ << "(" << __LINE__
<< ") Error: m_rows_per_column == 0 in FbTk::Menu::drawLine()\n";
#endif #endif
return; return;
} }