wx: add object set/check funcions

Needed functionality, to avoid abusing opauqe objects.

2 files changed, 16 insertions, 4 deletions

diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index 5fe0de485c..f89f25274a 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -361,7 +361,8 @@ wx_object(Config) ->
     wx:new(),
     Me = self(),
     Init = fun() ->
-		   Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
+		   Frame0 = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
+		   Frame = wx_object:set_pid(Frame0, self()),
 		   Sz = wxBoxSizer:new(?wxHORIZONTAL),
 		   Panel = wxPanel:new(Frame),
 		   wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]),
@@ -371,6 +372,7 @@ wx_object(Config) ->
 		   {Frame, {Frame, Panel}}
 	   end,
     Frame = ?mt(wxFrame, wx_obj_test:start([{init, Init}])),
+
     timer:sleep(500),
     ?m(ok, check_events(flush())),
 
@@ -378,6 +380,11 @@ wx_object(Config) ->
     ?m({call, foobar, {Me, _}}, wx_object:call(Frame, foobar)),
     ?m(ok, wx_object:cast(Frame, foobar2)),
     ?m([{cast, foobar2}|_], flush()),
+
+    ?m(Frame, wx_obj_test:who_are_you(Frame)),
+    {call, {Frame,Panel}, _} = wx_object:call(Frame, fun(US) -> US end),
+    ?m(false, wxWindow:getParent(Panel) =:= Frame),
+    ?m(true, wx:equal(wxWindow:getParent(Panel),Frame)),
     FramePid = wx_object:get_pid(Frame),
     io:format("wx_object pid ~p~n",[FramePid]),
     FramePid ! foo3,
diff --git a/lib/wx/test/wx_obj_test.erl b/lib/wx/test/wx_obj_test.erl
index cf99728c1a..23142e28b2 100644
--- a/lib/wx/test/wx_obj_test.erl
+++ b/lib/wx/test/wx_obj_test.erl
@@ -19,13 +19,13 @@
 -module(wx_obj_test).
 -include_lib("wx/include/wx.hrl").
 
--export([start/1, stop/1]).
+-export([start/1, stop/1, who_are_you/1]).
 
 %% 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, {parent, opts, user_state}).
+-record(state, {parent, me, opts, user_state}).
 
 start(Opts) ->
     wx_object:start_link(?MODULE, [{parent, self()}| Opts], []).
@@ -33,12 +33,15 @@ start(Opts) ->
 stop(Object) ->
     wx_object:stop(Object).
 
+who_are_you(Object) ->
+    wx_object:call(Object, who_are_you).
+
 init(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}}.
+    {Obj, #state{me=Obj, parent=Parent, opts=Opts, user_state=UserState}}.
 
 handle_sync_event(Event = #wx{obj=Panel, event=#wxPaint{}},
 		  WxEvent, #state{parent=Parent, user_state=US, opts=Opts}) ->
@@ -59,6 +62,8 @@ handle_event(Event, State = #state{parent=Parent}) ->
     Parent ! {event, Event},
     {noreply, State}.
 
+handle_call(who_are_you, _From, State = #state{me=Me}) ->
+    {reply, Me, State};
 handle_call(What, From, State = #state{user_state=US}) when is_function(What) ->
     Result = What(US),
     {reply, {call, Result, From}, State};