FString::rtrim() and FString::left() now return an FString object with the correct character length

ChangeLog

@@ -1,3 +1,7 @@
+2017-06-26  Markus Gans  <guru.mail@muenster.de>
+	* FString::rtrim() and FString::left() now return an FString 
+	  object with the correct character length
+
 2017-06-18  Markus Gans  <guru.mail@muenster.de>
 	* Move the dragScroll enumeration into the fc namespace
 

src/flistbox.cpp

@@ -384,7 +384,7 @@ void FListBox::clear()
 void FListBox::onKeyPress (FKeyEvent* ev)
 {
   int element_count = int(getCount());
-  int padding_space = 2; // 1 leading space + 1 tailing space
+  const int padding_space = 2; // 1 leading space + 1 tailing space
   int current_before = current;
   int xoffset_before = xoffset;
   int xoffset_end = max_line_width - getClientWidth() + padding_space;

src/fstring.cpp

@@ -829,7 +829,8 @@ FString FString::rtrim() const
   p = s.string;
   last = p + length;
 
-  while ( std::iswspace(wint_t(*--last)) && last > p );
+  while ( std::iswspace(wint_t(*--last)) && last > p )
+    s.length--;
 
   if ( last == p && std::iswspace(wint_t(*last)) )
     s.clear();
@@ -873,6 +874,7 @@ FString FString::left (uInt len) const
     return s;
 
   p = s.string;
+  s.length = len;
   *(p+len) = '\0';
   return s;
 }
@@ -1572,6 +1574,7 @@ FString FString::replace (const FString& from, const FString& to)
       p++;
     }
   }
+
   return s;
 }
 

test/listbox.cpp

@@ -97,9 +97,6 @@ Listbox::Listbox (FWidget* parent)
   list2->setGeometry(21, 1, 10, 10);
   list2->setText ("double");
 
-  for (double i=1; i<=15; i++)
-    double_list->push_back(2*i + (i/100));
-
   //
   // Import via lazy conversion on print
   //