projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doc/distribution script mods
[wxWidgets.git]
/
src
/
common
/
variant.cpp
diff --git
a/src/common/variant.cpp
b/src/common/variant.cpp
index c743090cc6373d252cbb74d77542611f9bf30505..26e623c1b53487e88a7becc03a7a720115366e03 100644
(file)
--- a/
src/common/variant.cpp
+++ b/
src/common/variant.cpp
@@
-11,6
+11,8
@@
#ifdef __GNUG__
#pragma implementation "variant.h"
#ifdef __GNUG__
#pragma implementation "variant.h"
+#pragma implementation "time.h"
+#pragma implementation "date.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#endif
// For compilers that support precompilation, includes "wx/wx.h".
@@
-20,10
+22,12
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_IOSTREAMH && wxUSE_STD_IOSTREAM
-# include <fstream.h>
-#else
-# include <fstream>
+#if wxUSE_STD_IOSTREAM
+ #if wxUSE_IOSTREAMH
+ #include <fstream.h>
+ #else
+ #include <fstream>
+ #endif
#endif
#if wxUSE_STREAMS
#endif
#if wxUSE_STREAMS
@@
-34,6
+38,14
@@
#include "wx/string.h"
#include "wx/variant.h"
#include "wx/string.h"
#include "wx/variant.h"
+#if wxUSE_TIMEDATE
+IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
+
+wxTime::tFormat wxTime::ms_Format = wxTime::wx12h;
+wxTime::tPrecision wxTime::ms_Precision = wxTime::wxStdMinSec;
+#endif
+
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant;
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant;
@@
-63,7
+75,7
@@
public:
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("list"); };
+ virtual wxString GetType() const { return
wx
T("list"); };
void Clear();
void Clear();
@@
-109,7
+121,7
@@
void wxVariantDataList::Clear()
void wxVariantDataList::Copy(wxVariantData& data)
{
void wxVariantDataList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("list")),
T("wxVariantDataList::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("list")), wx
T("wxVariantDataList::Copy: Can't copy to this type of data") );
wxVariantDataList& listData = (wxVariantDataList&) data;
wxVariantDataList& listData = (wxVariantDataList&) data;
@@
-125,7
+137,7
@@
void wxVariantDataList::Copy(wxVariantData& data)
bool wxVariantDataList::Eq(wxVariantData& data) const
{
bool wxVariantDataList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("list")),
T("wxVariantDataList::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("list")), wx
T("wxVariantDataList::Eq: argument mismatch") );
wxVariantDataList& listData = (wxVariantDataList&) data;
wxNode* node1 = m_value.First();
wxVariantDataList& listData = (wxVariantDataList&) data;
wxNode* node1 = m_value.First();
@@
-155,13
+167,13
@@
bool wxVariantDataList::Write(ostream& str) const
bool wxVariantDataList::Write(wxString& str) const
{
bool wxVariantDataList::Write(wxString& str) const
{
- str = T("");
+ str =
wx
T("");
wxNode* node = m_value.First();
while (node)
{
wxVariant* var = (wxVariant*) node->Data();
if (node != m_value.First())
wxNode* node = m_value.First();
while (node)
{
wxVariant* var = (wxVariant*) node->Data();
if (node != m_value.First())
- str += T(" ");
+ str +=
wx
T(" ");
wxString str1;
str += var->MakeString();
node = node->Next();
wxString str1;
str += var->MakeString();
node = node->Next();
@@
-173,7
+185,7
@@
bool wxVariantDataList::Write(wxString& str) const
#if wxUSE_STD_IOSTREAM
bool wxVariantDataList::Read(istream& WXUNUSED(str))
{
#if wxUSE_STD_IOSTREAM
bool wxVariantDataList::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-181,7
+193,7
@@
bool wxVariantDataList::Read(istream& WXUNUSED(str))
bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-210,7
+222,7
@@
public:
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("stringlist"); };
+ virtual wxString GetType() const { return
wx
T("stringlist"); };
protected:
wxStringList m_value;
protected:
wxStringList m_value;
@@
-225,7
+237,7
@@
void wxVariantDataStringList::SetValue(const wxStringList& value)
void wxVariantDataStringList::Copy(wxVariantData& data)
{
void wxVariantDataStringList::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("stringlist")),
T("wxVariantDataStringList::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("stringlist")), wx
T("wxVariantDataStringList::Copy: Can't copy to this type of data") );
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
@@
-234,7
+246,7
@@
void wxVariantDataStringList::Copy(wxVariantData& data)
bool wxVariantDataStringList::Eq(wxVariantData& data) const
{
bool wxVariantDataStringList::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("stringlist")),
T("wxVariantDataStringList::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("stringlist")), wx
T("wxVariantDataStringList::Eq: argument mismatch") );
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxNode* node1 = m_value.First();
wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
wxNode* node1 = m_value.First();
@@
-264,13
+276,13
@@
bool wxVariantDataStringList::Write(ostream& str) const
bool wxVariantDataStringList::Write(wxString& str) const
{
bool wxVariantDataStringList::Write(wxString& str) const
{
- str = T("");
+ str =
wx
T("");
wxNode* node = m_value.First();
while (node)
{
wxChar* s = (wxChar*) node->Data();
if (node != m_value.First())
wxNode* node = m_value.First();
while (node)
{
wxChar* s = (wxChar*) node->Data();
if (node != m_value.First())
- str += T(" ");
+ str +=
wx
T(" ");
str += s;
node = node->Next();
}
str += s;
node = node->Next();
}
@@
-281,7
+293,7
@@
bool wxVariantDataStringList::Write(wxString& str) const
#if wxUSE_STD_IOSTREAM
bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
{
#if wxUSE_STD_IOSTREAM
bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-289,7
+301,7
@@
bool wxVariantDataStringList::Read(istream& WXUNUSED(str))
bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{
bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// TODO
return FALSE;
}
// TODO
return FALSE;
}
@@
-322,7
+334,7
@@
public:
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("long"); };
+ virtual wxString GetType() const { return
wx
T("long"); };
protected:
long m_value;
protected:
long m_value;
@@
-332,7
+344,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
void wxVariantDataLong::Copy(wxVariantData& data)
{
void wxVariantDataLong::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("long")),
T("wxVariantDataLong::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("long")), wx
T("wxVariantDataLong::Copy: Can't copy to this type of data") );
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
@@
-341,7
+353,7
@@
void wxVariantDataLong::Copy(wxVariantData& data)
bool wxVariantDataLong::Eq(wxVariantData& data) const
{
bool wxVariantDataLong::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("long")),
T("wxVariantDataLong::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("long")), wx
T("wxVariantDataLong::Eq: argument mismatch") );
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
wxVariantDataLong& otherData = (wxVariantDataLong&) data;
@@
-360,7
+372,7
@@
bool wxVariantDataLong::Write(ostream& str) const
bool wxVariantDataLong::Write(wxString& str) const
{
bool wxVariantDataLong::Write(wxString& str) const
{
- str.Printf(T("%ld"), m_value);
+ str.Printf(
wx
T("%ld"), m_value);
return TRUE;
}
return TRUE;
}
@@
-377,7
+389,7
@@
bool wxVariantDataLong::Write(wxOutputStream& str) const
{
wxTextOutputStream s(str);
{
wxTextOutputStream s(str);
- s.Write32(m_value);
+ s.Write32(
(size_t)
m_value);
return TRUE;
}
return TRUE;
}
@@
-423,7
+435,7
@@
public:
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("double"); };
+ virtual wxString GetType() const { return
wx
T("double"); };
protected:
double m_value;
protected:
double m_value;
@@
-433,7
+445,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataReal, wxVariantData)
void wxVariantDataReal::Copy(wxVariantData& data)
{
void wxVariantDataReal::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("double")),
T("wxVariantDataReal::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("double")), wx
T("wxVariantDataReal::Copy: Can't copy to this type of data") );
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
@@
-442,7
+454,7
@@
void wxVariantDataReal::Copy(wxVariantData& data)
bool wxVariantDataReal::Eq(wxVariantData& data) const
{
bool wxVariantDataReal::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("double")),
T("wxVariantDataReal::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("double")), wx
T("wxVariantDataReal::Eq: argument mismatch") );
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
wxVariantDataReal& otherData = (wxVariantDataReal&) data;
@@
-461,7
+473,7
@@
bool wxVariantDataReal::Write(ostream& str) const
bool wxVariantDataReal::Write(wxString& str) const
{
bool wxVariantDataReal::Write(wxString& str) const
{
- str.Printf(T("%.4f"), m_value);
+ str.Printf(
wx
T("%.4f"), m_value);
return TRUE;
}
return TRUE;
}
@@
-524,7
+536,7
@@
public:
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("bool"); };
+ virtual wxString GetType() const { return
wx
T("bool"); };
protected:
bool m_value;
protected:
bool m_value;
@@
-534,7
+546,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
void wxVariantDataBool::Copy(wxVariantData& data)
{
void wxVariantDataBool::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("bool")),
T("wxVariantDataBool::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("bool")), wx
T("wxVariantDataBool::Copy: Can't copy to this type of data") );
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
@@
-543,7
+555,7
@@
void wxVariantDataBool::Copy(wxVariantData& data)
bool wxVariantDataBool::Eq(wxVariantData& data) const
{
bool wxVariantDataBool::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("bool")),
T("wxVariantDataBool::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("bool")), wx
T("wxVariantDataBool::Eq: argument mismatch") );
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
wxVariantDataBool& otherData = (wxVariantDataBool&) data;
@@
-562,14
+574,14
@@
bool wxVariantDataBool::Write(ostream& str) const
bool wxVariantDataBool::Write(wxString& str) const
{
bool wxVariantDataBool::Write(wxString& str) const
{
- str.Printf(T("%d"), (int) m_value);
+ str.Printf(
wx
T("%d"), (int) m_value);
return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataBool::Read(istream& WXUNUSED(str))
{
return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataBool::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// str >> (long) m_value;
return FALSE;
}
// str >> (long) m_value;
return FALSE;
}
@@
-626,7
+638,7
@@
public:
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("char"); };
+ virtual wxString GetType() const { return
wx
T("char"); };
protected:
char m_value;
protected:
char m_value;
@@
-636,7
+648,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
void wxVariantDataChar::Copy(wxVariantData& data)
{
void wxVariantDataChar::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("char")),
T("wxVariantDataChar::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("char")), wx
T("wxVariantDataChar::Copy: Can't copy to this type of data") );
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
@@
-645,7
+657,7
@@
void wxVariantDataChar::Copy(wxVariantData& data)
bool wxVariantDataChar::Eq(wxVariantData& data) const
{
bool wxVariantDataChar::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("char")),
T("wxVariantDataChar::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("char")), wx
T("wxVariantDataChar::Eq: argument mismatch") );
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
wxVariantDataChar& otherData = (wxVariantDataChar&) data;
@@
-664,14
+676,14
@@
bool wxVariantDataChar::Write(ostream& str) const
bool wxVariantDataChar::Write(wxString& str) const
{
bool wxVariantDataChar::Write(wxString& str) const
{
- str.Printf(T("%c"), m_value);
+ str.Printf(
wx
T("%c"), m_value);
return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataChar::Read(istream& WXUNUSED(str))
{
return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataChar::Read(istream& WXUNUSED(str))
{
- wxFAIL_MSG(T("Unimplemented"));
+ wxFAIL_MSG(
wx
T("Unimplemented"));
// str >> m_value;
return FALSE;
}
// str >> m_value;
return FALSE;
}
@@
-738,7
+750,7
@@
public:
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return T("string"); };
+ virtual wxString GetType() const { return
wx
T("string"); };
protected:
wxString m_value;
protected:
wxString m_value;
@@
-746,7
+758,7
@@
protected:
void wxVariantDataString::Copy(wxVariantData& data)
{
void wxVariantDataString::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("string")),
T("wxVariantDataString::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("string")), wx
T("wxVariantDataString::Copy: Can't copy to this type of data") );
wxVariantDataString& otherData = (wxVariantDataString&) data;
wxVariantDataString& otherData = (wxVariantDataString&) data;
@@
-755,7
+767,7
@@
void wxVariantDataString::Copy(wxVariantData& data)
bool wxVariantDataString::Eq(wxVariantData& data) const
{
bool wxVariantDataString::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("string")),
T("wxVariantDataString::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("string")), wx
T("wxVariantDataString::Eq: argument mismatch") );
wxVariantDataString& otherData = (wxVariantDataString&) data;
wxVariantDataString& otherData = (wxVariantDataString&) data;
@@
-818,7
+830,8
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
* wxVariantDataTime
*/
* wxVariantDataTime
*/
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
class wxVariantDataTime: public wxVariantData
{
class wxVariantDataTime: public wxVariantData
{
@@
-840,7
+853,7
@@
public:
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("time"); };
+ virtual wxString GetType() const { return
wx
T("time"); };
virtual wxVariantData* Clone() { return new wxVariantDataTime; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataTime; }
protected:
@@
-851,7
+864,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
void wxVariantDataTime::Copy(wxVariantData& data)
{
void wxVariantDataTime::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("time")),
T("wxVariantDataTime::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("time")), wx
T("wxVariantDataTime::Copy: Can't copy to this type of data") );
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
@@
-860,7
+873,7
@@
void wxVariantDataTime::Copy(wxVariantData& data)
bool wxVariantDataTime::Eq(wxVariantData& data) const
{
bool wxVariantDataTime::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("time")),
T("wxVariantDataTime::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("time")), wx
T("wxVariantDataTime::Eq: argument mismatch") );
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
wxVariantDataTime& otherData = (wxVariantDataTime&) data;
@@
-922,7
+935,7
@@
public:
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("date"); };
+ virtual wxString GetType() const { return
wx
T("date"); };
virtual wxVariantData* Clone() { return new wxVariantDataDate; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataDate; }
protected:
@@
-933,7
+946,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
void wxVariantDataDate::Copy(wxVariantData& data)
{
void wxVariantDataDate::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("date")),
T("wxVariantDataDate::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("date")), wx
T("wxVariantDataDate::Copy: Can't copy to this type of data") );
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
@@
-942,7
+955,7
@@
void wxVariantDataDate::Copy(wxVariantData& data)
bool wxVariantDataDate::Eq(wxVariantData& data) const
{
bool wxVariantDataDate::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("date")),
T("wxVariantDataDate::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("date")), wx
T("wxVariantDataDate::Eq: argument mismatch") );
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
wxVariantDataDate& otherData = (wxVariantDataDate&) data;
@@
-1005,7
+1018,7
@@
public:
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
virtual bool Read(istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return T("void*"); };
+ virtual wxString GetType() const { return
wx
T("void*"); };
virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
@@
-1016,7
+1029,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
{
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
{
- wxASSERT_MSG( (data.GetType() ==
T("void*")),
T("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("void*")), wx
T("wxVariantDataVoidPtr::Copy: Can't copy to this type of data") );
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
@@
-1025,7
+1038,7
@@
void wxVariantDataVoidPtr::Copy(wxVariantData& data)
bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
{
bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
{
- wxASSERT_MSG( (data.GetType() ==
T("void*")),
T("wxVariantDataVoidPtr::Eq: argument mismatch") );
+ wxASSERT_MSG( (data.GetType() ==
wxT("void*")), wx
T("wxVariantDataVoidPtr::Eq: argument mismatch") );
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
@@
-1044,7
+1057,7
@@
bool wxVariantDataVoidPtr::Write(ostream& str) const
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
- str.Printf(T("%ld"), (long) m_value);
+ str.Printf(
wx
T("%ld"), (long) m_value);
return TRUE;
}
return TRUE;
}
@@
-1125,7
+1138,8
@@
wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
m_name = name;
}
m_name = name;
}
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
{
m_data = new wxVariantDataTime(val);
wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
{
m_data = new wxVariantDataTime(val);
@@
-1235,7
+1249,7
@@
bool wxVariant::operator!= (double value) const
void wxVariant::operator= (double value)
{
void wxVariant::operator= (double value)
{
- if (GetType() == T("double"))
+ if (GetType() ==
wx
T("double"))
{
((wxVariantDataReal*)GetData())->SetValue(value);
}
{
((wxVariantDataReal*)GetData())->SetValue(value);
}
@@
-1263,7
+1277,7
@@
bool wxVariant::operator!= (long value) const
void wxVariant::operator= (long value)
{
void wxVariant::operator= (long value)
{
- if (GetType() == T("long"))
+ if (GetType() ==
wx
T("long"))
{
((wxVariantDataLong*)GetData())->SetValue(value);
}
{
((wxVariantDataLong*)GetData())->SetValue(value);
}
@@
-1291,7
+1305,7
@@
bool wxVariant::operator!= (char value) const
void wxVariant::operator= (char value)
{
void wxVariant::operator= (char value)
{
- if (GetType() == T("char"))
+ if (GetType() ==
wx
T("char"))
{
((wxVariantDataChar*)GetData())->SetValue(value);
}
{
((wxVariantDataChar*)GetData())->SetValue(value);
}
@@
-1320,7
+1334,7
@@
bool wxVariant::operator!= (bool value) const
void wxVariant::operator= (bool value)
{
void wxVariant::operator= (bool value)
{
- if (GetType() == T("bool"))
+ if (GetType() ==
wx
T("bool"))
{
((wxVariantDataBool*)GetData())->SetValue(value);
}
{
((wxVariantDataBool*)GetData())->SetValue(value);
}
@@
-1338,8
+1352,8
@@
bool wxVariant::operator== (const wxString& value) const
wxString thisValue;
if (!Convert(&thisValue))
return FALSE;
wxString thisValue;
if (!Convert(&thisValue))
return FALSE;
- else
-
return (value == thisValue)
;
+
+
return value == thisValue
;
}
bool wxVariant::operator!= (const wxString& value) const
}
bool wxVariant::operator!= (const wxString& value) const
@@
-1349,7
+1363,7
@@
bool wxVariant::operator!= (const wxString& value) const
void wxVariant::operator= (const wxString& value)
{
void wxVariant::operator= (const wxString& value)
{
- if (GetType() == T("string"))
+ if (GetType() ==
wx
T("string"))
{
((wxVariantDataString*)GetData())->SetValue(value);
}
{
((wxVariantDataString*)GetData())->SetValue(value);
}
@@
-1363,7
+1377,7
@@
void wxVariant::operator= (const wxString& value)
void wxVariant::operator= (const wxChar* value)
{
void wxVariant::operator= (const wxChar* value)
{
- if (GetType() == T("string"))
+ if (GetType() ==
wx
T("string"))
{
((wxVariantDataString*)GetData())->SetValue(wxString(value));
}
{
((wxVariantDataString*)GetData())->SetValue(wxString(value));
}
@@
-1377,7
+1391,7
@@
void wxVariant::operator= (const wxChar* value)
bool wxVariant::operator== (const wxStringList& value) const
{
bool wxVariant::operator== (const wxStringList& value) const
{
- wxASSERT_MSG( (GetType() ==
T("stringlist")),
T("Invalid type for == operator") );
+ wxASSERT_MSG( (GetType() ==
wxT("stringlist")), wx
T("Invalid type for == operator") );
wxVariantDataStringList other(value);
return (m_data->Eq(other));
wxVariantDataStringList other(value);
return (m_data->Eq(other));
@@
-1390,7
+1404,7
@@
bool wxVariant::operator!= (const wxStringList& value) const
void wxVariant::operator= (const wxStringList& value)
{
void wxVariant::operator= (const wxStringList& value)
{
- if (GetType() == T("stringlist"))
+ if (GetType() ==
wx
T("stringlist"))
{
((wxVariantDataStringList*)GetData())->SetValue(value);
}
{
((wxVariantDataStringList*)GetData())->SetValue(value);
}
@@
-1404,7
+1418,7
@@
void wxVariant::operator= (const wxStringList& value)
bool wxVariant::operator== (const wxList& value) const
{
bool wxVariant::operator== (const wxList& value) const
{
- wxASSERT_MSG( (GetType() ==
T("list")),
T("Invalid type for == operator") );
+ wxASSERT_MSG( (GetType() ==
wxT("list")), wx
T("Invalid type for == operator") );
wxVariantDataList other(value);
return (m_data->Eq(other));
wxVariantDataList other(value);
return (m_data->Eq(other));
@@
-1417,7
+1431,7
@@
bool wxVariant::operator!= (const wxList& value) const
void wxVariant::operator= (const wxList& value)
{
void wxVariant::operator= (const wxList& value)
{
- if (GetType() == T("list"))
+ if (GetType() ==
wx
T("list"))
{
((wxVariantDataList*)GetData())->SetValue(value);
}
{
((wxVariantDataList*)GetData())->SetValue(value);
}
@@
-1429,14
+1443,15
@@
void wxVariant::operator= (const wxList& value)
}
}
}
}
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool wxVariant::operator== (const wxTime& value) const
{
wxTime thisValue;
if (!Convert(&thisValue))
return FALSE;
bool wxVariant::operator== (const wxTime& value) const
{
wxTime thisValue;
if (!Convert(&thisValue))
return FALSE;
- else
-
return (value == thisValue)
;
+
+
return value == thisValue
;
}
bool wxVariant::operator!= (const wxTime& value) const
}
bool wxVariant::operator!= (const wxTime& value) const
@@
-1446,7
+1461,7
@@
bool wxVariant::operator!= (const wxTime& value) const
void wxVariant::operator= (const wxTime& value)
{
void wxVariant::operator= (const wxTime& value)
{
- if (GetType() == T("time"))
+ if (GetType() ==
wx
T("time"))
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
@@
-1463,8
+1478,8
@@
bool wxVariant::operator== (const wxDate& value) const
wxDate thisValue;
if (!Convert(&thisValue))
return FALSE;
wxDate thisValue;
if (!Convert(&thisValue))
return FALSE;
- else
-
return (value == thisValue);
+
+ return (value == thisValue);
}
bool wxVariant::operator!= (const wxDate& value) const
}
bool wxVariant::operator!= (const wxDate& value) const
@@
-1474,7
+1489,7
@@
bool wxVariant::operator!= (const wxDate& value) const
void wxVariant::operator= (const wxDate& value)
{
void wxVariant::operator= (const wxDate& value)
{
- if (GetType() == T("date"))
+ if (GetType() ==
wx
T("date"))
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
{
((wxVariantDataTime*)GetData())->SetValue(value);
}
@@
-1494,12
+1509,12
@@
bool wxVariant::operator== (void* value) const
bool wxVariant::operator!= (void* value) const
{
bool wxVariant::operator!= (void* value) const
{
- return (!((*this) == value));
+ return (!((*this) ==
(void*)
value));
}
void wxVariant::operator= (void* value)
{
}
void wxVariant::operator= (void* value)
{
- if (GetType() == T("void*"))
+ if (GetType() ==
wx
T("void*"))
{
((wxVariantDataVoidPtr*)GetData())->SetValue(value);
}
{
((wxVariantDataVoidPtr*)GetData())->SetValue(value);
}
@@
-1514,18
+1529,18
@@
void wxVariant::operator= (void* value)
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
// Treat a list variant as an array
wxVariant wxVariant::operator[] (size_t idx) const
{
- wxASSERT_MSG( (GetType() ==
T("list") || GetType() == T("stringlist")),
T("Invalid type for array operator") );
+ wxASSERT_MSG( (GetType() ==
wxT("list") || GetType() == wxT("stringlist")), wx
T("Invalid type for array operator") );
- if (GetType() == T("list"))
+ if (GetType() ==
wx
T("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wx
T("Invalid index for array") );
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
- else if (GetType() == T("stringlist"))
+ else if (GetType() ==
wx
T("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wx
T("Invalid index for array") );
wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
return variant;
wxVariant variant( wxString( (wxChar*) (data->GetValue().Nth(idx)->Data()) ));
return variant;
@@
-1538,10
+1553,10
@@
wxVariant& wxVariant::operator[] (size_t idx)
// We can't return a reference to a variant for a string list, since the string
// is actually stored as a char*, not a variant.
// We can't return a reference to a variant for a string list, since the string
// is actually stored as a char*, not a variant.
- wxASSERT_MSG( (GetType() ==
T("list")),
T("Invalid type for array operator") );
+ wxASSERT_MSG( (GetType() ==
wxT("list")), wx
T("Invalid type for array operator") );
wxVariantDataList* data = (wxVariantDataList*) m_data;
wxVariantDataList* data = (wxVariantDataList*) m_data;
- wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()), T("Invalid index for array") );
+ wxASSERT_MSG( (idx < (size_t) data->GetValue().Number()),
wx
T("Invalid index for array") );
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
return * (wxVariant*) (data->GetValue().Nth(idx)->Data());
}
@@
-1549,14
+1564,14
@@
wxVariant& wxVariant::operator[] (size_t idx)
// Return the number of elements in a list
int wxVariant::GetCount() const
{
// Return the number of elements in a list
int wxVariant::GetCount() const
{
- wxASSERT_MSG( (GetType() ==
T("list") || GetType() == T("stringlist")),
T("Invalid type for GetCount()") );
+ wxASSERT_MSG( (GetType() ==
wxT("list") || GetType() == wxT("stringlist")), wx
T("Invalid type for GetCount()") );
- if (GetType() == T("list"))
+ if (GetType() ==
wx
T("list"))
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
return data->GetValue().Number();
}
{
wxVariantDataList* data = (wxVariantDataList*) m_data;
return data->GetValue().Number();
}
- else if (GetType() == T("stringlist"))
+ else if (GetType() ==
wx
T("stringlist"))
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
return data->GetValue().Number();
{
wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
return data->GetValue().Number();
@@
-1572,7
+1587,7
@@
wxString wxVariant::MakeString() const
if (GetData()->Write(str))
return str;
}
if (GetData()->Write(str))
return str;
}
- return wxString(T(""));
+ return wxString(
wx
T(""));
}
// Accessors
}
// Accessors
@@
-1589,7
+1604,7
@@
void wxVariant::SetData(wxVariantData* data)
wxString wxVariant::GetType() const
{
if (IsNull())
wxString wxVariant::GetType() const
{
if (IsNull())
- return wxString(T("null"));
+ return wxString(
wx
T("null"));
else
return m_data->GetType();
}
else
return m_data->GetType();
}
@@
-1609,7
+1624,7
@@
double wxVariant::GetReal() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a real number"));
+ wxFAIL_MSG(
wx
T("Could not convert to a real number"));
return 0.0;
}
}
return 0.0;
}
}
@@
-1621,7
+1636,7
@@
long wxVariant::GetInteger() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(T("Could not convert to an integer"));
+ wxFAIL_MSG(
wx
T("Could not convert to an integer"));
return 0;
}
}
return 0;
}
}
@@
-1633,7
+1648,7
@@
char wxVariant::GetChar() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a char"));
+ wxFAIL_MSG(
wx
T("Could not convert to a char"));
return 0;
}
}
return 0;
}
}
@@
-1645,7
+1660,7
@@
bool wxVariant::GetBool() const
return value;
else
{
return value;
else
{
- wxFAIL_MSG(T("Could not convert to a bool"));
+ wxFAIL_MSG(
wx
T("Could not convert to a bool"));
return 0;
}
}
return 0;
}
}
@@
-1653,58
+1668,56
@@
bool wxVariant::GetBool() const
wxString wxVariant::GetString() const
{
wxString value;
wxString wxVariant::GetString() const
{
wxString value;
- if (Convert(& value))
- return value;
- else
+ if (!Convert(& value))
{
{
- wxFAIL_MSG(T("Could not convert to a string"));
- return wxString("");
+ wxFAIL_MSG(wxT("Could not convert to a string"));
}
}
+
+ return value;
}
}
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxTime wxVariant::GetTime() const
{
wxTime value;
wxTime wxVariant::GetTime() const
{
wxTime value;
- if (Convert(& value))
- return value;
- else
+ if (!Convert(& value))
{
{
- wxFAIL_MSG(T("Could not convert to a time"));
- return wxTime();
+ wxFAIL_MSG(wxT("Could not convert to a time"));
}
}
+
+ return value;
}
wxDate wxVariant::GetDate() const
{
wxDate value;
}
wxDate wxVariant::GetDate() const
{
wxDate value;
- if (Convert(& value))
- return value;
- else
+ if (!Convert(& value))
{
{
- wxFAIL_MSG(T("Could not convert to a date"));
- return wxDate();
+ wxFAIL_MSG(wxT("Could not convert to a date"));
}
}
+
+ return value;
}
}
-#endif
+#endif
// wxUSE_TIMEDATE
void* wxVariant::GetVoidPtr() const
{
void* wxVariant::GetVoidPtr() const
{
- wxASSERT( (GetType() == T("void*")) );
+ wxASSERT( (GetType() ==
wx
T("void*")) );
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
wxList& wxVariant::GetList() const
{
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
wxList& wxVariant::GetList() const
{
- wxASSERT( (GetType() == T("list")) );
+ wxASSERT( (GetType() ==
wx
T("list")) );
return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
}
wxStringList& wxVariant::GetStringList() const
{
return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
}
wxStringList& wxVariant::GetStringList() const
{
- wxASSERT( (GetType() == T("stringlist")) );
+ wxASSERT( (GetType() ==
wx
T("stringlist")) );
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
}
@@
-1746,7
+1759,7
@@
bool wxVariant::Delete(int item)
{
wxList& list = GetList();
{
wxList& list = GetList();
- wxASSERT_MSG( (item < list.Number()), T("Invalid index to Delete") );
+ wxASSERT_MSG( (item < list.Number()),
wx
T("Invalid index to Delete") );
wxNode* node = list.Nth(item);
wxVariant* variant = (wxVariant*) node->Data();
delete variant;
wxNode* node = list.Nth(item);
wxVariant* variant = (wxVariant*) node->Data();
delete variant;
@@
-1757,13
+1770,13
@@
bool wxVariant::Delete(int item)
// Clear list
void wxVariant::ClearList()
{
// Clear list
void wxVariant::ClearList()
{
- if (!IsNull() && (GetType() == T("list")))
+ if (!IsNull() && (GetType() ==
wx
T("list")))
{
((wxVariantDataList*) m_data)->Clear();
}
else
{
{
((wxVariantDataList*) m_data)->Clear();
}
else
{
- if (GetType() != T("list"))
+ if (GetType() !=
wx
T("list"))
{
delete m_data;
m_data = NULL;
{
delete m_data;
m_data = NULL;
@@
-1776,15
+1789,15
@@
void wxVariant::ClearList()
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
bool wxVariant::Convert(long* value) const
{
wxString type(GetType());
- if (type == T("double"))
+ if (type ==
wx
T("double"))
*value = (long) (((wxVariantDataReal*)GetData())->GetValue());
*value = (long) (((wxVariantDataReal*)GetData())->GetValue());
- else if (type == T("long"))
+ else if (type ==
wx
T("long"))
*value = ((wxVariantDataLong*)GetData())->GetValue();
#ifdef HAVE_BOOL
*value = ((wxVariantDataLong*)GetData())->GetValue();
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type ==
wx
T("bool"))
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
#endif
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
#endif
- else if (type == T("string"))
+ else if (type ==
wx
T("string"))
*value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
*value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
@@
-1795,21
+1808,21
@@
bool wxVariant::Convert(long* value) const
bool wxVariant::Convert(bool* value) const
{
wxString type(GetType());
bool wxVariant::Convert(bool* value) const
{
wxString type(GetType());
- if (type == T("double"))
+ if (type ==
wx
T("double"))
*value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
*value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
- else if (type == T("long"))
+ else if (type ==
wx
T("long"))
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
#ifdef HAVE_BOOL
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type ==
wx
T("bool"))
*value = ((wxVariantDataBool*)GetData())->GetValue();
#endif
*value = ((wxVariantDataBool*)GetData())->GetValue();
#endif
- else if (type == T("string"))
+ else if (type ==
wx
T("string"))
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
- if (val ==
T("true") || val ==
T("yes"))
+ if (val ==
wxT("true") || val == wx
T("yes"))
*value = TRUE;
*value = TRUE;
- else if (val ==
T("false") || val ==
T("no"))
+ else if (val ==
wxT("false") || val == wx
T("no"))
*value = FALSE;
else
return FALSE;
*value = FALSE;
else
return FALSE;
@@
-1823,15
+1836,15
@@
bool wxVariant::Convert(bool* value) const
bool wxVariant::Convert(double* value) const
{
wxString type(GetType());
bool wxVariant::Convert(double* value) const
{
wxString type(GetType());
- if (type == T("double"))
+ if (type ==
wx
T("double"))
*value = ((wxVariantDataReal*)GetData())->GetValue();
*value = ((wxVariantDataReal*)GetData())->GetValue();
- else if (type == T("long"))
+ else if (type ==
wx
T("long"))
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type ==
wx
T("bool"))
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
#endif
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
#endif
- else if (type == T("string"))
+ else if (type ==
wx
T("string"))
*value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
*value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
return FALSE;
@@
-1842,12
+1855,12
@@
bool wxVariant::Convert(double* value) const
bool wxVariant::Convert(char* value) const
{
wxString type(GetType());
bool wxVariant::Convert(char* value) const
{
wxString type(GetType());
- if (type == T("char"))
+ if (type ==
wx
T("char"))
*value = ((wxVariantDataChar*)GetData())->GetValue();
*value = ((wxVariantDataChar*)GetData())->GetValue();
- else if (type == T("long"))
+ else if (type ==
wx
T("long"))
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
- else if (type == T("bool"))
+ else if (type ==
wx
T("bool"))
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else
@@
-1862,13
+1875,14
@@
bool wxVariant::Convert(wxString* value) const
return TRUE;
}
return TRUE;
}
-#if wxUSE_TIMEDATE
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool wxVariant::Convert(wxTime* value) const
{
wxString type(GetType());
bool wxVariant::Convert(wxTime* value) const
{
wxString type(GetType());
- if (type == T("time"))
+ if (type ==
wx
T("time"))
*value = ((wxVariantDataTime*)GetData())->GetValue();
*value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type == T("date"))
+ else if (type ==
wx
T("date"))
*value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
else
return FALSE;
*value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
else
return FALSE;
@@
-1879,7
+1893,7
@@
bool wxVariant::Convert(wxTime* value) const
bool wxVariant::Convert(wxDate* value) const
{
wxString type(GetType());
bool wxVariant::Convert(wxDate* value) const
{
wxString type(GetType());
- if (type == T("date"))
+ if (type ==
wx
T("date"))
*value = ((wxVariantDataDate*)GetData())->GetValue();
else
return FALSE;
*value = ((wxVariantDataDate*)GetData())->GetValue();
else
return FALSE;
@@
-1888,3
+1902,4
@@
bool wxVariant::Convert(wxDate* value) const
}
#endif
// wxUSE_TIMEDATE
}
#endif
// wxUSE_TIMEDATE
+