diff options
author | Erlang/OTP <[email protected]> | 2009-12-07 13:12:37 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2009-12-07 13:12:37 +0000 |
commit | d6897fe9cb73b3b37a8872b81bfe50b01d169e3c (patch) | |
tree | bb6fc1ce0f5d163845cdb33e51a3a2bd0d4d7252 /lib/wx/c_src | |
parent | 0b340619c90d7b55189fcb06a46ff64e594d3a97 (diff) | |
parent | 546b1dfb3d66be446c90b4d9e11333352dbd5011 (diff) | |
download | otp-d6897fe9cb73b3b37a8872b81bfe50b01d169e3c.tar.gz otp-d6897fe9cb73b3b37a8872b81bfe50b01d169e3c.tar.bz2 otp-d6897fe9cb73b3b37a8872b81bfe50b01d169e3c.zip |
Merge branch 'dgud/wx_filedialog_bug' into ccase/r13b04_dev
* dgud/wx_filedialog_bug:
The generated updates, of the previous fix.
Fixed generation of wxFileDialog:getPaths/1.
OTP-8330 Corrected incorrectly generated wxFileDialog:getPaths/1. Reported
by Jason/hornja.
Diffstat (limited to 'lib/wx/c_src')
-rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index cb662fc91b..ccbacce9b9 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -20582,19 +20582,11 @@ case wxFileDialog_GetPath: { // wxFileDialog::GetPath break; } case wxFileDialog_GetPaths: { // wxFileDialog::GetPaths - wxFileDialog *This = (wxFileDialog *) getPtr(bp,memenv); bp += 4; - int * pathsLen = (int *) bp; bp += 4; wxArrayString paths; - int pathsASz = 0, * pathsTemp; - for(int i=0; i < *pathsLen; i++) { - pathsTemp = (int *) bp; bp += 4; - paths.Add(wxString(bp, wxConvUTF8)); - bp += *pathsTemp; - pathsASz += *pathsTemp+4; - } - bp += (8-((0+ pathsASz) & 7 )) & 7; + wxFileDialog *This = (wxFileDialog *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); This->GetPaths(paths); + rt.add(paths); break; } case wxFileDialog_GetWildcard: { // wxFileDialog::GetWildcard |