Changes to allow OLE to compile under mingw32/gcc-2.95

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index 6490e67f82babe1fbcab7b4842988e9fb33a4fc7..34cd92557a49505f44ab3c13bdf84fd11d578748 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -12,6 +12,7 @@
 #ifndef   _WX_OLEDATAOBJ_H
 #define   _WX_OLEDATAOBJ_H
 
 #ifndef   _WX_OLEDATAOBJ_H
 #define   _WX_OLEDATAOBJ_H
 

+#include "wx/bitmap.h"

 // ----------------------------------------------------------------------------
 // wxDataFormat identifies the single format of data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataFormat identifies the single format of data
 // ----------------------------------------------------------------------------


@@ -148,7 +149,7 @@ class WXDLLEXPORT wxBitmapDataObject : public wxDataObject
 {
 public:
   // ctors
 {
 public:
   // ctors

-  wxBitmapDataObject() {};
+  wxBitmapDataObject() {}

   wxBitmapDataObject(const wxBitmap& bitmap): m_bitmap(bitmap) {}
   void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
   wxBitmap GetBitmap() const { return m_bitmap; }
   wxBitmapDataObject(const wxBitmap& bitmap): m_bitmap(bitmap) {}
   void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
   wxBitmap GetBitmap() const { return m_bitmap; }

diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h
index bafcddee6768ce271f71cbcf2f7b41e7b464a3d6..6835e0a51669f1130db2014d91ccc7a94d5f53f2 100644 (file)
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -15,7 +15,7 @@
 #ifdef __GNUG__
 #pragma interface
 #endif
 #ifdef __GNUG__
 #pragma interface
 #endif

-
+#include "wx/window.h"

 #if !wxUSE_DRAG_AND_DROP
   #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
 #endif  //WX_DRAG_DROP
 #if !wxUSE_DRAG_AND_DROP
   #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
 #endif  //WX_DRAG_DROP

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 9809d398e0003e31755f98f391ae9e99c17b39b2..d20c22c17bd78f343f8ecc0d3598de503197461b 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -17,7 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-
+#ifdef wxUSE_NORLANDER_HEADERS
+#include <ole2.h>
+#endif

 // ============================================================================
 // General purpose functions and macros
 // ============================================================================
 // ============================================================================
 // General purpose functions and macros
 // ============================================================================

diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h
index eec658c87fcd8e74b35c4311a90ca84bfbfbee90..b70672d3e314bdbb3f2540f935bc12aaa519ecb3 100644 (file)
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -17,7 +17,7 @@
 #ifdef __GNUG__
 #pragma interface "uuid.h"
 #endif
 #ifdef __GNUG__
 #pragma interface "uuid.h"
 #endif

-
+#include "wx/wxchar.h"

 // ------------------------------------------------------------------
 // UUID (Universally Unique IDentifier) definition
 // ------------------------------------------------------------------
 // ------------------------------------------------------------------
 // UUID (Universally Unique IDentifier) definition
 // ------------------------------------------------------------------

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index dc4e711541d8e0e4be1bc4254f96d73e88d0f2d6..d1a70a3d3c8de29eaa0b6aa316aee2b7c607941e 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -69,11 +69,13 @@
 #endif
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation...
 #endif
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation...

+#ifndef wxUSE_NORLANDER_HEADERS

 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers
 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers

+#endif

 
 #if wxUSE_OLE
     #include <ole2.h>
 
 #if wxUSE_OLE
     #include <ole2.h>


@@ -218,7 +220,6 @@ bool wxApp::Initialize()
     while (!SetMessageQueue(iMsg) && (iMsg -= 8))
         ;
 #endif // Win16
     while (!SetMessageQueue(iMsg) && (iMsg -= 8))
         ;
 #endif // Win16

-

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index 4dad2d2c78f0fed7807b125e5d1db736f144f6c1..c838b38d78a2f0ea1562ba99903d2062a1bb829a 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -29,6 +29,10 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#include <wtypes.h>
+#include <unknwn.h>
+#include <ole2.h>
+#define _huge

 #include <ole2ver.h>
 #include <oleauto.h>
 
 #include <ole2ver.h>
 #include <oleauto.h>
 

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 1699f9dce67f0a6e761eaf7a996ae5657be466d7..1b3c066a8bd8ac92da6ebda5fac58273f9c75a98 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -27,18 +27,23 @@
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif

-
+#ifndef WX_PRECOMP
+#include "wx/intl.h"
+#endif

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#if defined(__WIN32__) && !defined(__GNUWIN32__)
+#if defined(__WIN32__) && !defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS)

 
 #include "wx/log.h"
 #include "wx/dataobj.h"
 
 #include <windows.h>
 
 #include "wx/log.h"
 #include "wx/dataobj.h"
 
 #include <windows.h>

+#ifdef wxUSE_NORLANDER_HEADERS
+  #include <ole2.h>
+#endif

 #include <oleauto.h>
 
 #include <oleauto.h>
 

-#ifndef __WIN32__
+#ifndef __WIN32__  

   #include <ole2.h>
   #include <olestd.h>
 #endif
   #include <ole2.h>
   #include <olestd.h>
 #endif

diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 4a38d8125f7d2b581b8a2eb6b781dade5cdf478a..86f31d8c585e78e0c5453a76e49f1aee8d53e9a3 100644 (file)
--- a/src/msw/ole/dropsrc.cpp
+++ b/src/msw/ole/dropsrc.cpp
@@ -27,6 +27,9 @@
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif
 #if defined(__BORLANDC__)
   #pragma hdrstop
 #endif

+#ifndef WX_PRECOMP
+#include "wx/window.h"
+#endif

 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 


@@ -37,6 +40,9 @@
 #include "wx/msw/ole/dropsrc.h"
 
 #include <windows.h>
 #include "wx/msw/ole/dropsrc.h"
 
 #include <windows.h>

+#ifdef wxUSE_NORLANDER_HEADERS
+#include <ole2.h>
+#endif

 
 #ifndef __WIN32__
   #include <ole2.h>
 
 #ifndef __WIN32__
   #include <ole2.h>