fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 83aad557766000e056a5ab7c70da893b01116311..87bdd0cc0892032d19c101ee6e7ee7e63d0d17e8 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -13,7 +13,7 @@
 // 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_OLE && ( wxUSE_DRAG_AND_DROP || (__WXDEBUG__ && wxUSE_DATAOBJ) )
+#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