Merge branch 'dgud/wx/fix-wx-2.9-compat/OTP-10407'

* dgud/wx/fix-wx-2.9-compat/OTP-10407: (26 commits)
  wx: Fix comments
  wx: Workaround wx-2.9 bugs
  wx: Mac fixes
  wx: Fix demo and tests
  wx: Allow 64 bits compilation on mac, requires wxWidgets-2.9
  appmon: Move runtime part to runtime_tools app
  reltool: fix wxWidgets-2.9 compability
  debugger: Fix 2.9 compat
  observer: Fix check for graphics contexts
  Observer: Fix distribution dialog
  observer: Fix font sizes
  wx: Fix the demo
  wx: Fix loading icons and cursors in Windows
  wx: Remove unnecessary casts
  wx: Fix changed getfunctions
  wx: Depricate wxCursor new functions
  wx: Fix int to enum
  wx: Include correct m4 file in 2.9
  wx: Update examples so they work with both wxWidgets 2.8 and 2.9
  wx: Modify tests so they work on wxWidgets-2.9
  ...

1 files changed, 16 insertions, 9 deletions

diff --git a/lib/wx/examples/demo/ex_canvas_paint.erl b/lib/wx/examples/demo/ex_canvas_paint.erl
index 9bc083766a..6873724655 100644
--- a/lib/wx/examples/demo/ex_canvas_paint.erl
+++ b/lib/wx/examples/demo/ex_canvas_paint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -207,6 +207,10 @@ handle_info(Msg, State) ->
     demo:format(State#state.config, "Got Info ~p\n", [Msg]),
     {noreply, State}.
 
+handle_call(shutdown, _From, State=#state{parent=Panel}) ->
+    wxPanel:destroy(Panel),
+    {stop, normal, ok, State};
+
 handle_call(Msg, _From, State) ->
     demo:format(State#state.config, "Got Call ~p\n", [Msg]),
     {reply,{error, nyi}, State}.
@@ -218,7 +222,7 @@ handle_cast(Msg, State) ->
 code_change(_, _, State) ->
     {stop, ignore, State}.
 
-terminate(_Reason, _State) ->
+terminate(_Reason, _) ->
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -239,14 +243,17 @@ draw(Canvas, Bitmap, Fun) ->
     wxMemoryDC:destroy(MemoryDC).
 
 redraw(DC, Bitmap) ->
-    MemoryDC = wxMemoryDC:new(Bitmap),
+    try
+	MemoryDC = wxMemoryDC:new(Bitmap),
 
-    wxDC:blit(DC, {0,0},
-	      {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
-	      MemoryDC, {0,0}),
-
-    wxMemoryDC:destroy(MemoryDC).
+	wxDC:blit(DC, {0,0},
+		  {wxBitmap:getWidth(Bitmap), wxBitmap:getHeight(Bitmap)},
+		  MemoryDC, {0,0}),
 
+	wxMemoryDC:destroy(MemoryDC)
+    catch error:{{badarg,_},_} -> %% Bitmap have been deleted
+	    ok
+    end.
 
-getPageInfo(_This) -> 
+getPageInfo(_This) ->
     {1,1,1,1}.