diff options
| author | Dan Gudmundsson <[email protected]> | 2012-03-21 10:23:37 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-03-21 10:23:37 +0100 |
| commit | d11efce543903a6adf6180f80ebf7ae854f5b6f1 (patch) | |
| tree | f830bd41c6ec4cc1d1253f4aedfcaef446bbf516 /lib/wx/src/gen/wxColourPickerCtrl.erl | |
| parent | 17aca0a257880761aa3e86da7ffa906269ed947c (diff) | |
| parent | 8d5372dcb2aaed98063d9a9c74a052612ecfa3ca (diff) | |
| download | otp-d11efce543903a6adf6180f80ebf7ae854f5b6f1.tar.gz otp-d11efce543903a6adf6180f80ebf7ae854f5b6f1.tar.bz2 otp-d11efce543903a6adf6180f80ebf7ae854f5b6f1.zip | |
Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
[wx] Add more types
[wx] Fix listctrl issues
[wx] Fix bad defines
[wx] Fix bad type references
[wx] Fix missing export_types
Diffstat (limited to 'lib/wx/src/gen/wxColourPickerCtrl.erl')
| -rw-r--r-- | lib/wx/src/gen/wxColourPickerCtrl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl index 5fd51eba15..1ba771695f 100644 --- a/lib/wx/src/gen/wxColourPickerCtrl.erl +++ b/lib/wx/src/gen/wxColourPickerCtrl.erl @@ -104,7 +104,7 @@ new(Parent,Id) | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {validator, wx:wx()}. + | {validator, wx:wx_object()}. new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options) when is_integer(Id),is_list(Options) -> ?CLASS(ParentT,wxWindow), @@ -133,7 +133,7 @@ create(This,Parent,Id) | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} | {style, integer()} - | {validator, wx:wx()}. + | {validator, wx:wx_object()}. create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, Options) when is_integer(Id),is_list(Options) -> ?CLASS(ThisT,wxColourPickerCtrl), |