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

put expdecl in the correct place in DECLARE/IMPLEMENT_VARIANT_OBJECT_EXPORTED

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-02 09:00:12 +00:00
parent 93df3f5f73
commit 39a485512a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/variant.h
View File

@@ -326,8 +326,8 @@ private:
DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE) DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
#define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ #define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \
classname& expdecl operator << ( classname &object, const wxVariant &variant ); \ expdecl classname& operator << ( classname &object, const wxVariant &variant ); \
wxVariant& expdecl operator << ( wxVariant &variant, const classname &object ); expdecl wxVariant& operator << ( wxVariant &variant, const classname &object );
#define IMPLEMENT_VARIANT_OBJECT(classname) \ #define IMPLEMENT_VARIANT_OBJECT(classname) \
IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE) IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
@@ -374,7 +374,7 @@ wxClassInfo* classname##VariantData::GetValueClassInfo()\
return m_value.GetClassInfo();\ return m_value.GetClassInfo();\
}\ }\
\ \
classname& expdecl operator << ( classname &value, const wxVariant &variant )\ expdecl classname& operator << ( classname &value, const wxVariant &variant )\
{\ {\
wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\ wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\
\ \
@@ -383,7 +383,7 @@ classname& expdecl operator << ( classname &value, const wxVariant &variant )\
return value;\ return value;\
}\ }\
\ \
wxVariant& expdecl operator << ( wxVariant &variant, const classname &value )\ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
{\ {\
classname##VariantData *data = new classname##VariantData( value );\ classname##VariantData *data = new classname##VariantData( value );\
variant.SetData( data );\ variant.SetData( data );\