projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved wxX11's wxSocketTable to private wxSocketEventDispatcher class reusable in...
[wxWidgets.git]
/
include
/
wx
/
strconv.h
diff --git
a/include/wx/strconv.h
b/include/wx/strconv.h
index c56ae9af2f206189494de646f46fc8e2864116e5..947efad79966bc0d8c9292675e972f1afe6751e2 100644
(file)
--- a/
include/wx/strconv.h
+++ b/
include/wx/strconv.h
@@
-373,9
+373,14
@@
public:
wxCSConv& operator=(const wxCSConv& conv);
wxCSConv& operator=(const wxCSConv& conv);
+ virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
+ const char *src, size_t srcLen = wxNO_LEN) const;
+ virtual size_t FromWChar(char *dst, size_t dstLen,
+ const wchar_t *src, size_t srcLen = wxNO_LEN) const;
virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
virtual size_t GetMBNulLen() const;
virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
virtual size_t GetMBNulLen() const;
+
virtual wxMBConv *Clone() const { return new wxCSConv(*this); }
void Clear();
virtual wxMBConv *Clone() const { return new wxCSConv(*this); }
void Clear();
@@
-460,8
+465,8
@@
extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
// filename conversion macros
// ----------------------------------------------------------------------------
// filename conversion macros
// ----------------------------------------------------------------------------
-// filenames are multibyte on Unix and
probably widechar on Windows?
-#if defined(__UNIX__) || defined(__
BORLANDC__) || defined(__WXMAC__
)
+// filenames are multibyte on Unix and
widechar on Windows
+#if defined(__UNIX__) || defined(__
WXMAC__
)
#define wxMBFILES 1
#else
#define wxMBFILES 0
#define wxMBFILES 1
#else
#define wxMBFILES 0