substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
// wxAccessible implements accessibility behaviour.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxAccessible : public wxAccessibleBase
|
||||
class WXDLLIMPEXP_CORE wxAccessible : public wxAccessibleBase
|
||||
{
|
||||
public:
|
||||
wxAccessible(wxWindow *win = NULL);
|
||||
|
@@ -31,7 +31,7 @@ typedef unsigned short* WXBSTR;
|
||||
* Wraps up an IDispatch pointer and invocation; does variant conversion.
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxAutomationObject: public wxObject
|
||||
class WXDLLIMPEXP_CORE wxAutomationObject: public wxObject
|
||||
{
|
||||
public:
|
||||
wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);
|
||||
|
@@ -16,7 +16,7 @@
|
||||
// wxDataFormat identifies the single format of data
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDataFormat
|
||||
class WXDLLIMPEXP_CORE wxDataFormat
|
||||
{
|
||||
public:
|
||||
// the clipboard formats under Win32 are WORD's
|
||||
|
@@ -22,7 +22,7 @@ struct IDataObject;
|
||||
// wxDataObject is a "smart" and polymorphic piece of data.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDataObject : public wxDataObjectBase
|
||||
class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
|
||||
{
|
||||
public:
|
||||
// ctor & dtor
|
||||
|
@@ -21,7 +21,7 @@
|
||||
// rarely used). This is ugly, but I haven't found a solution for it yet.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase
|
||||
class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
|
||||
{
|
||||
public:
|
||||
// ctors
|
||||
@@ -60,7 +60,7 @@ private:
|
||||
// FIXME did I already mention it was ugly?
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxBitmapDataObject2 : public wxBitmapDataObjectBase
|
||||
class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase
|
||||
{
|
||||
public:
|
||||
// ctors
|
||||
@@ -91,7 +91,7 @@ private:
|
||||
// wxFileDataObject - data object for CF_HDROP
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
|
||||
class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
|
||||
{
|
||||
public:
|
||||
wxFileDataObject() { }
|
||||
@@ -119,7 +119,7 @@ private:
|
||||
// wxURLDataObject: data object for URLs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
|
||||
class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite
|
||||
{
|
||||
public:
|
||||
// initialize with URL in ctor or use SetURL later
|
||||
|
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||
// wxDataObject object. It's responsible for giving UI feedback while dragging.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDropSource : public wxDropSourceBase
|
||||
class WXDLLIMPEXP_CORE wxDropSource : public wxDropSourceBase
|
||||
{
|
||||
public:
|
||||
// ctors: if you use default ctor you must call SetData() later!
|
||||
|
@@ -31,7 +31,7 @@ struct IDataObject;
|
||||
// (all of them, including protected ones which are called by the class itself)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxDropTarget : public wxDropTargetBase
|
||||
class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
|
||||
{
|
||||
public:
|
||||
// ctor & dtor
|
||||
|
@@ -204,7 +204,7 @@ void wxLogRelease(const wxChar *szInterface, ULONG cRef);
|
||||
|
||||
// wrapper around BSTR type (by Vadim Zeitlin)
|
||||
|
||||
class WXDLLEXPORT wxBasicString
|
||||
class WXDLLIMPEXP_CORE wxBasicString
|
||||
{
|
||||
public:
|
||||
// ctors & dtor
|
||||
@@ -229,15 +229,15 @@ private:
|
||||
// Convert variants
|
||||
class WXDLLIMPEXP_FWD_BASE wxVariant;
|
||||
|
||||
WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
|
||||
WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
|
||||
WXDLLIMPEXP_CORE bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
|
||||
WXDLLIMPEXP_CORE bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
|
||||
#endif // wxUSE_VARIANT
|
||||
|
||||
// Convert string to Unicode
|
||||
WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);
|
||||
WXDLLIMPEXP_CORE BSTR wxConvertStringToOle(const wxString& str);
|
||||
|
||||
// Convert string from BSTR to wxString
|
||||
WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr);
|
||||
WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr);
|
||||
|
||||
#else // !wxUSE_OLE
|
||||
|
||||
|
@@ -44,7 +44,7 @@ typedef unsigned char uchar;
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
// uses RPC functions to create/convert Universally Unique Identifiers
|
||||
class WXDLLEXPORT Uuid
|
||||
class WXDLLIMPEXP_CORE Uuid
|
||||
{
|
||||
private:
|
||||
UUID m_uuid;
|
||||
|
Reference in New Issue
Block a user