summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Basemenu.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 170c3c0..80ce8f1 100644
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -197,8 +197,8 @@ Basemenu::~Basemenu(void) {
197int Basemenu::insert(const char *l, int function, const char *e, int pos) { 197int Basemenu::insert(const char *l, int function, const char *e, int pos) {
198 char *label = 0, *exec = 0; 198 char *label = 0, *exec = 0;
199 199
200 if (l) label = bstrdup(l); 200 if (l) label = Misc::strdup(l);
201 if (e) exec = bstrdup(e); 201 if (e) exec = Misc::strdup(e);
202 202
203 BasemenuItem *item = new BasemenuItem(label, function, exec); 203 BasemenuItem *item = new BasemenuItem(label, function, exec);
204 menuitems->insert(item, pos); 204 menuitems->insert(item, pos);
@@ -210,7 +210,7 @@ int Basemenu::insert(const char *l, int function, const char *e, int pos) {
210int Basemenu::insert(const char *l, Basemenu *submenu, int pos) { 210int Basemenu::insert(const char *l, Basemenu *submenu, int pos) {
211 char *label = 0; 211 char *label = 0;
212 212
213 if (l) label = bstrdup(l); 213 if (l) label = Misc::strdup(l);
214 214
215 BasemenuItem *item = new BasemenuItem(label, submenu); 215 BasemenuItem *item = new BasemenuItem(label, submenu);
216 menuitems->insert(item, pos); 216 menuitems->insert(item, pos);
@@ -507,11 +507,11 @@ void Basemenu::redrawTitle(void) {
507 l += (menu.bevel_w * 2); 507 l += (menu.bevel_w * 2);
508 508
509 switch (screen->getMenuStyle()->titlefont.justify) { 509 switch (screen->getMenuStyle()->titlefont.justify) {
510 case FFont::Right: 510 case Misc::Font::RIGHT:
511 dx += menu.width - l; 511 dx += menu.width - l;
512 break; 512 break;
513 513
514 case FFont::Center: 514 case Misc::Font::CENTER:
515 dx += (menu.width - l) / 2; 515 dx += (menu.width - l) / 2;
516 break; 516 break;
517 default: 517 default:
@@ -644,11 +644,11 @@ void Basemenu::drawItem(int index, Bool highlight, Bool clear,
644 } 644 }
645 645
646 switch(screen->getMenuStyle()->framefont.justify) { 646 switch(screen->getMenuStyle()->framefont.justify) {
647 case FFont::Left: 647 case Misc::Font::LEFT:
648 text_x = item_x + menu.bevel_w + menu.item_h + 1; 648 text_x = item_x + menu.bevel_w + menu.item_h + 1;
649 break; 649 break;
650 650
651 case FFont::Right: 651 case Misc::Font::RIGHT:
652 text_x = item_x + menu.item_w - (menu.item_h + menu.bevel_w + text_w); 652 text_x = item_x + menu.item_w - (menu.item_h + menu.bevel_w + text_w);
653 break; 653 break;
654 default: //center 654 default: //center
@@ -789,7 +789,7 @@ void Basemenu::setLabel(const char *l) {
789 if (menu.label) 789 if (menu.label)
790 delete [] menu.label; 790 delete [] menu.label;
791 791
792 if (l) menu.label = bstrdup(l); 792 if (l) menu.label = Misc::strdup(l);
793 else menu.label = 0; 793 else menu.label = 0;
794} 794}
795 795