Merge lp:~michihenning/nux/nstring into lp:nux

[Michi Henning]

This set of changes removes NString from the Nux code base. NString.h still exists, but only for the helper functions it defines. The NString class itself is gone.

Unfortunately, these changes are quite large because NString was used a lot. The good news is that Unity has only a handful of places where NString shows up, so it'll be easy to make Unity work again after this change.

I have mostly used standard library features to do things that used to be methods on NString, even when there was no directly equivalent on std::string. In a few places, that added a few lines of code but, mostly, methods on std::string were sufficient. In a few places, I used Boost string algorithms where there was no convenient and short way to do something with just std::string methods (such tokenizing).

This builds OK on Ubuntu and the tests still pass. I don't have a Windows environment, so I left code that is conditionally compiled for Windows alone. I suspect that it won't be too difficult to make the corresponding Windows changes by looking at what I did in the corresponding Linux code, but it'll still be tedious, sorry.

=== modified file 'Nux/ActionItem.cpp'
--- Nux/ActionItem.cpp	2011-12-14 02:01:43 +0000
+++ Nux/ActionItem.cpp	2012-09-26 05:32:20 +0000
@@ -133,7 +133,7 @@
 
   const char *ActionItem::GetLabel() const
   {
-    return m_Label.GetTCharPtr();
+    return m_Label.c_str();
   }
 
   void ActionItem::SetIcon(const BaseTexture* icon)

=== modified file 'Nux/ActionItem.h'
--- Nux/ActionItem.h	2011-04-06 21:54:09 +0000
+++ Nux/ActionItem.h	2012-09-26 05:32:20 +0000
@@ -67,7 +67,7 @@
     //! A value defined by the user at construction time.
     int m_UserValue;
     BaseTexture* m_Icon;
-    NString m_Label;
+    std::string m_Label;
     bool m_IsActivated;
     MenuPage *m_Menu;
     bool m_Enable;

=== modified file 'Nux/BaseWindow.h'
--- Nux/BaseWindow.h	2012-08-07 20:39:44 +0000
+++ Nux/BaseWindow.h	2012-09-26 05:32:20 +0000
@@ -186,7 +186,7 @@
     //! Emit a signal when the BaseWindow becomes hidden.
     sigc::signal<void, BaseWindow*> sigHidden;
 
-    NString GetWindowName()
+    std::string GetWindowName()
     {
       return _name;
     }
@@ -252,7 +252,7 @@
     //! Contains the background of the texture. Can be used to blur. It is set by the window compositor.
     ObjectPtr<BaseTexture> _background_texture;
 
-    NString _name;
+    std::string _name;
     bool _size_match_layout;
     bool _is_visible;
     bool _is_modal;

=== modified file 'Nux/ColorPreview.cpp'
--- Nux/ColorPreview.cpp	2012-08-17 12:41:21 +0000
+++ Nux/ColorPreview.cpp	2012-09-26 05:32:20 +0000
@@ -27,6 +27,9 @@
 #include "TimerProc.h"
 #include "StaticTextBox.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -50,8 +53,12 @@
     m_ColorValue->SetFont(GetSysBoldFont());
     m_ColorValue->SetMinimumWidth(128);
 
-    NString text = NString::Printf("[ R:%d, G:%d, B:%d ]", (int) (m_Color.red * 255), (int) (m_Color.green * 255), (int) (m_Color.blue * 255));
-    m_ColorValue->SetText(text);
+    std::stringstream s;
+    s << "[ R:" << (int)(m_Color.red * 255)
+      << ", G:" << (int)(m_Color.green * 255)
+      << ", B:" << (int)(m_Color.blue * 255)
+      << " ]";
+    m_ColorValue->SetText(s.str());
 
     m_ColorArea->mouse_click.connect(sigc::mem_fun(this, &ColorPreview::RecvClick));
 

=== modified file 'Nux/DoubleValidator.cpp'
--- Nux/DoubleValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/DoubleValidator.cpp	2012-09-26 05:32:20 +0000
@@ -23,6 +23,9 @@
 #include "Nux.h"
 #include "DoubleValidator.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -127,10 +130,11 @@
     m_Decimals = Clamp<int> (dec, 0, 13);
   }
 
-  NString DoubleValidator::ToString(double d)
+  std::string DoubleValidator::ToString(double d)
   {
-    NString Prec = NString("%.") + NString::Printf("%d", m_Decimals) + NString("f");
-    return NString::Printf(Prec.GetTCharPtr(), d);
+    std::stringstream s;
+    s << std::setprecision(m_Decimals) << d;
+    return s.str();
   }
 
   double DoubleValidator::ToDouble(const char *str)

=== modified file 'Nux/DoubleValidator.h'
--- Nux/DoubleValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/DoubleValidator.h	2012-09-26 05:32:20 +0000
@@ -52,7 +52,7 @@
     void SetMaximum(double value);
     double GetMaximum() const;
 
-    NString ToString(double d);
+    std::string ToString(double d);
     double ToDouble(const char *str);
 
   private:

=== modified file 'Nux/EditTextBox.cpp'
--- Nux/EditTextBox.cpp	2012-09-17 09:55:43 +0000
+++ Nux/EditTextBox.cpp	2012-09-26 05:32:20 +0000
@@ -160,7 +160,7 @@
       {
 
         GetPainter().PaintColorTextLineEdit(graphics_engine, GetGeometry(),
-                                         m_KeyboardHandler.GetTextLine().m_string,
+                                         m_KeyboardHandler.GetTextLine(),
                                          GetTextColor(),
                                          m_WriteAlpha,
                                          m_SelectedTextColor,
@@ -177,7 +177,7 @@
       else
       {
         GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(),
-                                      m_KeyboardHandler.GetTextLine().m_string,
+                                      m_KeyboardHandler.GetTextLine(),
                                       GetTextColor());
       }
     }
@@ -194,34 +194,30 @@
 
   }
 
-  void EditTextBox::SetText(const char &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
   void EditTextBox::SetText(const char *Caption)
   {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void EditTextBox::SetText(const tstring &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void EditTextBox::SetText(const NString &Caption)
-  {
-    NString s(Caption);
-    s.RemovePrefix(m_Prefix);
-    s.RemoveSuffix(m_Suffix);
-
-    if (ValidateKeyboardEntry(s.GetTCharPtr()))
+    std::string s(Caption);
+    SetText(s);
+  }
+
+  void EditTextBox::SetText(const std::string &Caption)
+  {
+    std::string s(Caption);
+    size_t pos = s.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      s.erase(0, m_Prefix.size());
+    }
+    pos = s.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == s.size() - m_Suffix.size())
+    {
+      s.erase(pos);
+    }
+
+    if (ValidateKeyboardEntry(s.c_str()))
     {
       m_Text = (m_Prefix + s) + m_Suffix;
-      m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+      m_KeyboardHandler.SetText(m_Text);
       m_temporary_caption = m_Text;
       sigSetText.emit(this);
     }
@@ -232,16 +228,24 @@
 
   const char *EditTextBox::GetText() const
   {
-    return m_Text.GetTCharPtr();
+    return m_Text.c_str();
   }
 
 //! Return a caption string striping out the prefix and the suffix
-  NString EditTextBox::GetCleanText() const
+  std::string EditTextBox::GetCleanText() const
   {
-    NString CleanText(m_Text);
-    CleanText.RemovePrefix(m_Prefix);
-    CleanText.RemoveSuffix(m_Suffix);
-    return CleanText.m_string;
+    std::string CleanText(m_Text);
+    size_t pos = CleanText.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      CleanText.erase(0, m_Prefix.size());
+    }
+    pos = CleanText.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == CleanText.size() - m_Suffix.size())
+    {
+      CleanText.erase(pos);
+    }
+    return CleanText;
   }
 
   void EditTextBox::RecvMouseDoubleClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
@@ -342,10 +346,14 @@
 
     if (keysym == NUX_VK_ENTER || keysym == NUX_KP_ENTER)
     {
-      NString str(m_KeyboardHandler.GetTextLine());
-      str.RemoveSuffix(m_Suffix);
+      std::string str(m_KeyboardHandler.GetTextLine());
+      size_t pos = str.rfind(m_Suffix);
+      if (pos != std::string::npos && pos == str.size() - m_Suffix.size())
+      {
+        str.erase(pos);
+      }
 
-      if (ValidateKeyboardEntry(str.m_string.c_str()))
+      if (ValidateKeyboardEntry(str.c_str()))
       {
         m_Text = m_KeyboardHandler.GetTextLine();
         m_temporary_caption = m_Text;
@@ -397,7 +405,7 @@
 
   void EditTextBox::EnteringKeyboardFocus()
   {
-    m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+    m_KeyboardHandler.SetText(m_Text);
     m_KeyboardHandler.SelectAllText();
     // Preserve the current caption text. If ESC is pressed while we have keyboard focus then
     // the previous caption text is restored
@@ -408,25 +416,33 @@
 
   void EditTextBox::QuitingKeyboardFocus()
   {
-    NString CleanText(m_KeyboardHandler.GetTextLine());
-    CleanText.RemovePrefix(m_Prefix);
-    CleanText.RemoveSuffix(m_Suffix);
+    std::string CleanText(m_KeyboardHandler.GetTextLine());
+    size_t pos = CleanText.find(m_Prefix, 0);
+    if (pos == 0)
+    {
+      CleanText.erase(0, m_Prefix.size());
+    }
+    pos = CleanText.rfind(m_Suffix);
+    if (pos != std::string::npos && pos == CleanText.size() - m_Suffix.size())
+    {
+      CleanText.erase(pos);
+    }
 
-    if (ValidateKeyboardEntry(CleanText.GetTCharPtr()))
+    if (ValidateKeyboardEntry(CleanText.c_str()))
     {
       CleanText = m_Prefix + CleanText;
       CleanText = CleanText + m_Suffix;
 
-      m_Text = CleanText.m_string; //m_KeyboardHandler.GetTextLine();
-      m_KeyboardHandler.SetText(CleanText.m_string);
+      m_Text = CleanText; //m_KeyboardHandler.GetTextLine();
+      m_KeyboardHandler.SetText(CleanText);
       m_temporary_caption = m_Text;
-      sigValidateKeyboardEntry.emit(this, m_Text.GetTStringRef());
+      sigValidateKeyboardEntry.emit(this, m_Text);
       sigValidateEntry.emit(this);
     }
     else
     {
       m_Text = m_temporary_caption;
-      m_KeyboardHandler.SetText(m_Text.GetTStringRef());
+      m_KeyboardHandler.SetText(m_Text);
       m_KeyboardHandler.SelectAllText();
     }
 
@@ -455,12 +471,12 @@
 
   void EditTextBox::SetDoubleValue(double d)
   {
-    SetText(NString::Printf("%f", d));
+    SetText(std::to_string(d));
   }
 
   void EditTextBox::SetIntegerValue(int i)
   {
-    SetText(NString::Printf("%d", i));
+    SetText(std::to_string(i));
   }
 
   void EditTextBox::SetTextBackgroundColor(const Color &color)

=== modified file 'Nux/EditTextBox.h'
--- Nux/EditTextBox.h	2011-11-10 17:28:44 +0000
+++ Nux/EditTextBox.h	2012-09-26 05:32:20 +0000
@@ -50,21 +50,19 @@
       unsigned int keysym,
       const char* character);
 
-    void SetText(const char &Caption);
     void SetText(const char *Caption);
-    void SetText(const tstring &Caption);
-    void SetText(const NString &Caption);
+    void SetText(const std::string &Caption);
     const char *GetText() const;
     unsigned int GetTextSize() const
     {
-      return (unsigned int) m_Text.Length();
+      return (unsigned int) m_Text.length();
     }
 
     void SetDoubleValue(double d);
     void SetIntegerValue(int i);
 
     //! Return a caption string striping out the prefix and the suffix
-    virtual NString GetCleanText() const;
+    virtual std::string GetCleanText() const;
 
     void SetTextBackgroundColor(const Color &color);
     Color GetTextBackgroundColor() const;
@@ -128,10 +126,6 @@
     void RecvEndKeyFocus();
 
 
-    void SetPrefix(const tstring &p)
-    {
-      m_Prefix = p;
-    };
     void SetPrefix(const char *p)
     {
       m_Prefix = p;
@@ -140,19 +134,15 @@
     {
       m_Prefix = p;
     };
-    void SetPrefix(const NString &p)
+    void SetPrefix(const std::string &p)
     {
       m_Prefix = p;
     };
-    NString GetPrefix() const
+    std::string GetPrefix() const
     {
       return m_Prefix;
     };
 
-    void SetSuffix(const tstring &s)
-    {
-      m_Suffix = s;
-    };
     void SetSuffix(const char *s)
     {
       m_Suffix = s;
@@ -161,11 +151,11 @@
     {
       m_Suffix = s;
     };
-    void SetSuffix(const NString &s)
+    void SetSuffix(const std::string &s)
     {
       m_Suffix = s;
     };
-    NString Getsuffix() const
+    std::string Getsuffix() const
     {
       return m_Suffix;
     };
@@ -175,7 +165,7 @@
     sigc::signal< void, EditTextBox *, unsigned int > sigCharacter; // Emitted every time a character typed
     sigc::signal< void, EditTextBox * > sigEditChange; // Emitted every time a character typed
 
-    sigc::signal< void, EditTextBox *, const NString &> sigValidateKeyboardEntry;
+    sigc::signal< void, EditTextBox *, const std::string &> sigValidateKeyboardEntry;
     sigc::signal< void, EditTextBox * > sigValidateEntry;   // Emitted when the text is validated
     sigc::signal< void, EditTextBox * > sigSetText;     // Emitted when text is set with setCaption
     sigc::signal< void, EditTextBox * > sigEscapeKeyboardFocus;
@@ -196,7 +186,7 @@
 
     virtual long PostLayoutManagement(long LayoutResult);
 
-    NString m_Text;
+    std::string m_Text;
     HLayout *hlayout;
 
     Color m_BackgroundColor;
@@ -206,12 +196,12 @@
     Color m_CursorColor;
 
     BaseKeyboardHandler m_KeyboardHandler;
-    NString m_temporary_caption;
+    std::string m_temporary_caption;
     BaseKeyboardHandler::eKeyEntryType m_keytype;
 
     Validator *m_Validator;
-    NString m_Suffix;
-    NString m_Prefix;
+    std::string m_Suffix;
+    std::string m_Prefix;
 
     bool BlinkCursor;
     void BlinkCursorTimerInterrupt(void *v);

=== modified file 'Nux/FileSelector.cpp'
--- Nux/FileSelector.cpp	2011-10-10 01:52:00 +0000
+++ Nux/FileSelector.cpp	2012-09-26 05:32:20 +0000
@@ -53,9 +53,9 @@
     SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
     SetLayout(m_hlayout);
 
-    NString Path = NUX_FINDRESOURCELOCATION("Icons/Folder-16x16.png");
+    std::string Path = NUX_FINDRESOURCELOCATION("Icons/Folder-16x16.png");
     m_Texture = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    m_Texture->Update(Path.GetTCharPtr());
+    m_Texture->Update(Path.c_str());
   }
 
   FileSelector::~FileSelector()

=== modified file 'Nux/FloatingWindow.cpp'
--- Nux/FloatingWindow.cpp	2012-09-17 09:55:43 +0000
+++ Nux/FloatingWindow.cpp	2012-09-26 05:32:20 +0000
@@ -98,12 +98,12 @@
     SetMinimumSize(32, 32);
     SetGeometry(Geometry(100, 100, 320, 200));
 
-    NString Path = NUX_FINDRESOURCELOCATION("UITextures/AddButton.png");
+    std::string Path = NUX_FINDRESOURCELOCATION("UITextures/AddButton.png");
     MinimizeIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    MinimizeIcon->Update(Path.GetTCharPtr());
+    MinimizeIcon->Update(Path.c_str());
     Path = NUX_FINDRESOURCELOCATION("UITextures/CancelButton.png");
     CloseIcon = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
-    CloseIcon->Update(Path.GetTCharPtr());
+    CloseIcon->Update(Path.c_str());
 
     SetWindowTitle(WindowName);
   }
@@ -178,7 +178,7 @@
                                  _title_bar->GetBaseWidth(), _title_bar->GetBaseHeight()), Color(0xFF2f2f2f),
                                  eSHAPE_CORNER_ROUND10, eCornerTopLeft | eCornerTopRight);
 
-      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetGeometry(), _window_title.m_string, Color(0xFFFFFFFF), true, eAlignTextCenter);
+      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetGeometry(), _window_title, Color(0xFFFFFFFF), true, eAlignTextCenter);
       GetPainter().Draw2DTextureAligned(graphics_engine, CloseIcon, _close_button->GetGeometry(), TextureAlignmentStyle(eTACenter, eTACenter));
     }
 
@@ -472,7 +472,7 @@
     _window_title = title;
   }
 
-  NString FloatingWindow::GetWindowTitle()
+  std::string FloatingWindow::GetWindowTitle()
   {
     return _window_title;
   }

=== modified file 'Nux/FloatingWindow.h'
--- Nux/FloatingWindow.h	2012-08-17 12:41:21 +0000
+++ Nux/FloatingWindow.h	2012-09-26 05:32:20 +0000
@@ -71,7 +71,7 @@
     void RecvTitleBarMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
 
     void SetWindowTitle(const char *title);
