Missed these in the char -> wxChar change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/variant.tex b/docs/latex/wx/variant.tex
index 8205ca19bd07224a13f969c1293cae9cc6df7df5..7dce11fb4aec7220d941f11cf327d8c21d65d57a 100644 (file)
--- a/docs/latex/wx/variant.tex
+++ b/docs/latex/wx/variant.tex
@@ -14,7 +14,7 @@
 The {\bf wxVariant} class represents a container for any type.
 A variant's value can be changed at run time, possibly to a different type of value.
 
 The {\bf wxVariant} class represents a container for any type.
 A variant's value can be changed at run time, possibly to a different type of value.
 

-As standard, wxVariant can store values of type bool, char, double, long, string,
+As standard, wxVariant can store values of type bool, wxChar, double, long, string,

 string list, time, date, void pointer, list of strings, and list of variants. 
 However, an application can extend wxVariant's capabilities by deriving from the
 class \helpref{wxVariantData}{wxvariantdata} and using the wxVariantData form of
 string list, time, date, void pointer, list of strings, and list of variants. 
 However, an application can extend wxVariant's capabilities by deriving from the
 class \helpref{wxVariantData}{wxvariantdata} and using the wxVariantData form of


@@ -96,13 +96,13 @@ Default constructor.
 
 Copy constructor.
 
 
 Copy constructor.
 

