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

Unicode changes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:19:15 +00:00
parent c0de7af40b
commit c47d0f2eb1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/ole/droptgt.h
View File

@@ -83,7 +83,7 @@ class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
{ {
public: public:
virtual bool OnDrop(long x, long y, const void *pData); 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: protected:
virtual size_t GetFormatCount() const; virtual size_t GetFormatCount() const;
@@ -100,7 +100,7 @@ public:
// params: the number of files and the array of file names // params: the number of files and the array of file names
virtual bool OnDropFiles(long x, long y, virtual bool OnDropFiles(long x, long y,
size_t nFiles, const char * const aszFiles[]) = 0; size_t nFiles, const wxChar * const aszFiles[]) = 0;
protected: protected:
virtual size_t GetFormatCount() const; virtual size_t GetFormatCount() const;

12
include/wx/msw/ole/uuid.h
View File

@@ -53,8 +53,8 @@ class WXDLLEXPORT Uuid
{ {
private: private:
UUID m_uuid; UUID m_uuid;
uchar *m_pszUuid; // this string is alloc'd and freed by RPC wxUChar *m_pszUuid; // this string is alloc'd and freed by RPC
char *m_pszCForm; // this string is allocated in Set/Create wxChar *m_pszCForm; // this string is allocated in Set/Create
void UuidToCForm(); void UuidToCForm();
@@ -64,7 +64,7 @@ private:
public: public:
// ctors & dtor // ctors & dtor
Uuid() { Init(); } Uuid() { Init(); }
Uuid(const char *pc) { Init(); Set(pc); } Uuid(const wxChar *pc) { Init(); Set(pc); }
Uuid(const UUID &uuid) { Init(); Set(uuid); } Uuid(const UUID &uuid) { Init(); Set(uuid); }
~Uuid(); ~Uuid();
@@ -76,16 +76,16 @@ public:
void Create(); void Create();
// set value of UUID // 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) void Set(const UUID& uuid); // from another UUID (never fails)
// accessors // accessors
operator const UUID*() const { return &m_uuid; } operator const UUID*() const { return &m_uuid; }
operator const char*() const { return (char *)(m_pszUuid); } operator const wxChar*() const { return (wxChar *)(m_pszUuid); }
// return string representation of the UUID in the C form // return string representation of the UUID in the C form
// (as in DEFINE_GUID macro) // (as in DEFINE_GUID macro)
const char *CForm() const { return m_pszCForm; } const wxChar *CForm() const { return m_pszCForm; }
}; };
#endif //_WX_OLEUUID_H #endif //_WX_OLEUUID_H