-    NString GetWindowTitle();
+    std::string GetWindowTitle();
 
     //! Return true if this object can break the layout.
     /*
@@ -134,7 +134,7 @@
     std::list<View *> m_InterfaceObject;
     HLayout *_title_bar_layout;
 
-    NString _window_title;
+    std::string _window_title;
 
     friend class PopUpWindow;
     friend class ComboBox_Logic_WindowView;

=== modified file 'Nux/HLayout.cpp'
--- Nux/HLayout.cpp	2011-12-10 06:39:14 +0000
+++ Nux/HLayout.cpp	2012-09-26 05:32:20 +0000
@@ -48,7 +48,7 @@
     m_ContentStacking = eStackLeft;
   }
 
-  HLayout::HLayout(NString name, NUX_FILE_LINE_DECL)
+  HLayout::HLayout(std::string name, NUX_FILE_LINE_DECL)
     : LinearLayout(NUX_FILE_LINE_PARAM)
   {
     m_name = name;

=== modified file 'Nux/HLayout.h'
--- Nux/HLayout.h	2011-10-21 22:06:35 +0000
+++ Nux/HLayout.h	2012-09-26 05:32:20 +0000
@@ -33,7 +33,7 @@
     NUX_DECLARE_OBJECT_TYPE(HLayout, LinearLayout);
   public:
     HLayout(NUX_FILE_LINE_PROTO);
-    HLayout(NString name, NUX_FILE_LINE_PROTO);
+    HLayout(std::string name, NUX_FILE_LINE_PROTO);
     ~HLayout();
 
     virtual long ComputeContentSize();

=== modified file 'Nux/HexRegExpValidator.cpp'
--- Nux/HexRegExpValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/HexRegExpValidator.cpp	2012-09-26 05:32:20 +0000
@@ -121,10 +121,9 @@
   {
   }
 
-  NString HexRegExpValidator::ToString(int i)
+  std::string HexRegExpValidator::ToString(int i)
   {
-    NString Prec("%d");
-    return NString::Printf(Prec.GetTCharPtr(), i);
+    return std::to_string(i);
   }
 
   int HexRegExpValidator::ToInteger(const char *str)

=== modified file 'Nux/HexRegExpValidator.h'
--- Nux/HexRegExpValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/HexRegExpValidator.h	2012-09-26 05:32:20 +0000
@@ -50,7 +50,7 @@
     void SetMaximum(int value);
     int GetMaximum() const;
 
-    NString ToString(int i);
+    std::string ToString(int i);
     int ToInteger(const char *str);
 
   private:

=== modified file 'Nux/IntegerValidator.cpp'
--- Nux/IntegerValidator.cpp	2012-09-19 04:53:45 +0000
+++ Nux/IntegerValidator.cpp	2012-09-26 05:32:20 +0000
@@ -122,10 +122,9 @@
   {
   }
 
-  NString IntegerValidator::ToString(int i)
+  std::string IntegerValidator::ToString(int i)
   {
-    NString Prec("%d");
-    return NString::Printf(Prec.GetTCharPtr(), i);
+    return std::to_string(i);
   }
 
   int IntegerValidator::ToInteger(const char *str)

=== modified file 'Nux/IntegerValidator.h'
--- Nux/IntegerValidator.h	2011-10-17 21:23:50 +0000
+++ Nux/IntegerValidator.h	2012-09-26 05:32:20 +0000
@@ -49,7 +49,7 @@
     void SetMaximum(int value);
     int GetMaximum() const;
 
-    NString ToString(int i);
+    std::string ToString(int i);
     int ToInteger(const char *str);
 
   private:

=== modified file 'Nux/KeyboardHandler.cpp'
--- Nux/KeyboardHandler.cpp	2011-10-21 22:06:35 +0000
+++ Nux/KeyboardHandler.cpp	2012-09-26 05:32:20 +0000
@@ -63,7 +63,7 @@
 
     // Remove the characters
     for (int i = nFirst; i < nLast; ++i)
-      m_textline.Erase(nFirst, 1);
+      m_textline.erase(nFirst, 1);
   }
 
   void BaseKeyboardHandler::InsertChar(unsigned int character)
@@ -78,19 +78,19 @@
     m_caret = 0;
 
     m_previous_cursor_position = 0;
-    m_textline.Clear();
+    m_textline.clear();
   }
 
   void BaseKeyboardHandler::PlaceCaret(unsigned int nCP)
   {
-    nuxAssert((nCP >= 0) && (nCP <= (unsigned int) m_textline.Length()));
+    nuxAssert((nCP >= 0) && (nCP <= (unsigned int) m_textline.length()));
     m_previous_cursor_position = m_caret;
     m_caret = nCP;
   }
 
   unsigned int BaseKeyboardHandler::NextWordPosition(unsigned int cp)
   {
-    unsigned int num_char = (unsigned int) m_textline.Length();
+    unsigned int num_char = (unsigned int) m_textline.length();
 
     if (cp == num_char)
       return cp;
@@ -159,10 +159,10 @@
     if (m_entering_focus)
       return;
 
-    if (m_textline.Length() == 0)
+    if (m_textline.length() == 0)
       return;
 
-    unsigned int StrLength = (unsigned int) m_textline.Length();
+    unsigned int StrLength = (unsigned int) m_textline.length();
     int total = m_text_positionx;
     unsigned int nCP = StrLength;
 
@@ -210,17 +210,17 @@
     if (m_entering_focus)
       return;
 
-    if (m_textline.Length() == 0)
+    if (m_textline.length() == 0)
       return;
 
-    int StrLength = (int) m_textline.Length();
+    int StrLength = (int) m_textline.length();
 
     //nuxDebugMsg("[BaseKeyboardHandler::ResolveCaretPosition]");
     if (x < geo.x)
     {
       if (m_mouse_inside_text_area)
       {
-        while (m_caret && (GetFont()->GetCharStringWidth(m_textline.GetTCharPtr(), m_caret) + m_text_positionx > 0))
+        while (m_caret && (GetFont()->GetCharStringWidth(m_textline.c_str(), m_caret) + m_text_positionx > 0))
         {
           --m_caret;
           //nuxDebugMsg("Group Add: %c", m_textline[m_caret]);
@@ -242,7 +242,7 @@
     {
       if (m_mouse_inside_text_area)
       {
-        while ((m_caret != StrLength) && (GetFont()->GetCharStringWidth(m_textline.GetTCharPtr(), m_caret) + m_text_positionx < geo.GetWidth()))
+        while ((m_caret != StrLength) && (GetFont()->GetCharStringWidth(m_textline.c_str(), m_caret) + m_text_positionx < geo.GetWidth()))
         {
           ++m_caret;
           //nuxDebugMsg("Group Add: %c", m_textline[m_caret-1]);
@@ -311,7 +311,7 @@
                 // If we are in overwrite mode and there is already
                 // a char at the caret's position, simply replace it.
                 // Otherwise, we insert the char as normal.
-                if ( !m_insert_mode && m_caret < (int) m_textline.Length())
+                if ( !m_insert_mode && m_caret < (int) m_textline.length())
                 {
                   m_textline[m_caret] = key;
                   PlaceCaret(m_caret + 1 );
@@ -320,9 +320,9 @@
                 else
                 {
                   // Insert the char
-                  if ( m_caret <= (int) m_textline.Length())
+                  if ( m_caret <= (int) m_textline.length())
                   {
-                    m_textline.Insert(m_caret, 1, key);
+                    m_textline.insert(m_caret, 1, key);
                     PlaceCaret(m_caret + 1 );
                     m_selection_start = m_caret;
                   }
@@ -334,7 +334,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if ( !m_insert_mode && m_caret < (int) m_textline.Length())
+              if ( !m_insert_mode && m_caret < (int) m_textline.length())
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -343,9 +343,9 @@
               else
               {
                 // Insert the char
-                if ( m_caret <= (int) m_textline.Length())
+                if ( m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -371,7 +371,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+              if (!m_insert_mode && (m_caret < (int) m_textline.length()))
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -380,9 +380,9 @@
               else
               {
                 // Insert the char
-                if ( m_caret <= (int) m_textline.Length())
+                if ( m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -393,7 +393,7 @@
               // If we are in overwrite mode and there is already
               // a char at the caret's position, simply replace it.
               // Otherwise, we insert the char as normal.
-              if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+              if (!m_insert_mode && (m_caret < (int) m_textline.length()))
               {
                 m_textline[m_caret] = key;
                 PlaceCaret(m_caret + 1 );
@@ -402,9 +402,9 @@
               else
               {
                 // Insert the char
-                if (m_caret <= (int) m_textline.Length())
+                if (m_caret <= (int) m_textline.length())
                 {
-                  m_textline.Insert(m_caret, 1, key);
+                  m_textline.insert(m_caret, 1, key);
                   PlaceCaret(m_caret + 1 );
                   m_selection_start = m_caret;
                 }
@@ -428,7 +428,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -437,9 +437,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -463,7 +463,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -472,9 +472,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -497,7 +497,7 @@
             // If we are in overwrite mode and there is already
             // a char at the caret's position, simply replace it.
             // Otherwise, we insert the char as normal.
-            if (!m_insert_mode && (m_caret < (int) m_textline.Length()))
+            if (!m_insert_mode && (m_caret < (int) m_textline.length()))
             {
               m_textline[m_caret] = key;
               PlaceCaret(m_caret + 1 );
@@ -506,9 +506,9 @@
             else
             {
               // Insert the char
-              if (m_caret <= (int) m_textline.Length())
+              if (m_caret <= (int) m_textline.length())
               {
-                m_textline.Insert(m_caret, 1, key);
+                m_textline.insert(m_caret, 1, key);
                 PlaceCaret(m_caret + 1 );
                 m_selection_start = m_caret;
               }
@@ -524,9 +524,9 @@
     // CTRL+C
     if ((virtual_code == NUX_VK_C) && (state & NUX_STATE_CTRL))
     {
-      NString s = GetSelectedText();
+      std::string s = GetSelectedText();
 #if defined(NUX_OS_WINDOWS)
-      inlCopyTextToClipboard(s.GetTCharPtr());
+      inlCopyTextToClipboard(s.c_str());
 #endif
     }
 
@@ -534,15 +534,15 @@
     if ((virtual_code == NUX_VK_V) && (state & NUX_STATE_CTRL))
     {
 #if defined(NUX_OS_WINDOWS)
-      NString s = inlReadTextToClipboard();
+      std::string s = inlReadTextToClipboard();
 #elif defined(NUX_OS_LINUX)
-      NString s = "Paste not implemented yet";
+      std::string s = "Paste not implemented yet";
 #endif
       unsigned int start = GetTextSelectionStart();
       unsigned int end = GetTextSelectionEnd();
-      m_textline.Replace(start, end - start, s.m_string);
+      m_textline.replace(start, end - start, s);
 
-      m_caret = start + (unsigned int) s.Length();
+      m_caret = start + (unsigned int) s.length();
       UnselectAllText();
     }
 
@@ -568,7 +568,7 @@
         // Deleting one character
         if ( m_caret > 0 )
         {
-          m_textline.Erase(m_caret - 1, 1);
+          m_textline.erase(m_caret - 1, 1);
           PlaceCaret(m_caret - 1 );
 
           m_selection_start = m_caret;
@@ -585,9 +585,9 @@
       else
       {
         // Deleting one character
-        if (m_caret < (int) m_textline.Length())
+        if (m_caret < (int) m_textline.length())
         {
-          m_textline.Erase(m_caret, 1);
+          m_textline.erase(m_caret, 1);
         }
       }
     }
@@ -637,7 +637,7 @@
           m_caret = NextWordPosition( m_caret);
           PlaceCaret(m_caret );
         }
-        else if (m_caret < (int) m_textline.Length())
+        else if (m_caret < (int) m_textline.length())
           PlaceCaret(m_caret + 1 );
 
         if ((state & NUX_STATE_SHIFT) == 0)
@@ -666,14 +666,14 @@
     {
       if ((state & NUX_STATE_SHIFT) == 0)
       {
-        PlaceCaret((unsigned int) m_textline.Length());
+        PlaceCaret((unsigned int) m_textline.length());
         // Shift is not down. Update selection
         // start along with the caret.
         m_selection_start = m_caret;
       }
       else
       {
-        PlaceCaret((unsigned int) m_textline.Length());
+        PlaceCaret((unsigned int) m_textline.length());
       }
     }
     else if (virtual_code == NUX_VK_ESCAPE)
@@ -695,19 +695,19 @@
     }
     else if (virtual_code == NUX_VK_END)
     {
-      unsigned int str_width = GetFont()->GetStringWidth(m_textline.GetTCharPtr());
+      unsigned int str_width = GetFont()->GetStringWidth(m_textline.c_str());
 
       if (str_width + s_cursor_width > (unsigned int) m_clip_region.GetWidth())
         m_text_positionx = m_clip_region.GetWidth() - (str_width + s_cursor_width);
       else
         m_text_positionx = 0;
     }
-    else if (m_textline.Length() != 0)
+    else if (m_textline.length() != 0)
     {
       AdjustCursorAndTextPosition();
       m_need_redraw = true;
     }
-    else if (m_textline.Length() == 0)
+    else if (m_textline.length() == 0)
     {
       ClearText();
       m_need_redraw = true;
@@ -719,11 +719,11 @@
 
   void BaseKeyboardHandler::AdjustCursorAndTextPosition()
   {
-    int str_width = GetFont()->GetStringWidth(m_textline.GetTCharPtr());
-    NString temp0;
+    int str_width = GetFont()->GetStringWidth(m_textline.c_str());
+    std::string temp0;
 
     if (m_caret > 0)
-      temp0 = m_textline.GetSubString(0, m_caret - 1).GetTStringRef();
+      temp0 = m_textline.substr(0, m_caret - 1);
     else
       temp0 = "";
 
@@ -736,8 +736,8 @@
     //      temp1 = "abcdefgh"
     //      temp2 = "abcdefghi"
 
-    NString temp1 = m_textline.GetSubString(0, m_caret).GetTStringRef();
-    NString temp2 = m_textline.GetSubString(0, m_caret + 1).GetTStringRef();
+    std::string temp1 = m_textline.substr(0, m_caret);
+    std::string temp2 = m_textline.substr(0, m_caret + 1);
     int str_width0 = GetFont()->GetStringWidth(temp0);
     int str_width1 = GetFont()->GetStringWidth(temp1);
     int str_width2 = GetFont()->GetStringWidth(temp2);
@@ -746,7 +746,7 @@
     if ((m_text_positionx + str_width1 + s_cursor_width) > m_clip_region.GetWidth())
     {
       // Hitting the end of the text box
-      if (m_caret == (int) m_textline.Length())
+      if (m_caret == (int) m_textline.length())
       {
         m_text_positionx = - (str_width + (int) s_cursor_width - m_clip_region.GetWidth());
       }
@@ -814,7 +814,7 @@
   }
   void BaseKeyboardHandler::MoveCursorAtEnd()
   {
-    unsigned int StrLength = ( unsigned int) m_textline.Length();
+    unsigned int StrLength = ( unsigned int) m_textline.length();
     m_previous_cursor_position = m_caret;
     m_caret = StrLength;
   }
@@ -846,16 +846,11 @@
     m_text_positionx = 0;
   }
 
-  void BaseKeyboardHandler::SetText(const tstring &s)
+  void BaseKeyboardHandler::SetText(const std::string &s)
   {
     SetText(s.c_str());
   }
 
-  void BaseKeyboardHandler::SetText(const NString &s)
-  {
-    SetText(s.GetTCharPtr());
-  }
-
   void BaseKeyboardHandler::SetClipRegion(const Geometry &g)
   {
     m_clip_region = g;
@@ -880,7 +875,7 @@
   void BaseKeyboardHandler::SelectAllText()
   {
     m_selection_start = 0;
-    m_caret = (unsigned int) m_textline.Length();
+    m_caret = (unsigned int) m_textline.length();
     AdjustCursorAndTextPosition();
   }
 
@@ -889,15 +884,15 @@
     m_selection_start = m_caret;
   }
 
-  NString BaseKeyboardHandler::GetSelectedText() const
+  std::string BaseKeyboardHandler::GetSelectedText() const
   {
     if (m_selection_start == m_caret)
     {
-      return NString("");
+      return std::string("");
     }
     else
     {
-      NString s = m_textline.GetSubString(GetTextSelectionStart(), GetTextSelectionEnd() - GetTextSelectionStart()).GetTStringRef();
+      std::string s = m_textline.substr(GetTextSelectionStart(), GetTextSelectionEnd() - GetTextSelectionStart());
       return s;
     }
   }

=== modified file 'Nux/KeyboardHandler.h'
--- Nux/KeyboardHandler.h	2011-10-21 22:06:35 +0000
+++ Nux/KeyboardHandler.h	2012-09-26 05:32:20 +0000
@@ -61,13 +61,13 @@
       char      character    /*character*/,
       const Geometry &g);
 
-    NString GetTextLine() const
+    std::string GetTextLine() const
     {
       return m_textline;
     }
     unsigned int GetLength() const
     {
-      return (unsigned int) m_textline.Length();
+      return (unsigned int) m_textline.length();
     }
 
     unsigned int GetCursorPosition() const
@@ -88,8 +88,7 @@
     }
 
     void SetText(const char *str);
-    void SetText(const tstring &s);
-    void SetText(const NString &s);
+    void SetText(const std::string &s);
 
     void ClearText();
     void PlaceCaret(unsigned int cp);
@@ -104,13 +103,13 @@
     void GetTextSelection(int *start, int *end) const;
     int GetTextSelectionStart() const;
     int GetTextSelectionEnd() const;
-    NString GetSelectedText() const;
+    std::string GetSelectedText() const;
     void SelectAllText();
     void UnselectAllText();
     bool IsTextSelected();
 
-    void SetPrefix(NString); // 0x865, 25 rad, 25 degree...
-    void SetPostfix(NString);
+    void SetPrefix(std::string); // 0x865, 25 rad, 25 degree...
+    void SetPostfix(std::string);
 
     void EnterFocus();
 
@@ -128,7 +127,7 @@
 
   protected:
     ObjectPtr<FontTexture> m_Font;
-    NString m_textline;
+    std::string m_textline;
     int m_previous_cursor_position;
     bool m_need_redraw;
     int m_text_positionx;

=== modified file 'Nux/Layout.h'
--- Nux/Layout.h	2012-09-04 18:56:19 +0000
+++ Nux/Layout.h	2012-09-26 05:32:20 +0000
@@ -294,7 +294,7 @@
 
     std::list<Area *> _layout_element_list;
 
-    NString m_name;
+    std::string m_name;
 
     LayoutContentDistribution m_ContentStacking;
   };

=== modified file 'Nux/MenuPage.cpp'
--- Nux/MenuPage.cpp	2011-12-06 16:29:06 +0000
+++ Nux/MenuPage.cpp	2012-09-26 05:32:20 +0000
@@ -277,7 +277,7 @@
 //
   const char *MenuPage::GetName() const
   {
-    return m_Name.GetTCharPtr();
+    return m_Name.c_str();
   }
 
   bool MenuPage::CanClose() const

=== modified file 'Nux/MenuPage.h'
--- Nux/MenuPage.h	2011-10-17 21:23:50 +0000
+++ Nux/MenuPage.h	2012-09-26 05:32:20 +0000
@@ -275,7 +275,7 @@
     VLayout* _vlayout;
     bool m_NextMouseUpMeanStop;
     MenuItem *m_SubMenuAction;
-    NString m_Name;
+    std::string m_Name;
 
     bool m_Action_Triggered;
     MenuPage *m_Parent;

=== modified file 'Nux/NumericValuator.cpp'
--- Nux/NumericValuator.cpp	2012-07-04 16:36:46 +0000
+++ Nux/NumericValuator.cpp	2012-09-26 05:32:20 +0000
@@ -26,6 +26,8 @@
 #include "DoubleValidator.h"
 #include "NumericValuator.h"
 
