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/wxColourPickerEvent.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/wxColourPickerEvent.erl')
| -rw-r--r-- | lib/wx/src/gen/wxColourPickerEvent.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxColourPickerEvent.erl b/lib/wx/src/gen/wxColourPickerEvent.erl index 9ba431b841..71a3fd3e5b 100644 --- a/lib/wx/src/gen/wxColourPickerEvent.erl +++ b/lib/wx/src/gen/wxColourPickerEvent.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 @@ -40,13 +40,16 @@ parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1, skip/1,skip/2,stopPropagation/1]). +-export_type([wxColourPickerEvent/0]). %% @hidden parent_class(wxCommandEvent) -> true; parent_class(wxEvent) -> true; parent_class(_Class) -> erlang:error({badtype, ?MODULE}). -%% @spec (This::wxColourPickerEvent()) -> wx:colour() +-type wxColourPickerEvent() :: wx:wx_object(). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerevent.html#wxcolourpickereventgetcolour">external documentation</a>. +-spec getColour(This) -> wx:wx_colour4() when + This::wxColourPickerEvent(). getColour(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxColourPickerEvent), wxe_util:call(?wxColourPickerEvent_GetColour, |