Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/anystr.h b/include/wx/anystr.h
index f8167456253e6d7c6c838e3c5016b603b352b171..4251d37d1ad2e83b1f761361cfb3fbc655b64313 100644 (file)
--- a/include/wx/anystr.h
+++ b/include/wx/anystr.h
@@ -61,6 +61,10 @@ public:
     // different conversions to pointers)
     operator bool() const { return m_str != NULL; }
 
+    // at least VC6 and VC7 also need this one or they complain about ambiguity
+    // for !anystr expressions
+    bool operator!() const { return !((bool)*this); }
+
 
     // and these are the conversions operator which allow to assign the result
     // of FuncReturningAnyStrPtr() to either char* or wxChar* (i.e. wchar_t*)
@@ -124,8 +128,8 @@ public:
     // already works fine.
 
 private:
-    // the original string and the offset in it we correspond to, if the string
-    // is NULL this object is NULL pointer-like
+    // the original string and the position in it we correspond to, if the
+    // string is NULL this object is NULL pointer-like
     const wxString * const m_str;
     const wxString::const_iterator m_iter;