#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
#endif
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+using namespace std ;
+#endif
+
#if wxUSE_STREAMS
#include "wx/stream.h"
#include "wx/txtstrm.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;
-wxChar wxTime::ms_bufTime[128];
-#endif
-
IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
wxVariant WXDLLEXPORT wxNullVariant;
wxVariant* var1 = (wxVariant*) node1->GetData();
wxVariant* var2 = (wxVariant*) node2->GetData();
if ((*var1) != (*var2))
- return false;
+ return FALSE;
node1 = node1->GetNext();
node2 = node2->GetNext();
}
- if (node1 || node2) return false;
- return true;
+ if (node1 || node2) return FALSE;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
node = node->GetNext();
}
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
{
wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return false;
+ return FALSE;
}
#endif
{
wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return false;
+ return FALSE;
}
/*
wxString str1 ( node1->GetData() );
wxString str2 ( node2->GetData() );
if (str1 != str2)
- return false;
+ return FALSE;
node1 = node1->GetNext();
node2 = node2->GetNext();
}
- if (node1 || node2) return false;
- return true;
+ if (node1 || node2) return FALSE;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
node = node->GetNext();
}
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
{
wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return false;
+ return FALSE;
}
#endif
{
wxFAIL_MSG(wxT("Unimplemented"));
// TODO
- return false;
+ return FALSE;
}
/*
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataLong::Write(wxString& str) const
{
str.Printf(wxT("%ld"), m_value);
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataLong::Read(wxSTD istream& str)
{
str >> m_value;
- return true;
+ return TRUE;
}
#endif
wxTextOutputStream s(str);
s.Write32((size_t)m_value);
- return true;
+ return TRUE;
}
bool wxVariantDataLong::Read(wxInputStream& str)
{
wxTextInputStream s(str);
m_value = s.Read32();
- return true;
+ return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataLong::Read(wxString& str)
{
m_value = wxAtol((const wxChar*) str);
- return true;
+ return TRUE;
}
/*
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataReal::Write(wxString& str) const
{
str.Printf(wxT("%.4f"), m_value);
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataReal::Read(wxSTD istream& str)
{
str >> m_value;
- return true;
+ return TRUE;
}
#endif
{
wxTextOutputStream s(str);
s.WriteDouble((double)m_value);
- return true;
+ return TRUE;
}
bool wxVariantDataReal::Read(wxInputStream& str)
{
wxTextInputStream s(str);
m_value = (float)s.ReadDouble();
- return true;
+ return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataReal::Read(wxString& str)
{
m_value = wxAtof((const wxChar*) str);
- return true;
+ return TRUE;
}
#ifdef HAVE_BOOL
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataBool::Write(wxString& str) const
{
str.Printf(wxT("%d"), (int) m_value);
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
{
wxFAIL_MSG(wxT("Unimplemented"));
// str >> (long) m_value;
- return false;
+ return FALSE;
}
#endif
wxTextOutputStream s(str);
s.Write8(m_value);
- return true;
+ return TRUE;
}
bool wxVariantDataBool::Read(wxInputStream& str)
wxTextInputStream s(str);
m_value = s.Read8() != 0;
- return true;
+ return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataBool::Read(wxString& str)
{
m_value = (wxAtol((const wxChar*) str) != 0);
- return true;
+ return TRUE;
}
#endif // HAVE_BOOL
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataChar::Write(wxString& str) const
{
str.Printf(wxT("%c"), m_value);
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
{
wxFAIL_MSG(wxT("Unimplemented"));
// str >> m_value;
- return false;
+ return FALSE;
}
#endif
wxTextOutputStream s(str);
s.Write8(m_value);
- return true;
+ return TRUE;
}
bool wxVariantDataChar::Read(wxInputStream& str)
wxTextInputStream s(str);
m_value = s.Read8();
- return true;
+ return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataChar::Read(wxString& str)
{
m_value = str[(size_t)0];
- return true;
+ return TRUE;
}
/*
bool wxVariantDataString::Write(wxSTD ostream& str) const
{
str << (const char*) m_value.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataString::Write(wxString& str) const
{
str = m_value;
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataString::Read(wxSTD istream& str)
{
str >> m_value;
- return true;
+ return TRUE;
}
#endif
// why doesn't wxOutputStream::operator<< take "const wxString&"
wxTextOutputStream s(str);
s.WriteString(m_value);
- return true;
+ return TRUE;
}
bool wxVariantDataString::Read(wxInputStream& str)
wxTextInputStream s(str);
m_value = s.ReadString();
- return true;
+ return TRUE;
}
#endif // wxUSE_STREAMS
bool wxVariantDataString::Read(wxString& str)
{
m_value = str;
- return true;
+ return TRUE;
}
#if defined(__BORLANDC__) && defined(__WIN16__)
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
#endif
-/*
- * wxVariantDataTime
- */
-
-// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
-#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
-
-class wxVariantDataTime: public wxVariantData
-{
- DECLARE_DYNAMIC_CLASS(wxVariantDataTime)
-public:
- wxVariantDataTime() { }
- wxVariantDataTime(const wxTime& value) { m_value = value; }
-
- inline wxTime GetValue() const { return m_value; }
- inline void SetValue(const wxTime& value) { m_value = value; }
-
- virtual void Copy(wxVariantData& data);
- virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
- virtual bool Write(wxSTD ostream& str) const;
-#endif
- virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& str);
-#endif
- virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("time"); };
- virtual wxVariantData* Clone() { return new wxVariantDataTime; }
-
-protected:
- wxTime m_value;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataTime, wxVariantData)
-
-void wxVariantDataTime::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Copy: Can't copy to this type of data") );
-
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
-
- otherData.m_value = m_value;
-}
-
-bool wxVariantDataTime::Eq(wxVariantData& data) const
-{
- wxASSERT_MSG( (data.GetType() == wxT("time")), wxT("wxVariantDataTime::Eq: argument mismatch") );
-
- wxVariantDataTime& otherData = (wxVariantDataTime&) data;
-
- return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Write(wxSTD ostream& str) const
-{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return true;
-}
-#endif
-
-bool wxVariantDataTime::Write(wxString& str) const
-{
- wxChar*s = m_value.FormatTime();
- str = s;
- return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataTime::Read(wxSTD istream& WXUNUSED(str))
-{
- // Not implemented
- return false;
-}
-#endif
-
-bool wxVariantDataTime::Read(wxString& WXUNUSED(str))
-{
- // Not implemented
- return false;
-}
-
-/*
- * wxVariantDataDate
- */
-
-class wxVariantDataDate: public wxVariantData
-{
- DECLARE_DYNAMIC_CLASS(wxVariantDataDate)
-public:
- wxVariantDataDate() { }
- wxVariantDataDate(const wxDate& value) { m_value = value; }
-
- inline wxDate GetValue() const { return m_value; }
- inline void SetValue(const wxDate& value) { m_value = value; }
-
- virtual void Copy(wxVariantData& data);
- virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
- virtual bool Write(wxSTD ostream& str) const;
-#endif
- virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& str);
-#endif
- virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("date"); };
- virtual wxVariantData* Clone() { return new wxVariantDataDate; }
-
-protected:
- wxDate m_value;
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDate, wxVariantData)
-
-void wxVariantDataDate::Copy(wxVariantData& data)
-{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Copy: Can't copy to this type of data") );
-
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
-
- otherData.m_value = m_value;
-}
-
-bool wxVariantDataDate::Eq(wxVariantData& data) const
-{
- wxASSERT_MSG( (data.GetType() == wxT("date")), wxT("wxVariantDataDate::Eq: argument mismatch") );
-
- wxVariantDataDate& otherData = (wxVariantDataDate&) data;
-
- return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Write(wxSTD ostream& str) const
-{
- wxString s;
- Write(s);
- str << (const char*) s.mb_str();
- return true;
-}
-#endif
-
-bool wxVariantDataDate::Write(wxString& str) const
-{
- str = m_value.FormatDate();
- return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDate::Read(wxSTD istream& WXUNUSED(str))
-{
- // Not implemented
- return false;
-}
-#endif
-
-bool wxVariantDataDate::Read(wxString& WXUNUSED(str))
-{
- // Not implemented
- return false;
-}
-#endif
- // wxUSE_TIMEDATE
-
/*
* wxVariantDataVoidPtr
*/
wxString s;
Write(s);
str << (const char*) s.mb_str();
- return true;
+ return TRUE;
}
#endif
bool wxVariantDataVoidPtr::Write(wxString& str) const
{
str.Printf(wxT("%ld"), (long) m_value);
- return true;
+ return TRUE;
}
#if wxUSE_STD_IOSTREAM
bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return false;
+ return FALSE;
}
#endif
bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
{
// Not implemented
- return false;
+ return FALSE;
}
/*
* wxVariantDataDateTime
*/
+#if wxUSE_DATETIME
+
class wxVariantDataDateTime: public wxVariantData
{
DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
{
// Not implemented
- return false;
+ return FALSE;
}
#endif
bool wxVariantDataDateTime::Write(wxString& str) const
{
str = m_value.Format();
- return true;
+ return TRUE;
}
bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return false;
+ return FALSE;
}
#endif
bool wxVariantDataDateTime::Read(wxString& str)
{
if(! m_value.ParseDateTime(str))
- return false;
- return true;
+ return FALSE;
+ return TRUE;
}
+#endif // wxUSE_DATETIME
+
// ----------------------------------------------------------------------------
// wxVariantDataArrayString
// ----------------------------------------------------------------------------
bool wxVariantDataArrayString::Write(wxSTD ostream& str) const
{
// Not implemented
- return false;
+ return FALSE;
}
#endif
str += m_value[n];
}
- return true;
+ return TRUE;
}
bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
{
// Not implemented
- return false;
+ return FALSE;
}
#endif
m_value.Add(tk.GetNextToken());
}
- return true;
+ return TRUE;
}
m_name = name;
}
-// 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);
- m_name = name;
-}
-
-wxVariant::wxVariant(const wxDate& val, const wxString& name) // Date
-{
- m_data = new wxVariantDataDate(val);
- m_name = name;
-}
-#endif
-
-wxVariant::wxVariant(void* val, const wxString& name) // Void ptr
+wxVariant::wxVariant( void* val, const wxString& name)
{
- m_data = new wxVariantDataVoidPtr(val);
- m_name = name;
+ m_data = new wxVariantDataVoidPtr(val);
+ m_name = name;
}
+#if wxUSE_DATETIME
wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
{
- m_data = new wxVariantDataDateTime(val);
- m_name = name;
+ m_data = new wxVariantDataDateTime(val);
+ m_name = name;
}
+#endif // wxUSE_DATETIME
#if wxUSE_ODBC
wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
{
double thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
else
return (value == thisValue);
}
{
long thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
else
return (value == thisValue);
}
{
char thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
else
return (value == thisValue);
}
{
bool thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
else
return (value == thisValue);
}
{
wxString thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
return value == thisValue;
}
}
}
-// 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;
-
- return value == thisValue;
-}
-
-bool wxVariant::operator!= (const wxTime& value) const
-{
- return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxTime& value)
-{
- if (GetType() == wxT("time"))
- {
- ((wxVariantDataTime*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataTime(value);
- }
-}
-
-bool wxVariant::operator== (const wxDate& value) const
-{
- wxDate thisValue;
- if (!Convert(&thisValue))
- return false;
-
- return (value == thisValue);
-}
-
-bool wxVariant::operator!= (const wxDate& value) const
-{
- return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxDate& value)
-{
- if (GetType() == wxT("date"))
- {
- ((wxVariantDataTime*)GetData())->SetValue(value);
- }
- else
- {
- if (m_data)
- delete m_data;
- m_data = new wxVariantDataDate(value);
- }
-}
-#endif
-
bool wxVariant::operator== (void* value) const
{
return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
}
}
+#if wxUSE_DATETIME
bool wxVariant::operator== (const wxDateTime& value) const
{
wxDateTime thisValue;
if (!Convert(&thisValue))
- return false;
+ return FALSE;
return value.IsEqualTo(thisValue);
}
m_data = new wxVariantDataDateTime(value);
}
}
+#endif // wxUSE_DATETIME
#if wxUSE_ODBC
void wxVariant::operator= (const DATE_STRUCT* value)
{
wxFAIL_MSG( _T("TODO") );
- return false;
+ return FALSE;
}
bool wxVariant::operator!=(const wxArrayString& value) const
return value;
}
-// 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;
- if (!Convert(& value))
- {
- wxFAIL_MSG(wxT("Could not convert to a time"));
- }
-
- return value;
-}
-
-wxDate wxVariant::GetDate() const
-{
- wxDate value;
- if (!Convert(& value))
- {
- wxFAIL_MSG(wxT("Could not convert to a date"));
- }
-
- return value;
-}
-#endif // wxUSE_TIMEDATE
-
void* wxVariant::GetVoidPtr() const
{
wxASSERT( (GetType() == wxT("void*")) );
return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
}
+#if wxUSE_DATETIME
wxDateTime wxVariant::GetDateTime() const
{
wxDateTime value;
return value;
}
+#endif // wxUSE_DATETIME
wxList& wxVariant::GetList() const
{
list.Insert(new wxVariant(value));
}
-// Returns true if the variant is a member of the list
+// Returns TRUE if the variant is a member of the list
bool wxVariant::Member(const wxVariant& value) const
{
wxList& list = GetList();
{
wxVariant* other = (wxVariant*) node->GetData();
if (value == *other)
- return true;
+ return TRUE;
node = node->GetNext();
}
- return false;
+ return FALSE;
}
// Deletes the nth element of the list
wxVariant* variant = (wxVariant*) node->GetData();
delete variant;
delete node;
- return true;
+ return TRUE;
}
// Clear list
else if (type == wxT("string"))
*value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
- return false;
+ return FALSE;
- return true;
+ return TRUE;
}
bool wxVariant::Convert(bool* value) const
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
val.MakeLower();
- if (val == wxT("true") || val == wxT("yes"))
- *value = true;
- else if (val == wxT("false") || val == wxT("no"))
- *value = false;
+ if (val == wxT("TRUE") || val == wxT("yes"))
+ *value = TRUE;
+ else if (val == wxT("FALSE") || val == wxT("no"))
+ *value = FALSE;
else
- return false;
+ return FALSE;
}
else
- return false;
+ return FALSE;
- return true;
+ return TRUE;
}
bool wxVariant::Convert(double* value) const
else if (type == wxT("string"))
*value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
else
- return false;
+ return FALSE;
- return true;
+ return TRUE;
}
bool wxVariant::Convert(char* value) const
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else
- return false;
+ return FALSE;
- return true;
+ return TRUE;
}
bool wxVariant::Convert(wxString* value) const
{
*value = MakeString();
- return true;
+ return TRUE;
}
-// 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());
- if (type == wxT("time"))
- *value = ((wxVariantDataTime*)GetData())->GetValue();
- else if (type == wxT("date"))
- *value = wxTime(((wxVariantDataDate*)GetData())->GetValue());
- else
- return false;
-
- return true;
-}
-
-bool wxVariant::Convert(wxDate* value) const
-{
- wxString type(GetType());
- if (type == wxT("date"))
- *value = ((wxVariantDataDate*)GetData())->GetValue();
- else
- return false;
-
- return true;
-}
-#endif // wxUSE_TIMEDATE
-
+#if wxUSE_DATETIME
bool wxVariant::Convert(wxDateTime* value) const
{
wxString type(GetType());
if (type == wxT("datetime"))
{
*value = ((wxVariantDataDateTime*)GetData())->GetValue();
- return true;
- }
+ return TRUE;
+ }
// Fallback to string conversion
wxString val;
return Convert(&val) && (value->ParseDate(val));
}
+#endif // wxUSE_DATETIME
+
projects / wxWidgets.git / blobdiff