From 8577598667bff43f503f3cae87934c3e9918d135 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Mon, 11 Oct 2010 11:00:38 +0200
Subject: Windows and Mac build issues

---
 lib/wx/src/gen/gl.erl         | 4 ++--
 lib/wx/src/gen/wxGLCanvas.erl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/wx/src/gen')

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>>).
 
-- 
cgit v1.2.3