Unicode. You know the drill.

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

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index e2b849b7a12255954f4d1ec154ea6bb57f562f3e..168eeefdf0ce6fcbaffe98424948d6b7ea6d2f99 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -69,8 +69,8 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
   // Callbacks to SERVER - override at will
   virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), 
                           int WXUNUSED(format) ) { return FALSE; };
-  virtual wxChar *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), 
-                            int *WXUNUSED(size), int WXUNUSED(format) ) { return (wxChar *) NULL; };
+  virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), 
+                            int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; };
   virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), 
                       int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; };
   virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) 
@@ -79,7 +79,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject
                              { return FALSE; };
 
   // Callbacks to CLIENT - override at will
-  virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), 
+  virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), 
                         int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; };
 
   // Callbacks to BOTH

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index f0a80d8cbb781a22681ded9946536cfa79491d44..ef78d5f86646ee3b31aafddd94798e06e75f2525 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -73,17 +73,17 @@ public:
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make
-  bool Execute(char *data, int size = -1,
+  bool Execute(wxChar *data, int size = -1,
                wxIPCFormat format = wxIPC_TEXT);
   char *Request(const wxString& item, int *size = NULL,
                 wxIPCFormat format = wxIPC_TEXT);
-  bool Poke(const wxString& item, char *data, int size = -1,
+  bool Poke(const wxString& item, wxChar *data, int size = -1,
             wxIPCFormat format = wxIPC_TEXT);
   bool StartAdvise(const wxString& item);
   bool StopAdvise(const wxString& item);
 
   // Calls that SERVER can make
-  bool Advise(const wxString& item, char *data, int size = -1,
+  bool Advise(const wxString& item, wxChar *data, int size = -1,
               wxIPCFormat format = wxIPC_TEXT);
 
   // Calls that both can make

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 58f4bf23800fea1241f40ea713bffca4aa60fc37..de915f8f7dc85e859ac76f895557964463ec6303 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -84,7 +84,7 @@ public:
 #endif
     wxVariant(char val, const wxString& name = g_szNul);
     wxVariant(const wxString& val, const wxString& name = g_szNul);
-    wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
+    wxVariant(const wxChar* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
     wxVariant(const wxStringList& val, const wxString& name = g_szNul);
     wxVariant(const wxList& val, const wxString& name = g_szNul); // List of variants
 #if wxUSE_TIMEDATE
@@ -124,7 +124,7 @@ public:
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
-    void operator= (const char* value) ; // Necessary or VC++ assumes bool!
+    void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool!
     bool operator== (const wxStringList& value) const;
     bool operator!= (const wxStringList& value) const;
     void operator= (const wxStringList& value) ;