Added support for wxLongLong and wxULongLong in wxVariant (closes #10166)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-06-15 22:43:27 +00:00
parent 958e4b4b75
commit 4e00b90802
13 changed files with 577 additions and 351 deletions

View File

@@ -141,6 +141,16 @@ public:
*/
wxVariant(double value, const wxString& name = wxEmptyString);
/**
Constructs a variant from a wxLongLong.
*/
wxVariant(wxLongLong value, const wxString& name = wxEmptyString);
/**
Constructs a variant from a wxULongLong.
*/
wxVariant(wxULongLong value, const wxString& name = wxEmptyString);
/**
Constructs a variant from a list of variants
*/
@@ -250,6 +260,8 @@ public:
bool Convert(double* value) const;
bool Convert(wxString* value) const;
bool Convert(wxChar* value) const;
bool Convert(wxLongLong* value) const;
bool Convert(wxULongLong* value) const;
bool Convert(wxDateTime* value) const;
//@}
@@ -290,6 +302,11 @@ public:
*/
long GetLong() const;
/**
Returns the signed 64-bit integer value.
*/
wxLongLong GetLongLong() const;
/**
Returns a constant reference to the variant name.
*/
@@ -310,7 +327,9 @@ public:
- "double"
- "list"
- "long"
- "longlong"
- "string"
- "ulonglong"
- "arrstring"
- "void*"
@@ -319,6 +338,11 @@ public:
*/
wxString GetType() const;
/**
Returns the unsigned 64-bit integer value.
*/
wxULongLong GetULongLong() const;
/**
Gets the void pointer value.
@@ -390,6 +414,8 @@ public:
bool operator !=(long value) const;
bool operator !=(bool value) const;
bool operator !=(double value) const;
bool operator !=(wxLongLong value) const;
bool operator !=(wxULongLong value) const;
bool operator !=(void* value) const;
bool operator !=(wxObject* value) const;
bool operator !=(const wxVariantList& value) const;
@@ -410,6 +436,8 @@ public:
void operator =(long value);
void operator =(bool value);
void operator =(double value);
bool operator =(wxLongLong value) const;
bool operator =(wxULongLong value) const;
void operator =(void* value);
void operator =(wxObject* value);
void operator =(const wxVariantList& value);
@@ -428,6 +456,8 @@ public:
bool operator ==(long value) const;
bool operator ==(bool value) const;
bool operator ==(double value) const;
bool operator ==(wxLongLong value) const;
bool operator ==(wxULongLong value) const;
bool operator ==(void* value) const;
bool operator ==(wxObject* value) const;
bool operator ==(const wxVariantList& value) const;
@@ -437,10 +467,13 @@ public:
//@{
/**
Operator for implicit conversion to a long, using GetLong().
Operators for implicit conversion, using appropriate getter member
function.
*/
double operator double() const;
long operator long() const;
wxLongLong operator wxLongLong() const;
wxULongLong operator wxULongLong() const;
//@}
/**