diff options
author | fluxgen <fluxgen> | 2006-04-02 21:37:44 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2006-04-02 21:37:44 (GMT) |
commit | 894a7148be8ac88f7f1e98917f33088ab301bf60 (patch) | |
tree | b9c3bd9fa04a64babc749a319a5610caabea9479 /src/FbTk/Menu.cc | |
parent | 0ca3754d683b862762695d1be891c98410f439ac (diff) | |
download | fluxbox-894a7148be8ac88f7f1e98917f33088ab301bf60.zip fluxbox-894a7148be8ac88f7f1e98917f33088ab301bf60.tar.bz2 |
size_t fixes, thanks Semushin Slava aka php-coder
Diffstat (limited to 'src/FbTk/Menu.cc')
-rw-r--r-- | src/FbTk/Menu.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 5687be1..0616906 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -577,13 +577,13 @@ void Menu::clearWindow() { | |||
577 | menu.frame.clear(); | 577 | menu.frame.clear(); |
578 | 578 | ||
579 | // clear foreground bits of frame items | 579 | // clear foreground bits of frame items |
580 | for (unsigned int i = 0; i < menuitems.size(); i++) { | 580 | for (size_t i = 0; i < menuitems.size(); i++) { |
581 | clearItem(i, false); // no clear | 581 | clearItem(i, false); // no clear |
582 | } | 582 | } |
583 | } | 583 | } |
584 | 584 | ||
585 | void Menu::redrawFrame(FbDrawable &drawable) { | 585 | void Menu::redrawFrame(FbDrawable &drawable) { |
586 | for (unsigned int i = 0; i < menuitems.size(); i++) { | 586 | for (size_t i = 0; i < menuitems.size(); i++) { |
587 | drawItem(drawable, i); | 587 | drawItem(drawable, i); |
588 | } | 588 | } |
589 | 589 | ||
@@ -636,7 +636,8 @@ void Menu::redrawTitle(FbDrawable &drawable) { | |||
636 | const char *text = menu.label.c_str(); | 636 | const char *text = menu.label.c_str(); |
637 | 637 | ||
638 | const FbTk::Font &font = theme().titleFont(); | 638 | const FbTk::Font &font = theme().titleFont(); |
639 | int dx = theme().bevelWidth(), len = menu.label.size(); | 639 | int dx = theme().bevelWidth(); |
640 | size_t len = menu.label.size(); | ||
640 | unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2; | 641 | unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2; |
641 | 642 | ||
642 | switch (theme().titleFontJustify()) { | 643 | switch (theme().titleFontJustify()) { |