+#include <string>
+
 namespace nux
 {
 
@@ -47,7 +49,7 @@
   void NumericValuator::InitializeWidgets()
   {
     m_EditLine->SetValidator(&m_DoubleValidator);
-    m_EditLine->SetText(NString::Printf("%d", m_DoubleValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string(m_DoubleValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(2 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, 2 * DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT));
@@ -104,7 +106,7 @@
     if (m_fValue > m_DoubleValidator.GetMaximum())
       m_fValue = m_DoubleValidator.GetMaximum();
 
-    m_EditLine->SetText(NString::Printf("%f", m_fValue));
+    m_EditLine->SetText(std::to_string(m_fValue));
   }
 
   float NumericValuator::GetValue() const
@@ -152,20 +154,20 @@
   void NumericValuator::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_fValue = ret;
 
       if (m_fValue < m_DoubleValidator.GetMinimum())
       {
         m_fValue = m_DoubleValidator.GetMinimum();
-        m_EditLine->SetText(NString::Printf("%f", m_fValue));
+        m_EditLine->SetText(std::to_string(m_fValue));
       }
 
       if (m_fValue > m_DoubleValidator.GetMaximum())
       {
         m_fValue = m_DoubleValidator.GetMaximum();
-        m_EditLine->SetText(NString::Printf("%f", m_fValue));
+        m_EditLine->SetText(std::to_string(m_fValue));
       }
     }
 //     else

=== modified file 'Nux/PangoText.cpp'
--- Nux/PangoText.cpp	2012-05-25 20:36:09 +0000
+++ Nux/PangoText.cpp	2012-09-26 05:32:20 +0000
@@ -131,7 +131,7 @@
     // intentionally left empty
   }
 
-  void PangoText::SetText(NString text)
+  void PangoText::SetText(std::string text)
   {
     if (_text != text)
     {

=== modified file 'Nux/RGBValuator.cpp'
--- Nux/RGBValuator.cpp	2012-09-17 09:55:43 +0000
+++ Nux/RGBValuator.cpp	2012-09-26 05:32:20 +0000
@@ -31,6 +31,9 @@
 #include "DoubleValidator.h"
 #include "RGBValuator.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(RGBValuator);
@@ -648,6 +651,27 @@
     SetRGB(color.red, color.green, color.blue);
   }
 
+  std::string as_hex(float f)
+  {
+    std::ostringstream s;
+    s << std::hex << (int)f;
+    return s.str();
+  }
+
+  std::string as_dec(float f)
+  {
+    std::ostringstream s;
+    s << (int)f;
+    return s.str();
+  }
+
+  std::string as_float(float f)
+  {
+    std::ostringstream s;
+    s << std::setprecision(3) << f;
+    return s.str();
+  }
+
   void RGBValuator::SetRGB(float r, float g, float b)
   {
     rgb_.red   = Clamp(r, 0.0f, 1.0f);
@@ -660,21 +684,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (rgb_.red * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (rgb_.green * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (rgb_.blue * 255)));
+      red_caption_->SetText(as_hex(rgb_.red * 255));
+      green_caption_->SetText(as_hex(rgb_.green * 255));
+      blue_caption_->SetText(as_hex(rgb_.blue * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (rgb_.red * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (rgb_.green * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (rgb_.blue * 255)));
+      red_caption_->SetText(as_dec(rgb_.red * 255));
+      green_caption_->SetText(as_dec(rgb_.green * 255));
+      blue_caption_->SetText(as_dec(rgb_.blue * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", rgb_.red));
-      green_caption_->SetText(NString::Printf("%.3f", rgb_.green));
-      blue_caption_->SetText(NString::Printf("%.3f", rgb_.blue));
+      red_caption_->SetText(as_float(rgb_.red));
+      green_caption_->SetText(as_float(rgb_.green));
+      blue_caption_->SetText(as_float(rgb_.blue));
     }
 
     // Restore text selection if necessary.
@@ -701,21 +725,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (hsv_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (hsv_.saturation * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (hsv_.value * 255)));
+      red_caption_->SetText(as_hex(hsv_.hue * 255));
+      green_caption_->SetText(as_hex(hsv_.saturation * 255));
+      blue_caption_->SetText(as_hex(hsv_.value * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (hsv_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (hsv_.saturation * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (hsv_.value * 255)));
+      red_caption_->SetText(as_dec(hsv_.hue * 255));
+      green_caption_->SetText(as_dec(hsv_.saturation * 255));
+      blue_caption_->SetText(as_dec(hsv_.value * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", hsv_.hue));
-      green_caption_->SetText(NString::Printf("%.3f", hsv_.saturation));
-      blue_caption_->SetText(NString::Printf("%.3f", hsv_.value));
+      red_caption_->SetText(as_float(hsv_.hue));
+      green_caption_->SetText(as_float(hsv_.saturation));
+      blue_caption_->SetText(as_float(hsv_.value));
     }
 
     if (hsv_.hue >= 1.0f)
@@ -746,21 +770,21 @@
 
     if (m_color_format == color::HEX)
     {
-      red_caption_->SetText(NString::Printf("%x", (int) (hls_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%x", (int) (hls_.lightness * 255)));
-      blue_caption_->SetText(NString::Printf("%x", (int) (hls_.saturation * 255)));
+      red_caption_->SetText(as_hex(hls_.hue * 255));
+      green_caption_->SetText(as_hex(hls_.lightness * 255));
+      blue_caption_->SetText(as_hex(hls_.saturation * 255));
     }
     else if (m_color_format == color::INT)
     {
-      red_caption_->SetText(NString::Printf("%d", (int) (hls_.hue * 255)));
-      green_caption_->SetText(NString::Printf("%d", (int) (hls_.lightness * 255)));
-      blue_caption_->SetText(NString::Printf("%d", (int) (hls_.saturation * 255)));
+      red_caption_->SetText(as_dec(hls_.hue * 255));
+      green_caption_->SetText(as_dec(hls_.lightness * 255));
+      blue_caption_->SetText(as_dec(hls_.saturation * 255));
     }
     else
     {
-      red_caption_->SetText(NString::Printf("%.3f", hls_.hue));
-      green_caption_->SetText(NString::Printf("%.3f", hls_.lightness));
-      blue_caption_->SetText(NString::Printf("%.3f", hls_.saturation));
+      red_caption_->SetText(as_float(hls_.hue));
+      green_caption_->SetText(as_float(hls_.lightness));
+      blue_caption_->SetText(as_float(hls_.saturation));
     }
 
     if (hls_.hue >= 1.0f)
@@ -785,15 +809,15 @@
 
     if (m_color_format == color::HEX)
     {
-      alpha_caption_->SetText(NString::Printf("%x", (int) (alpha_ * 255)));
+      alpha_caption_->SetText(as_hex(alpha_ * 255));
     }
     else if (m_color_format == color::INT)
     {
-      alpha_caption_->SetText(NString::Printf("%d", (int) (alpha_ * 255)));
+      alpha_caption_->SetText(as_dec(alpha_ * 255));
     }
     else
     {
-      alpha_caption_->SetText(NString::Printf("%.3f", alpha_));
+      alpha_caption_->SetText(as_float(alpha_));
     }
 
     sigColorChanged.emit(rgb_.red, rgb_.green, rgb_.blue, alpha_);
@@ -1211,21 +1235,21 @@
 
   }
 
-  void RGBValuator::OnComponentInput(EditTextBox *textbox, const NString &s, int componentIndex)
+  void RGBValuator::OnComponentInput(EditTextBox *textbox, const std::string &s, int componentIndex)
   {
     float f = 0;
 
-    if ((m_color_format == color::HEX) && (m_HexRegExp.Validate(s.GetTCharPtr()) == Validator::Acceptable))
+    if ((m_color_format == color::HEX) && (m_HexRegExp.Validate(s.c_str()) == Validator::Acceptable))
     {
-      f = (float) m_HexRegExp.ToInteger(s.GetTCharPtr()) / 255.0f;
+      f = (float) m_HexRegExp.ToInteger(s.c_str()) / 255.0f;
     }
-    else if ((m_color_format == color::INT) && (m_IntRegExp.Validate(s.GetTCharPtr()) == Validator::Acceptable))
+    else if ((m_color_format == color::INT) && (m_IntRegExp.Validate(s.c_str()) == Validator::Acceptable))
     {
-      f = (float) m_IntRegExp.ToInteger(s.GetTCharPtr()) / 255.0f;
+      f = (float) m_IntRegExp.ToInteger(s.c_str()) / 255.0f;
     }
     else
     {
-      f = (float) m_DoubleRegExp.ToDouble(s.GetTCharPtr());
+      f = (float) m_DoubleRegExp.ToDouble(s.c_str());
     }
 
     f = Clamp(f, 0.0f, 1.0f);
@@ -1302,7 +1326,7 @@
     if (componentIndex == 3)
     {
       float f = 0;
-      f = CharToDouble(s.GetTCharPtr());
+      f = CharToDouble(s.c_str());
       f = Clamp(f, 0.0f, 1.0f);
       //if(m_color_model == color::RGB)
       {

=== modified file 'Nux/RGBValuator.h'
--- Nux/RGBValuator.h	2012-08-17 12:41:21 +0000
+++ Nux/RGBValuator.h	2012-09-26 05:32:20 +0000
@@ -87,7 +87,7 @@
     void OnReceiveMouseUp_Green     (int x, int y, unsigned long button_flags, unsigned long key_flags);
     void OnReceiveMouseUp_Blue      (int x, int y, unsigned long button_flags, unsigned long key_flags);
 
-    void OnComponentInput           (EditTextBox *textbox, const NString &s, int componentIndex);
+    void OnComponentInput           (EditTextBox *textbox, const std::string &s, int componentIndex);
     void OnChannelKeyboardFocus();
     void OnChannelLostKeyboardFocus();
     void OnChannelValidateKeyboardEntry();

=== modified file 'Nux/RangeValue.cpp'
--- Nux/RangeValue.cpp	2012-08-17 12:41:21 +0000
+++ Nux/RangeValue.cpp	2012-09-26 05:32:20 +0000
@@ -25,6 +25,9 @@
 #include "HLayout.h"
 #include "RangeValue.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(RangeValue);
@@ -172,7 +175,7 @@
     else
       m_Value = value;
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     QueueDraw();
   }
 
@@ -193,7 +196,7 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseDown.emit(m_Value);
@@ -211,7 +214,9 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    std::stringstream s;
+    s << std::setprecision(3) << m_Value;
+    m_ValueString->SetText(s.str());
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseUp.emit(m_Value);
@@ -228,7 +233,9 @@
     else
       m_Value = m_min + (m_max - m_min) * (float) x / (float) m_Percentage->GetBaseWidth();
 
-    m_ValueString->SetText(NString::Printf("%.3f", m_Value));
+    std::stringstream s;
+    s << std::setprecision(3) << m_Value;
+    m_ValueString->SetText(s.str());
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);
     sigMouseDrag.emit(m_Value);
@@ -246,10 +253,10 @@
 
   }
 
-  void RangeValue::OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text)
+  void RangeValue::OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text)
   {
     float f;
-    f = CharToDouble(text.GetTCharPtr());
+    f = CharToDouble(text.c_str());
     SetValue(f);
     sigValueChanged.emit(this);
     sigFloatChanged.emit(m_Value);

=== modified file 'Nux/RangeValue.h'
--- Nux/RangeValue.h	2012-08-17 12:41:21 +0000
+++ Nux/RangeValue.h	2012-09-26 05:32:20 +0000
@@ -89,7 +89,7 @@
     void OnReceiveMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
     void OnKeyboardFocus();
     void OnLostKeyboardFocus();
-    void OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text);
+    void OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text);
 
     bool IsCtrlKeyPressed() const
     {

=== modified file 'Nux/RangeValueInteger.cpp'
--- Nux/RangeValueInteger.cpp	2012-08-17 12:41:21 +0000
+++ Nux/RangeValueInteger.cpp	2012-09-26 05:32:20 +0000
@@ -169,7 +169,7 @@
       m_Value = value;
 
     m_MarkerPosition = m_Value;
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     QueueDraw();
   }
 
@@ -202,7 +202,7 @@
         m_Value++;
     }
 
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     sigValueChanged.emit(this);
     sigMouseDown.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -225,7 +225,7 @@
     }
 
     m_MarkerPosition = m_Value;
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     sigValueChanged.emit(this);
     sigMouseUp.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -254,7 +254,7 @@
         m_Value++;
     }
 
-    m_ValueString->SetText(NString::Printf("%d", m_Value));
+    m_ValueString->SetText(std::to_string(m_Value));
     sigValueChanged.emit(this);
     sigMouseDrag.emit(m_Value);
     sigValueChanged2.emit(m_Value);
@@ -272,10 +272,10 @@
 
   }
 
-  void RangeValueInteger::OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text)
+  void RangeValueInteger::OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text)
   {
     int i;
-    i = CharToInteger(text.GetTCharPtr());
+    i = CharToInteger(text.c_str());
     SetValue(i);
     sigValueChanged.emit(this);
     sigSetTypedValue.emit(i);

=== modified file 'Nux/RangeValueInteger.h'
--- Nux/RangeValueInteger.h	2012-08-17 12:41:21 +0000
+++ Nux/RangeValueInteger.h	2012-09-26 05:32:20 +0000
@@ -94,7 +94,7 @@
     void OnReceiveMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
     void OnKeyboardFocus();
     void OnLostKeyboardFocus();
-    void OnValidateKeyboardEntry(EditTextBox *textbox, const NString &text);
+    void OnValidateKeyboardEntry(EditTextBox *textbox, const std::string &text);
 
     bool IsCtrlKeyPressed() const
     {

=== modified file 'Nux/SpinBox.cpp'
--- Nux/SpinBox.cpp	2012-07-04 16:36:46 +0000
+++ Nux/SpinBox.cpp	2012-09-26 05:32:20 +0000
@@ -43,7 +43,7 @@
     m_EditLine->SetValidator(&m_IntValidator);
     m_EditLine->SetSuffix("");
     m_EditLine->SetPrefix("");
-    m_EditLine->SetText(NString::Printf("%d", m_IntValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string(m_IntValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(1.5 * DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT));
@@ -134,7 +134,7 @@
   void SpinBox::SetValue(int value)
   {
     m_iValue = m_IntValidator.GetClampedValue(value);
-    m_EditLine->SetText(NString::Printf("%d", m_iValue));
+    m_EditLine->SetText(std::to_string(m_iValue));
     sigValueChanged.emit(this);
     sigValue.emit(m_iValue);
     QueueDraw();
@@ -221,10 +221,10 @@
   void SpinBox::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_iValue = m_IntValidator.GetClampedValue(ret);
-      m_EditLine->SetText(NString::Printf("%d", m_iValue));
+      m_EditLine->SetText(std::to_string(m_iValue));
       sigValueChanged.emit(this);
       sigValue.emit(m_iValue);
 //

=== modified file 'Nux/SpinBoxDouble.cpp'
--- Nux/SpinBoxDouble.cpp	2012-07-04 16:36:46 +0000
+++ Nux/SpinBoxDouble.cpp	2012-09-26 05:32:20 +0000
@@ -53,7 +53,7 @@
     m_EditLine->SetValidator(&m_DoubleValidator);
     m_EditLine->SetSuffix("");
     m_EditLine->SetPrefix("");
-    m_EditLine->SetText(NString::Printf("%.3f", m_DoubleValidator.GetMinimum()));
+    m_EditLine->SetText(std::to_string(m_DoubleValidator.GetMinimum()));
 
     m_EditLine->SetMinimumSize(1.5 * DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT);
     m_EditLine->SetGeometry(Geometry(0, 0, DEFAULT_WIDGET_WIDTH, DEFAULT_WIDGET_HEIGHT));
@@ -141,7 +141,7 @@
 //        m_Value = m_DoubleValidator.GetMinimum();
 //    if (m_Value > m_DoubleValidator.GetMaximum())
 //        m_Value = m_DoubleValidator.GetMaximum();
-    m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+    m_EditLine->SetText(std::to_string(m_Value));
     sigValueChanged.emit(this);
     sigValue.emit(m_Value);
     QueueDraw();
@@ -228,10 +228,10 @@
   void SpinBoxDouble::ImplementValidateEntry()
   {
     double ret = 0;
-    ret = CharToDouble(m_EditLine->GetCleanText().GetTCharPtr());
+    ret = CharToDouble(m_EditLine->GetCleanText().c_str());
     {
       m_Value = m_DoubleValidator.GetClampedValue(ret);
-      m_EditLine->SetText(NString::Printf("%.3f", m_Value));
+      m_EditLine->SetText(std::to_string(m_Value));
       sigValueChanged.emit(this);
       sigValue.emit(m_Value);
 //

=== modified file 'Nux/StaticTextBox.cpp'
--- Nux/StaticTextBox.cpp	2012-08-27 09:09:21 +0000
+++ Nux/StaticTextBox.cpp	2012-09-26 05:32:20 +0000
@@ -67,13 +67,13 @@
       if (m_bDrawBackground)
       {
         GetPainter().PushDrawLayer(graphics_engine, base, m_Background);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text.m_string, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
         GetPainter().PopBackground();
       }
       else
       {
         //GetPainter().PaintBackground(graphics_engine, base);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text.m_string, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
       }
 
       graphics_engine.PopClippingRectangle();
@@ -90,25 +90,13 @@
 
   }
 
-  void StaticTextBox::SetText(const char &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
   void StaticTextBox::SetText(const char *Caption)
   {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void StaticTextBox::SetText(const tstring &Caption)
-  {
-    NString s(Caption);
-    SetText(s);
-  }
-
-  void StaticTextBox::SetText(const NString &Caption)
+    std::string s(Caption);
+    SetText(s);
+  }
+
+  void StaticTextBox::SetText(const std::string &Caption)
   {
     m_Text = Caption;
 
@@ -133,10 +121,10 @@
 
   void StaticTextBox::AdjustMinWidthToMatchText()
   {
-    if (m_Text.Size() == 0)
+    if (m_Text.size() == 0)
       return;
 
-    SetMinimumWidth(/*4 + */GetFont()->GetStringWidth(m_Text.GetTStringRef()));
+    SetMinimumWidth(/*4 + */GetFont()->GetStringWidth(m_Text));
   }
 
   void StaticTextBox::SetFont(ObjectPtr<FontTexture> Font)

=== modified file 'Nux/StaticTextBox.h'
--- Nux/StaticTextBox.h	2011-10-21 22:06:35 +0000
+++ Nux/StaticTextBox.h	2012-09-26 05:32:20 +0000
@@ -39,14 +39,12 @@
     virtual void PostDraw(GraphicsEngine &graphics_engine, bool force_draw);
 
     // API
-    void SetText(const char &Caption);
     void SetText(const char *Caption);
-    void SetText(const tstring &Caption);
-    void SetText(const NString &Caption);
+    void SetText(const std::string &Caption);
     const char *GetText() const;
     unsigned int GetTextSize() const
     {
-      return (unsigned int) m_Text.Length();
+      return (unsigned int) m_Text.length();
     }
 
     //! Change the widget minimum width whenever the text is set.
@@ -100,7 +98,7 @@
     virtual bool AcceptKeyNavFocus();
     void AdjustMinWidthToMatchText();
 
-    NString m_Text;
+    std::string m_Text;
     Color m_TextColor;
     Color m_BackgroundColor;
     tstring m_temporary_caption;

=== modified file 'Nux/SystemThread.h'
--- Nux/SystemThread.h	2011-12-29 18:06:53 +0000
+++ Nux/SystemThread.h	2012-09-26 05:32:20 +0000
@@ -82,7 +82,7 @@
     // Declare operator adress-of as private
     SystemThread *operator &();
 
-    NString m_ThreadName;
+    std::string m_ThreadName;
 
     friend SystemThread *CreateSystemThread(AbstractThread *Parent, ThreadUserInitFunc UserInitFunc, void *InitData);
     

=== modified file 'Nux/TabView.cpp'
--- Nux/TabView.cpp	2012-08-17 12:41:21 +0000
+++ Nux/TabView.cpp	2012-09-26 05:32:20 +0000
@@ -40,7 +40,7 @@
   Color TabView::TAB_HEADER_COLOR               = Color(0xFF333333);
   Color TabView::TAB_HEADER_FOCUS_COLOR         = Color(0xFF5D5D5D);
 
-  TabView::TabElement::TabElement(NString TabName, Layout *TabLayout)
+  TabView::TabElement::TabElement(std::string TabName, Layout *TabLayout)
   {
     _index = 0;
     _tab_name = TabName;
@@ -78,7 +78,7 @@
     return _tab_area->GetGeometry();
   }
 
-  const NString &TabView::TabElement::GetName() const
+  const std::string &TabView::TabElement::GetName() const
   {
     return _tab_name;
   }
@@ -206,7 +206,7 @@
     for (unsigned int i = 0; i < vector_size; i++)
     {
       Geometry tab_geo = _tab_array[i]->_tab_area->GetGeometry();
-      const char *tab_text = _tab_array[i]->GetName().GetTCharPtr();
+      const char *tab_text = _tab_array[i]->GetName().c_str();
 
       if (_tab_array[i]->_index == m_FocusTabIndex)
       {

=== modified file 'Nux/TabView.h'
--- Nux/TabView.h	2012-08-17 12:41:21 +0000
+++ Nux/TabView.h	2012-09-26 05:32:20 +0000
@@ -63,16 +63,16 @@
     class TabElement
     {
     public:
-      TabElement(NString TabName, Layout *TabLayout);
+      TabElement(std::string TabName, Layout *TabLayout);
       ~TabElement();
 
       void SetIndex(int index);
       int GetIndex() const;
       void SetGeometry(const Geometry &geo);
       Geometry const& GetGeometry() const;
-      const NString &GetName() const;
+      const std::string &GetName() const;
 
-      NString     _tab_name;
+      std::string     _tab_name;
       Layout     *_tab_content_layout;
       BasicView  *_tab_area;
       int         _index;

=== modified file 'Nux/Theme.cpp'
--- Nux/Theme.cpp	2012-08-07 20:39:44 +0000
+++ Nux/Theme.cpp	2012-09-26 05:32:20 +0000
@@ -204,8 +204,8 @@
       {
         BaseTexture* device_texture;
 
-        NString texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(*value_cursor);
-        device_texture = theme->Load2DTextureFile(texture_filename.GetTCharPtr());
+        std::string texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(*value_cursor);
+        device_texture = theme->Load2DTextureFile(texture_filename.c_str());
 
         pimage->texture = device_texture;
       }
@@ -228,8 +228,8 @@
 
   void UXTheme::LoadPainterImages()
   {
-    NString file_search = "Painter.xml";
-    NString painter_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(file_search.GetTCharPtr());
+    std::string file_search = "Painter.xml";
+    std::string painter_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(file_search.c_str());
 
     if (painter_filename == "")
     {
@@ -253,10 +253,10 @@
       this,
       NULL);
 
-    NString str;
-    LoadFileToString(str, painter_filename.GetTCharPtr());
+    std::string str;
+    LoadFileToString(str, painter_filename.c_str());
 
-    if (g_markup_parse_context_parse(context, str.GetTCharPtr(), str.Length(), NULL) == FALSE)
+    if (g_markup_parse_context_parse(context, str.c_str(), str.length(), NULL) == FALSE)
     {
       nuxCriticalMsg("[GraphicsEngine::LoadPainterImages] Failed to parse data.");
       return;
@@ -264,7 +264,7 @@
 
 #else
 
-    TiXmlDocument doc(painter_filename.GetTCharPtr());
+    TiXmlDocument doc(painter_filename.c_str());
     doc.LoadFile();
 
     TiXmlHandle docHandle( &doc );
@@ -276,9 +276,9 @@
       PainterImage *pimage = new PainterImage;
       Memset(pimage, 0, sizeof(PainterImage));
 
-      NString style = image->Attribute(TCHARToUTF8("style"));
+      std::string style = image->Attribute(TCHARToUTF8("style"));
 
-      pimage->style = GetStyleImageRef(style.GetTCharPtr());
+      pimage->style = GetStyleImageRef(style.c_str());
 
       // If the attributes border_left, border_right, border_top, border_bottom are not present, assume they are equal to 0;
       pimage->border_left = pimage->border_right = pimage->border_top = pimage->border_bottom = 0;
@@ -311,17 +311,17 @@
       {
         BaseTexture* device_texture;
 
-        NString filename = image->Attribute(TCHARToUTF8("Name"));
-        NString texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(filename.GetTCharPtr());
-        device_texture = Load2DTextureFile(texture_filename.GetTCharPtr());
+        std::string filename = image->Attribute(TCHARToUTF8("Name"));
+        std::string texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(filename.c_str());
+        device_texture = Load2DTextureFile(texture_filename.c_str());
 
         pimage->texture = device_texture;
       }
       else
       {
-        NString filename = image->Attribute(TCHARToUTF8("Name"));
-        NString texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(filename.GetTCharPtr());
-        pimage->texture = Load2DTextureFile(texture_filename.GetTCharPtr());
+        std::string filename = image->Attribute(TCHARToUTF8("Name"));
+        std::string texture_filename = NUX_FIND_RESOURCE_LOCATION_NOFAIL(filename.c_str());
+        pimage->texture = Load2DTextureFile(texture_filename.c_str());
       }
 
       painter_image_list_.push_back(pimage);

=== modified file 'Nux/VLayout.cpp'
--- Nux/VLayout.cpp	2012-07-30 21:02:35 +0000
+++ Nux/VLayout.cpp	2012-09-26 05:32:20 +0000
@@ -49,7 +49,7 @@
 
   }
 
-  VLayout::VLayout(NString name, NUX_FILE_LINE_DECL)
+  VLayout::VLayout(std::string name, NUX_FILE_LINE_DECL)
     : LinearLayout(NUX_FILE_LINE_PARAM)
   {
     m_name = name;

=== modified file 'Nux/VLayout.h'
--- Nux/VLayout.h	2011-10-21 22:06:35 +0000
+++ Nux/VLayout.h	2012-09-26 05:32:20 +0000
@@ -33,7 +33,7 @@
     NUX_DECLARE_OBJECT_TYPE(VLayout, LinearLayout);
   public:
     VLayout(NUX_FILE_LINE_PROTO);
-    VLayout(NString name, NUX_FILE_LINE_PROTO);
+    VLayout(std::string name, NUX_FILE_LINE_PROTO);
     ~VLayout();
 
     virtual long ComputeContentSize();

=== modified file 'Nux/Validator.cpp'
--- Nux/Validator.cpp	2011-10-10 01:52:00 +0000
+++ Nux/Validator.cpp	2012-09-26 05:32:20 +0000
@@ -38,13 +38,13 @@
   bool Validator::InitRegExp()
   {
 #if defined(NUX_OS_WINDOWS)
-    regex_ = _regexp_str.GetTCharPtr();
+    regex_ = _regexp_str.c_str();
     return true;
 #else
     const char *error;
     int   erroffset;
     _regexp = pcre_compile(
-      _regexp_str.GetTCharPtr(),    /* the pattern */
+      _regexp_str.c_str(),    /* the pattern */
       PCRE_MULTILINE,
       &error,         /* for error message */
       &erroffset,     /* for error offset */
@@ -52,7 +52,7 @@
 
     if (!_regexp)
     {
-      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.GetTCharPtr());
+      nuxDebugMsg("[IntegerValidator::IntegerValidator] Invalid regular expression: %s", _regexp_str.c_str());
       return false;
     }    
     return true;

=== modified file 'Nux/Validator.h'
--- Nux/Validator.h	2011-10-17 21:23:50 +0000
+++ Nux/Validator.h	2012-09-26 05:32:20 +0000
@@ -52,7 +52,7 @@
 
   protected:
     bool InitRegExp();
-    NString _regexp_str;
+    std::string _regexp_str;
 
 #if defined(NUX_OS_WINDOWS)
     std::regex regex_;

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-09-24 18:50:37 +0000
+++ Nux/WindowCompositor.cpp	2012-09-26 05:32:20 +0000
@@ -1298,11 +1298,11 @@
     else
       window_thread_->GetGraphicsEngine().SetOpenGLClippingRectangle(0, 0, buffer_width, buffer_height);
 
-    if (m_TooltipText.Size())
+    if (m_TooltipText.size())
     {
         //SetProcessingTopView(_tooltip_window);
         GetPainter().PaintShape(window_thread_->GetGraphicsEngine(), _tooltip_geometry, Color(0xA0000000), eSHAPE_CORNER_ROUND10, true);
-        GetPainter().PaintTextLineStatic(window_thread_->GetGraphicsEngine(), GetSysBoldFont(), _tooltip_text_geometry, m_TooltipText.m_string, Color(0xFFFFFFFF));
+        GetPainter().PaintTextLineStatic(window_thread_->GetGraphicsEngine(), GetSysBoldFont(), _tooltip_text_geometry, m_TooltipText, Color(0xFFFFFFFF));
         //SetProcessingTopView(NULL);
     }
 
@@ -1687,9 +1687,9 @@
     m_TooltipX = x;
     m_TooltipY = y;
 
-    if (m_TooltipText.Size())
+    if (m_TooltipText.size())
     {
-      int w = GetSysBoldFont()->GetCharStringWidth(m_TooltipText.GetTCharPtr());
+      int w = GetSysBoldFont()->GetCharStringWidth(m_TooltipText.c_str());
       int h = GetSysBoldFont()->GetFontHeight();
 
       _tooltip_text_geometry = Geometry(
@@ -1790,7 +1790,7 @@
         key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, direction);
         // nuxDebugMsg("[WindowCompositor::SetKeyFocusArea] Area type '%s' named '%s': Lost key nav focus.",
         //   key_focus_area_->Type().name,
-        //   key_focus_area_->GetBaseString().GetTCharPtr());
+        //   key_focus_area_->GetBaseString().c_str());
       }
 
       if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))
@@ -1818,7 +1818,7 @@
         key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), true, direction);
         // nuxDebugMsg("[WindowCompositor::SetKeyFocusArea] Area type '%s' named '%s': Has key nav focus.",
         //   key_focus_area_->Type().name,
-        //   key_focus_area_->GetBaseString().GetTCharPtr());
+        //   key_focus_area_->GetBaseString().c_str());
       }
 
       if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))
@@ -2108,7 +2108,7 @@
           key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, KEY_NAV_NONE);
           // nuxDebugMsg("[WindowCompositor::GrabKeyboardAdd] Area type '%s' named '%s': Lost key nav focus.",
           //   key_focus_area_->Type().name,
-          //   key_focus_area_->GetBaseString().GetTCharPtr());
+          //   key_focus_area_->GetBaseString().c_str());
 
         }
 
@@ -2183,7 +2183,7 @@
           key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, KEY_NAV_NONE);
           // nuxDebugMsg("[WindowCompositor::GrabKeyboardRemove] Area type '%s' named '%s': Lost key nav focus.",
           //   key_focus_area_->Type().name,
-          //   key_focus_area_->GetBaseString().GetTCharPtr());          
+          //   key_focus_area_->GetBaseString().c_str());          
         }
 
         if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))

=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-09-24 16:03:12 +0000
+++ Nux/WindowCompositor.h	2012-09-26 05:32:20 +0000
@@ -487,7 +487,7 @@
     int m_Width;
     int m_Height;
 
-    NString m_TooltipText;
+    std::string m_TooltipText;
     InputArea* m_TooltipArea;
     int m_TooltipX;
     int m_TooltipY;

=== modified file 'NuxCore/FileIO.cpp'
--- NuxCore/FileIO.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FileIO.cpp	2012-09-26 05:32:20 +0000
@@ -232,7 +232,7 @@
       Load a text file to an NString. The file maybe ANSI or Unicode.
       The resulting string is TCHAR.
   */
-  bool LoadFileToString ( NString &Result, const TCHAR *Filename, NFileManager &FileManager )
+  bool LoadFileToString ( std::string &Result, const TCHAR *Filename, NFileManager &FileManager )
   {
     NSerializer *Reader = FileManager.CreateFileReader (Filename);
 
@@ -318,9 +318,9 @@
   /*!
       Save string to File. Attempt to write it as ASCII if possible. If not write as UTF16-BE.
   */
-  bool SaveStringToFile ( const NString &String, const TCHAR *Filename, NFileManager &FileManager )
+  bool SaveStringToFile ( const std::string &String, const TCHAR *Filename, NFileManager &FileManager )
   {
-    if ( !String.Length() )
+    if ( !String.length() )
       return 0;
 
     NSerializer *Ar = FileManager.CreateFileWriter ( Filename );
@@ -331,7 +331,7 @@
     bool SaveAsUnicode = false, Success = true;
 #if UNICODE
 
-    for ( int i = 0; i < String.Length(); i++ )
+    for ( int i = 0; i < String.length(); i++ )
     {
       // Test if the UNICODE 0xABCD is the same as the ASCII 0x00CB.
       if ( (*String) [i] != (TCHAR) (ANSIUCHAR) ConvertTCHARToAnsiChar ( (*String) [i]) )
@@ -347,20 +347,20 @@
 
     if ( SaveAsUnicode || (sizeof (TCHAR) == 1) )
     {
-      unsigned int s = (unsigned int) String.Length() * sizeof (TCHAR);
-      Ar->Serialize ( NUX_CONST_CAST (TCHAR *, String.GetTCharPtr() ), (unsigned int) s);
+      unsigned int s = (unsigned int) String.length() * sizeof (TCHAR);
+      Ar->Serialize ( NUX_CONST_CAST (TCHAR *, String.c_str() ), (unsigned int) s);
     }
     else
     {
-      unsigned int s = (unsigned int) String.Length();
+      unsigned int s = (unsigned int) String.length();
       std::vector<ANSICHAR> AnsiBuffer ( (unsigned int) s);
 
       // Cast all character down from UTF16 to ANSI
-      for (unsigned int i = 0; i < (unsigned int) String.Length(); i++ )
+      for (unsigned int i = 0; i < (unsigned int) String.length(); i++ )
         AnsiBuffer[i] = ConvertTCHARToAnsiChar ( (unsigned int) String[i]);
 
       // serialize
-      s = (unsigned int) String.Length();
+      s = (unsigned int) String.length();
       Ar->Serialize ( NUX_CONST_CAST (ANSICHAR *, &AnsiBuffer[0]), s);
     }
 

=== modified file 'NuxCore/FileIO.h'
--- NuxCore/FileIO.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FileIO.h	2012-09-26 05:32:20 +0000
@@ -23,15 +23,18 @@
 #ifndef NFILE_H
 #define NFILE_H
 
+#include <vector>
+#include <string>
+
 namespace nux
 {
 
   bool LoadFileToArray ( std::vector<BYTE>& Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
   bool LoadTextFileToAnsiArray ( std::vector<ANSICHAR>& Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
   bool LoadTextFileToUnicodeArray ( std::vector<UNICHAR>& Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
-  bool LoadFileToString ( NString &Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
+  bool LoadFileToString ( std::string &Result, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
   bool SaveArrayToFile ( const std::vector<BYTE>& Array, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
-  bool SaveStringToFile ( const NString &String, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
+  bool SaveStringToFile ( const std::string &String, const TCHAR *Filename, NFileManager &FileManager = GFileManager );
 
 }
 

=== modified file 'NuxCore/FileManager/NFileManagerGNU.h'
--- NuxCore/FileManager/NFileManagerGNU.h	2011-10-21 23:49:15 +0000
+++ NuxCore/FileManager/NFileManagerGNU.h	2012-09-26 05:32:20 +0000
@@ -127,8 +127,8 @@
     bool DeleteDirectory (const TCHAR *Path, bool DeleteContentFirst = false);
 
 
-    void FindFiles (std::vector<NString>& Result, const TCHAR *Filename, bool Files, bool Directories) {};
-    void ListFilesInDirectory (std::vector<NString>& Result, const TCHAR *DirName) {};
+    void FindFiles (std::vector<std::string>& Result, const TCHAR *Filename, bool Files, bool Directories) {};
+    void ListFilesInDirectory (std::vector<std::string>& Result, const TCHAR *DirName) {};
     double GetFileAgeSeconds (const TCHAR *Filename)
     {
       return 0;
@@ -141,9 +141,9 @@
     {
       return false;
     };
-    NString GetCurrentDirectory()
+    std::string GetCurrentDirectory()
     {
-      return NString();
+      return std::string();
     };
     bool GetTimeStamp (const TCHAR *Filename, FileTimeStamp &Timestamp)
     {

=== modified file 'NuxCore/FileManager/NFileManagerGeneric.cpp'
--- NuxCore/FileManager/NFileManagerGeneric.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FileManager/NFileManagerGeneric.cpp	2012-09-26 05:32:20 +0000
@@ -38,10 +38,10 @@
     }
 
     int	    Result		= COPY_OK;
-    NString SrcFile		= InSrcFile;
-    NString DestFile	= InDestFile;
+    std::string SrcFile		= InSrcFile;
+    std::string DestFile	= InDestFile;
 
-    NSerializer *Src = CreateFileReader (SrcFile.GetTCharPtr() );
+    NSerializer *Src = CreateFileReader (SrcFile.c_str() );
 
     if (!Src)
     {
@@ -50,7 +50,7 @@
     else
     {
       unsigned int Size = Src->GetFileSize();
-      NSerializer *Dest = CreateFileWriter (DestFile.GetTCharPtr(), (OverWriteExisting ? 0 : FILEWRITE_NOREPLACEEXISTING) | (OverWriteReadOnly ? FILEWRITE_EVENIFREADONLY : 0) );
+      NSerializer *Dest = CreateFileWriter (DestFile.c_str(), (OverWriteExisting ? 0 : FILEWRITE_NOREPLACEEXISTING) | (OverWriteReadOnly ? FILEWRITE_EVENIFREADONLY : 0) );
 
       if (!Dest)
       {
@@ -103,7 +103,7 @@
 
         if (Result != COPY_OK)
         {
-          Delete (DestFile.GetTCharPtr() );
+          Delete (DestFile.c_str() );
         }
       }
 
@@ -190,28 +190,28 @@
     if (PathLength == 0)
       return false;
 
-    NString WildcardPath = NString (Path);
+    std::string WildcardPath = std::string (Path);
 
     if ( (WildcardPath[PathLength - 1] != NUX_BACKSLASH_CHAR) && (WildcardPath[PathLength - 1] != NUX_SLASH_CHAR) )
       WildcardPath += NUX_BACKSLASH_CHAR;
 
     WildcardPath += TEXT ("*");
 
-    std::vector<NString> List;
-    FindFiles (List, *WildcardPath, 1, 0);
+    std::vector<std::string> List;
+    FindFiles (List, WildcardPath.c_str(), 1, 0);
 
     for (unsigned int i = 0; i < List.size(); i++)
     {
-      if (!Delete (* (NString (Path) + NUX_BACKSLASH_CHAR + List[i]), 1) )
+      if (!Delete ((std::string (Path) + NUX_BACKSLASH_CHAR + List[i]).c_str(), 1) )
         return 0;
     }
 
     List.clear();
-    FindFiles (List, *WildcardPath, 0, 1);
+    FindFiles (List, WildcardPath.c_str(), 0, 1);
 
     for (unsigned int i = 0; i < List.size(); i++)
     {
-      if (!DeleteDirectory (* (NString (Path) + NUX_BACKSLASH_CHAR + List[i]), true) )
+      if (!DeleteDirectory ((std::string (Path) + NUX_BACKSLASH_CHAR + List[i]).c_str(), true) )
         return 0;
     }
 
@@ -230,13 +230,13 @@
   }
 
 
-  int NFileManagerGeneric::CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex)
+  int NFileManagerGeneric::CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex)
   {
     nuxAssert (Filename);
     nuxAssert (Extension);
 
-    NString FullPath (Filename);
-    const size_t IndexMarker = FullPath.Length();			// Marks location of the four-digit index.
+    std::string FullPath (Filename);
+    const size_t IndexMarker = FullPath.length();			// Marks location of the four-digit index.
     FullPath += TEXT ("0000.");
     FullPath += Extension;
 
@@ -248,7 +248,7 @@
       FullPath[IndexMarker+2] = (i / 10)  % 10 + TEXT ('0');
       FullPath[IndexMarker+3] =   i     % 10 + TEXT ('0');
 
-      if (GFileManager.FileSize (FullPath.GetTCharPtr() ) == -1)
+      if (GFileManager.FileSize (FullPath.c_str() ) == -1)
       {
         // The file doesn't exist; output success.
         OutputFilename = FullPath;

=== modified file 'NuxCore/FileManager/NFileManagerGeneric.h'
--- NuxCore/FileManager/NFileManagerGeneric.h	2011-10-21 22:06:35 +0000
+++ NuxCore/FileManager/NFileManagerGeneric.h	2012-09-26 05:32:20 +0000
@@ -26,7 +26,6 @@
 namespace nux
 {
 
-  class NString;
   class NFileManagerWindows;
 
   class NFileTransferMonitor
@@ -149,15 +148,15 @@
         @param	BaseIndex		Base for index search.
         @return					Index of the new file. -1 if the file couldn't be created The index has to be in the range [0, 9999].
     */
-    virtual int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex = 0xffffffff) = 0;
-
-
-    virtual void FindFiles ( std::vector<NString>& FileNames, const TCHAR *Filename, bool Files, bool Directories ) = 0;
-    virtual void ListFilesInDirectory ( std::vector<NString>& Result, const TCHAR *DirName) = 0;
+    virtual int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex = 0xffffffff) = 0;
+
+
+    virtual void FindFiles ( std::vector<std::string>& FileNames, const TCHAR *Filename, bool Files, bool Directories ) = 0;
+    virtual void ListFilesInDirectory ( std::vector<std::string>& Result, const TCHAR *DirName) = 0;
     virtual time_t GetFileLastModified (const TCHAR *Filename) = 0;
     virtual double GetFileAgeSeconds (const TCHAR *Filename) = 0;
     virtual bool SetDefaultDirectory() = 0;
-    virtual NString GetCurrentDirectory() = 0;
+    virtual std::string GetCurrentDirectory() = 0;
     virtual bool GetTimeStamp ( const TCHAR *Path, FileTimeStamp &Timestamp ) = 0;
 
 
@@ -172,7 +171,7 @@
     bool MakeDirectory (const TCHAR *Path, bool CreateCompletePath = false);
     bool DeleteDirectory (const TCHAR *Path, bool DeleteContentFirst = false);
     bool Move (const TCHAR *Dest, const TCHAR *Src, bool OverWriteExisting = true, bool OverWriteReadOnly = false, NFileTransferMonitor *Monitor = NULL);
-    int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, NString &OutputFilename, unsigned int BaseIndex = 0xffffffff);
+    int CreateUniqueFileName (const TCHAR *Filename, const TCHAR *Extension, std::string &OutputFilename, unsigned int BaseIndex = 0xffffffff);
 
     bool IsDrive (const TCHAR *Path);
   };

=== modified file 'NuxCore/FileName.cpp'
--- NuxCore/FileName.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FileName.cpp	2012-09-26 05:32:20 +0000
@@ -27,72 +27,59 @@
 namespace nux
 {
 
-  NString NFileName::GetDrive() const
+  std::string NFileName::GetDrive() const
   {
-    size_t Pos = FindFirstOccurence (NUX_BACKSLASH_CHAR);
-
-    if (Pos == tstring::npos)
-    {
-      Pos = FindFirstOccurence ("\\");
-
-      if (Pos != tstring::npos)
-      {
-        return GetSubString (Pos);
-      }
-    }
-
-    return TEXT ("");
+    size_t Pos = find('\\', 0);
+    return Pos != std::string::npos ? substr(0, Pos) : "";
   }
 
-  NString NFileName::GetExtension() const
+  std::string NFileName::GetExtension() const
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return TEXT ("");
+    size_t Pos = rfind('.');
+    return Pos != std::string::npos ? substr(Pos + 1) : "";
   }
 
 // Returns the base filename without the path
-  NString NFileName::GetCleanFilename() const
+  std::string NFileName::GetCleanFilename() const
   {
-    size_t Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return *this;
+    size_t bsPos = rfind('\\');
+    size_t sPos = rfind('/');
+    size_t Pos = std::string::npos;
+    if (bsPos != std::string::npos && sPos != std::string::npos)
+    {
+      Pos = Max<size_t>(bsPos, sPos);
+    }
+    else if (bsPos != std::string::npos)
+    {
+      Pos = bsPos;
+    }
+    else if (sPos != std::string::npos)
+    {
+      Pos = sPos;
+    }
+    return  Pos != std::string::npos ? (const std::string)substr(Pos + 1) : *this;
   }
 
-  NString NFileName::GetFilenameNoExtension() const
+  std::string NFileName::GetFilenameNoExtension() const
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
+    size_t Pos = rfind('.');
+    if (Pos != std::string::npos && Pos != 0)
     {
-      return GetSubString (Pos);
+      return substr(0, Pos);
     }
-
     return *this;
   }
 
 // Returns the base filename without the path and without the extension
-  NString NFileName::GetBaseFilename() const
+  std::string NFileName::GetBaseFilename() const
   {
-    NString Wk = GetCleanFilename();
-
-    size_t Pos = Wk.FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
+    std::string Wk = GetCleanFilename();
+
+    size_t Pos = Wk.rfind('.');
+
+    if (Pos != std::string::npos)
     {
-      return Wk.GetSubString (Pos);
+      return Wk.substr(Pos);
     }
 
     return Wk;
@@ -100,113 +87,124 @@
 
 // Returns the path in front of the filename
 
-  NString NFileName::GetDirectoryPath() const
+  std::string NFileName::GetDirectoryPath() const
   {
-    size_t Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<size_t> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos);
-    }
-
-    return *this;
+    size_t bsPos = rfind('\\');
+    size_t sPos = rfind('/');
+    size_t Pos = std::string::npos;
+    if (bsPos != std::string::npos && sPos != std::string::npos)
+    {
+      Pos = Max<size_t>(bsPos, sPos);
+    }
+    else if (bsPos != std::string::npos)
+    {
+      Pos = bsPos;
+    }
+    else if (sPos != std::string::npos)
+    {
+      Pos = sPos;
+    }
+    return Pos != std::string::npos ? substr(Pos) : ".";
   }
 
   void NFileName::ChangeFileExtension (const TCHAR *ext)
   {
-    size_t Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      (*this) = GetSubString (Pos) + NString (TEXT (".") ) + NString (ext);
-    }
-    else
-    {
-      (*this) = (*this) + NString (TEXT (".") ) + NString (ext);
-    }
+    size_t Pos = rfind('.');
+    if (Pos != std::string::npos)
+    {
+      replace(begin() + Pos, end(), ext);
+    }
+    *this = *this + "." + ext;
   }
 
   void NFileName::ConvertSlashToBackslash()
   {
-    size_t Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('/') );
+    size_t Pos = find('/');
 
-    while (Pos != tstring::npos)
+    while (Pos != std::string::npos)
     {
-      Replace (Pos, 1, 1, TEXT ('\\') );
+      replace(Pos, 1, 1, '\\');
     }
   }
 
-
   void NFileName::ConvertBackslashToSlash()
   {
-    size_t Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('\\') );
+    size_t Pos = find('\\');
 
-    while (Pos != tstring::npos)
+    while (Pos != std::string::npos)
     {
-      Replace (Pos, 1, 1, TEXT ('/') );
+      replace(Pos, 1, 1, '/');
     }
   }
 
   void NFileName::AddSlashAtEnd()
   {
-    if (GetLastChar() != TEXT ('/') )
-      *this += TEXT ('/');
+    if (!empty() && operator[](size() - 1) != '/')
+      append("/");
   }
 
   void NFileName::AddBackSlashAtEnd()
   {
-    if (GetLastChar() != TEXT ('\\') )
-      *this += TEXT ('\\');
+    if (!empty() && operator[](size() - 1) != '\\')
+      *this += '\\';
   }
 
   void NFileName::AddSlashAtStart()
   {
-    if (GetFirstChar() != TEXT ('/') )
-      Insert (0, 1, TEXT ('/') );
+    if (!empty() && operator[](0) != '/')
+      insert(0, 1, '/');
   }
 
   void NFileName::AddBackSlashAtStart()
   {
-    if (GetFirstChar() != TEXT ('\\') )
-      Insert (0, 1, TEXT ('\\') );
+    if (!empty() && operator[](0) != '\\')
+      insert(0, 1, '\\');
   }
 
   void NFileName::RemoveSlashAtEnd()
   {
-    RemoveSuffix (TEXT ('/') );
+    if (!empty() && operator[](size() - 1) == '/')
+    {
+      erase(end() - 1);
+    }
   }
 
   void NFileName::RemoveBackSlashAtEnd()
   {
-    RemoveSuffix (TEXT ('\\') );
+    if (!empty() && operator[](size() - 1) == '\\')
+    {
+      erase(end() - 1);
+    }
   }
 
   void NFileName::RemoveSlashAtStart()
   {
-    RemovePrefix (TEXT ('/') );
+    if (!empty() && operator[](0) == '/')
+    {
+      erase(0, 1);
+    }
   }
 
   void NFileName::RemoveBackSlashAtStart()
   {
-    RemovePrefix (TEXT ('\\') );
+    if (!empty() && operator[](0) == '\\')
+    {
+      erase(0, 1);
+    }
   }
 
   void NFileName::ConvertToCleanSlash()
   {
     ConvertBackslashToSlash();
 
-    size_t size = Size();
+    size_t count = size();
 
-    for (size_t i = 0; i < size; )
+    for (size_t i = 0; i < count; )
     {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('/') ) && (operator[] (i + 1) == TEXT ('/') ) )
+      if ( (i < count - 1) && (operator[] (i) == '/' ) && (operator[] (i + 1) == ('/') ) )
       {
-        Erase (i + 1, 1);
-        --size;
+        erase (i + 1, 1);
+        --count;
       }
       else
       {
@@ -219,13 +217,13 @@
   {
     ConvertSlashToBackslash();
 
-    size_t size = Size();
+    size_t count = size();
 
-    for (size_t i = 0; i < size; )
+    for (size_t i = 0; i < count; )
     {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('\\') ) && (operator[] (i + 1) == TEXT ('\\') ) )
+      if ( (i < count - 1) && (operator[] (i) == '\\' ) && (operator[] (i + 1) == '\\' ) )
       {
-        Erase (i + 1, 1);
+        erase (i + 1, 1);
       }
       else
       {

=== modified file 'NuxCore/FileName.h'
--- NuxCore/FileName.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FileName.h	2012-09-26 05:32:20 +0000
@@ -28,25 +28,22 @@
 namespace nux
 {
 
-  class NFileName : public NString
+  class NFileName : public std::string
   {
   public:
     NFileName()
-      : NString()
+      : std::string()
     {}
     NFileName ( const NFileName &Filename )
-      : NString ( Filename.GetTCharPtr() )
+      : std::string ( Filename )
     {}
 
-    NFileName ( const NString &str )
-      : NString ( str )
+    NFileName ( const std::string &str )
+      : std::string ( str )
     {}
 
     NFileName ( const ANSICHAR *str )
-      : NString ( str )
-    {}
-    NFileName ( const UNICHAR *str )
-      : NString ( str )
+      : std::string ( str )
     {}
 
     //! Replace all slash with backslash.
@@ -75,18 +72,18 @@
     //! Replace all slash with backslash. Replace multiple consecutive backslash with one backslash.
     void ConvertToCleanBackslash();
 
-    NString GetDrive() const;
+    std::string GetDrive() const;
     //! Returns the text following the last period.
-    NString GetExtension() const;
+    std::string GetExtension() const;
     //! Returns the base filename, minus any path information.
-    NString GetCleanFilename() const;
+    std::string GetCleanFilename() const;
     //! Returns the base filename, without the extension (keep the path)
-    NString GetFilenameNoExtension() const;
+    std::string GetFilenameNoExtension() const;
 
     //! Returns the same thing as GetCleanFilename, but without the extension
-    NString GetBaseFilename() const;
+    std::string GetBaseFilename() const;
     //! Returns the path in front of the filename
-    NString GetDirectoryPath() const;
+    std::string GetDirectoryPath() const;
     //! Change the file extension. Do not start ext with a dot character '.'.
     //! ie ext = "com"
     void ChangeFileExtension (const TCHAR *ext);

=== modified file 'NuxCore/FilePath.cpp'
--- NuxCore/FilePath.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/FilePath.cpp	2012-09-26 05:32:20 +0000
@@ -40,7 +40,7 @@
 
   }
 
-  void FilePath::AddSearchPath (const NString &searchpath)
+  void FilePath::AddSearchPath (const std::string &searchpath)
   {
     if (std::find (m_SearchPath.begin(), m_SearchPath.end(), searchpath) != m_SearchPath.end() )
       return;
@@ -48,7 +48,7 @@
     m_SearchPath.push_back (searchpath);
   }
 
-  void FilePath::AddSearchPath (const std::vector<NString>& searchpath)
+  void FilePath::AddSearchPath (const std::vector<std::string>& searchpath)
   {
     for (unsigned int i = 0; i < searchpath.size(); i++)
     {
@@ -57,51 +57,52 @@
     }
   }
 
-  NString FilePath::GetPathToFile (const TCHAR *filename) const
+  std::string FilePath::GetPathToFile (const TCHAR *filename) const
   {
-    NString FileName = GetFile (filename);
-
-    int loc = (int) FileName.FindLastOccurence (TEXT ('\\') );
-
-    if (loc == -1)
+    std::string FileName = GetFile (filename);
+
+    size_t loc = FileName.rfind(TEXT('\\'), 0);
+
+    if (loc == std::string::npos)
     {
-      loc = (int) FileName.FindLastOccurence (TEXT ('/') );
+      loc = FileName.rfind(TEXT('/'), 0);
     }
 
-    if (loc != -1)
-      FileName = FileName.GetSubString (0, loc);
+    if (loc != std::string::npos)
+      FileName = FileName.substr(0, loc);
     else
-      FileName = NString (TEXT (".") );
+      FileName = std::string(TEXT ("."));
 
     return FileName;
   }
 
-  NString FilePath::GetFile (const TCHAR *filename) const
+  std::string FilePath::GetFile (const TCHAR *filename) const
   {
-    NUX_RETURN_VALUE_IF_NULL (filename, NString (TEXT ("") ) );
-
-    if (NString (filename) == NString (TEXT ("") ) )
-      return NString (TEXT ("") );
-
-    NString FileName = filename;
-
-    if (GFileManager.FileExist (FileName.GetTCharPtr() ) )
+    NUX_RETURN_VALUE_IF_NULL (filename, std::string (TEXT ("") ) );
+
+    if (std::string (filename) == std::string (TEXT ("") ) )
+      return std::string (TEXT ("") );
+
+    std::string FileName = filename;
+
+    if (GFileManager.FileExist(FileName.c_str() ) )
       return FileName;
 
     for (unsigned int i = 0; i < m_SearchPath.size(); i++)
     {
-      if (m_SearchPath[i].Size() == 0)
+      if (m_SearchPath[i].size() == 0)
         continue;
 
-      NString FilePath;
+      std::string FilePath;
    
-      if ((m_SearchPath[i].GetLastChar () == TEXT('/')) || (m_SearchPath[i].GetLastChar () == TEXT('\\')))
+      char last = m_SearchPath[i][m_SearchPath.size() - 1];
+      if (last == TEXT('/') || last == TEXT('\\'))
         FilePath = m_SearchPath[i] + filename;
       else
         FilePath = m_SearchPath[i] + NUX_PATH_SEPARATOR_STRING + filename;
 
 
-      if (GFileManager.FileExist (FilePath.GetTCharPtr() ) )
+      if (GFileManager.FileExist (FilePath.c_str() ) )
         return FilePath;
     }
 
@@ -123,27 +124,28 @@
     for (size_t i = 0; i < m_SearchPath.size(); i++)
     {
       size_t pos;
-      NString PathName;
+      std::string PathName;
 
-      while (FileName.FindFirstOccurenceOf (TEXT ("\\/") ) != std::string::npos)
+      while (FileName.find_first_of(TEXT ("\\/")) != std::string::npos)
       {
-        pos = FileName.FindFirstOccurenceOf (TEXT ("\\/") ) + 1;
-
-        FileName = FileName.GetSubString (pos, FileName.Length() - pos);
-
-        if ((m_SearchPath[i].GetLastChar () == TEXT('/')) || (m_SearchPath[i].GetLastChar () == TEXT('\\')))
+        pos = FileName.find_first_of(TEXT ("\\/")) + 1;
+
+        FileName = FileName.substr(pos, FileName.length() - pos);
+
+        char last = m_SearchPath[i][m_SearchPath[i].size() - 1];
+        if (last == TEXT('/') || last == TEXT('\\'))
           PathName = m_SearchPath[i] + FileName;
         else
           PathName = m_SearchPath[i] + NUX_PATH_SEPARATOR_STRING + FileName;
 
 
-        if (GFileManager.FileExist (PathName.GetTCharPtr() ) )
+        if (GFileManager.FileExist (PathName.c_str() ) )
           return PathName;
       }
     }
 
     nuxDebugMsg (TEXT ("[FilePath::GetFile] Cannot find file: %s"), filename);
-    return NString (TEXT ("") );
+    return std::string (TEXT ("") );
   }
 
 }

=== modified file 'NuxCore/FilePath.h'
--- NuxCore/FilePath.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FilePath.h	2012-09-26 05:32:20 +0000
@@ -47,14 +47,14 @@
     FilePath();
     ~FilePath();
 
-    void AddSearchPath (const NString &searchpath);
-    void AddSearchPath (const std::vector<NString>& searchpath);
+    void AddSearchPath (const std::string &searchpath);
+    void AddSearchPath (const std::vector<std::string>& searchpath);
 
-    NString GetPathToFile (const TCHAR *filename) const;
-    NString GetFile (const TCHAR *filename) const;
+    std::string GetPathToFile (const TCHAR *filename) const;
+    std::string GetFile (const TCHAR *filename) const;
 
   private:
-    std::vector<NString>          m_SearchPath;
+    std::vector<std::string>          m_SearchPath;
   };
 
 }

=== modified file 'NuxCore/NumberConversion.cpp'
--- NuxCore/NumberConversion.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/NumberConversion.cpp	2012-09-26 05:32:20 +0000
@@ -31,7 +31,7 @@
    * Written by Lukás Chmela
    * Released under GPLv3.
    */
-  NString IntegerToChar (int value, int base)
+  std::string IntegerToChar (int value, int base)
   {
     char result[65];
 
@@ -39,7 +39,7 @@
     if (base < 2 || base > 36)
     {
       //*result = '\0';
-      NString str = TEXT ('\0');
+      std::string str = TEXT ('\0');
       return str;
     }
 
@@ -67,16 +67,16 @@
       *ptr1++ = tmp_char;
     }
 
-    NString str = result;
+    std::string str = result;
     return str;
   }
 
   double CharToDouble (const TCHAR *digit)
   {
     char *endptr = NULL;
-    NString str = TCHAR_TO_ANSICHAR (digit);
+    std::string str = TCHAR_TO_ANSICHAR (digit);
     errno = 0;
-    double ret = std::strtod (str.GetTCharPtr(), &endptr);
+    double ret = std::strtod (str.c_str(), &endptr);
     unsigned int error = errno;
 
     if (error == ERANGE)
@@ -87,13 +87,16 @@
     return ret;
   }
 
-  NString DoubleToChar (double d)
+  std::string DoubleToChar (double d)
   {
     TCHAR *buffer = new TCHAR[64];
     Memset (buffer, 0, 64);
     SPRINTF_S (buffer, 64, "%.39f", d);
-    NString str = buffer;
-    str = str.TrimRight (TEXT ("0") );
+    std::string str = buffer;
+    while (!str.empty() && str[str.size() - 1] == '0')
+    {
+      str.erase(str.end() - 1);
+    }
 
     delete[] buffer;
     return str;
@@ -101,8 +104,8 @@
 
   int CharToInteger (const TCHAR *digit)
   {
-    NString str = TCHAR_TO_ANSICHAR (digit);
-    long long ret = std::atoi (str.GetTCharPtr() );
+    std::string str = TCHAR_TO_ANSICHAR (digit);
+    long long ret = std::atoi (str.c_str() );
     return ret;
   }
 

=== modified file 'NuxCore/NumberConversion.h'
--- NuxCore/NumberConversion.h	2011-10-21 22:06:35 +0000
+++ NuxCore/NumberConversion.h	2012-09-26 05:32:20 +0000
@@ -26,8 +26,6 @@
 namespace nux
 {
 
-  class NString;
-
 //! Convert a TCHAR string to a double value.
   /*!
       @param  digit A TCHAR string.
@@ -35,12 +33,12 @@
   */
   double CharToDouble (const TCHAR *digit);
 
-//! Convert a double to an NString.
+//! Convert a double to an std::string.
   /*!
       @param  d A double value.
-      @return An NString.
+      @return An std::string.
   */
-  NString DoubleToChar (double d);
+  std::string DoubleToChar (double d);
 
 //! Convert a TCHAR string to a 32 bits long value.
   /*!
@@ -55,7 +53,7 @@
       @param  base  Base of the integer representation.
       @return A string.
   */
-  NString IntegerToChar (int value, int base = 10);
+  std::string IntegerToChar (int value, int base = 10);
 
 //! Convert an string to an integer.
   /*!

=== modified file 'NuxCore/OutputDevice.cpp'
--- NuxCore/OutputDevice.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/OutputDevice.cpp	2012-09-26 05:32:20 +0000
@@ -23,6 +23,9 @@
 #include "NuxCore.h"
 #include "Parsing.h"
 
+#include <sstream>
+#include <iomanip>
+
 namespace nux
 {
 
@@ -38,20 +41,35 @@
       // Create string with system time to create a unique filename.
       unsigned int Year, Month, Day, Hour, Min, Sec, MSec;
       GetLocalTime (Year, Month, Day, Hour, Min, Sec, MSec);
-      NString Name, Extension;
-      NString (Filename).SplitAtLastOccurenceOf (TEXT ("."), Name, Extension);
-      NString BackupFilename;
-
-      if (Extension.Size() )
+      std::string Name, Extension;
+      std::string file = Filename;
+      size_t pos = file.rfind('.');
+      if (pos != std::string::npos)
       {
-        BackupFilename = NString::Printf (TEXT ("%s-backup-%i.%02i.%02i-%02i.%02i.%02i.%s"), Name.GetTCharPtr(), Year, Month, Day, Hour, Min, Sec, Extension.GetTCharPtr() );
+        Name = file.substr(0, pos);
+        Extension = file.substr(pos + 1);
       }
       else
       {
-        BackupFilename = NString::Printf (TEXT ("%s-backup-%i.%02i.%02i-%02i.%02i.%02i"), Name.GetTCharPtr(), Year, Month, Day, Hour, Min, Sec);
-      }
-
-      GFileManager.Copy (BackupFilename.GetTCharPtr(), Filename, true, true, NULL);
+        Name = file;
+      }
+
+      std::ostringstream s;
+      s << std::setfill('0')
+        << Name << "-backup-" << Year << "."
+        << std::setw(2) << Month << "."
+        << std::setw(2) << Day << "."
+        << std::setw(2) << Hour << "."
+        << std::setw(2) << Min << "."
+        << std::setw(2) << Sec;
+      if (Extension.size() )
+      {
+        s << "." << Extension;
+      }
+
+      std::string BackupFilename = s.str();
+
+      GFileManager.Copy (BackupFilename.c_str(), Filename, true, true, NULL);
     }
   }
 #endif
@@ -142,13 +160,13 @@
     // The Editor requires a fully qualified directory to not end up putting the log in various directories.
     m_Filename = GetProgramDirectory();
 
-    if ( (m_Filename[m_Filename.Size()-1] != NUX_SLASH_CHAR) || (m_Filename[m_Filename.Size()-1] != NUX_BACKSLASH_CHAR) )
+    if ( (m_Filename[m_Filename.size()-1] != NUX_SLASH_CHAR) || (m_Filename[m_Filename.size()-1] != NUX_BACKSLASH_CHAR) )
       m_Filename += (const TCHAR *) NUX_PATH_SEPARATOR_STRING;
 
     m_Filename += GetLogDirectory();
 
     // Create the directory tree where the Logs file will be stored.
-    GFileManager.MakeDirectory (m_Filename.GetTCharPtr(), 1);
+    GFileManager.MakeDirectory (m_Filename.c_str(), 1);
 
     m_Filename += (const TCHAR *) NUX_PATH_SEPARATOR_STRING;
     m_Filename += TEXT ("nux");
@@ -157,11 +175,11 @@
     // if the file already exists, create a backup as we are going to overwrite it
     if (!m_Opened)
     {
-      CreateBackupCopy (m_Filename.GetTCharPtr() );
+      CreateBackupCopy (m_Filename.c_str() );
     }
 
     // Open log file.
-    m_LogSerializer = GFileManager.CreateFileWriter (m_Filename.GetTCharPtr(), NSerializer::Read | NSerializer::Write | NSerializer::OverWriteReadOnly | (m_Opened ? NSerializer::Append : 0) );
+    m_LogSerializer = GFileManager.CreateFileWriter (m_Filename.c_str(), NSerializer::Read | NSerializer::Write | NSerializer::OverWriteReadOnly | (m_Opened ? NSerializer::Append : 0) );
 
     if (m_LogSerializer)
     {
@@ -169,7 +187,7 @@
 #if UNICODE && !NUX_LOG_FILE_ANSI
       m_LogSerializer->Serialize ( (void *) &NUX_UTF16_BE[1], NUX_UTF16_BE[0] /*size*/ );
 #endif
-      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file open, %s"), GetFormattedLocalTime().GetTCharPtr());
+      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file open, %s"), GetFormattedLocalTime().c_str());
     }
     else
     {
@@ -193,7 +211,7 @@
   {
     if (m_LogSerializer)
     {
-      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file closed, %s"), GetFormattedLocalTime().GetTCharPtr());
+      LogFunction (NUX_MSG_SEVERITY_NONE, TEXT ("Log file closed, %s"), GetFormattedLocalTime().c_str());
       Flush();
       delete m_LogSerializer;
       m_LogSerializer = NULL;
@@ -249,8 +267,8 @@
 
       m_LogSerializer->Serialize (ACh, i);
 #else
-      NString Raw = NString (log_prefix) + NString (TEXT (": ") ) + NString (log_data) + NString (NUX_LINE_TERMINATOR);
-      SerializeRaw (Raw.GetTCharPtr() );
+      std::string Raw = std::string (log_prefix) + std::string (TEXT (": ") ) + std::string (log_data) + std::string (NUX_LINE_TERMINATOR);
+      SerializeRaw (Raw.c_str() );
 #endif
     }
   }

=== modified file 'NuxCore/OutputDevice.h'
--- NuxCore/OutputDevice.h	2011-04-06 21:54:09 +0000
+++ NuxCore/OutputDevice.h	2012-09-26 05:32:20 +0000
@@ -84,7 +84,7 @@
 
   private:
     NSerializer    *m_LogSerializer;
-    NString         m_Filename;
+    std::string         m_Filename;
     bool            m_Opened;
     bool            m_Closed;
 

=== modified file 'NuxCore/Parsing.cpp'
--- NuxCore/Parsing.cpp	2012-07-30 21:35:43 +0000
+++ NuxCore/Parsing.cpp	2012-09-26 05:32:20 +0000
@@ -133,7 +133,7 @@
     return false;
   }
 
-  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, NString &Value)
+  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, std::string &Value)
   {
     TCHAR Temp[4096] = TEXT ("");
 
@@ -336,9 +336,9 @@
     return sz != 0;
   }
 
-  bool ParseToken (const TCHAR *Str, NString &TokenString)
+  bool ParseToken (const TCHAR *Str, std::string &TokenString)
   {
-    TokenString.Clear();
+    TokenString.clear();
 
     // Skip spaces and tabs.
     while (IsWhitespaceChar (*Str) )
@@ -367,10 +367,10 @@
       }
     }
 
-    return TokenString.Length() > 0;
+    return TokenString.length() > 0;
   }
 
-  NString ParseToken (const TCHAR *Str, bool UseEscape)
+  std::string ParseToken (const TCHAR *Str, bool UseEscape)
   {
     TCHAR Buffer[1024];
 
@@ -398,16 +398,16 @@
     return LineBuffer[0] != 0;
   }
 
-  bool ParseLine (const TCHAR **Stream, NString &LineString)
+  bool ParseLine (const TCHAR **Stream, std::string &LineString)
   {
-    LineString.Clear();
+    LineString.clear();
 
     while ( (**Stream != 0) && (**Stream != CHAR_NEW_LINE) && (**Stream != CHAR_CR) && (**Stream != CHAR_FF) )
     {
       LineString += **Stream++;
     }
 
-    return LineString.Size() > 0;
+    return LineString.size() > 0;
   }
 
 }

=== modified file 'NuxCore/Parsing.h'
--- NuxCore/Parsing.h	2011-10-21 22:06:35 +0000
+++ NuxCore/Parsing.h	2012-09-26 05:32:20 +0000
@@ -112,15 +112,15 @@
       @return TRUE if the token is found inside the stream.
   */
   bool Parse_int (const TCHAR *Stream, const TCHAR *Match, int &Value);
-//! Parse a NString after the named token.
+//! Parse a std::string after the named token.
   /*!
-      Parse a NString after the named token.
+      Parse a std::string after the named token.
       @param  Stream      Character stream to search.
       @param  Match       Token to match.
-      @param Value parsed NString
+      @param Value parsed std::string
       @return TRUE if the token is found inside the stream.
   */
-  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, NString &Value);
+  bool Parse_string (const TCHAR *Stream, const TCHAR *Match, std::string &Value);
 //! Parse a QUADWORD after the named token.
   /*!
       Parse a QUADWORD after the named token.
@@ -168,7 +168,7 @@
                           If FALSE advanced the pointer past all the CR/LF character at the end of the string.
       @return True i a line was copied to LineString;
   */
