Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-08-09 17:47:28 +00:00
parent 98781fa30e
commit 7dee726c7e
8 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/ole/dataobj.h
View File

@@ -12,6 +12,7 @@
#ifndef _WX_OLEDATAOBJ_H #ifndef _WX_OLEDATAOBJ_H
#define _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: public:
// ctors // ctors
wxBitmapDataObject() {}; wxBitmapDataObject() {}
wxBitmapDataObject(const wxBitmap& bitmap): m_bitmap(bitmap) {} wxBitmapDataObject(const wxBitmap& bitmap): m_bitmap(bitmap) {}
void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
wxBitmap GetBitmap() const { return m_bitmap; } wxBitmap GetBitmap() const { return m_bitmap; }

2
include/wx/msw/ole/dropsrc.h
View File

@@ -15,7 +15,7 @@
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
#include "wx/window.h"
#if !wxUSE_DRAG_AND_DROP #if !wxUSE_DRAG_AND_DROP
#error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!" #error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
#endif //WX_DRAG_DROP #endif //WX_DRAG_DROP

4
include/wx/msw/ole/oleutils.h
View File

@@ -17,7 +17,9 @@
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
#ifdef wxUSE_NORLANDER_HEADERS
#include <ole2.h>
#endif
// ============================================================================ // ============================================================================
// General purpose functions and macros // General purpose functions and macros
// ============================================================================ // ============================================================================

2
include/wx/msw/ole/uuid.h
View File

@@ -17,7 +17,7 @@
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "uuid.h" #pragma interface "uuid.h"
#endif #endif
#include "wx/wxchar.h"
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// UUID (Universally Unique IDentifier) definition // UUID (Universally Unique IDentifier) definition
// ------------------------------------------------------------------ // ------------------------------------------------------------------

3
src/msw/app.cpp
View File

@@ -69,11 +69,13 @@
#endif #endif
// OLE is used for drag-and-drop, clipboard, OLE Automation... // OLE is used for drag-and-drop, clipboard, OLE Automation...
#ifndef wxUSE_NORLANDER_HEADERS
#if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__) #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
#undef wxUSE_OLE #undef wxUSE_OLE
#define wxUSE_OLE 0 #define wxUSE_OLE 0
#endif // broken compilers #endif // broken compilers
#endif
#if wxUSE_OLE #if wxUSE_OLE
#include <ole2.h> #include <ole2.h>
@@ -218,7 +220,6 @@ bool wxApp::Initialize()
while (!SetMessageQueue(iMsg) && (iMsg -= 8)) while (!SetMessageQueue(iMsg) && (iMsg -= 8))
; ;
#endif // Win16 #endif // Win16
// we need to initialize OLE library // we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) ) if ( FAILED(::OleInitialize(NULL)) )
wxLogError(_("Cannot initialize OLE")); wxLogError(_("Cannot initialize OLE"));

4
src/msw/ole/automtn.cpp
View File

@@ -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 <ole2ver.h>
#include <oleauto.h> #include <oleauto.h>

11
src/msw/ole/dataobj.cpp
View File

@@ -27,18 +27,23 @@
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#pragma hdrstop #pragma hdrstop
#endif #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/log.h"
#include "wx/dataobj.h" #include "wx/dataobj.h"
#include <windows.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 <ole2.h>
#include <olestd.h> #include <olestd.h>
#endif #endif

6
src/msw/ole/dropsrc.cpp
View File

@@ -27,6 +27,9 @@
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#pragma hdrstop #pragma hdrstop
#endif #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 "wx/msw/ole/dropsrc.h"
#include <windows.h> #include <windows.h>
#ifdef wxUSE_NORLANDER_HEADERS
#include <ole2.h>
#endif
#ifndef __WIN32__ #ifndef __WIN32__
#include <ole2.h> #include <ole2.h>