X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bce6687f47dfa5fb8d4bab92702a5b5b1eb3485..a9fc5eec8b1facb001552e61e28c88a22034f199:/src/msw/ole/uuid.cpp

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 04f81a8385..87bdd0cc08 100644
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -6,14 +6,14 @@
 // Created:     12.09.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // Declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "uuid.h"
 #endif
 
@@ -26,11 +26,11 @@
 
 #include  "wx/setup.h"
 
-#if wxUSE_OLE && wxUSE_DRAG_AND_DROP
+#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
 
 // standard headers
 #if wxCHECK_W32API_VERSION( 1, 0 )
-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"
 #endif
 #include  <rpc.h>                       // UUID related functions
 
@@ -136,10 +136,6 @@ void Uuid::Create()
 // set the value
 bool Uuid::Set(const wxChar *pc)
 {
-#ifdef __WXWINE__
-    wxFAIL_MSG(_T("UUid::Set not implemented"));
-    return FALSE;
-#else
   // get UUID from string
 #ifdef _UNICODE
   if ( UuidFromString((unsigned short *)pc, &m_uuid) != RPC_S_OK)
@@ -160,7 +156,6 @@ bool Uuid::Set(const wxChar *pc)
   UuidToCForm();
 
   return TRUE;
-#endif
 }
 
 // stores m_uuid in m_pszCForm in a format required by