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

Put wxAny implementation entirely in the header.

Browse Source 
This allows to remove WXDLLIMPEXP_BASE from the class declaration and should
hopefully fix VC6 linking errors when building the unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-20 12:37:16 +00:00
parent 97051666f0
commit 45de347c10
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/any.h
View File

@@ -514,7 +514,7 @@ bool operator==(TUS value) const \
// As standard, wxAny can store value of almost any type, in a fairly // As standard, wxAny can store value of almost any type, in a fairly
// optimal manner even. // optimal manner even.
// //
class WXDLLIMPEXP_BASE wxAny class wxAny
{ {
public: public:
/** /**
@@ -755,7 +755,15 @@ public:
private: private:
// Assignment functions // Assignment functions
void AssignAny(const wxAny &any); void AssignAny(const wxAny& any)
{
if ( !any.m_type->IsSameType(m_type) )
{
m_type->DeleteValue(m_buffer);
m_type = any.m_type;
}
m_type->CopyBuffer(any.m_buffer, m_buffer);
}
template<typename T> template<typename T>
void Assign(const T &value) void Assign(const T &value)

14
src/common/any.cpp
View File

@@ -105,20 +105,6 @@ wxAnyValueType::wxAnyValueType()
g_wxAnyValueTypeGlobals->RegisterValueType(this); g_wxAnyValueTypeGlobals->RegisterValueType(this);
} }
//-------------------------------------------------------------------------
// wxAny
//-------------------------------------------------------------------------
void wxAny::AssignAny(const wxAny &any)
{
if ( !any.m_type->IsSameType(m_type) )
{
m_type->DeleteValue(m_buffer);
m_type = any.m_type;
}
m_type->CopyBuffer(any.m_buffer, m_buffer);
}
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
// Dynamic conversion member functions // Dynamic conversion member functions
//------------------------------------------------------------------------- //-------------------------------------------------------------------------