diff options
| author | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-02-28 12:21:15 +0100 |
| commit | 77426493dc04593cc00c166e6fb17dd5fc985255 (patch) | |
| tree | 868060b6e16d4e9f6a347202ac1ba9c78761f404 /lib/wx/src/gen/wxControl.erl | |
| parent | 6510ee4abddbecf10b41d0474a35af1e780ea5be (diff) | |
| parent | 6628dbe4ba097a5abed4ca7439a5b515adb0f556 (diff) | |
| download | otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.gz otp-77426493dc04593cc00c166e6fb17dd5fc985255.tar.bz2 otp-77426493dc04593cc00c166e6fb17dd5fc985255.zip | |
Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
[wx] Add simple taskbaricon test
[wx] Add missing stc function
[wx] Add wxTaskBarIcon class
[wx] Doc overloaded functions
[wx] Fix spec errors
[wx] Fix api bugs in wxDC
[wx] Fix wxGraphicContext bugs
[wx] Remove redundant erts version check
[wx] Generated types for all wx classes
[wx] Generate GL api from latest version
[wx] Cleanup Makefiles
Diffstat (limited to 'lib/wx/src/gen/wxControl.erl')
| -rw-r--r-- | lib/wx/src/gen/wxControl.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl index e3f602e65a..f840d0c6bc 100644 --- a/lib/wx/src/gen/wxControl.erl +++ b/lib/wx/src/gen/wxControl.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. 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 @@ -68,20 +68,24 @@ show/1,show/2,thaw/1,transferDataFromWindow/1,transferDataToWindow/1, update/1,updateWindowUI/1,updateWindowUI/2,validate/1,warpPointer/3]). +-export_type([wxControl/0]). %% @hidden parent_class(wxWindow) -> true; parent_class(wxEvtHandler) -> true; parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -%% @spec (This::wxControl()) -> string() +-type wxControl() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolgetlabel">external documentation</a>. +-spec getLabel(This) -> unicode:charlist() when + This::wxControl(). getLabel(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxControl), wxe_util:call(?wxControl_GetLabel, <<ThisRef:32/?UI>>). -%% @spec (This::wxControl(), Label::string()) -> ok %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolsetlabel">external documentation</a>. +-spec setLabel(This, Label) -> ok when + This::wxControl(), Label::unicode:chardata(). setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label) when is_list(Label) -> ?CLASS(ThisT,wxControl), |