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

Move wxVariant support for GDI classes to their

Browse Source 
files (and thus away from wxBase).
  Add export declaration field for variant macros.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-30 20:45:15 +00:00
parent e48a305514
commit 6f5d78250c
10 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/variant.h
View File

@@ -316,12 +316,23 @@ private:
DECLARE_DYNAMIC_CLASS(wxVariant)
};
/* Fake macro parameter value */
#ifdef EMPTY_PARAMETER_VALUE
#undef EMPTY_PARAMETER_VALUE
#endif
#define EMPTY_PARAMETER_VALUE
#define DECLARE_VARIANT_OBJECT(classname) \
classname& operator << ( classname &object, const wxVariant &variant ); \
wxVariant& operator << ( wxVariant &variant, const classname &object );
DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
#define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \
classname& expdecl operator << ( classname &object, const wxVariant &variant ); \
wxVariant& expdecl operator << ( wxVariant &variant, const classname &object );
#define IMPLEMENT_VARIANT_OBJECT(classname) \
IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE)
#define IMPLEMENT_VARIANT_OBJECT_EXPORTED(classname,expdecl) \
class classname##VariantData: public wxVariantData \
{ \
public:\
@@ -363,7 +374,7 @@ wxClassInfo* classname##VariantData::GetValueClassInfo()\
return m_value.GetClassInfo();\
}\
\
classname& operator << ( classname &value, const wxVariant &variant )\
classname& expdecl operator << ( classname &value, const wxVariant &variant )\
{\
wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\
\
@@ -372,27 +383,13 @@ classname& operator << ( classname &value, const wxVariant &variant )\
return value;\
}\
\
wxVariant& operator << ( wxVariant &variant, const classname &value )\
wxVariant& expdecl operator << ( wxVariant &variant, const classname &value )\
{\
classname##VariantData *data = new classname##VariantData( value );\
variant.SetData( data );\
return variant;\
}
#include "wx/colour.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/image.h"
#include "wx/icon.h"
#include "wx/bitmap.h"
DECLARE_VARIANT_OBJECT(wxColour)
DECLARE_VARIANT_OBJECT(wxPen)
DECLARE_VARIANT_OBJECT(wxBrush)
DECLARE_VARIANT_OBJECT(wxImage)
DECLARE_VARIANT_OBJECT(wxIcon)
DECLARE_VARIANT_OBJECT(wxBitmap)
// Since we want type safety wxVariant we need to fetch and dynamic_cast
// in a seemingly safe way so the compiler can check, so we define
// a dynamic_cast /wxDynamicCast analogue.