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
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

View File

@@ -12,6 +12,7 @@
#ifndef _WX_OLEDATAOBJ_H
#define _WX_OLEDATAOBJ_H
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// wxDataFormat identifies the single format of data
// ----------------------------------------------------------------------------
@@ -148,7 +149,7 @@ class WXDLLEXPORT wxBitmapDataObject : public wxDataObject
{
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; }

View File

@@ -15,7 +15,7 @@
#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

View File

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

View File

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