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

minor cleaning

Browse source
This commit is contained in:
fluxgen 2003-05-04 10:34:09 +00:00
parent c2cc8cb8b8
commit 853c075a5e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/FbTk/Menu.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: Menu.cc,v 1.19 2003/05/01 14:33:36 rathnor Exp $ // $Id: Menu.cc,v 1.20 2003/05/04 10:34:09 fluxgen Exp $
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -427,8 +427,12 @@ void Menu::update() {
menu.frame.width(), menu.frame.height(), menu.frame.width(), menu.frame.height(),
attr.depth); attr.depth);
if (m_frame_pm.drawable() == 0) if (m_frame_pm.drawable() == 0) {
cerr<<"Can't create pixmap!"<<endl; cerr<<"FbTk::Menu: Warning: Failed to create pixmap ("<<
menu.frame.window()<<", "<<menu.frame.width()<<", "<<
menu.frame.height()<<
", "<<attr.depth<<") !"<<endl;
}
} }
@ -660,8 +664,7 @@ bool Menu::hasSubmenu(unsigned int index) const {
void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_trans, void Menu::drawItem(unsigned int index, bool highlight, bool clear, bool render_trans,
int x, int y, unsigned int w, unsigned int h) int x, int y, unsigned int w, unsigned int h) {
{
if (index >= menuitems.size() || menuitems.size() == 0 || if (index >= menuitems.size() || menuitems.size() == 0 ||
menu.persub == 0) menu.persub == 0)
return; return;
@ -939,7 +942,7 @@ void Menu::buttonPressEvent(XButtonEvent &be) {
if (item->submenu()) if (item->submenu())
drawSubmenu(w); drawSubmenu(w);
else else
drawItem(w, (item->isEnabled()), true, true); drawItem(w, item->isEnabled(), true, true);
} }
} else { } else {
menu.x_move = be.x_root - menu.x; menu.x_move = be.x_root - menu.x;
@ -1045,7 +1048,7 @@ void Menu::motionNotifyEvent(XMotionEvent &me) {
if (itmp->submenu()) if (itmp->submenu())
drawSubmenu(w); drawSubmenu(w);
else else
drawItem(w, (itmp->isEnabled()), true, true); drawItem(w, itmp->isEnabled(), true, true);
} }
} }
} }