store bitmap data in premultiplied by alpha format in wxBitmap/wxDIB (patch 991172)

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

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 38519d4f9bda2e2bc4adb4a7b66b8ff9c19b08dc..ce53368f7af42b805c3620f3c7b19a74f40908ef 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -6,7 +6,7 @@
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #pragma implementation "oleutils.h"
 #endif
 
 #pragma implementation "oleutils.h"
 #endif
 


@@ -31,10 +31,25 @@
 #include  "wx/setup.h"
 #include  "wx/log.h"
 
 #include  "wx/setup.h"
 #include  "wx/log.h"
 

-#include <windows.h>
+#if wxUSE_OLE
+
+#ifndef __CYGWIN10__
+
+#include "wx/msw/private.h"
+
+#ifdef __WXWINCE__
+    #include <winreg.h>
+    #include <ole2.h>
+
+    #define GUID_DEFINED
+    #define UUID_DEFINED
+#endif

 
 // OLE
 
 // OLE

+#ifndef __WXWINCE__

 #include  "wx/msw/ole/uuid.h"
 #include  "wx/msw/ole/uuid.h"

+#endif
+

 #include  "wx/msw/ole/oleutils.h"
 
 #if defined(__VISUALC__) && (__VISUALC__ > 1000)
 #include  "wx/msw/ole/oleutils.h"
 
 #if defined(__VISUALC__) && (__VISUALC__ > 1000)


@@ -45,41 +60,41 @@
 // Implementation
 // ============================================================================
 
 // Implementation
 // ============================================================================
 

-// return TRUE if the iid is in the array
+// return true if the iid is in the array

 bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )
 bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )

-      return TRUE;
+      return true;

   }
 
   }
 

-  return FALSE;
+  return false;

 }
 
 }
 

-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ

 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 

-#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)
-const char *GetIidName(REFIID riid)
+#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
+static wxString GetIidName(REFIID riid)

 {
   // an association between symbolic name and numeric value of an IID
   struct KNOWN_IID {
     const IID  *pIid;
 {
   // an association between symbolic name and numeric value of an IID
   struct KNOWN_IID {
     const IID  *pIid;

-    const char *szName;
+    const wxChar *szName;

   };
 
   // construct the table containing all known interfaces
   };
 
   // construct the table containing all known interfaces

-  #define ADD_KNOWN_IID(name) { &IID_I##name, #name }
+  #define ADD_KNOWN_IID(name) { &IID_I##name, _T(#name) }

 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),

-#if !defined( __VISUALC__) || (__VISUALC__!=1010) 
+#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__)

     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),


@@ -165,25 +180,29 @@ const char *GetIidName(REFIID riid)
     }
   }
 
     }
   }
 

+#ifndef __WXWINCE__

   // unknown IID, just transform to string
   // unknown IID, just transform to string

-  static Uuid s_uuid;
-  s_uuid.Set(riid);
-  return s_uuid;
+  Uuid uuid(riid);
+  return wxString((const wxChar *)uuid);
+#else
+  return wxEmptyString;
+#endif

 }
 
 }
 

-void wxLogQueryInterface(const char *szInterface, REFIID riid)
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)

 {
 {

-  wxLogTrace("%s::QueryInterface (iid = %s)", szInterface, GetIidName(riid));
+  wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
+             szInterface, GetIidName(riid).c_str());

 }
 
 }
 

-void wxLogAddRef(const char *szInterface, ULONG cRef)
+void wxLogAddRef(const wxChar *szInterface, ULONG cRef)

 {
 {

-  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);

 }
 
 }
 

-void wxLogRelease(const char *szInterface, ULONG cRef)
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)

 {
 {

-  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+  wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);

 }
 
 #elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
 }
 
 #elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)


@@ -208,3 +227,10 @@ void wxLogRelease(const char *szInterface, ULONG cRef)
 
 #endif
   // wxUSE_DRAG_AND_DROP
 
 #endif
   // wxUSE_DRAG_AND_DROP

+
+#endif
+  // __CYGWIN10__
+
+#endif
+  // wxUSE_OLE
+