-  bool ParseLine (const TCHAR **Stream, NString &LineString);
+  bool ParseLine (const TCHAR **Stream, std::string &LineString);
 
 //! Parse the next space-delimited string from the input stream. If the next token starts with a quote, gets entire quoted string.
   /*!
@@ -185,14 +185,14 @@
       @param TokenBuffer The parsed token string.
       @return True if a token was found.
   */
-  bool ParseToken (const TCHAR *Str, NString &TokenString);
+  bool ParseToken (const TCHAR *Str, std::string &TokenString);
 
 //! Parse the next space-delimited string from the input stream. If the next token starts with a quote, gets entire quoted string.
   /*!
       @param Str stream of characters to parse.
-      @return The next token in a NString.
+      @return The next token in a std::string.
   */
-  NString ParseToken (const TCHAR *Str);
+  std::string ParseToken (const TCHAR *Str);
 
 //! Go to the next token in the stream.
   /*!

=== modified file 'NuxCore/Platform.cpp'
--- NuxCore/Platform.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/Platform.cpp	2012-09-26 05:32:20 +0000
@@ -60,7 +60,7 @@
 
   }
 
-  static NString _GetProgramDirectory()
+  static std::string _GetProgramDirectory()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR RootDirectory[NUX_MAX_FILEPATH_SIZE] = TEXT ("");
@@ -71,7 +71,7 @@
       nuxAssertMsg (Result, TEXT ("[GetProgramDirectory] Can't get program's directory path.") );
 
       if (Result == 0)
-        NString (TEXT ("Unknown Program Directory") );
+        std::string (TEXT ("Unknown Program Directory") );
 
       unsigned int i;
 
@@ -85,7 +85,7 @@
       RootDirectory[i] = 0;
     }
 
-    return NString (RootDirectory);
+    return std::string (RootDirectory);
 
 #elif defined(NUX_OS_LINUX)
 
@@ -97,19 +97,19 @@
       nuxAssertMsg (Result, TEXT ("[GetProgramDirectory] Can't get program's directory path.") );
 
       if (Result == 0)
-        NString (TEXT ("Unknown Program Directory") );
+        std::string (TEXT ("Unknown Program Directory") );
 
     }
 
     nuxDebugMsg (TEXT ("[GetProgramDirectory] Program directory path: %s"), RootDirectory);
-    return NString (RootDirectory);
+    return std::string (RootDirectory);
 
 #else
-    return NString (TEXT ("Unknown Program Directory") );
+    return std::string (TEXT ("Unknown Program Directory") );
 #endif
   }
 
-  static NString _GetComputerName()
+  static std::string _GetComputerName()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR ComputerName[NUX_MAX_FILEPATH_SIZE] = TEXT ("");
@@ -130,7 +130,7 @@
       *d++ = 0;
     }
 
-    return NString (ComputerName);
+    return std::string (ComputerName);
 
 #elif defined(NUX_OS_LINUX)
     char Buffer[NUX_MAX_FILEPATH_SIZE];
@@ -138,18 +138,18 @@
 
     if (gethostname (Buffer, BufferSize) != -1)
     {
-      return NString (Buffer);
+      return std::string (Buffer);
     }
 
-    return NString (TEXT ("Unknown Computer Name") );
+    return std::string (TEXT ("Unknown Computer Name") );
 
 #else
-    return NString (TEXT ("Unknown Computer Name") );
+    return std::string (TEXT ("Unknown Computer Name") );
 #endif
   }
 
 // Get user name.  NOTE: Only one return value is valid at a time!
-  static NString _GetUserName()
+  static std::string _GetUserName()
   {
 #if defined(NUX_OS_WINDOWS)
     TCHAR UserName[256] = TEXT ("");
@@ -167,19 +167,19 @@
       *d++ = 0;
     }
 
-    return NString (UserName);
+    return std::string (UserName);
 
 #elif defined(NUX_OS_LINUX)
     struct passwd *userinfo;
     userinfo = getpwuid (getuid() );
 
     if (userinfo == 0)
-      return NString (TEXT ("Unknown User") );
+      return std::string (TEXT ("Unknown User") );
 
-    return NString (userinfo->pw_name);
+    return std::string (userinfo->pw_name);
 
 #else
-    return return NString (TEXT ("Unknown User") );
+    return return std::string (TEXT ("Unknown User") );
 #endif
   }
 
@@ -203,27 +203,27 @@
 
   }
 
-  NString GetComputerName()
+  std::string GetComputerName()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_ComputerName;
   }
 
-  NString GetProgramDirectory()
+  std::string GetProgramDirectory()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_ProgramDirectory;
   }
 
-  NString GetUserName()
+  std::string GetUserName()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_UserName;
   }
 
-  NString GetCmdLine()
+  std::string GetCmdLine()
   {
     return NUX_GLOBAL_OBJECT_INSTANCE (NGlobalData).m_CommandLine;
   }
 
-  NString GetLogDirectory()
+  std::string GetLogDirectory()
   {
     return TEXT ("Logs");
   }

=== modified file 'NuxCore/Platform.h'
--- NuxCore/Platform.h	2011-10-21 22:06:35 +0000
+++ NuxCore/Platform.h	2012-09-26 05:32:20 +0000
@@ -43,28 +43,28 @@
       Get the program command line.
       @return The program command line.
   */
