diff options
author | Dan Gudmundsson <dgud@erlang.org> | 2012-02-16 13:55:08 +0100 |
---|---|---|
committer | Dan Gudmundsson <dgud@erlang.org> | 2012-02-17 10:19:45 +0100 |
commit | 953ee650a80d863a85c99e82ef69501496db0ad6 (patch) | |
tree | 637e728152ec48479bc06275e0976250c47a1d23 /lib/wx/src/gen/wxGraphicsPath.erl | |
parent | 2e3260f90ce4cb595296a36fbd212578e10a7e94 (diff) | |
download | otp-953ee650a80d863a85c99e82ef69501496db0ad6.tar.gz otp-953ee650a80d863a85c99e82ef69501496db0ad6.tar.bz2 otp-953ee650a80d863a85c99e82ef69501496db0ad6.zip |
[wx] Fix wxGraphicContext bugs
* Lines had wrong arguments
* Change float() to number in guards, when packing arguments
integers are converted floats to automaticly anyway.
Diffstat (limited to 'lib/wx/src/gen/wxGraphicsPath.erl')
-rw-r--r-- | lib/wx/src/gen/wxGraphicsPath.erl | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/lib/wx/src/gen/wxGraphicsPath.erl b/lib/wx/src/gen/wxGraphicsPath.erl index 6e9af755b9..32e9685895 100644 --- a/lib/wx/src/gen/wxGraphicsPath.erl +++ b/lib/wx/src/gen/wxGraphicsPath.erl @@ -49,49 +49,49 @@ moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY}) when is_number(PX),is_number(PY) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_MoveToPoint_1, - <<ThisRef:32/?UI,0:32,PX:64/float,PY:64/float>>). + <<ThisRef:32/?UI,0:32,PX:64/?F,PY:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>. -spec moveToPoint(This, X, Y) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(). + This::wxGraphicsPath(), X::number(), Y::number(). moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y) - when is_float(X),is_float(Y) -> + when is_number(X),is_number(Y) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_MoveToPoint_2, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>. -spec addArc(This, C, R, StartAngle, EndAngle, Clockwise) -> ok when - This::wxGraphicsPath(), C::{X::float(), Y::float()}, R::float(), StartAngle::float(), EndAngle::float(), Clockwise::boolean(). + This::wxGraphicsPath(), C::{X::float(), Y::float()}, R::number(), StartAngle::number(), EndAngle::number(), Clockwise::boolean(). addArc(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY},R,StartAngle,EndAngle,Clockwise) - when is_number(CX),is_number(CY),is_float(R),is_float(StartAngle),is_float(EndAngle),is_boolean(Clockwise) -> + when is_number(CX),is_number(CY),is_number(R),is_number(StartAngle),is_number(EndAngle),is_boolean(Clockwise) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddArc_5, - <<ThisRef:32/?UI,0:32,CX:64/float,CY:64/float,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>). + <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>. -spec addArc(This, X, Y, R, StartAngle, EndAngle, Clockwise) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(), R::float(), StartAngle::float(), EndAngle::float(), Clockwise::boolean(). + This::wxGraphicsPath(), X::number(), Y::number(), R::number(), StartAngle::number(), EndAngle::number(), Clockwise::boolean(). addArc(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,StartAngle,EndAngle,Clockwise) - when is_float(X),is_float(Y),is_float(R),is_float(StartAngle),is_float(EndAngle),is_boolean(Clockwise) -> + when is_number(X),is_number(Y),is_number(R),is_number(StartAngle),is_number(EndAngle),is_boolean(Clockwise) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddArc_6, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarctopoint">external documentation</a>. -spec addArcToPoint(This, X1, Y1, X2, Y2, R) -> ok when - This::wxGraphicsPath(), X1::float(), Y1::float(), X2::float(), Y2::float(), R::float(). + This::wxGraphicsPath(), X1::number(), Y1::number(), X2::number(), Y2::number(), R::number(). addArcToPoint(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,R) - when is_float(X1),is_float(Y1),is_float(X2),is_float(Y2),is_float(R) -> + when is_number(X1),is_number(Y1),is_number(X2),is_number(Y2),is_number(R) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddArcToPoint, <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,R:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcircle">external documentation</a>. -spec addCircle(This, X, Y, R) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(), R::float(). + This::wxGraphicsPath(), X::number(), Y::number(), R::number(). addCircle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R) - when is_float(X),is_float(Y),is_float(R) -> + when is_number(X),is_number(Y),is_number(R) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddCircle, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F>>). @@ -103,22 +103,22 @@ addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{C1X,C1Y},{C2X,C2Y},{EX,EY}) when is_number(C1X),is_number(C1Y),is_number(C2X),is_number(C2Y),is_number(EX),is_number(EY) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_3, - <<ThisRef:32/?UI,0:32,C1X:64/float,C1Y:64/float,C2X:64/float,C2Y:64/float,EX:64/float,EY:64/float>>). + <<ThisRef:32/?UI,0:32,C1X:64/?F,C1Y:64/?F,C2X:64/?F,C2Y:64/?F,EX:64/?F,EY:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>. -spec addCurveToPoint(This, Cx1, Cy1, Cx2, Cy2, X, Y) -> ok when - This::wxGraphicsPath(), Cx1::float(), Cy1::float(), Cx2::float(), Cy2::float(), X::float(), Y::float(). + This::wxGraphicsPath(), Cx1::number(), Cy1::number(), Cx2::number(), Cy2::number(), X::number(), Y::number(). addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx1,Cy1,Cx2,Cy2,X,Y) - when is_float(Cx1),is_float(Cy1),is_float(Cx2),is_float(Cy2),is_float(X),is_float(Y) -> + when is_number(Cx1),is_number(Cy1),is_number(Cx2),is_number(Cy2),is_number(X),is_number(Y) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_6, <<ThisRef:32/?UI,0:32,Cx1:64/?F,Cy1:64/?F,Cx2:64/?F,Cy2:64/?F,X:64/?F,Y:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddellipse">external documentation</a>. -spec addEllipse(This, X, Y, W, H) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float(). + This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number(). addEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H) - when is_float(X),is_float(Y),is_float(W),is_float(H) -> + when is_number(X),is_number(Y),is_number(W),is_number(H) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddEllipse, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>). @@ -130,13 +130,13 @@ addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY}) when is_number(PX),is_number(PY) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddLineToPoint_1, - <<ThisRef:32/?UI,0:32,PX:64/float,PY:64/float>>). + <<ThisRef:32/?UI,0:32,PX:64/?F,PY:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>. -spec addLineToPoint(This, X, Y) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(). + This::wxGraphicsPath(), X::number(), Y::number(). addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y) - when is_float(X),is_float(Y) -> + when is_number(X),is_number(Y) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddLineToPoint_2, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>). @@ -152,27 +152,27 @@ addPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) -> %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddquadcurvetopoint">external documentation</a>. -spec addQuadCurveToPoint(This, Cx, Cy, X, Y) -> ok when - This::wxGraphicsPath(), Cx::float(), Cy::float(), X::float(), Y::float(). + This::wxGraphicsPath(), Cx::number(), Cy::number(), X::number(), Y::number(). addQuadCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx,Cy,X,Y) - when is_float(Cx),is_float(Cy),is_float(X),is_float(Y) -> + when is_number(Cx),is_number(Cy),is_number(X),is_number(Y) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddQuadCurveToPoint, <<ThisRef:32/?UI,0:32,Cx:64/?F,Cy:64/?F,X:64/?F,Y:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddrectangle">external documentation</a>. -spec addRectangle(This, X, Y, W, H) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float(). + This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number(). addRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H) - when is_float(X),is_float(Y),is_float(W),is_float(H) -> + when is_number(X),is_number(Y),is_number(W),is_number(H) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddRectangle, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddroundedrectangle">external documentation</a>. -spec addRoundedRectangle(This, X, Y, W, H, Radius) -> ok when - This::wxGraphicsPath(), X::float(), Y::float(), W::float(), H::float(), Radius::float(). + This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number(), Radius::number(). addRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius) - when is_float(X),is_float(Y),is_float(W),is_float(H),is_float(Radius) -> + when is_number(X),is_number(Y),is_number(W),is_number(H),is_number(Radius) -> ?CLASS(ThisT,wxGraphicsPath), wxe_util:cast(?wxGraphicsPath_AddRoundedRectangle, <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F,Radius:64/?F>>). @@ -195,13 +195,13 @@ contains(This,C={CX,CY}) %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>. -spec contains(This, X, Y) -> boolean() when - This::wxGraphicsPath(), X::float(), Y::float(); + This::wxGraphicsPath(), X::number(), Y::number(); (This, C, [Option]) -> boolean() when This::wxGraphicsPath(), C::{X::float(), Y::float()}, Option :: {fillStyle, integer()}. contains(This,X,Y) - when is_record(This, wx_ref),is_float(X),is_float(Y) -> + when is_record(This, wx_ref),is_number(X),is_number(Y) -> contains(This,X,Y, []); contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options) when is_number(CX),is_number(CY),is_list(Options) -> @@ -210,14 +210,14 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options) (BadOpt, _) -> erlang:error({badoption, BadOpt}) end, BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)), wxe_util:call(?wxGraphicsPath_Contains_2, - <<ThisRef:32/?UI,0:32,CX:64/float,CY:64/float, BinOpt/binary>>). + <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F, BinOpt/binary>>). %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>. -spec contains(This, X, Y, [Option]) -> boolean() when - This::wxGraphicsPath(), X::float(), Y::float(), + This::wxGraphicsPath(), X::number(), Y::number(), Option :: {fillStyle, integer()}. contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options) - when is_float(X),is_float(Y),is_list(Options) -> + when is_number(X),is_number(Y),is_list(Options) -> ?CLASS(ThisT,wxGraphicsPath), MOpts = fun({fillStyle, FillStyle}, Acc) -> [<<1:32/?UI,FillStyle:32/?UI>>|Acc]; (BadOpt, _) -> erlang:error({badoption, BadOpt}) end, |