aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/src/gen/wxTaskBarIcon.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-12-02 09:51:11 +0100
committerDan Gudmundsson <[email protected]>2013-12-02 09:51:11 +0100
commitd3e5761436cfbcb5b53edad9e1140e445ce94bfd (patch)
tree71a4fa03858907b43f68c06a733b0f28bce63d51 /lib/wx/src/gen/wxTaskBarIcon.erl
parent0201ed20979a8828c2e989552684c09f320d0126 (diff)
parent76a1a59d320f3b48c86fe82c6d47c6bfa232196b (diff)
downloadotp-d3e5761436cfbcb5b53edad9e1140e445ce94bfd.tar.gz
otp-d3e5761436cfbcb5b53edad9e1140e445ce94bfd.tar.bz2
otp-d3e5761436cfbcb5b53edad9e1140e445ce94bfd.zip
Merge branch 'dgud/wx/fix-wx-init-macosx/OTP-11393' into maint
* dgud/wx/fix-wx-init-macosx/OTP-11393: wx: Fix initialization wx: Fix compiler options for xcode 5.0 wx: Update documentation links to wxWidgets wx: wxListBox::Set crashes on wxWidgets 3.0 with NULL argument wx: Fix crash in wxe_server cleanup wx: Fix looping debug printout wx: Fix compilation on old macs wx: Fix compiler warnings wx: Fix cleanup of event handlers wx: Enable configure flags --with-wxdir --with-wx-prefix on windows wx: Fix initializations on mac osx
Diffstat (limited to 'lib/wx/src/gen/wxTaskBarIcon.erl')
-rw-r--r--lib/wx/src/gen/wxTaskBarIcon.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/wx/src/gen/wxTaskBarIcon.erl b/lib/wx/src/gen/wxTaskBarIcon.erl
index 5ca2c91b16..be3862fd24 100644
--- a/lib/wx/src/gen/wxTaskBarIcon.erl
+++ b/lib/wx/src/gen/wxTaskBarIcon.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -17,7 +17,7 @@
%% %CopyrightEnd%
%% This file is generated DO NOT EDIT
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html">wxTaskBarIcon</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html">wxTaskBarIcon</a>.
%% <p>This class is derived (and can use functions) from:
%% <br />{@link wxEvtHandler}
%% </p>
@@ -38,13 +38,13 @@ parent_class(wxEvtHandler) -> true;
parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
-type wxTaskBarIcon() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconwxtaskbaricon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconwxtaskbaricon">external documentation</a>.
-spec new() -> wxTaskBarIcon().
new() ->
wxe_util:construct(?wxTaskBarIcon_new,
<<>>).
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconpopupmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconpopupmenu">external documentation</a>.
-spec popupMenu(This, Menu) -> boolean() when
This::wxTaskBarIcon(), Menu::wxMenu:wxMenu().
popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
@@ -53,7 +53,7 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
wxe_util:call(?wxTaskBarIcon_PopupMenu,
<<ThisRef:32/?UI,MenuRef:32/?UI>>).
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconremoveicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconremoveicon">external documentation</a>.
-spec removeIcon(This) -> boolean() when
This::wxTaskBarIcon().
removeIcon(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -69,7 +69,7 @@ setIcon(This,Icon)
when is_record(This, wx_ref),is_record(Icon, wx_ref) ->
setIcon(This,Icon, []).
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconseticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconseticon">external documentation</a>.
-spec setIcon(This, Icon, [Option]) -> boolean() when
This::wxTaskBarIcon(), Icon::wxIcon:wxIcon(),
Option :: {tooltip, unicode:chardata()}.