-  NString GetCmdLine();
+  std::string GetCmdLine();
 
 //! Get startup directory.
   /*!
       Get startup directory.
       @return The computer name.
   */
-  NString GetProgramDirectory();
+  std::string GetProgramDirectory();
 
 //! Get computer name.
   /*!
       Get computer name.
       @return The computer name.
   */
-  NString GetComputerName();
+  std::string GetComputerName();
 
 //! Get user name.
   /*!
       Get the user name.
       @return The user name.
   */
-  NString GetUserName();
+  std::string GetUserName();
 
 
 //! Return the logs directory
@@ -74,7 +74,7 @@
 
       @return The logs directory
   */
-  NString GetLogDirectory();
+  std::string GetLogDirectory();
 
   class NGlobalData
   {
@@ -84,11 +84,11 @@
     void Initialize (const TCHAR *CommandLine);
 
     unsigned int m_RandomSeed;
-    NString m_UserName;
-    NString m_ComputerName;
-    NString m_ProgramName;
-    NString m_ProgramDirectory;
-    NString m_CommandLine;
+    std::string m_UserName;
+    std::string m_ComputerName;
+    std::string m_ProgramName;
+    std::string m_ProgramDirectory;
+    std::string m_CommandLine;
   };
 
 }

=== modified file 'NuxCore/TextString.cpp'
--- NuxCore/TextString.cpp	2012-09-19 04:53:45 +0000
+++ NuxCore/TextString.cpp	2012-09-26 05:32:20 +0000
@@ -35,25 +35,6 @@
     return Dest;
   }
 
