xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index c23c4ca414bc3a95770f747af4555025fa564b62..87bdd0cc0892032d19c101ee6e7ee7e63d0d17e8 100644 (file)
--- 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>
 // Created:     12.09.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // Declarations
 // ============================================================================
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // Declarations
 // ============================================================================
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "uuid.h"
 #endif
 
 #pragma implementation "uuid.h"
 #endif
 


@@ -26,11 +26,11 @@
 
 #include  "wx/setup.h"
 
 
 #include  "wx/setup.h"
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )

 
 // standard headers
 #if wxCHECK_W32API_VERSION( 1, 0 )
 
 // standard headers
 #if wxCHECK_W32API_VERSION( 1, 0 )

-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"

 #endif
 #include  <rpc.h>                       // UUID related functions
 
 #endif
 #include  <rpc.h>                       // UUID related functions
 


@@ -170,8 +170,8 @@ void Uuid::UuidToCForm()
 
   wsprintf(m_pszCForm, wxT("0x%8.8X,0x%4.4X,0x%4.4X,0x%2.2X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X"),
            m_uuid.Data1, m_uuid.Data2, m_uuid.Data3,
 
   wsprintf(m_pszCForm, wxT("0x%8.8X,0x%4.4X,0x%4.4X,0x%2.2X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X,0x2.2%X"),
            m_uuid.Data1, m_uuid.Data2, m_uuid.Data3,

-           m_uuid.Data4[1], m_uuid.Data4[2], m_uuid.Data4[3], m_uuid.Data4[4],
-           m_uuid.Data4[5], m_uuid.Data4[6], m_uuid.Data4[7], m_uuid.Data4[8]);
+           m_uuid.Data4[0], m_uuid.Data4[1], m_uuid.Data4[2], m_uuid.Data4[3],
+           m_uuid.Data4[4], m_uuid.Data4[5], m_uuid.Data4[6], m_uuid.Data4[7]);

 }
 
 #endif
 }
 
 #endif