diff options
| author | Patrik Nyblom <[email protected]> | 2010-06-02 15:22:19 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-06-02 16:47:29 +0200 |
| commit | 1b8f86d8314389bf6033d23d3e6d707514ba7612 (patch) | |
| tree | ad57aabe4d838b11355de712c29d7599a0a05193 /lib/gs/src | |
| parent | 656e4790551b2211ff51c3ca24adbd07b135327e (diff) | |
| download | otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.tar.gz otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.tar.bz2 otp-1b8f86d8314389bf6033d23d3e6d707514ba7612.zip | |
Remove (harmless) warnings about min/max in core applications
Diffstat (limited to 'lib/gs/src')
| -rw-r--r-- | lib/gs/src/tool_utils.erl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/gs/src/tool_utils.erl b/lib/gs/src/tool_utils.erl index 697dd07151..3b82a4f96c 100644 --- a/lib/gs/src/tool_utils.erl +++ b/lib/gs/src/tool_utils.erl @@ -224,11 +224,11 @@ help_win(Type, Parent, Strings) -> {Wbtn0,Hbtn0} = gs:read(Lbl, {font_wh,{Font,"Cancel"}}), %% Compute size of the objects and adjust the graphics accordingly - Wbtn = max(Wbtn0+10, ?Wbtn), - Hbtn = max(Hbtn0+10, ?Hbtn), - Hent = max(Hent0+10, ?Hent), - Wlbl = max(Wlbl0, max(Nbtn*Wbtn+(Nbtn-1)*?PAD, ?Wlbl)), - Hlbl = max(Hlbl0, ?Hlbl), + Wbtn = erlang:max(Wbtn0+10, ?Wbtn), + Hbtn = erlang:max(Hbtn0+10, ?Hbtn), + Hent = erlang:max(Hent0+10, ?Hent), + Wlbl = erlang:max(Wlbl0, erlang:max(Nbtn*Wbtn+(Nbtn-1)*?PAD, ?Wlbl)), + Hlbl = erlang:max(Hlbl0, ?Hlbl), Wwin = ?PAD+Wlbl+?PAD, @@ -297,9 +297,6 @@ data("Yes") -> {helpwin,yes}; data("No") -> {helpwin,no}; data("Cancel") -> {helpwin,cancel}. -max(X, Y) when X>Y -> X; -max(_X, Y) -> Y. - get_coords(Parent, W, H) -> case gs:read(Parent, x) of X when is_integer(X) -> |