diff options
| author | Dan Gudmundsson <[email protected]> | 2010-10-11 11:00:38 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-15 10:13:07 +0100 |
| commit | 8577598667bff43f503f3cae87934c3e9918d135 (patch) | |
| tree | 7769951ae687f9c266ee938f0df221e291699529 /lib/wx/src/gen | |
| parent | ac433c8318566261a74ffe7fd0824fb99610bed3 (diff) | |
| download | otp-8577598667bff43f503f3cae87934c3e9918d135.tar.gz otp-8577598667bff43f503f3cae87934c3e9918d135.tar.bz2 otp-8577598667bff43f503f3cae87934c3e9918d135.zip | |
Windows and Mac build issues
Diffstat (limited to 'lib/wx/src/gen')
| -rw-r--r-- | lib/wx/src/gen/gl.erl | 4 | ||||
| -rw-r--r-- | lib/wx/src/gen/wxGLCanvas.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/src/gen/gl.erl b/lib/wx/src/gen/gl.erl index 56cb2f1e23..bf56067da1 100644 --- a/lib/wx/src/gen/gl.erl +++ b/lib/wx/src/gen/gl.erl @@ -235,8 +235,8 @@ cast(Op, Args) -> rec() -> receive {'_egl_result_', Res} -> Res; - {'_egl_error_', Res} -> error({error,Res}) - end. + {'_egl_error_', Op, Res} -> error({error,Res,Op}) + end. %% @hidden send_bin(Bin) when is_binary(Bin) -> diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl index ed5430dae1..e5d7bec4ca 100644 --- a/lib/wx/src/gen/wxGLCanvas.erl +++ b/lib/wx/src/gen/wxGLCanvas.erl @@ -105,7 +105,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options) ({palette, #wx_ref{type=PaletteT,ref=PaletteRef}}, Acc) -> ?CLASS(PaletteT,wxPalette),[<<7:32/?UI,PaletteRef:32/?UI>>|Acc]; (BadOpt, _) -> erlang:error({badoption, BadOpt}) end, BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)), - wxe_master:init_opengl(), + {ok, _} = wxe_master:init_opengl(), wxe_util:construct(?wxGLCanvas_new_2, <<ParentRef:32/?UI, 0:32,BinOpt/binary>>). @@ -131,7 +131,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Opt ({palette, #wx_ref{type=PaletteT,ref=PaletteRef}}, Acc) -> ?CLASS(PaletteT,wxPalette),[<<7:32/?UI,PaletteRef:32/?UI>>|Acc]; (BadOpt, _) -> erlang:error({badoption, BadOpt}) end, BinOpt = list_to_binary(lists:foldl(MOpts, [<<0:32>>], Options)), - wxe_master:init_opengl(), + {ok, _} = wxe_master:init_opengl(), wxe_util:construct(SharedOP, <<ParentRef:32/?UI,SharedRef:32/?UI, BinOpt/binary>>). |