fingers crossed..

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 67f2d2710fdc8cd3c47272de7f07d5618dda37d8..c23c4ca414bc3a95770f747af4555025fa564b62 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -24,14 +24,17 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include  <wx/setup.h>
+#include  "wx/setup.h"

 
 #if wxUSE_DRAG_AND_DROP
 
 // standard headers
 
 #if wxUSE_DRAG_AND_DROP
 
 // standard headers

+#if wxCHECK_W32API_VERSION( 1, 0 )
+    #include <windows.h>
+#endif

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

-#include  <wx/msw/ole/uuid.h>
+#include  "wx/msw/ole/uuid.h"

 
 
 
 
 
 


@@ -165,8 +168,7 @@ void Uuid::UuidToCForm()
   if ( m_pszCForm == NULL )
     m_pszCForm = new wxChar[UUID_CSTRLEN];
 
   if ( m_pszCForm == NULL )
     m_pszCForm = new wxChar[UUID_CSTRLEN];
 

-  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"),
+  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.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]);