Generate code using IsOk() instead of Ok() in stc.cpp.

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

diff --git a/include/wx/anystr.h b/include/wx/anystr.h
index 029e5095cf0189c25dcb7284e66882c72380b9e8..4251d37d1ad2e83b1f761361cfb3fbc655b64313 100644 (file)
--- a/include/wx/anystr.h
+++ b/include/wx/anystr.h
@@ -61,10 +61,9 @@ public:
     // different conversions to pointers)
     operator bool() const { return m_str != NULL; }
 
     // different conversions to pointers)
     operator bool() const { return m_str != NULL; }
 

-#ifdef __VISUALC6__
-    // FIXME-VC6: it also needs this one or it complains about ambiguity
+    // at least VC6 and VC7 also need this one or they complain about ambiguity
+    // for !anystr expressions

     bool operator!() const { return !((bool)*this); }
     bool operator!() const { return !((bool)*this); }

-#endif // __VISUALC6__

 
 
     // and these are the conversions operator which allow to assign the result
 
 
     // and these are the conversions operator which allow to assign the result


@@ -129,22 +128,13 @@ public:
     // already works fine.
 
 private:
     // 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;
 
     wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr);
 };
 
     const wxString * const m_str;
     const wxString::const_iterator m_iter;
 
     wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr);
 };
 

-// FIXME-VC6: expressions involving logical operations are not compiled
-//            correctly without these operators
-#ifdef __VISUALC6__
-    inline bool operator||(const wxAnyStrPtr& p, bool v) { return (bool)p || v; }
-    inline bool operator||(bool v, const wxAnyStrPtr& p) { return v || (bool)p; }
-    inline bool operator&&(const wxAnyStrPtr& p, bool v) { return (bool)p && v; }
-    inline bool operator&&(bool v, const wxAnyStrPtr& p) { return v && (bool)p; }
-#endif // __VISUALC6__
-

 #endif // _WX_ANYSTR_H_
 
 #endif // _WX_ANYSTR_H_