fix wxSystemSettings::GetColour() for wxGTK3

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 76a968022261564f03f3601458bea8720c4f591c..3bafbba898f3e5761417022f7f673c3a7d60efc2 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.96
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,7 +19,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
+#if wxUSE_OLE && (wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ)
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
@@ -86,7 +85,7 @@ bool Uuid::operator==(const Uuid& uuid) const
 {
     // 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;
+    return IsEqualGUID(m_uuid, uuid.m_uuid) != 0;
 }
 
 // dtor