aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/c_src/wxe_impl.h
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-03-25 16:43:57 +0100
committerDan Gudmundsson <[email protected]>2014-03-26 11:56:19 +0100
commit3a51f434c6a79bbf7dca8b0fd96a5df7671b5792 (patch)
tree9c68af076355d760240430fdaa9697f0bba3fef6 /lib/wx/c_src/wxe_impl.h
parent4486d61b3ea94875564337580cff66c0b7a79c5f (diff)
downloadotp-3a51f434c6a79bbf7dca8b0fd96a5df7671b5792.tar.gz
otp-3a51f434c6a79bbf7dca8b0fd96a5df7671b5792.tar.bz2
otp-3a51f434c6a79bbf7dca8b0fd96a5df7671b5792.zip
wx: Add wxLocale class
Diffstat (limited to 'lib/wx/c_src/wxe_impl.h')
-rw-r--r--lib/wx/c_src/wxe_impl.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index 44a36692d5..5b23e1cbbd 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -36,6 +36,14 @@ extern "C" {
#include "wxe_callback_impl.h"
#include "wxe_memory.h"
+#if !wxCHECK_VERSION(2,9,0)
+#define wxeLocaleC wxChar *
+#define wxeLocaleC2String(Str) wxString(Str)
+#else
+typedef wxString wxeLocaleC;
+#define wxeLocaleC2String(Str) Str
+#endif
+
#define WXE_NOT_INITIATED 0
#define WXE_INITIATED 1
#define WXE_EXITED 2
@@ -76,7 +84,7 @@ public:
void init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller);
// Code found in gen/wxe_derived_dest.h
- void delete_object(void *ptr, wxeRefData *refd);
+ bool delete_object(void *ptr, wxeRefData *refd);
wxeMemMap refmap;
ptrMap ptr2ref;