-\func{}{wxVariant}{\param{const char*}{ value}, \param{const wxString\& }{name = ``"}}
+\func{}{wxVariant}{\param{const wxChar*}{ value}, \param{const wxString\& }{name = ``"}}

 
 \func{}{wxVariant}{\param{const wxString\&}{ value}, \param{const wxString\& }{name = ``"}}
 
 Construction from a string value.
 
 
 \func{}{wxVariant}{\param{const wxString\&}{ value}, \param{const wxString\& }{name = ``"}}
 
 Construction from a string value.
 

-\func{}{wxVariant}{\param{char}{ value}, \param{const wxString\& }{name = ``"}}
+\func{}{wxVariant}{\param{wxChar}{ value}, \param{const wxString\& }{name = ``"}}

 
 Construction from a character value.
 
 
 Construction from a character value.
 


@@ -197,7 +197,7 @@ Deletes the contents of the list.
 
 \constfunc{bool}{Convert}{\param{wxString*}{ value}}
 
 
 \constfunc{bool}{Convert}{\param{wxString*}{ value}}
 

-\constfunc{bool}{Convert}{\param{char*}{ value}}
+\constfunc{bool}{Convert}{\param{wxChar*}{ value}}

 
 \constfunc{bool}{Convert}{\param{wxDateTime*}{ value}}
 
 
 \constfunc{bool}{Convert}{\param{wxDateTime*}{ value}}
 


@@ -230,7 +230,7 @@ Returns the boolean value.
 
 \membersection{wxVariant::GetChar}\label{wxvariantgetchar}
 
 
 \membersection{wxVariant::GetChar}\label{wxvariantgetchar}
 

-\constfunc{char}{GetChar}{\void}
+\constfunc{wxChar}{GetChar}{\void}

 
 Returns the character value.
 
 
 Returns the character value.
 


@@ -356,9 +356,9 @@ Sets the internal variant data, deleting the existing data if there is any.
 
 \func{void}{operator $=$}{\param{const wxString\& }{value}}
 
 
 \func{void}{operator $=$}{\param{const wxString\& }{value}}
 

-\func{void}{operator $=$}{\param{const char* }{value}}
+\func{void}{operator $=$}{\param{const wxChar* }{value}}

 
 

-\func{void}{operator $=$}{\param{char }{value}}
+\func{void}{operator $=$}{\param{wxChar }{value}}

 
 \func{void}{operator $=$}{\param{const long }{value}}
 
 
 \func{void}{operator $=$}{\param{const long }{value}}
 


@@ -390,9 +390,9 @@ Assignment operators.
 
 \constfunc{bool}{operator $==$}{\param{const wxString\& }{value}}
 
 
 \constfunc{bool}{operator $==$}{\param{const wxString\& }{value}}
 

-\constfunc{bool}{operator $==$}{\param{const char* }{value}}
+\constfunc{bool}{operator $==$}{\param{const wxChar* }{value}}

 
 

-\constfunc{bool}{operator $==$}{\param{char }{value}}
+\constfunc{bool}{operator $==$}{\param{wxChar }{value}}

 
 \constfunc{bool}{operator $==$}{\param{const long }{value}}
 
 
 \constfunc{bool}{operator $==$}{\param{const long }{value}}
 


@@ -418,9 +418,9 @@ Equality test operators.
 
 \constfunc{bool}{operator $!=$}{\param{const wxString\& }{value}}
 
 
 \constfunc{bool}{operator $!=$}{\param{const wxString\& }{value}}
 

-\constfunc{bool}{operator $!=$}{\param{const char* }{value}}
+\constfunc{bool}{operator $!=$}{\param{const wxChar* }{value}}

 
 

-\constfunc{bool}{operator $!=$}{\param{char }{value}}
+\constfunc{bool}{operator $!=$}{\param{wxChar }{value}}

 
 \constfunc{bool}{operator $!=$}{\param{const long }{value}}
 
 
 \constfunc{bool}{operator $!=$}{\param{const long }{value}}
 


@@ -451,11 +451,11 @@ Returns the value at {\it idx} (zero-based).
 Returns a reference to the value at {\it idx} (zero-based). This can be used
 to change the value at this index.
 
 Returns a reference to the value at {\it idx} (zero-based). This can be used
 to change the value at this index.
 

-\membersection{wxVariant::operator char}\label{wxvariantchar}
+\membersection{wxVariant::operator wxChar}\label{wxvariantchar}

 
 

-\constfunc{char}{operator char}{\void}
+\constfunc{char}{operator wxChar}{\void}

 
 

-Operator for implicit conversion to a char, using \helpref{wxVariant::GetChar}{wxvariantgetchar}.
+Operator for implicit conversion to a wxChar, using \helpref{wxVariant::GetChar}{wxvariantgetchar}.

 
 \membersection{wxVariant::operator double}\label{wxvariantdouble}
 
 
 \membersection{wxVariant::operator double}\label{wxvariantdouble}
 

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 43edc77ccb3ba9d14780f596e0550b919148a87c..848c0a0261011aa72c782a9b590a9a29f3d3bff6 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -302,7 +302,7 @@ public:
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;

-    bool Convert(char* value) const;
+    bool Convert(wxChar* value) const;

 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME
 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index b2cca822ace0c41a69e20c6e17952d4b64c0d9e2..333568d0cb1e9545c998971e9891b08f4ade4c19 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -733,7 +733,7 @@ wxVariant::wxVariant(wxChar val, const wxString& name)
 
 bool wxVariant::operator== (wxChar value) const
 {
 
 bool wxVariant::operator== (wxChar value) const
 {

-    char thisValue;
+    wxChar thisValue;

     if (!Convert(&thisValue))
         return false;
     else
     if (!Convert(&thisValue))
         return false;
     else


@@ -761,7 +761,7 @@ void wxVariant::operator= (wxChar value)
 
 wxChar wxVariant::GetChar() const
 {
 
 wxChar wxVariant::GetChar() const
 {

-    char value;
+    wxChar value;

     if (Convert(& value))
         return value;
     else
     if (Convert(& value))
         return value;
     else


@@ -1987,7 +1987,7 @@ bool wxVariant::Convert(double* value) const
     return true;
 }
 
     return true;
 }
 

-bool wxVariant::Convert(char* value) const
+bool wxVariant::Convert(wxChar* value) const

 {
     wxString type(GetType());
     if (type == wxT("char"))
 {
     wxString type(GetType());
     if (type == wxT("char"))