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/src/gen/wxFileDialog.erl | |
| 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/src/gen/wxFileDialog.erl')
| -rw-r--r-- | lib/wx/src/gen/wxFileDialog.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl index 22b39aa150..efe1ff57f3 100644 --- a/lib/wx/src/gen/wxFileDialog.erl +++ b/lib/wx/src/gen/wxFileDialog.erl @@ -31,7 +31,7 @@ -module(wxFileDialog). -include("wxe.hrl"). -export([destroy/1,getDirectory/1,getFilename/1,getFilenames/1,getFilterIndex/1, - getMessage/1,getPath/1,getPaths/2,getWildcard/1,new/1,new/2,setDirectory/2, + getMessage/1,getPath/1,getPaths/1,getWildcard/1,new/1,new/2,setDirectory/2, setFilename/2,setFilterIndex/2,setMessage/2,setPath/2,setWildcard/2]). %% inherited exports @@ -152,15 +152,12 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) -> wxe_util:call(?wxFileDialog_GetPath, <<ThisRef:32/?UI>>). -%% @spec (This::wxFileDialog(), Paths::[[string()]]) -> ok +%% @spec (This::wxFileDialog()) -> [[string()]] %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpaths">external documentation</a>. -getPaths(#wx_ref{type=ThisT,ref=ThisRef},Paths) - when is_list(Paths) -> +getPaths(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxFileDialog), - Paths_UCA = [unicode:characters_to_binary([PathsTemp,0]) || - PathsTemp <- Paths], - wxe_util:cast(?wxFileDialog_GetPaths, - <<ThisRef:32/?UI,(length(Paths_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Paths_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Paths_UCA])) band 16#7)) band 16#7))/unit:8>>). + wxe_util:call(?wxFileDialog_GetPaths, + <<ThisRef:32/?UI>>). %% @spec (This::wxFileDialog()) -> string() %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetwildcard">external documentation</a>. |