AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wx_media linkage/export problems - from RN patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-02-11 00:30:20 +00:00
parent 24f904f41f
commit e28985499b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,14 +231,14 @@ private:
// Convert variants
class WXDLLIMPEXP_BASE wxVariant;
bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
// Convert string to Unicode
BSTR wxConvertStringToOle(const wxString& str);
WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);
// Convert string from BSTR to wxString
wxString wxConvertStringFromOle(BSTR bStr);
WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr);
#else // !wxUSE_OLE

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

@ -544,7 +544,7 @@ bool wxAutomationObject::CreateInstance(const wxString& classId) const
}
bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
{
ClearVariant(&oleVariant);
if (variant.IsNull())
@ -666,7 +666,7 @@ bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
#define VT_TYPEMASK 0xfff
#endif
bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
{
switch (oleVariant.vt & VT_TYPEMASK)
{

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

@ -66,7 +66,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
return false;
}
BSTR wxConvertStringToOle(const wxString& str)
WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str)
{
/*
unsigned int len = strlen((const char*) str);
@ -80,7 +80,7 @@ BSTR wxConvertStringToOle(const wxString& str)
return bstr.Get();
}
wxString wxConvertStringFromOle(BSTR bStr)
WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
{
#if wxUSE_UNICODE
wxString str(bStr);