Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index e34c0931dfc3512e97fff09238fbeaac4de7f231..d4079803b4708122a2d2ce48ae671daa179bbf75 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        ole/uuid.cpp
+// Name:        src/msw/ole/uuid.cpp

 // Purpose:     implements Uuid class, see uuid.h for details
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implements Uuid class, see uuid.h for details
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -20,14 +20,12 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include  "wx/setup.h"
+#if wxUSE_OLE && (wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ)

 
 

-#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
-
-// standard headers
-#if wxCHECK_W32API_VERSION( 1, 0 )
+#ifndef WX_PRECOMP

     #include "wx/msw/wrapwin.h"
 #endif
     #include "wx/msw/wrapwin.h"
 #endif

+

 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"
 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"


@@ -84,6 +82,13 @@ Uuid& Uuid::operator=(const Uuid& uuid)
   return *this;
 }
 
   return *this;
 }
 

+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;
+}
+

 // dtor
 Uuid::~Uuid()
 {
 // dtor
 Uuid::~Uuid()
 {