improve native language handling, move messages and menu labels to

FbTk::FbString

1 files changed, 11 insertions, 12 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index d99c9ba..63f3958 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -193,15 +193,15 @@ Menu::~Menu() {
         s_focused = 0;
 }
 
-int Menu::insert(const char *label, RefCount<Command> &cmd, int pos) {
+int Menu::insert(const FbString &label, RefCount<Command> &cmd, int pos) {
     return insert(new MenuItem(label, cmd), pos);
 }
 
-int Menu::insert(const char *label, int pos) {
+int Menu::insert(const FbString &label, int pos) {
     return insert(new MenuItem(label), pos);
 }
 
-int Menu::insert(const char *label, Menu *submenu, int pos) {
+int Menu::insert(const FbString &label, Menu *submenu, int pos) {
     submenu->m_parent = this;
     return insert(new MenuItem(label, submenu), pos);
 }
@@ -392,7 +392,7 @@ void Menu::enableTitle() {
 
 void Menu::updateMenu(int active_index) {
     if (m_title_vis) {
-        menu.item_w = theme().titleFont().textWidth(menu.label.c_str(),
+        menu.item_w = theme().titleFont().textWidth(menu.label,
                                                     menu.label.size());
         menu.item_w += (theme().bevelWidth() * 2);
     } else
@@ -427,14 +427,14 @@ void Menu::updateMenu(int active_index) {
     int itmp = (theme().itemHeight() * menu.persub);
     menu.frame_h = itmp < 1 ? 1 : itmp;
 
-    int new_width = (menu.sublevels * menu.item_w);
-    int new_height = menu.frame_h;
+    unsigned int new_width = (menu.sublevels * menu.item_w);
+    unsigned int new_height = menu.frame_h;
 
     if (m_title_vis)
         new_height += theme().titleHeight() + ((menu.frame_h > 0)?menu.title.borderWidth():0);
 
 
-    if (new_width < 1) {
+    if (new_width == 0) {
         if (menu.item_w > 0) 
             new_width = menu.item_w;
         else
@@ -638,12 +638,11 @@ void Menu::move(int x, int y) {
 
 
 void Menu::redrawTitle(FbDrawable &drawable) {
-    const char *text = menu.label.c_str();
 
     const FbTk::Font &font = theme().titleFont();
     int dx = theme().bevelWidth();
     size_t len = menu.label.size();
-    unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2;
+    unsigned int l = font.textWidth(menu.label, len) + theme().bevelWidth()*2;
 
     switch (theme().titleFontJustify()) {
     case FbTk::RIGHT:
@@ -662,7 +661,7 @@ void Menu::redrawTitle(FbDrawable &drawable) {
     font.drawText(drawable, // drawable
                   screenNumber(),
                   theme().titleTextGC().gc(), // graphic context
-                  text, len,  // text string with length
+                  menu.label, len,  // text string with length
                   dx, font.ascent() + theme().bevelWidth() + height_offset/2);  // position
 }
 
@@ -784,9 +783,9 @@ int Menu::drawItem(FbDrawable &drawable, unsigned int index,
     return item_y;
 }
 
-void Menu::setLabel(const char *labelstr) {
+void Menu::setLabel(const FbString &labelstr) {
     //make sure we don't send 0 to std::string
-    menu.label = (labelstr ? labelstr : "");
+    menu.label = labelstr;
     reconfigure();
 }