Merge branch 'master' into sverker/master/load_nif-print-init-error

1 files changed, 0 insertions, 78 deletions

diff --git a/lib/gs/examples/ball.erl b/lib/gs/examples/ball.erl
deleted file mode 100644
index c5d1e10db5..0000000000
--- a/lib/gs/examples/ball.erl
+++ /dev/null
@@ -1,78 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
-%%
-%% ------------------------------------------------------------
-%% A simple demo showing a ball
-%% bouncing in a window.
-%% ------------------------------------------------------------
-
--module(ball).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,canvas,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,oval,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
--export([start/0,init/0]).
-
-start() ->
-    spawn(ball,init,[]).
-
-init() ->
-    I= gs:start(),
-    W= gs:window(I,[{title,"Ball"},{width,300},{height,300},{map,true}]),
-    C= gs:canvas(W,[{width,300},{height,300},{bg,yellow}]),
-    gs:button(W,[{label, {text,"Quit Demo"}},{x,100}]),
-    Ball = gs:oval(C,[{coords,[{0,0},{50,50}]},{fill,red}]),
-    ball(Ball,0,0,5.5,4.1).
-
-ball(Ball,X,Y,DX,DY) ->
-    {NX,NDX} = cc(X,DX),
-    {NY,NDY} = cc(Y,DY),
-    gs:config(Ball,{move,{DX,DY}}),    
-    receive
-	{gs,_,click,_,_} -> exit(normal);
-	{gs,_,destroy,_,_} -> exit(normal)
-    after 20 ->
-	    true
-    end,
-    ball(Ball,NX,NY,NDX,NDY).
-
-cc(X,DX) ->
-    if 
-	DX>0 ->
-	    if 
-		X=<250 ->
-		    {X+DX,DX};
-		x>250 ->
-		    {X-DX,-DX}
-	    end;
-	DX<0 ->
-	    if
-		X>=0 ->
-		    {X+DX,DX};
-		X<0 ->
-		    {X-DX,-DX}
-	    end
-    end.
-
-%% ------------------------------------------------------------