More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

[wxWidgets.git] / include / wx / string.h

diff --git a/include/wx/string.h b/include/wx/string.h
index 3b2512c3ddd81659b686411a8f15d6defb3b0186..44d6803a1b5d6edbf970dbc12744e282e95d71df 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -254,13 +254,13 @@ public:
   /** @name generic attributes & operations */
   //@{
     /// as standard strlen()
   /** @name generic attributes & operations */
   //@{
     /// as standard strlen()

-  size_t Len() const { return GetStringData() ? GetStringData()->nDataLength : 0; }
+  size_t Len() const { return GetStringData()->nDataLength; }

     /// string contains any characters?
   bool IsEmpty() const { return Len() == 0; }
     /// reinitialize string (and free data!)
   void Empty()
   {
     /// string contains any characters?
   bool IsEmpty() const { return Len() == 0; }
     /// reinitialize string (and free data!)
   void Empty()
   {

-    if ( GetStringData() && GetStringData()->nDataLength != 0 )
+    if ( GetStringData()->nDataLength != 0 )

       Reinit();
 
     wxASSERT( GetStringData()->nDataLength == 0 );
       Reinit();
 
     wxASSERT( GetStringData()->nDataLength == 0 );