introduced FbTk::BidiString

a 'BidiString' holds both the logical content and the visual reordered
version of the content of a string. this helps to reduce the number of
calls to reorder the string before drawing it (as introduced in the patch
from Ken Bloom) and to be more consistent in menus and textboxes (drawing
cursors and underlining text).

1 files changed, 3 insertions, 3 deletions

diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 09bdd8c..a7bb982 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -108,7 +108,7 @@ public:
     void grabInputFocus();
     virtual void reconfigure();
     /// set label string
-    void setLabel(const FbString &labelstr);
+    void setLabel(const FbTk::BiDiString &labelstr);
     /// move menu to x,y
     virtual void move(int x, int y);
     virtual void updateMenu();
@@ -136,7 +136,7 @@ public:
     const FbWindow &fbwindow() const { return menu.window; }
     FbWindow &titleWindow() { return menu.title; }
     FbWindow &frameWindow() { return menu.frame; }
-    const std::string &label() const { return menu.label; }
+    const FbTk::BiDiString &label() const { return menu.label; }
     int x() const { return menu.window.x(); }
     int y() const { return menu.window.y(); }
     unsigned int width() const { return menu.window.width(); }
@@ -225,7 +225,7 @@ private:
         Pixmap frame_pixmap, title_pixmap, hilite_pixmap;
         FbTk::FbWindow window, frame, title;
 
-        std::string label;
+        FbTk::BiDiString label;
         int x_move, y_move, sublevels, persub, minsub, grab_x, grab_y;
 
         unsigned int frame_h, item_w;