added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index cc912a6d1db8af147f80cb4b874bfb110d121eec..f64ae4d358ccb1e735d5ef3e425ff5c3470ef861 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -26,9 +26,12 @@
 
 #include  "wx/setup.h"
 
 
 #include  "wx/setup.h"
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_OLE && wxUSE_DRAG_AND_DROP

 
 // standard headers
 
 // standard headers

+#if wxCHECK_W32API_VERSION( 1, 0 )
+    #include <windows.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"


@@ -165,11 +168,10 @@ 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.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