Fixed wxRichTextCtrl base class

[wxWidgets.git] / src / msw / ole / uuid.cpp

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index c21369b4ef0895263d0d1e60e5e74665f5808934..76a968022261564f03f3601458bea8720c4f591c 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -84,12 +84,9 @@ Uuid& Uuid::operator=(const Uuid& uuid)
 
 bool Uuid::operator==(const Uuid& uuid) const
 {
 
 bool Uuid::operator==(const Uuid& uuid) const
 {

-  return m_uuid == uuid.m_uuid;
-}
-
-bool Uuid::operator!=(const Uuid& uuid) const
-{
-  return m_uuid != uuid.m_uuid;
+    // IsEqualGUID() returns BOOL and not bool so use an explicit comparison to
+    // avoid MSVC warnings about int->bool conversion
+    return IsEqualGUID(m_uuid, uuid.m_uuid) == TRUE;

 }
 
 // dtor
 }
 
 // dtor