-//
-// Concatenate a string with length checking
-//
-  TCHAR *Strncat (TCHAR *Dest, size_t Size, const TCHAR *Src, size_t MaxLen)
-  {
-    size_t Len = StringLength (Dest);
-    nuxAssert (Size >= Len);
-    TCHAR *NewDest = Dest + Len;
-
-    if ( (MaxLen -= Len) > 0)
-    {
-      Strncpy (NewDest, Size - Len, Src, MaxLen);
-      NewDest[MaxLen-1] = 0;
-    }
-
-    return Dest;
-  }
-
-
 // Search a string inside a string. Return a pointer to the beginning of the searched string if it is found. Else, return NULL;
 // The shearched string must be preceded by a non alpha numeric character in Str.
 
@@ -91,6 +72,7 @@
     return NULL;
   }
 
+<<<<<<< TREE
   bool IsLastChar (const TCHAR *CharString, const TCHAR Chr)
   {
     nuxAssert (CharString != 0);
@@ -310,6 +292,8 @@
     return result;
   }
 
+=======
+>>>>>>> MERGE-SOURCE
   VARARG_BODY (int, Snprintf, const TCHAR *, VARARG_EXTRA (TCHAR *Dest) VARARG_EXTRA (int Size) VARARG_EXTRA (int Count) )
   {
     int Result = -1;
@@ -317,6 +301,7 @@
     return Result;
   }
 
+<<<<<<< TREE
   NString::NString()
   {
     m_string = TEXT("");
@@ -1343,4 +1328,6 @@
     return ResultString;
   }
 
+=======
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'NuxCore/TextString.h'
--- NuxCore/TextString.h	2012-02-18 21:32:06 +0000
+++ NuxCore/TextString.h	2012-09-26 05:32:20 +0000
@@ -28,8 +28,6 @@
 namespace nux
 {
 
-  class NString;
-
   class TCharToUpperCase
   {
     TCHAR *UpperCaseString;
@@ -639,240 +637,6 @@
 
   bool IsLastChar (const TCHAR *CharString, const TCHAR Chr);
 
-//
-// Convert an integer to a string.
-//
-  NString Itoa ( int InNum );
-
-
-
-  class NString
-  {
-  public:
-    NString();
-    NString (const NString &s);
-    NString (const tstring &s);
-    NString (const TCHAR &s);
-    //NString(const TCHAR* s);
-    NString (const ANSICHAR *s);
-    NString (const UNICHAR *s);
-
-    ~NString();
-    NString &operator= (const NString &s);
-
-    const tstring &GetTStringRef() const;
-    //const TCHAR* GetTChar() const;
-    const TCHAR *GetTCharPtr() const;
-
-    size_t Length() const;
-    size_t Size() const;
-    void Clear();
-    bool IsEmpty() const;
-
-    void Erase (size_t Pos, size_t count);
-    NString &Insert (size_t Pos, const TCHAR *Ptr);
-    NString &Insert (size_t Pos, const TCHAR *Ptr, size_t Count);
-    NString &Insert (size_t Pos, const tstring &Str);
-    NString &Insert (size_t Pos, const tstring &Str, size_t Offset, size_t Count);
-    NString &Insert (size_t Pos, const NString &Str);
-    NString &Insert (size_t Pos, const NString &Str, size_t Offset, size_t Count);
-    NString &Insert (size_t Pos, int Count, const TCHAR &Ch);
-
-    const TCHAR &operator[] (size_t ChPos) const;
-    TCHAR &operator[] (size_t ChPos);
-
-    NString &Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr);
-    NString &Replace (size_t Pos1, size_t Num1, const TCHAR *Ptr, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, const tstring &Str);
-    NString &Replace (size_t Pos1, size_t Num1, const tstring &Str, size_t Pos2, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, const NString &Str);
-    NString &Replace (size_t Pos1, size_t Num1, const NString &Str, size_t Pos2, size_t Num2);
-    NString &Replace (size_t Pos1, size_t Num1, size_t Count, TCHAR Ch);
-
-    //! Reverse the string
-    void Reverse();
-
-    //! Replace character ChOut with ChIn in the string
-    NString &SearchAndReplace (TCHAR ChOut, TCHAR ChIn);
-
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const TCHAR &suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const TCHAR *suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const tstring &suffix) const;
-    //! Return The last position of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurence (const NString &suffix) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const TCHAR &suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const TCHAR *suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const tstring &suffix) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurence (const NString &suffix) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const TCHAR &suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const TCHAR *suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const tstring &suffix, size_t start = 0) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindNextOccurence (const NString &suffix, size_t start = 0) const;
-
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const TCHAR &str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const TCHAR *str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const tstring &str) const;
-    //! Return the position of the first occurrence of the substring suffix or -1 if it is not found.
-    size_t FindFirstOccurenceOf (const NString &str) const;
-
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const TCHAR &str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const TCHAR *str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const tstring &str) const;
-    //! Return the position of the last occurrence of the substring suffix or -1 if it is not found.
-    size_t FindLastOccurenceOf (const NString &str) const;
-
-    //! Searches this string for the first match of a substring.
-    size_t Find (NString str, int start = 0);
-    //! Searches this string for the first match of a character.
-    size_t Find (TCHAR c, int start = 0);
-
-    //! Return True if the string is terminated by the character 'suffix'
-    bool IsSuffix (const TCHAR &suffix);
-    //! Return True if the string is terminated by the character string 'suffix'
-    bool IsSuffix (const TCHAR *suffix);
-    //! Return True if the string is terminated by the tstring 'suffix'
-    bool IsSuffix (const tstring &suffix);
-    //! Return True if the string is terminated by the NString 'suffix'
-    bool IsSuffix (const NString &suffix);
-
-    //! Return True if the string start with the character contained in prefix
-    bool IsPrefix (const TCHAR &prefix);
-    //! Return True if the string start with the character string contained in prefix
-    bool IsPrefix (const TCHAR *prefix);
-    //! Return True if the string start with the tstring contained in prefix
-    bool IsPrefix (const tstring &prefix);
-    //! Return True if the string start with the NString contained in prefix
-    bool IsPrefix (const NString &prefix);
-
-    //! Remove the suffix if it is present
-    void RemoveSuffix (const TCHAR &suffix);
-    //! Remove the suffix if it is present
-    void RemoveSuffix (const TCHAR *suffix);
-    //! Remove the suffix if it is present
-    void RemoveSuffix (const tstring &suffix);
-    //! Remove the suffix if it is present
-    void RemoveSuffix (const NString &suffix);
-
-    //! Remove the prefix if it is present
-    void RemovePrefix (const TCHAR &prefix);
-    //! Remove the prefix if it is present
-    void RemovePrefix (const TCHAR *prefix);
-    //! Remove the prefix if it is present
-    void RemovePrefix (const tstring &prefix);
-    //! Remove the prefix if it is present
-    void RemovePrefix (const NString &prefix);
-
-    //! Return an NString of the first count characters.
-    NString GetSubString (size_t count) const;
-    //! Return an NString of the first count characters starting at position start.
-    NString GetSubString (size_t start, size_t count) const;
-
-
-    //! Extracts the first N characters..
-    NString Mid (size_t count) const;
-    //! Extracts the middle part of a string.
-    NString Mid (size_t start, size_t count) const;
-    //! Extracts the left part of a string. At most N characters are extracted.
-    NString Left (size_t N) const;
-    //! Extracts the right part of a string. At most N characters are extracted.
-    NString Right (size_t N) const;
-
-    //! Trims all leading and trailing whitespace characters from the string.
-    NString Trim() const;
-    //! Trim the white space characters at the start of this string. Return a trimmed NString.
-    NString TrimLeft() const;
-    //! Trim the white space characters at the end of this string. Return a trimmed NString.
-    NString TrimRight() const;
-
-    //! Trim any of the characters in the argument string. Return a trimmed NString.
-    NString TrimLeft (NString str) const;
-    //! Trim any of the characters in the argument string. Return a trimmed NString.
-    NString TrimRight (NString str) const;
-
-    //! Get first character.
-    /*!
-        @return The first character or 0 if the string is empty.
-    */
-    TCHAR GetFirstChar() const;
-
-    //! Get last character.
-    /*!
-        @return The last character or 0 if the string is empty.
-    */
-    TCHAR GetLastChar() const;
-
-    const TCHAR *operator () () const;
-    const TCHAR *operator * () const;
-    //operator const TCHAR*() const;
-
-    //! Append a character to this string.
-    NString &operator += (const TCHAR &sufix);
-    //! Append a TCHAR* to this string.
-    NString &operator += (const TCHAR *sufix);
-    //! Append a tstring to this string.
-    NString &operator += (const tstring sufix);
-    //! Append an NString to this string.
-    NString &operator += (const NString sufix);
-
-
-    void SplitAtFirstOccurenceOf (const TCHAR *SplitString, NString &Left, NString &Right);
-    void SplitAtFirstOccurenceOf (const TCHAR &SplitChar, NString &Left, NString &Right);
-    void SplitAtFirstOccurenceOf (const NString &SplitString, NString &Left, NString &Right);
-
-    void SplitAtLastOccurenceOf (const TCHAR *SplitString, NString &Left, NString &Right);
-    void SplitAtLastOccurenceOf (const TCHAR &SplitChar, NString &Left, NString &Right);
-    void SplitAtLastOccurenceOf (const NString &SplitString, NString &Left, NString &Right);
-
-    void ParseToArray (std::vector<NString>& StringArray, const NString &delimiter);
-
-    friend bool operator!= (const NString &left, const NString &right);
-    friend bool operator== (const NString &left, const NString &right);
-    friend bool operator<  (const NString &left, const NString &right);
-    friend bool operator<= (const NString &left, const NString &right);
-    friend bool operator>  (const NString &left, const NString &right);
-    friend bool operator>= (const NString &left, const NString &right);
-
-
-    friend NString operator+ (const NString &left, const NString &right);
-
-    friend NString operator+ (const NString &left, const TCHAR *right);
-    friend NString operator+ (const NString &left, const TCHAR right);
-
-    friend NString operator+ (const TCHAR *left, const NString &right);
-    friend NString operator+ (const TCHAR left, const NString &right);
-
-    friend tostream &operator << (tostream &o, const NString &s);
-
-    /*!
-        Behave like printf. Use an internal buffer of 1024 characters. Do not use this function if you are expecting
-        the result to be more that 1024-1 characters.
-        @return A string with formated arguments in a NString.
-    */
-    VARARG_DECL ( static NString, static NString, return, Printf, VARARG_NONE, const TCHAR *, VARARG_NONE, VARARG_NONE );
-
-  public:
-    tstring m_string;
-  };
-
 }
 
 #endif // TEXTSTRING_H

=== modified file 'NuxCore/TimeFunctions.cpp'
--- NuxCore/TimeFunctions.cpp	2011-10-21 22:06:35 +0000
+++ NuxCore/TimeFunctions.cpp	2012-09-26 05:32:20 +0000
@@ -127,7 +127,7 @@
   }
 
 
