diff options
| author | Dan Gudmundsson <[email protected]> | 2012-03-21 10:29:21 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2012-03-21 10:29:21 +0100 |
| commit | 66b09026bfbb1385e17d4cd60c543858e5b5b98e (patch) | |
| tree | 4ff883c2efe01e1f46ad19ab4b6e3161c3d08ca4 /lib/wx/src/gen/wxGLCanvas.erl | |
| parent | 5dc35dc142de8875bf81fb2bbf6f6bfc8c731438 (diff) | |
| parent | 6763de4ffecfeb56a69c5f763d221ba20d1eef7d (diff) | |
| download | otp-66b09026bfbb1385e17d4cd60c543858e5b5b98e.tar.gz otp-66b09026bfbb1385e17d4cd60c543858e5b5b98e.tar.bz2 otp-66b09026bfbb1385e17d4cd60c543858e5b5b98e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/src/gen/wxGLCanvas.erl')
| -rw-r--r-- | lib/wx/src/gen/wxGLCanvas.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl index 3a9cb39020..46168374af 100644 --- a/lib/wx/src/gen/wxGLCanvas.erl +++ b/lib/wx/src/gen/wxGLCanvas.erl @@ -96,7 +96,7 @@ new(Parent) %% | {palette, wxPalette:wxPalette()}.<br /> %% -spec new(Parent, Shared) -> wxGLCanvas() when - Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas(); + Parent::wxWindow:wxWindow(), Shared::wx:wx_object() | wxGLCanvas(); (Parent, [Option]) -> wxGLCanvas() when Parent::wxWindow:wxWindow(), Option :: {id, integer()} @@ -128,7 +128,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>. -spec new(Parent, Shared, [Option]) -> wxGLCanvas() when - Parent::wxWindow:wxWindow(), Shared::wxGLContext:wxGLContext() | wxGLCanvas(), + Parent::wxWindow:wxWindow(), Shared::wx:wx_object() | wxGLCanvas(), Option :: {id, integer()} | {pos, {X::integer(), Y::integer()}} | {size, {W::integer(), H::integer()}} @@ -159,7 +159,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Opt <<ParentRef:32/?UI,SharedRef:32/?UI, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasgetcontext">external documentation</a>. --spec getContext(This) -> wxGLContext:wxGLContext() when +-spec getContext(This) -> wx:wx_object() when This::wxGLCanvas(). getContext(#wx_ref{type=ThisT,ref=ThisRef}) -> ?CLASS(ThisT,wxGLCanvas), |