Unicode changes.

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

diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h
index 95484cf7a68fcc25424f2ff521b7ccf33c2ce753..d623116b315e251f3de1afcccbb9ff3068951e49 100644 (file)
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -83,7 +83,7 @@ class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
 {
 public:
   virtual bool OnDrop(long x, long y, const void *pData);
-  virtual bool OnDropText(long x, long y, const char *psz) = 0;
+  virtual bool OnDropText(long x, long y, const wxChar *psz) = 0;
 
 protected:
   virtual size_t GetFormatCount() const;
@@ -100,7 +100,7 @@ public:
 
   // params: the number of files and the array of file names
   virtual bool OnDropFiles(long x, long y, 
-                           size_t nFiles, const char * const aszFiles[]) = 0;
+                           size_t nFiles, const wxChar * const aszFiles[]) = 0;
 
 protected:
   virtual size_t GetFormatCount() const;

diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h
index 2dee9946aa7e85400a6aa2de40f4ebf51a6a5cfc..eec658c87fcd8e74b35c4311a90ca84bfbfbee90 100644 (file)
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -53,8 +53,8 @@ class WXDLLEXPORT Uuid
 {
 private:
   UUID  m_uuid;
-  uchar *m_pszUuid;   // this string is alloc'd and freed by RPC 
-  char  *m_pszCForm;  // this string is allocated in Set/Create
+  wxUChar *m_pszUuid;   // this string is alloc'd and freed by RPC 
+  wxChar  *m_pszCForm;  // this string is allocated in Set/Create
 
   void  UuidToCForm();
 
@@ -64,7 +64,7 @@ private:
 public:
   // ctors & dtor
   Uuid()                 { Init();            }
-  Uuid(const char *pc)   { Init(); Set(pc);   }
+  Uuid(const wxChar *pc) { Init(); Set(pc);   }
   Uuid(const UUID &uuid) { Init(); Set(uuid); }
  ~Uuid();
 
@@ -76,16 +76,16 @@ public:
   void Create();
 
   // set value of UUID 
-  bool Set(const char *pc);   // from a string, returns true if ok
+  bool Set(const wxChar *pc); // from a string, returns true if ok
   void Set(const UUID& uuid); // from another UUID (never fails)
 
   // accessors
-  operator const UUID*() const { return &m_uuid;             }
-  operator const char*() const { return (char *)(m_pszUuid); }
+  operator const UUID*()   const { return &m_uuid;               }
+  operator const wxChar*() const { return (wxChar *)(m_pszUuid); }
 
   // return string representation of the UUID in the C form
   // (as in DEFINE_GUID macro)
-  const char *CForm() const    { return m_pszCForm;          }
+  const wxChar *CForm() const    { return m_pszCForm;            }
 };
 
 #endif //_WX_OLEUUID_H