-  NString GetFormattedLocalTime()
+  std::string GetFormattedLocalTime()
   {
     TCHAR buffer[1024];
     Memset(buffer, 0, 1024);
@@ -143,10 +143,10 @@
     GetLocalTime (Year, Month, Day, Hour, Minute, Second, MicroSec);
 #ifdef _WIN32
     _stprintf_s (buffer, 1024 - 1, TEXT ("%d:%d:%d: %d/%d/%d"), Hour, Minute, Second, Day, Month, Year);
-    NString result = buffer;
+    std::string result = buffer;
 #else
     _stprintf (buffer, TEXT ("%d:%d:%d: %d/%d/%d"), Hour, Minute, Second, Day, Month, Year);
-    NString result = buffer;
+    std::string result = buffer;
 #endif
 
     return result;

=== modified file 'NuxCore/TimeFunctions.h'
--- NuxCore/TimeFunctions.h	2011-10-21 22:06:35 +0000
+++ NuxCore/TimeFunctions.h	2012-09-26 05:32:20 +0000
@@ -95,7 +95,7 @@
   /*!
       @return The time formatted in a string.
   */
-  NString GetFormattedLocalTime();
+  std::string GetFormattedLocalTime();
 
   /*!
       Suspend thread execution for an interval measured in microseconds.

=== modified file 'NuxGraphics/FontTexture.cpp'
--- NuxGraphics/FontTexture.cpp	2012-07-30 21:49:44 +0000
+++ NuxGraphics/FontTexture.cpp	2012-09-26 05:32:20 +0000
@@ -36,10 +36,10 @@
   FontTexture::FontTexture(const char *FontFile, NUX_FILE_LINE_DECL)
     :   Object(true, NUX_FILE_LINE_PARAM)
   {
-    NString FontPath = GNuxGraphicsResources.FindResourceLocation(FontFile);
+    std::string FontPath = GNuxGraphicsResources.FindResourceLocation(FontFile);
 
     std::filebuf fb;
-    fb.open(FontPath.GetTCharPtr(), std::ios::in);
+    fb.open(FontPath.c_str(), std::ios::in);
     std::istream is(&fb);
 
     BMFontParseFNT(is);
@@ -72,7 +72,7 @@
     return m_Charset.Chars[ascii].XAdvance;
   }
 
-  int FontTexture::GetStringWidth(const NString &str) const
+  int FontTexture::GetStringWidth(const std::string &str) const
   {
 //     unsigned int total = 0;
 //     for (unsigned int i = 0; i != (unsigned int)str.size(); ++i)
@@ -80,12 +80,12 @@
 //         total += GetCharWidth(str[i]);
 //     }
 //     return total;
-    return GetCharStringWidth(str.GetTCharPtr());
+    return GetCharStringWidth(str.c_str());
   }
 
   int FontTexture::GetCharStringWidth(const char *str) const
   {
-    if ((str == 0) || (NString(str) == NString("")))
+    if (str == 0 || *str == '\0')
       return 0;
 
     unsigned int total = 0;
@@ -101,14 +101,14 @@
     return total;
   }
 
-  int FontTexture::GetStringWidth(const NString &str, int num_char_to_compute) const
+  int FontTexture::GetStringWidth(const std::string &str, int num_char_to_compute) const
   {
-    return GetCharStringWidth(str.GetTCharPtr(), num_char_to_compute);
+    return GetCharStringWidth(str.c_str(), num_char_to_compute);
   }
 
   int FontTexture::GetCharStringWidth(const char *str, int num_char_to_compute) const
   {
-    if ((str == 0) || (NString(str) == NString("")))
+    if (str == 0 || *str == '\0')
       return 0;
 
     int num_chars = num_char_to_compute;
@@ -215,11 +215,7 @@
 //                 FontPath.AddSearchPath(".");
 //                 FontPath.AddSearchPath("../Fonts");
 
-#ifdef UNICODE
-          NString font_texture_file = GNuxGraphicsResources.FindResourceLocation(texture);
-#else
-          NString font_texture_file = GNuxGraphicsResources.FindResourceLocation(texture);
-#endif
+          std::string font_texture_file = GNuxGraphicsResources.FindResourceLocation(texture);
 
 #ifdef NUX_OPENGLES_20
           Texture2D *Texture = new Texture2D(NUX_TRACKER_LOCATION);
@@ -227,7 +223,7 @@
           TextureRectangle *Texture = new TextureRectangle(NUX_TRACKER_LOCATION);
 #endif
 
-          NBitmapData* bitmap_data = LoadImageFile(font_texture_file.GetTCharPtr());
+          NBitmapData* bitmap_data = LoadImageFile(font_texture_file.c_str());
 
           if (bitmap_data)
             Texture->Update(bitmap_data, false);
@@ -258,12 +254,12 @@
 //          If the function succeeds, it returns S_OK.
 //          If the function fails, it returns an HRESULT.
 //          The return value can be tested with the SUCCEEDED and FAILED macros.
-  bool FontTexture::CursorPosToX(const NString &Str,
+  bool FontTexture::CursorPosToX(const std::string &Str,
                                   int icp,
                                   bool fTrailing,
                                   int *pX)
   {
-    if (icp > (int) Str.Size())
+    if (icp > (int) Str.size())
       return false;
 
     if (fTrailing)
@@ -293,14 +289,14 @@
 //          If the function is successful, it returns S_OK.
 //          If the function fails, it returns an HRESULT.
 //          The return value can be tested with the SUCCEEDED and FAILED macros.
-  bool FontTexture::XToCursorPosition(const NString &Str,
+  bool FontTexture::XToCursorPosition(const std::string &Str,
                                        int iX,
                                        unsigned int FirstVisibleCharIndex,
                                        int *piCh,
                                        int *piTrailing)
   {
     unsigned int num_chars;
-    num_chars = (unsigned int) Str.Size();
+    num_chars = (unsigned int) Str.size();
     nuxAssert(FirstVisibleCharIndex < num_chars);
 
     *piCh = 0;

=== modified file 'NuxGraphics/FontTexture.h'
--- NuxGraphics/FontTexture.h	2012-02-18 21:32:06 +0000
+++ NuxGraphics/FontTexture.h	2012-09-26 05:32:20 +0000
@@ -190,9 +190,9 @@
     // Knowing the width of a character or a string can be useful if you
     // want your UI to look good at all.
     int GetCharWidth(const char &c) const;
-    int GetStringWidth(const NString &str) const;
+    int GetStringWidth(const std::string &str) const;
     int GetCharStringWidth(const char *str) const;
-    int GetStringWidth(const NString &str, int num_char_to_compute) const;
+    int GetStringWidth(const std::string &str, int num_char_to_compute) const;
     int GetCharStringWidth(const char *str, int num_char_to_compute) const;
     int GetFontHeight();
 
@@ -211,7 +211,7 @@
     //          If the function succeeds, it returns S_OK.
     //          If the function fails, it returns an HRESULT.
     //          The return value can be tested with the SUCCEEDED and FAILED macros.
-    bool CursorPosToX(const NString &Str,
+    bool CursorPosToX(const std::string &Str,
                        int icp,
                        bool fTrailing,
                        int *pX);
@@ -233,7 +233,7 @@
     //          If the function is successful, it returns S_OK.
     //          If the function fails, it returns an HRESULT.
     //          The return value can be tested with the SUCCEEDED and FAILED macros.
-    bool XToCursorPosition(const NString &Str,
+    bool XToCursorPosition(const std::string &Str,
                             int iX,
                             unsigned int FirstVisibleCharIndex,
                             int *piCh,

=== modified file 'NuxGraphics/GLSh_ColorPicker.cpp'
--- NuxGraphics/GLSh_ColorPicker.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLSh_ColorPicker.cpp	2012-09-26 05:32:20 +0000
@@ -40,7 +40,7 @@
 // Use assembly shaders for Intel GPUs: ARB_fragment_program does not have the required
 // instruction to implement the HSV to RGB color conversion.
 
-  static NString VtxShader = "            \n\
+  const char* VtxShader = "            \n\
         uniform mat4 ViewProjectionMatrix;      \n\
         attribute vec4 AVertex;                 \n\
         attribute vec4 VertexColor;             \n\
@@ -49,7 +49,7 @@
             gl_Position = ViewProjectionMatrix * AVertex;   \n\
         }";
 
-  static NString RedFrgShader = "         \n\
+  const char* RedFrgShader = "         \n\
         #ifdef GL_ES                            \n\
         precision mediump float;                \n\
         #endif                                  \n\
@@ -63,7 +63,7 @@
             gl_FragColor = vec4(Color.r, y, x, 1.0);                        \n\
         }";
 
-  static NString GreenFrgShader = "       \n\
+  const char* GreenFrgShader = "       \n\
         #ifdef GL_ES                            \n\
         precision mediump float;                \n\
         #endif                                  \n\
@@ -77,7 +77,7 @@
             gl_FragColor = vec4(y, Color.g, x, 1.0);                        \n\
         }";
 
-  static NString BlueFrgShader = "        \n\
+  const char* BlueFrgShader = "        \n\
         #ifdef GL_ES                            \n\
         precision mediump float;                \n\
         #endif                                  \n\
@@ -91,7 +91,7 @@
             gl_FragColor = vec4(x, y, Color.b, 1.0);                        \n\
         }";
 
-  static NString HueFrgShader = "                 \n\
+  const char* HueFrgShader = "                 \n\
         #ifdef GL_ES                                    \n\
         precision mediump float;                        \n\
         #endif                                          \n\
@@ -107,7 +107,7 @@
             gl_FragColor = vec4(rgb, 1.0);                      \n\
         }";
 
-  static NString SaturationFrgShader = "              \n\
+  const char* SaturationFrgShader = "              \n\
         #ifdef GL_ES                                        \n\
         precision mediump float;                            \n\
         #endif                                              \n\
@@ -123,7 +123,7 @@
             gl_FragColor = vec4(rgb, 1.0);                      \n\
         }";
 
-  static NString ValueFrgShader = "           \n\
+  const char* ValueFrgShader = "           \n\
         #ifdef GL_ES                                \n\
         precision mediump float;                    \n\
         #endif                                      \n\
@@ -139,7 +139,7 @@
             gl_FragColor = vec4(rgb, 1.0);                                  \n\
         }";
 
-  static NString HSV_To_RGBFrgShader = "                                  \n\
+  const char* HSV_To_RGBFrgShader = "                                  \n\
         #ifdef GL_ES                                                            \n\
         precision mediump float;                                                \n\
         #endif                                                                  \n\
@@ -165,7 +165,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-  static NString AsmVtxShader = "!!ARBvp1.0                                 \n\
+  const char* AsmVtxShader = "!!ARBvp1.0                                 \n\
         ATTRIB iPos         = vertex.position;      \n\
         PARAM  mvp[4]       = {state.matrix.mvp};   \n\
         OUTPUT oPos         = result.position;      \n\
@@ -176,7 +176,7 @@
         DP4   oPos.w, mvp[3], iPos;      \n\
         END";
 
-  NString AsmRedFrgShader = "!!ARBfp1.0                  \n\
+  const char* AsmRedFrgShader = "!!ARBfp1.0                  \n\
         PARAM RectPosition = program.local[0];              \n\
         PARAM RectDimension = program.local[1];             \n\
         PARAM Color = program.local[2];                     \n\
@@ -193,7 +193,7 @@
         MOV result.color, temp1;                            \n\
         END";
 
-  NString AsmGreenFrgShader = "!!ARBfp1.0                  \n\
+  const char* AsmGreenFrgShader = "!!ARBfp1.0                  \n\
        PARAM RectPosition = program.local[0];              \n\
        PARAM RectDimension = program.local[1];             \n\
        PARAM Color = program.local[2];                     \n\
@@ -210,7 +210,7 @@
        MOV result.color, temp1;                            \n\
        END";
 
-  NString AsmBlueFrgShader = "!!ARBfp1.0                \n\
+  const char* AsmBlueFrgShader = "!!ARBfp1.0                \n\
        PARAM RectPosition = program.local[0];              \n\
        PARAM RectDimension = program.local[1];             \n\
        PARAM Color = program.local[2];                     \n\
@@ -228,15 +228,15 @@
        END";
 
 
-  NString AsmHueFrgShader = "!!ARBfp1.0                  \n\
+  const char* AsmHueFrgShader = "!!ARBfp1.0                  \n\
         MOV result.color, {0, 0, 0, 0};                     \n\
         END";
 
-  NString AsmSaturationFrgShader = "!!ARBfp1.0                  \n\
+  const char* AsmSaturationFrgShader = "!!ARBfp1.0                  \n\
        MOV result.color, {0, 0, 0, 0};                      \n\
        END";
 
-  NString AsmValueFrgShader = "!!ARBfp1.0                  \n\
+  const char* AsmValueFrgShader = "!!ARBfp1.0                  \n\
        MOV result.color, {0, 0, 0, 0};                      \n\
        END";
 
@@ -250,7 +250,7 @@
     ,   _ScreenOffsetX(0)
     ,   _ScreenOffsetY(0)
   {
-    NString FrgShaderCode;
+    const char* FrgShaderCode;
 
     if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath() && (GetGraphicsDisplay()->GetGpuDevice()->GetGPUBrand() != GPU_BRAND_INTEL))
     {
@@ -297,11 +297,11 @@
       GlobalPixelShader = GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader();
       sprog = GetGraphicsDisplay()->GetGpuDevice()->CreateShaderProgram();
 
-      GlobalPixelShader->SetShaderCode(HSV_To_RGBFrgShader.GetTCharPtr());
+      GlobalPixelShader->SetShaderCode(HSV_To_RGBFrgShader);
 
       sprog->AddShaderObject(GlobalPixelShader);
-      sprog->LoadVertexShader(VtxShader.GetTCharPtr(), NULL);
-      sprog->LoadPixelShader(FrgShaderCode.GetTCharPtr(), NULL);
+      sprog->LoadVertexShader(VtxShader, NULL);
+      sprog->LoadPixelShader(FrgShaderCode, NULL);
       sprog->Link();
     }
     else
@@ -347,8 +347,8 @@
       }
 
       m_AsmProg = GetGraphicsDisplay()->GetGpuDevice()->CreateAsmShaderProgram();
-      m_AsmProg->LoadVertexShader(AsmVtxShader.GetTCharPtr());
-      m_AsmProg->LoadPixelShader(FrgShaderCode.GetTCharPtr());
+      m_AsmProg->LoadVertexShader(AsmVtxShader);
+      m_AsmProg->LoadPixelShader(FrgShaderCode);
       m_AsmProg->Link();
     }
   }

=== modified file 'NuxGraphics/GLSh_DrawFunction.cpp'
--- NuxGraphics/GLSh_DrawFunction.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLSh_DrawFunction.cpp	2012-09-26 05:32:20 +0000
@@ -32,7 +32,7 @@
 namespace nux
 {
 
-  static NString VtxShader = "            \n\
+  static std::string VtxShader = "            \n\
         uniform mat4 ViewProjectionMatrix;      \n\
         attribute vec4 AVertex;                 \n\
         attribute vec4 VertexColor;             \n\
@@ -41,7 +41,7 @@
             gl_Position = ViewProjectionMatrix * AVertex;   \n\
         }";
 
-  static NString FrgShader = "                    \n\
+  static std::string FrgShader = "                    \n\
         #ifdef GL_ES                                    \n\
         precision mediump float;                        \n\
         #endif                                          \n\
@@ -68,7 +68,7 @@
         }";
 
 
-  static NString AsmVtxShader = "!!ARBvp1.0                                 \n\
+  static std::string AsmVtxShader = "!!ARBvp1.0                                 \n\
         ATTRIB iPos         = vertex.position;      \n\
         PARAM  mvp[4]       = {state.matrix.mvp};   \n\
         OUTPUT oPos         = result.position;      \n\
@@ -79,7 +79,7 @@
         DP4   oPos.w, mvp[3], iPos;      \n\
         END";
 
-  NString AsmFrgShader = "!!ARBfp1.0                  \n\
+  std::string AsmFrgShader = "!!ARBfp1.0                  \n\
         PARAM RectPosition = program.local[0];              \n\
         PARAM RectDimension = program.local[1];             \n\
         PARAM Color = program.local[2];                     \n\
@@ -105,15 +105,15 @@
     if (GetGraphicsDisplay()->GetGraphicsEngine()->UsingGLSLCodePath() && (GetGraphicsDisplay()->GetGpuDevice()->GetGPUBrand() != GPU_BRAND_INTEL))
     {
       sprog = GetGraphicsDisplay()->GetGpuDevice()->CreateShaderProgram();
-      sprog->LoadVertexShader(VtxShader.GetTCharPtr(), NULL);
-      sprog->LoadPixelShader(FrgShader.GetTCharPtr(), NULL);
+      sprog->LoadVertexShader(VtxShader.c_str(), NULL);
+      sprog->LoadPixelShader(FrgShader.c_str(), NULL);
       sprog->Link();
     }
     else
     {
       m_AsmProg = GetGraphicsDisplay()->GetGpuDevice()->CreateAsmShaderProgram();
-      m_AsmProg->LoadVertexShader(AsmVtxShader.GetTCharPtr());
-      m_AsmProg->LoadPixelShader(AsmFrgShader.GetTCharPtr());
+      m_AsmProg->LoadVertexShader(AsmVtxShader.c_str());
+      m_AsmProg->LoadPixelShader(AsmFrgShader.c_str());
       m_AsmProg->Link();
     }
   }

=== modified file 'NuxGraphics/GLShaderParameter.h'
--- NuxGraphics/GLShaderParameter.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/GLShaderParameter.h	2012-09-26 05:32:20 +0000
@@ -51,7 +51,7 @@
   public:
     int                      m_Index;                  // Register m_Index / Attribute m_Index
     eShaderParameterType        m_ShaderParameterType;
-    NString                     m_Name;
+    std::string                m_Name;
     bool                       m_bIsOptional;
     bool                       m_bIsStatic;
     bool                       bStaticSet;

=== modified file 'NuxGraphics/GpuDevice.cpp'
--- NuxGraphics/GpuDevice.cpp	2012-09-19 04:53:45 +0000
+++ NuxGraphics/GpuDevice.cpp	2012-09-26 05:32:20 +0000
@@ -32,6 +32,11 @@
 #include "GLTemplatePrimitiveBuffer.h"
 #include "GraphicsEngine.h"
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <vector>
+
 namespace nux
 {
 #if (NUX_ENABLE_CG_SHADERS)
@@ -331,13 +336,11 @@
     _glsl_version_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_VERSION)));
     CHECKGL_MSG(glGetString(GL_VERSION));
 
-    NString opengl_major;
-    NString opengl_minor;
-    char split = '.';
-    _glsl_version_string.SplitAtFirstOccurenceOf(split, opengl_major, opengl_minor);
+    std::vector<std::string> versions;
+    boost::split(versions, _glsl_version_string, boost::algorithm::is_any_of("."));
 
-    _opengl_major = (char)opengl_major.GetTCharPtr()[0] - '0';
-    _opengl_minor = (char)opengl_minor.GetTCharPtr()[0] - '0';
+    _opengl_major = std::stoi(versions[0]);
+    _opengl_minor = std::stoi(versions[1]);
 
     if (_opengl_major >= 3)
     {
@@ -528,24 +531,24 @@
     _openGL_version_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char *, glGetString(GL_VERSION)));
     CHECKGL_MSG(glGetString(GL_VERSION));
 
-    nuxDebugMsg("Gpu Vendor: %s", _board_vendor_string.GetTCharPtr());
-    nuxDebugMsg("Gpu Renderer: %s", _board_renderer_string.GetTCharPtr());
-    nuxDebugMsg("Gpu OpenGL Version: %s", _openGL_version_string.GetTCharPtr());
+    nuxDebugMsg("Gpu Vendor: %s", _board_vendor_string.c_str());
+    nuxDebugMsg("Gpu Renderer: %s", _board_renderer_string.c_str());
+    nuxDebugMsg("Gpu OpenGL Version: %s", _openGL_version_string.c_str());
     nuxDebugMsg("Gpu OpenGL Major Version: %d", _opengl_major);
     nuxDebugMsg("Gpu OpenGL Minor Version: %d", _opengl_minor);
-    nuxDebugMsg("Gpu GLSL Version: %s", _glsl_version_string.GetTCharPtr());
-
-    NString TempStr = (const char *) TCharToUpperCase(_board_vendor_string.GetTCharPtr());
-
-    if (TempStr.FindFirstOccurence("NVIDIA") != tstring::npos)
+    nuxDebugMsg("Gpu GLSL Version: %s", _glsl_version_string.c_str());
+
+    std::string TempStr = boost::algorithm::to_upper_copy(_board_vendor_string);
+
+    if (TempStr.find("NVIDIA", 0) != std::string::npos)
     {
       _gpu_brand = GPU_BRAND_NVIDIA;
     }
-    else if (TempStr.FindFirstOccurence("ATI") != tstring::npos)
+    else if (TempStr.find("ATI", 0) != std::string::npos)
     {
       _gpu_brand = GPU_BRAND_AMD;
     }
-    else if (TempStr.FindFirstOccurence("TUNGSTEN") != tstring::npos)
+    else if (TempStr.find("TUNGSTEN", 0) != std::string::npos)
     {
       _gpu_brand = GPU_BRAND_INTEL;
     }

=== modified file 'NuxGraphics/GpuDevice.h'
--- NuxGraphics/GpuDevice.h	2012-09-17 09:55:43 +0000
+++ NuxGraphics/GpuDevice.h	2012-09-26 05:32:20 +0000
@@ -481,10 +481,10 @@
     int _glsl_version_major;  //!< GLSL major version.
     int _glsl_version_minor;  //!< GLSL major version.
 
-    NString _board_vendor_string;     //!< GPU vendor sting.
-    NString _board_renderer_string;   //!< GPU renderer sting.
-    NString _openGL_version_string;   //!< OpenGL version string.
-    NString _glsl_version_string;     //!< GLSL version string.
+    std::string _board_vendor_string;     //!< GPU vendor sting.
+    std::string _board_renderer_string;   //!< GPU renderer sting.
+    std::string _openGL_version_string;   //!< OpenGL version string.
+    std::string _glsl_version_string;     //!< GLSL version string.
     GpuBrand _gpu_brand;              //!< GPU brand.
 
     bool _UsePixelBufferObject;

=== modified file 'NuxGraphics/GraphicsDisplayWin.cpp'
--- NuxGraphics/GraphicsDisplayWin.cpp	2012-08-14 00:53:12 +0000
+++ NuxGraphics/GraphicsDisplayWin.cpp	2012-09-26 05:32:20 +0000
@@ -717,7 +717,7 @@
 
     if (!wglMakeCurrent(device_context_, glrc))
     {
-      NString error = inlGetSystemErrorMessage();
+      std::string error = inlGetSystemErrorMessage();
       DestroyOpenGLWindow();
       MessageBox(NULL, "Can't Activate The GL Rendering Context.", "ERROR", MB_OK | MB_ICONERROR);
     }

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2012-09-19 04:53:45 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2012-09-26 05:32:20 +0000
@@ -113,59 +113,59 @@
     inlSetThreadLocalStorage(_TLS_GraphicsDisplay, 0);
   }
 
-  NString GraphicsDisplay::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string GraphicsDisplay::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
-    NString path = m_ResourcePathLocation.GetFile(ResourceFileName);
+    std::string path = m_ResourcePathLocation.GetFile(ResourceFileName);
 
     if (path == "" && ErrorOnFail)
     {
       nuxCriticalMsg("[GraphicsDisplay::FindResourceLocation] Failed to locate resource file: %s.", ResourceFileName);
-      return NString("");
+      return "";
     }
 
     return path;
   }
 
-  NString GraphicsDisplay::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string GraphicsDisplay::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_UITextureSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[GraphicsDisplay::FindResourceLocation] Failed to locate ui texture file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString GraphicsDisplay::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string GraphicsDisplay::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_ShaderSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[GraphicsDisplay::FindResourceLocation] Failed to locate shader file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString GraphicsDisplay::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string GraphicsDisplay::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_FontSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[GraphicsDisplay::FindResourceLocation] Failed to locate font file file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;

=== modified file 'NuxGraphics/GraphicsDisplayX11.h'
--- NuxGraphics/GraphicsDisplayX11.h	2012-09-17 09:55:43 +0000
+++ NuxGraphics/GraphicsDisplayX11.h	2012-09-26 05:32:20 +0000
@@ -118,7 +118,11 @@
 
     char m_WindowClassName[256];
     GLuint      m_PixelFormat;      // Holds The Results After Searching For A Match
+<<<<<<< TREE
     std::string window_title_;
+=======
+    std::string m_WindowTitle;
+>>>>>>> MERGE-SOURCE
 
     // size, position
     Size viewport_size_;
@@ -423,28 +427,28 @@
     }
 #endif
 
-    NString FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindFontLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindFontLocation(const char *ResourceFileName, bool ErrorOnFail = false);
 
-    const std::vector<NString>& GetFontSearchPath() const
+    const std::vector<std::string>& GetFontSearchPath() const
     {
       return m_FontSearchPath;
     }
-    const std::vector<NString>& GetShaderSearchPath() const
+    const std::vector<std::string>& GetShaderSearchPath() const
     {
       return m_ShaderSearchPath;
     }
-    const std::vector<NString>& GetUITextureSearchPath() const
+    const std::vector<std::string>& GetUITextureSearchPath() const
     {
       return m_UITextureSearchPath;
     }
 
   private:
-    std::vector<NString> m_FontSearchPath;
-    std::vector<NString> m_ShaderSearchPath;
-    std::vector<NString> m_UITextureSearchPath;
+    std::vector<std::string> m_FontSearchPath;
+    std::vector<std::string> m_ShaderSearchPath;
+    std::vector<std::string> m_UITextureSearchPath;
     FilePath m_ResourcePathLocation;
 
     GraphicsDisplay();

=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-09-17 09:55:43 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-09-26 05:32:20 +0000
@@ -271,18 +271,18 @@
       (_graphics_display.GetGpuDevice()->GetOpenGLMajorVersion() >= 2))
 #endif
     {
-      NString renderer_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char* , glGetString(GL_RENDERER)));
+      std::string renderer_string = ANSI_TO_TCHAR(NUX_REINTERPRET_CAST(const char* , glGetString(GL_RENDERER)));
       CHECKGL_MSG(glGetString(GL_RENDERER));
 
       // Exclude Geforce FX from using GLSL
-      if (renderer_string.FindFirstOccurence("GeForce FX") != tstring::npos)
+      if (renderer_string.find("GeForce FX", 0) != tstring::npos)
       {
         _use_glsl_shaders = false;
         return;
       }
 
       // Exclude Geforce FX Go from using GLSL: this case is not needed since it is detected by the one above.
-      if (renderer_string.FindFirstOccurence("GeForce FX Go") != tstring::npos)
+      if (renderer_string.find("GeForce FX Go", 0) != tstring::npos)
       {
         _use_glsl_shaders = false;
         return;
@@ -318,7 +318,7 @@
 #else
       if (_normal_font.IsNull())
       {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8.txt", true).c_str(), NUX_TRACKER_LOCATION);
         _normal_font = ObjectPtr<FontTexture> (fnt);
         fnt->UnReference();
       }
@@ -331,14 +331,14 @@
     #if defined(NUX_OS_WINDOWS)
       if (_bold_font.IsNull())
       {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/Tahoma_size_8_bold.txt", true).c_str(), NUX_TRACKER_LOCATION);
         _bold_font = ObjectPtr<FontTexture> (fnt);
         fnt->UnReference();
       }
 #else
       if (_bold_font.IsNull())
       {
-        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8_bold.txt", true).GetTCharPtr(), NUX_TRACKER_LOCATION);
+        FontTexture* fnt = new FontTexture(GNuxGraphicsResources.FindResourceLocation("Fonts/nuxfont_size_8_bold.txt", true).c_str(), NUX_TRACKER_LOCATION);
         _bold_font = ObjectPtr<FontTexture> (fnt);
         fnt->UnReference();
       }

=== modified file 'NuxGraphics/IOpenGLAsmShader.cpp'
--- NuxGraphics/IOpenGLAsmShader.cpp	2012-08-02 16:29:19 +0000
+++ NuxGraphics/IOpenGLAsmShader.cpp	2012-09-26 05:32:20 +0000
@@ -39,7 +39,7 @@
   NUX_IMPLEMENT_OBJECT_TYPE(IOpenGLAsmPixelShader);
   NUX_IMPLEMENT_OBJECT_TYPE(IOpenGLAsmShaderProgram);
 
-  bool ExtractShaderString3(const NString &ShaderToken, const NString &ShaderSource, NString &RetSource, NString ShaderPreprocessorDefines);
+  bool ExtractShaderString3(const std::string &ShaderToken, const std::string &ShaderSource, std::string &RetSource, std::string ShaderPreprocessorDefines);
 
   IOpenGLAsmShader::IOpenGLAsmShader(std::string const& shader_name, GLint shader_type, OpenGLResourceType ResourceType)
     : IOpenGLResource(ResourceType)
@@ -113,7 +113,7 @@
   {
   }
 
-  IOpenGLAsmShaderProgram::IOpenGLAsmShaderProgram(NString ShaderProgramName)
+  IOpenGLAsmShaderProgram::IOpenGLAsmShaderProgram(const char* ShaderProgramName)
     :   IOpenGLResource(RT_GLSL_SHADERPROGRAM)
     ,   _ShaderProgramName(ShaderProgramName)
   {
@@ -131,7 +131,7 @@
   {
     nuxAssertMsg(ShaderFileName, "[IOpenGLAsmShaderProgram::LoadIShaderFile] Invalid shader file name.");
     NUX_RETURN_IF_NULL(ShaderFileName);
-    NString SourceCode;
+    std::string SourceCode;
     LoadFileToString(SourceCode, ShaderFileName);
     LoadIShader(&SourceCode[0]);
   }
@@ -140,10 +140,10 @@
   {
     nuxAssertMsg(ShaderCode, "[IOpenGLAsmShaderProgram::LoadIShader] Invalid shader code.");
     NUX_RETURN_IF_NULL(ShaderCode);
-    NString VertexShaderSource;
-    ExtractShaderString3("[Vertex Shader]", ShaderCode, VertexShaderSource, NString(""));
-    NString PixelShaderSource;
-    ExtractShaderString3("[Fragment Shader]", ShaderCode, PixelShaderSource, NString(""));
+    std::string VertexShaderSource;
+    ExtractShaderString3("[Vertex Shader]", ShaderCode, VertexShaderSource, std::string(""));
+    std::string PixelShaderSource;
+    ExtractShaderString3("[Fragment Shader]", ShaderCode, PixelShaderSource, std::string(""));
 
     m_AsmVertexProgram->SetShaderCode(&VertexShaderSource[0]);
     m_AsmFragmentProgram->SetShaderCode(&PixelShaderSource[0]);

=== modified file 'NuxGraphics/IOpenGLAsmShader.h'
--- NuxGraphics/IOpenGLAsmShader.h	2012-08-02 16:29:19 +0000
+++ NuxGraphics/IOpenGLAsmShader.h	2012-09-26 05:32:20 +0000
@@ -121,9 +121,9 @@
     void SetFragmentLocalParameter4fvARB    (unsigned int index, const float *params);
 
   private:
-    IOpenGLAsmShaderProgram(NString ShaderProgramName = NString("AsmShaderProgram"));
+    IOpenGLAsmShaderProgram(const char* ShaderProgramName = "AsmShaderProgram");
     std::vector<ObjectPtr<IOpenGLAsmShader> > ShaderObjectList;
-    NString _ShaderProgramName;
+    std::string _ShaderProgramName;
 
     ObjectPtr<IOpenGLAsmVertexShader> m_AsmVertexProgram;
     ObjectPtr<IOpenGLAsmPixelShader> m_AsmFragmentProgram;

=== modified file 'NuxGraphics/IOpenGLGLSLShader.cpp'
--- NuxGraphics/IOpenGLGLSLShader.cpp	2012-02-23 16:30:14 +0000
+++ NuxGraphics/IOpenGLGLSLShader.cpp	2012-09-26 05:32:20 +0000
@@ -43,7 +43,7 @@
   NUX_IMPLEMENT_OBJECT_TYPE(IOpenGLShaderProgram);
 
 
-  bool ExtractShaderString3(const NString &ShaderToken, const NString &ShaderSource, NString &RetSource, NString ShaderPreprocessorDefines)
+  bool ExtractShaderString3(const std::string &ShaderToken, const std::string &ShaderSource, std::string &RetSource, std::string ShaderPreprocessorDefines)
   {
     size_t lineStart = 0;
     size_t lineCount = 1;
@@ -57,7 +57,7 @@
     {
       size_t i;
 
-      for (i = 0; i < ShaderSource.Length(); i++)
+      for (i = 0; i < ShaderSource.length(); i++)
       {
         //Check if the starting character '[' (open bracket) is found at the beginning of the line
         // i counts the characters in the file. lineStart is equal to i at the beginning of the line.
@@ -66,10 +66,10 @@
           if (!startTokenFound)
           {
             //Test for the start token
-            if (ShaderSource.FindFirstOccurence(ShaderToken) == i)
+            if (ShaderSource.find(ShaderToken, 0) == i)
             {
               // Found the shader token
-              shaderStringStart = i + ShaderToken.Length();
+              shaderStringStart = i + ShaderToken.length();
               startTokenFound = true;
 
               //Set what line the shader was found on
@@ -104,13 +104,13 @@
       }
 
       //Assign the return string
-      RetSource = ShaderSource.GetSubString(shaderStringStart, i - shaderStringStart);
+      RetSource = ShaderSource.substr(shaderStringStart, i - shaderStringStart);
 
       //Add the line directive to the shader source. See the documentation for GLSL #line directive.
       // GLSL spec: The #version directive must occur in a shader before anything else, except for comments and white space.
-      size_t Pos = RetSource.FindFirstOccurence("#version");
+      size_t Pos = RetSource.find("#version", 0);
 
-      while (RetSource[Pos] != '\n')
+      while (Pos != std::string::npos && RetSource[Pos] != '\n')
       {
         if (RetSource[Pos] == 0)
           break;
@@ -124,17 +124,19 @@
       size_t EndOfLinePosition = 0;
       size_t LinePosition = 0;
 
-      while ((EndOfLinePosition = RetSource.FindNextOccurence('\n', EndOfLinePosition)) < Pos - 1)
+      while ((EndOfLinePosition = RetSource.find('\n', EndOfLinePosition)) < Pos - 1)
       {
         ++EndOfLinePosition;
         ++LinePosition;
       }
 
-      RetSource.Insert(Pos, NString::Printf("#line %u\n", LinePosition + shaderStartLine));
+      std::string s = "#line ";
+      s += std::to_string(LinePosition + shaderStartLine) + "\n";
+      RetSource.insert(Pos, s);
 
       // Insert the preprocessor definitions before the #line directive
-      if (ShaderPreprocessorDefines.Length())
-        RetSource.Insert(Pos, ShaderPreprocessorDefines + NString('\n'));
+      if (ShaderPreprocessorDefines.length())
+        RetSource.insert(Pos, ShaderPreprocessorDefines + std::string("\n"));
 
       return true;
     }
@@ -146,26 +148,26 @@
     }
   }
 
-  static void InsertPreProcessorDefinitions(const NString &ShaderSource, NString &RetSource, NString &ShaderPreprocessorDefines)
+  static void InsertPreProcessorDefinitions(const std::string &ShaderSource, std::string &RetSource, std::string &ShaderPreprocessorDefines)
   {
     RetSource = ShaderSource;
 
-    if (ShaderPreprocessorDefines.Length() == 0)
+    if (ShaderPreprocessorDefines.length() == 0)
       return;
 
     // GLSL spec: The #version directive must occur in a shader before anything else, except for comments and white space.
-    size_t Pos = RetSource.FindFirstOccurence("#version");
+    size_t Pos = RetSource.find("#version", 0);
 
     if (Pos != tstring::npos)
     {
-      Pos = RetSource.FindNextOccurence('\n', Pos);
+      Pos = RetSource.find('\n', Pos);
 
-      if (Pos == tstring::npos)
+      if (Pos == std::string::npos)
       {
         // this is most likely an incorrect shader
-        Pos = RetSource.Size();
-        RetSource.Insert(Pos, NString('\n'));
-        Pos = RetSource.Size();
+        Pos = RetSource.size();
+        RetSource.insert(Pos, std::string("\n"));
+        Pos = RetSource.size();
       }
       else
       {
@@ -178,11 +180,11 @@
       Pos = 0;
     }
 
-    if (ShaderPreprocessorDefines.Length())
-      RetSource.Insert(Pos, ShaderPreprocessorDefines + NString('\n'));
+    if (ShaderPreprocessorDefines.length())
+      RetSource.insert(Pos, ShaderPreprocessorDefines + std::string("\n"));
   }
 
-  IOpenGLShader::IOpenGLShader(NString ShaderName, OpenGLResourceType ResourceType)
+  IOpenGLShader::IOpenGLShader(std::string ShaderName, OpenGLResourceType ResourceType)
     :   IOpenGLResource(ResourceType)
     ,   _ShaderName(ShaderName)
   {
@@ -194,7 +196,7 @@
 
   }
 
-  IOpenGLVertexShader::IOpenGLVertexShader(NString ShaderName)
+  IOpenGLVertexShader::IOpenGLVertexShader(std::string ShaderName)
     :   IOpenGLShader(ShaderName, RT_GLSL_VERTEXSHADER)
     ,   m_CompiledAndReady(false)
   {
@@ -213,8 +215,8 @@
   {
     nuxAssertMsg(ShaderCode, "[IOpenGLVertexShader::SetShaderCode] Invalid shader code.");
     NUX_RETURN_IF_NULL(ShaderCode);
-    NString ProcessedShaderSource;
-    NString Defines(VtxShaderPreprocessorDefines);
+    std::string ProcessedShaderSource;
+    std::string Defines(VtxShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(ShaderCode, ProcessedShaderSource, Defines);
 
     m_CompiledAndReady = false;
@@ -223,7 +225,7 @@
 
   bool IOpenGLVertexShader::Compile()
   {
-    size_t CodeSize = _ShaderCode.Size();
+    size_t CodeSize = _ShaderCode.size();
 
     if (CodeSize == 0)
     {
@@ -232,7 +234,7 @@
 
     char *ShaderSource = new char[CodeSize+1];
     Memset(ShaderSource, 0, CodeSize + 1);
-    Memcpy(ShaderSource, _ShaderCode.GetTCharPtr(), CodeSize);
+    Memcpy(ShaderSource, _ShaderCode.c_str(), CodeSize);
 
     CHECKGL(glShaderSource(_OpenGLID, 1, (const GLcharARB **) &ShaderSource, NULL));
     delete [] ShaderSource;
@@ -272,7 +274,7 @@
     return(m_CompiledAndReady ? true : false);
   }
 
-  IOpenGLPixelShader::IOpenGLPixelShader(NString ShaderName)
+  IOpenGLPixelShader::IOpenGLPixelShader(std::string ShaderName)
     :   IOpenGLShader(ShaderName, RT_GLSL_PIXELSHADER)
     ,   m_CompiledAndReady(false)
 
@@ -292,8 +294,8 @@
   {
     nuxAssertMsg(ShaderCode, "[IOpenGLPixelShader::SetShaderCode] Invalid shader code.");
     NUX_RETURN_IF_NULL(ShaderCode);
-    NString ProcessedShaderSource;
-    NString Defines(FrgShaderPreprocessorDefines);
+    std::string ProcessedShaderSource;
+    std::string Defines(FrgShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(ShaderCode, ProcessedShaderSource, Defines);
 
     m_CompiledAndReady = false;
@@ -303,7 +305,7 @@
   bool IOpenGLPixelShader::Compile()
   {
 
-    GLint CodeSize = (GLint) _ShaderCode.Size();
+    GLint CodeSize = (GLint) _ShaderCode.size();
 
     if (CodeSize == 0)
     {
@@ -312,7 +314,7 @@
 
     char *ShaderSource = new char[CodeSize+1];
     Memset(ShaderSource, 0, CodeSize + 1);
-    Memcpy(ShaderSource, _ShaderCode.m_string.c_str(), CodeSize);
+    Memcpy(ShaderSource, _ShaderCode.c_str(), CodeSize);
     CHECKGL(glShaderSource(_OpenGLID, 1, (const GLcharARB **) &ShaderSource, &CodeSize));
     delete [] ShaderSource;
 
@@ -449,7 +451,7 @@
   }
 #endif
 
-  IOpenGLShaderProgram::IOpenGLShaderProgram(NString ShaderProgramName)
+  IOpenGLShaderProgram::IOpenGLShaderProgram(std::string ShaderProgramName)
     :   IOpenGLResource(RT_GLSL_SHADERPROGRAM)
     ,   _FirstParameter(0)
     ,   m_CompiledAndReady(false)
@@ -476,7 +478,7 @@
   {
     nuxAssertMsg(ShaderFileName, "[IOpenGLShaderProgram::LoadIShaderFile] Invalid shader file name.");
     NUX_RETURN_IF_NULL(ShaderFileName);
-    NString SourceCode;
+    std::string SourceCode;
     LoadFileToString(SourceCode, ShaderFileName);
     LoadIShader(&SourceCode[0], VtxShaderPreprocessorDefines, FrgShaderPreprocessorDefines);
   }
@@ -485,10 +487,10 @@
   {
     nuxAssertMsg(ShaderCode, "[IOpenGLShaderProgram::LoadIShader] Invalid shader code.");
     NUX_RETURN_IF_NULL(ShaderCode);
-    NString VertexShaderSource;
-    ExtractShaderString3("[Vertex Shader]", ShaderCode, VertexShaderSource, NString(VtxShaderPreprocessorDefines));
-    NString PixelShaderSource;
-    ExtractShaderString3("[Fragment Shader]", ShaderCode, PixelShaderSource, NString(FrgShaderPreprocessorDefines));
+    std::string VertexShaderSource;
+    ExtractShaderString3("[Vertex Shader]", ShaderCode, VertexShaderSource, std::string(VtxShaderPreprocessorDefines));
+    std::string PixelShaderSource;
+    ExtractShaderString3("[Fragment Shader]", ShaderCode, PixelShaderSource, std::string(FrgShaderPreprocessorDefines));
 
     ObjectPtr<IOpenGLVertexShader> vs = GetGraphicsDisplay()->GetGpuDevice()->CreateVertexShader(); //new IOpenGLVertexShader;
     ObjectPtr<IOpenGLPixelShader> ps = GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader(); //new IOpenGLPixelShader;
@@ -510,8 +512,8 @@
     NUX_RETURN_IF_NULL(glslshader);
     ObjectPtr<IOpenGLVertexShader> vs = GetGraphicsDisplay()->GetGpuDevice()->CreateVertexShader(); //new IOpenGLVertexShader;
 
-    NString ProcessedShaderSource;
-    NString Defines(VtxShaderPreprocessorDefines);
+    std::string ProcessedShaderSource;
+    std::string Defines(VtxShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(glslshader, ProcessedShaderSource, Defines);
 
     vs->SetShaderCode(glslshader);
@@ -525,8 +527,8 @@
     NUX_RETURN_IF_NULL(glslshader);
     ObjectPtr<IOpenGLPixelShader> ps = GetGraphicsDisplay()->GetGpuDevice()->CreatePixelShader(); //new IOpenGLPixelShader;
 
-    NString ProcessedShaderSource;
-    NString Defines(FrgShaderPreprocessorDefines);
+    std::string ProcessedShaderSource;
+    std::string Defines(FrgShaderPreprocessorDefines);
     InsertPreProcessorDefinitions(glslshader, ProcessedShaderSource, Defines);
 
     ps->SetShaderCode(glslshader);
@@ -607,7 +609,7 @@
       {
         if (ShaderObjectList[i]->Compile() == false)
         {
-          nuxDebugMsg("[IOpenGLShaderProgram::Link] Attached shader %s does not compile with program: %s.", ShaderObjectList[i]->_ShaderName.GetTCharPtr(), _ShaderProgramName.GetTCharPtr());
+          nuxDebugMsg("[IOpenGLShaderProgram::Link] Attached shader %s does not compile with program: %s.", ShaderObjectList[i]->_ShaderName.c_str(), _ShaderProgramName.c_str());
         }
       }
 
@@ -793,13 +795,13 @@
 
     while (m_CompiledAndReady && parameter)
     {
-      int location = glGetUniformLocationARB(_OpenGLID, TCHAR_TO_ANSI(parameter->m_Name.GetTCharPtr()));
-      CHECKGL_MSG( glGetUniformLocationARB(_OpenGLID, TCHAR_TO_ANSI(parameter->m_Name.GetTCharPtr())));
+      int location = glGetUniformLocationARB(_OpenGLID, TCHAR_TO_ANSI(parameter->m_Name.c_str()));
+      CHECKGL_MSG( glGetUniformLocationARB(_OpenGLID, TCHAR_TO_ANSI(parameter->m_Name.c_str())));
 
       //nuxDebugMsg("[IOpenGLShaderProgram::CheckUniformLocation] Location index: %d", location);
       if (location == -1 && (!parameter->m_bIsOptional))
       {
-        nuxDebugMsg("[IOpenGLShaderProgram::CheckUniformLocation] Couldn't find shader program parameter %s \n", parameter->m_Name.GetTCharPtr());
+        nuxDebugMsg("[IOpenGLShaderProgram::CheckUniformLocation] Couldn't find shader program parameter %s \n", parameter->m_Name.c_str());
         nuxAssert(0);
       }
 

=== modified file 'NuxGraphics/IOpenGLGLSLShader.h'
--- NuxGraphics/IOpenGLGLSLShader.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/IOpenGLGLSLShader.h	2012-09-26 05:32:20 +0000
@@ -28,19 +28,19 @@
 
   class IOpenGLResource;
 
-  bool ExtractShaderString3(const NString &ShaderToken, const NString &ShaderSource, NString &RetSource, NString ShaderPreprocessorDefines = NString(""));
+  bool ExtractShaderString3(const std::string &ShaderToken, const std::string &ShaderSource, std::string &RetSource, std::string ShaderPreprocessorDefines = std::string(""));
 
   class IOpenGLShader:  public IOpenGLResource
   {
     NUX_DECLARE_OBJECT_TYPE(IOpenGLShader, IOpenGLResource);
-    IOpenGLShader(NString ShaderName, OpenGLResourceType ResourceType);
+    IOpenGLShader(std::string ShaderName, OpenGLResourceType ResourceType);
     virtual ~IOpenGLShader();
   public:
     virtual void SetShaderCode(const ANSICHAR *ShaderCode, const char *ShaderPreprocessorDefines = "") = 0;
     virtual bool Compile() = 0;
     virtual bool IsValid() = 0;
-    NString _ShaderName;
-    NString _ShaderCode;
+    std::string _ShaderName;
+    std::string _ShaderCode;
   };
 
   class IOpenGLVertexShader:  public IOpenGLShader
@@ -52,7 +52,7 @@
     virtual bool Compile();
     virtual bool IsValid();
   private:
-    IOpenGLVertexShader(NString ShaderName = NString("Vertex Shader"));
+    IOpenGLVertexShader(std::string ShaderName = std::string("Vertex Shader"));
     int m_CompiledAndReady;
     friend class GpuDevice;
   };
@@ -66,7 +66,7 @@
     virtual bool Compile();
     virtual bool IsValid();
   private:
-    IOpenGLPixelShader(NString ShaderName = NString("Fragment Shader"));
+    IOpenGLPixelShader(std::string ShaderName = std::string("Fragment Shader"));
     int m_CompiledAndReady;
     friend class GpuDevice;
   };
@@ -207,11 +207,11 @@
     int GetAttributeLocation(const char *AttributeName);
 
   private:
-    IOpenGLShaderProgram(NString ShaderProgramName = NString("ShaderProgram"));
+    IOpenGLShaderProgram(std::string ShaderProgramName = std::string("ShaderProgram"));
     ShaderAttributeDefinition m_ProgramAttributeDefinition[16/*NUM_VERTEX_SHADER_INPUT_ATTRIBUTE*/];
     std::vector<ObjectPtr<IOpenGLShader> > ShaderObjectList;
     bool m_CompiledAndReady;
