projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assert is raised when using the thread sample (which works) so the test is
[wxWidgets.git]
/
src
/
common
/
variant.cpp
diff --git
a/src/common/variant.cpp
b/src/common/variant.cpp
index c6a70f2a33c74f08411f48e8531d63d10f1a6670..2a0982c6feb910ef84b9e9fa9b62998de4f29e76 100644
(file)
--- a/
src/common/variant.cpp
+++ b/
src/common/variant.cpp
@@
-28,6
+28,10
@@
#endif
#endif
#endif
#endif
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+using namespace std ;
+#endif
+
#if wxUSE_STREAMS
#include "wx/stream.h"
#include "wx/txtstrm.h"
#if wxUSE_STREAMS
#include "wx/stream.h"
#include "wx/txtstrm.h"
@@
-1163,6
+1167,12
@@
wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
m_name = name;
}
m_name = name;
}
+wxVariant::wxVariant( void* val, const wxString& name)
+{
+ m_data = new wxVariantDataVoidPtr(val);
+ m_name = name;
+}
+
#if wxUSE_ODBC
wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
{
#if wxUSE_ODBC
wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
{