wx: Fix crash when garbage collect event handlers (debugger caused seg fault)

wxStyledTextCtrl had no wrapper class so, because it was not detected
that it had virtual destructors, thus references to it was not cleaned
up on destruction. When a process dies and wx cleans up the event handlers
access was made to the deleted object and caused a seg fault.

Added a testcase which I thought could provoke the bug but didn't.

1 files changed, 37 insertions, 35 deletions

diff --git a/lib/wx/test/wx_obj_test.erl b/lib/wx/test/wx_obj_test.erl
index b4d7640c7e..f47f2fbc46 100644
--- a/lib/wx/test/wx_obj_test.erl
+++ b/lib/wx/test/wx_obj_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. 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
@@ -18,69 +18,71 @@
 -module(wx_obj_test).
 -include_lib("wx/include/wx.hrl").
 
--export([start/1]).
+-export([start/1, stop/2]).
 
 %% wx_object callbacks
 -export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
 	 handle_sync_event/3, handle_event/2, handle_cast/2]).
 
--record(state, {frame, panel, opts}).
+-record(state, {parent, opts, user_state}).
 
 start(Opts) ->
-    wx_object:start_link(?MODULE, [{parent, self()}, Opts], []).
+    wx_object:start_link(?MODULE, [{parent, self()}| Opts], []).
+
+stop(Object, Fun) ->
+    wx_object:call(Object, {stop, Fun}).
 
 init(Opts) ->
-    put(parent_pid, proplists:get_value(parent, Opts)),
-    Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
-    Sz = wxBoxSizer:new(?wxHORIZONTAL),
-    Panel = wxPanel:new(Frame),
-    wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]),
-    wxPanel:connect(Panel, size, [{skip, true}]),
-    wxPanel:connect(Panel, paint, [callback, {userData, proplists:get_value(parent, Opts)}]),
-    wxWindow:show(Frame),
-    {Frame, #state{frame=Frame, panel=Panel, opts=Opts}}.
+    Parent = proplists:get_value(parent, Opts),
+    put(parent_pid, Parent),
+    Init = proplists:get_value(init, Opts),
+    {Obj, UserState} = Init(),
+    {Obj, #state{parent=Parent, opts=Opts, user_state=UserState}}.
 
-handle_sync_event(Event = #wx{obj=Panel}, WxEvent, #state{opts=Opts}) ->
-    DC=wxPaintDC:new(Panel),  %% We must create & destroy paintDC, or call wxEvent:skip(WxEvent))
-    wxPaintDC:destroy(DC),    %% in sync_event. Otherwise wx on windows keeps sending the events.
-    Pid = proplists:get_value(parent, Opts),
-    true = is_pid(Pid),
-    Pid ! {sync_event, Event, WxEvent},
+handle_sync_event(Event = #wx{obj=Panel, event=#wxPaint{}},
+		  WxEvent, #state{parent=Parent, user_state=US, opts=Opts}) ->
+    case proplists:get_value(redraw, Opts) of
+	undefined ->
+	    DC=wxPaintDC:new(Panel),  %% We must create & destroy paintDC, or call wxEvent:skip(WxEvent))
+	    wxPaintDC:destroy(DC),    %% in sync_event. Otherwise wx on windows keeps sending the events.
+	    Parent ! {sync_event, Event, WxEvent};
+	Redraw ->
+	    Redraw(Event, WxEvent, US)
+    end,
+    ok;
+handle_sync_event(Event, WxEvent, #state{parent=Parent}) ->
+    Parent ! {sync_event, Event, WxEvent},
     ok.
 
-handle_event(Event, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
-    Pid ! {event, Event},
+handle_event(Event, State = #state{parent=Parent}) ->
+    Parent ! {event, Event},
     {noreply, State}.
 
-handle_call(What, From, State) when is_function(What) ->
-    Result = What(State),
+handle_call(What, From, State = #state{user_state=US}) when is_function(What) ->
+    Result = What(US),
     {reply, {call, Result, From}, State};
+handle_call({stop, Fun}, From, State = #state{user_state=US}) ->
+    {stop, Fun(US), {stop, From}, State};
 handle_call(What, From, State) ->
     {reply, {call, What, From}, State}.
 
-handle_cast(What, State = #state{opts=Opts})  when is_function(What) ->
-    Result = What(State),
-    Pid = proplists:get_value(parent, Opts),
+handle_cast(What, State = #state{parent=Pid, user_state=US})  when is_function(What) ->
+    Result = What(US),
     Pid ! {cast, Result},
     {noreply, State};
 
-handle_cast(What, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+handle_cast(What, State = #state{parent=Pid}) ->
     Pid ! {cast, What},
     {noreply, State}.
 
-handle_info(What, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+handle_info(What, State = #state{parent=Pid}) ->
     Pid ! {info, What},
     {noreply, State}.
 
-terminate(What, #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+terminate(What, #state{parent=Pid}) ->
     Pid ! {terminate, What},
     ok.
 
-code_change(Ver1, Ver2, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+code_change(Ver1, Ver2, State = #state{parent=Pid}) ->
     Pid ! {code_change, Ver1, Ver2},
     State.