-    NString _ShaderProgramName;
+    std::string _ShaderProgramName;
     friend class GpuDevice;
   };
 

=== modified file 'NuxGraphics/NuxGraphics.h'
--- NuxGraphics/NuxGraphics.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/NuxGraphics.h	2012-09-26 05:32:20 +0000
@@ -30,8 +30,8 @@
 
   GraphicsDisplay* GetGraphicsDisplay();
 
-  #define NUX_FINDRESOURCELOCATION(a) GNuxGraphicsResources.FindResourceLocation(a, false)()
-  #define NUX_FIND_RESOURCE_LOCATION_NOFAIL(a) GNuxGraphicsResources.FindResourceLocation(a, true)()
+  #define NUX_FINDRESOURCELOCATION(a) GNuxGraphicsResources.FindResourceLocation(a, false)
+  #define NUX_FIND_RESOURCE_LOCATION_NOFAIL(a) GNuxGraphicsResources.FindResourceLocation(a, true)
 
   inlDeclareThreadLocalStorage(GraphicsDisplay *, 1, _TLS_GraphicsDisplay);
 

=== modified file 'NuxGraphics/NuxGraphicsResources.cpp'
--- NuxGraphics/NuxGraphicsResources.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/NuxGraphicsResources.cpp	2012-09-26 05:32:20 +0000
@@ -41,83 +41,6 @@
 
   void NuxGraphicsResources::InitializeResources()
   {
-//         FilePath m_FilePath;
-//         m_FilePath.AddSearchPath(""); // for case where fully qualified path is given
-//         m_FilePath.AddSearchPath("./ini");
-//         m_FilePath.AddSearchPath("../ini");
-//         m_FilePath.AddSearchPath("../../ini");
-//         m_FilePath.AddSearchPath("../../../ini");
-//
-//
-//         NString file_search = "inalogic.ini";
-//         NString FileName = m_FilePath.GetFile(file_search.GetTCharPtr());
-//         if (FileName == "")
-//         {
-//             nuxCriticalMsg("[GraphicsDisplay::GraphicsDisplay] Can't find inalogic.ini file.");
-// //             exit(-1);
-//         }
-//
-//         if (FileName != "")
-//         {
-//             NString key_name = "UseBackupFBO";
-//             NString section_name = "OpenGLSystem";
-//
-//             if (CIniFile::RecordExists(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr()) == false)
-//             {
-//                 nuxDebugMsg("[GraphicsDisplay::GraphicsDisplay] Key [%s] does not exit in .ini file.");
-//             }
-//             else
-//             {
-//                 bool m_BackupFrameBuffer;
-//                 NString value = CIniFile::GetValue(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr());
-//                 if ((value == "1") || (value == "true"))
-//                 {
-//                     m_BackupFrameBuffer = true;
-//                 }
-//                 else
-//                 {
-//                     m_BackupFrameBuffer = false;
-//                 }
-//             }
-//
-//             section_name = "SearchPath";
-//             key_name = "FontPath";
-//             if (CIniFile::RecordExists(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr()))
-//             {
-//                 NString FontPath = CIniFile::GetValue(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr());
-//                 FontPath.ParseToArray(m_FontSearchPath, ";");
-//             }
-//             else
-//             {
-//                 nuxCriticalMsg("[GraphicsDisplay::GraphicsDisplay] Failed to read font search path from .ini file.");
-// //                 return;
-//
-//             }
-//
-//             key_name = "UITexturePath";
-//             if (CIniFile::RecordExists(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr()))
-//             {
-//                 NString UITexturePath = CIniFile::GetValue(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr());
-//                 UITexturePath.ParseToArray(m_UITextureSearchPath, ";");
-//             }
-//             else
-//             {
-//                 nuxCriticalMsg("[GraphicsDisplay::GraphicsDisplay] Failed to read texture search path from .ini file.");
-// //                 return;
-//             }
-//
-//             key_name = "ShaderPath";
-//             if (CIniFile::RecordExists(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr()))
-//             {
-//                 NString ShaderPath = CIniFile::GetValue(key_name.GetTCharPtr(), section_name.GetTCharPtr(), FileName.GetTCharPtr());
-//                 ShaderPath.ParseToArray(m_ShaderSearchPath, ";");
-//             }
-//             else
-//             {
-//                 nuxCriticalMsg("[GraphicsDisplay::GraphicsDisplay] Failed to read shader search path from .ini file.");
-// //                 return;
-//             }
-//         }
 
 #ifdef NUX_OS_LINUX
     m_ResourcePathLocation.AddSearchPath(PKGDATADIR);
@@ -158,117 +81,117 @@
   }
 
 #ifdef NUX_OS_WINDOWS
-  NString NuxGraphicsResources::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
-    NString path = m_ResourcePathLocation.GetFile(ResourceFileName);
+    std::string path = m_ResourcePathLocation.GetFile(ResourceFileName);
 
     if (path == "" && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate resource file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_UITextureSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate ui texture file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_ShaderSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate shader file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_FontSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate font file file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 #elif defined(NUX_OS_LINUX)
-  NString NuxGraphicsResources::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
-    NString path = m_ResourcePathLocation.GetFile(ResourceFileName);
+    std::string path = m_ResourcePathLocation.GetFile(ResourceFileName);
 
     if (path == "" && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate resource file: %s.", ResourceFileName);
-      return NString("");
+      return "";
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_UITextureSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate ui texture file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_ShaderSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate shader file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;
   }
 
-  NString NuxGraphicsResources::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
+  std::string NuxGraphicsResources::FindFontLocation(const char *ResourceFileName, bool ErrorOnFail)
   {
     FilePath searchpath;
     searchpath.AddSearchPath(m_FontSearchPath);
-    NString path = searchpath.GetFile(ResourceFileName);
+    std::string path = searchpath.GetFile(ResourceFileName);
 
     if ((path == "") && ErrorOnFail)
     {
       nuxCriticalMsg("[NuxGraphicsResources::FindResourceLocation] Failed to locate font file file: %s.", ResourceFileName);
-      return NString("");
+      return std::string("");
     }
 
     return path;

=== modified file 'NuxGraphics/NuxGraphicsResources.h'
--- NuxGraphics/NuxGraphicsResources.h	2011-10-19 20:32:38 +0000
+++ NuxGraphics/NuxGraphicsResources.h	2012-09-26 05:32:20 +0000
@@ -34,16 +34,16 @@
   public:
 
     void InitializeResources();
-    NString FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail = false);
-    NString FindFontLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindResourceLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindUITextureLocation(const char *ResourceFileName, bool ErrorOnFail = false);
+    std::string FindShaderLocation(const char *ResourceFileName, bool ErrorOnFail = false);