projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split this out from other changes to keep things sane..
[wxWidgets.git]
/
include
/
wx
/
strconv.h
diff --git
a/include/wx/strconv.h
b/include/wx/strconv.h
index 7b4b2255f3ce93ef961f71ad73e270a0b7274497..7d22b34c0aa77ded94ad4804895c905ea7b30c35 100644
(file)
--- a/
include/wx/strconv.h
+++ b/
include/wx/strconv.h
@@
-54,6
+54,9
@@
public:
const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
#endif // Unicode/ANSI
const wxCharBuffer cWC2WX(const wchar_t *psz) const { return cWC2MB(psz); }
const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
#endif // Unicode/ANSI
+
+ // virtual dtor for any base class
+ virtual ~wxMBConv();
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
@@
-115,7
+118,7
@@
public:
virtual ~wxCSConv();
wxCSConv& operator=(const wxCSConv& conv);
virtual ~wxCSConv();
wxCSConv& operator=(const wxCSConv& conv);
-
+
void LoadNow();
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
void LoadNow();
virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
@@
-135,6
+138,7
@@
private:
#define wxConvFile wxConvLocal
WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
#define wxConvFile wxConvLocal
WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
+WXDLLEXPORT_DATA(extern wxCSConv) wxConvISO8859_1;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
// ----------------------------------------------------------------------------
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
// ----------------------------------------------------------------------------
@@
-170,7
+174,7
@@
public:
const char* cWX2MB(const char *psz) const { return psz; }
};
const char* cWX2MB(const char *psz) const { return psz; }
};
-WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile, wxConvLocal
, wxConvISO8859_1
;
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxFNCONV(name) name
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxFNCONV(name) name