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

Changed char to wxChar.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-09-30 11:29:52 +00:00
parent 2562c82329
commit 71520754fc
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/variant.h
View File

@@ -222,13 +222,13 @@ public:
inline operator wxString () const { return MakeString(); } inline operator wxString () const { return MakeString(); }
wxString GetString() const; wxString GetString() const;
// char (wxChar?) // wxChar
wxVariant(char val, const wxString& name = wxEmptyString); wxVariant(wxChar val, const wxString& name = wxEmptyString);
bool operator== (char value) const; bool operator== (wxChar value) const;
bool operator!= (char value) const; bool operator!= (wxChar value) const;
void operator= (char value) ; void operator= (wxChar value) ;
inline operator char () const { return GetChar(); } inline operator wxChar () const { return GetChar(); }
char GetChar() const ; wxChar GetChar() const ;
// wxArrayString // wxArrayString
wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString);

25
src/common/variant.cpp
View File

@@ -642,10 +642,10 @@ class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
DECLARE_DYNAMIC_CLASS(wxVariantDataChar) DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
public: public:
wxVariantDataChar() { m_value = 0; } wxVariantDataChar() { m_value = 0; }
wxVariantDataChar(char value) { m_value = value; } wxVariantDataChar(wxChar value) { m_value = value; }
inline char GetValue() const { return m_value; } inline wxChar GetValue() const { return m_value; }
inline void SetValue(char value) { m_value = value; } inline void SetValue(wxChar value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const; virtual bool Eq(wxVariantData& data) const;
#if wxUSE_STD_IOSTREAM #if wxUSE_STD_IOSTREAM
@@ -661,7 +661,7 @@ public:
virtual wxString GetType() const { return wxT("char"); }; virtual wxString GetType() const { return wxT("char"); };
protected: protected:
char m_value; wxChar m_value;
}; };
IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData) IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
@@ -695,7 +695,7 @@ bool wxVariantDataChar::Write(wxString& str) const
bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
{ {
wxFAIL_MSG(wxT("Unimplemented")); wxFAIL_MSG(wxT("Unimplemented"));
// str >> m_value;
return false; return false;
} }
#endif #endif
@@ -713,24 +713,25 @@ bool wxVariantDataChar::Read(wxInputStream& str)
{ {
wxTextInputStream s(str); wxTextInputStream s(str);
m_value = s.Read8(); s >> m_value;
return true; return true;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
bool wxVariantDataChar::Read(wxString& str) bool wxVariantDataChar::Read(wxString& str)
{ {
m_value = str.ToAscii()[size_t(0)]; m_value = str[size_t(0)];
return true; return true;
} }
wxVariant::wxVariant(char val, const wxString& name) wxVariant::wxVariant(wxChar val, const wxString& name)
{ {
m_data = new wxVariantDataChar(val); m_data = new wxVariantDataChar(val);
m_name = name; m_name = name;
} }
bool wxVariant::operator== (char value) const bool wxVariant::operator== (wxChar value) const
{ {
char thisValue; char thisValue;
if (!Convert(&thisValue)) if (!Convert(&thisValue))
@@ -739,12 +740,12 @@ bool wxVariant::operator== (char value) const
return (value == thisValue); return (value == thisValue);
} }
bool wxVariant::operator!= (char value) const bool wxVariant::operator!= (wxChar value) const
{ {
return (!((*this) == value)); return (!((*this) == value));
} }
void wxVariant::operator= (char value) void wxVariant::operator= (wxChar value)
{ {
if (GetType() == wxT("char") && if (GetType() == wxT("char") &&
m_data->GetRefCount() == 1) m_data->GetRefCount() == 1)
@@ -758,7 +759,7 @@ void wxVariant::operator= (char value)
} }
} }
char wxVariant::GetChar() const wxChar wxVariant::GetChar() const
{ {
char value; char value;
if (Convert(& value)) if (Convert(& value))