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, 5 insertions, 6 deletions

diff --git a/src/FbTk/TextButton.hh b/src/FbTk/TextButton.hh
index 6ddcd8f..a1c8b0e 100644
--- a/src/FbTk/TextButton.hh
+++ b/src/FbTk/TextButton.hh
@@ -23,8 +23,7 @@
 #define FBTK_TEXTBUTTON_HH
 
 #include "Button.hh"
-
-#include <string>
+#include "FbString.hh"
 
 namespace FbTk {
 
@@ -34,11 +33,11 @@ class Font;
 class TextButton: public FbTk::Button, FbTk::FbWindowRenderer {
 public:
     TextButton(const FbTk::FbWindow &parent, 
-               FbTk::Font &font, const std::string &text);
+               FbTk::Font &font, const FbTk::BiDiString &text);
 
     void setJustify(FbTk::Justify just);
     bool setOrientation(FbTk::Orientation orient);
-    void setText(const std::string &text);
+    void setText(const FbTk::BiDiString &text);
     void setFont(FbTk::Font &font);
     void setTextPadding(unsigned int padding);
     void setTextPaddingLeft(unsigned int leftpadding);
@@ -60,7 +59,7 @@ public:
     void renderForeground(FbDrawable &drawable);
 
     FbTk::Justify justify() const { return m_justify; }
-    const std::string &text() const { return m_text; }
+    const BiDiString &text() const { return m_text; }
     FbTk::Font &font() const { return *m_font; }
     FbTk::Orientation orientation() const { return m_orientation; }
     unsigned int textWidth() const;
@@ -75,7 +74,7 @@ protected:
 
 private:
     FbTk::Font *m_font;
-    std::string m_text;
+    BiDiString m_text;
     FbTk::Justify m_justify;
     FbTk::Orientation m_orientation;