diff options
author | Dan Gudmundsson <[email protected]> | 2015-09-16 11:49:14 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-09-16 11:49:14 +0200 |
commit | acc47d90e34e4552ffe99766da7ac95423db1e30 (patch) | |
tree | ba4b9838ac573456db2fe1b523b5bfa372888275 /lib/wx/src/gen/wxAuiManager.erl | |
parent | e23ea97d7dce3c12f54f06cb90354a0b3a55d073 (diff) | |
parent | e7d0b4e0f19280daa03292214163880cd7337cb2 (diff) | |
download | otp-acc47d90e34e4552ffe99766da7ac95423db1e30.tar.gz otp-acc47d90e34e4552ffe99766da7ac95423db1e30.tar.bz2 otp-acc47d90e34e4552ffe99766da7ac95423db1e30.zip |
Merge branch 'dgud/wx/add-missing-aui-func/OTP-12961' into maint
* dgud/wx/add-missing-aui-func/OTP-12961:
wx: Fix wxAuiManager:getAllPanes/1
wx: Add missing aui functionality
Diffstat (limited to 'lib/wx/src/gen/wxAuiManager.erl')
-rw-r--r-- | lib/wx/src/gen/wxAuiManager.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxAuiManager.erl b/lib/wx/src/gen/wxAuiManager.erl index 5a945f59e8..bf22e3091d 100644 --- a/lib/wx/src/gen/wxAuiManager.erl +++ b/lib/wx/src/gen/wxAuiManager.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2015. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -120,7 +120,7 @@ detachPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) <<ThisRef:32/?UI,WindowRef:32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetallpanes">external documentation</a>. --spec getAllPanes(This) -> wx:wx_object() when +-spec getAllPanes(This) -> [wxAuiPaneInfo:wxAuiPaneInfo()] when This::wxAuiManager(). getAllPanes(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxAuiManager), |