diff options
| author | Dan Gudmundsson <[email protected]> | 2012-11-05 10:47:29 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-01-09 11:41:41 +0100 |
| commit | 4d30bb386125882d8baba975f1f7d1ef9a93cc67 (patch) | |
| tree | a860bd82c060778618a563cd7f35cae3244a0360 /lib/wx/test/wx_class_SUITE.erl | |
| parent | 9cffd30e76296fec83b22a2b3aa07bd3435cbe30 (diff) | |
| download | otp-4d30bb386125882d8baba975f1f7d1ef9a93cc67.tar.gz otp-4d30bb386125882d8baba975f1f7d1ef9a93cc67.tar.bz2 otp-4d30bb386125882d8baba975f1f7d1ef9a93cc67.zip | |
wx: Modify tests so they work on wxWidgets-2.9
Things have changed in 2.9 modify tests so they are still valid for
both 2.8 and 2.9 branches, so far only tested on linux.
Diffstat (limited to 'lib/wx/test/wx_class_SUITE.erl')
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 6ed7243c5b..22bfa53e0a 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -82,13 +82,14 @@ calendarCtrl(Config) -> true -> ?log("DateAttr is null~n",[]); false -> - ?log("DateAttr is useable~n",[]) + ?log("DateAttr is useable~n",[]), + DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()), + wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}), + wxCalendarCtrl:setAttr(Cal, Day, DateAttr), + DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)), + io:format("DateAttr ~p~n",[DateAttr1]), + ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)) end, - DateAttr = ?mt(wxCalendarDateAttr, wxCalendarDateAttr:new()), - wxCalendarDateAttr:setBackgroundColour(DateAttr, {0,243,0}), - wxCalendarCtrl:setAttr(Cal, Day, DateAttr), - DateAttr1 = ?mt(wxCalendarDateAttr, wxCalendarCtrl:getAttr(Cal,Day)), - ?m({0,243,0,255}, wxCalendarDateAttr:getBackgroundColour(DateAttr1)), ?m({YMD, _},wxCalendarCtrl:getDate(Cal)), @@ -476,7 +477,9 @@ taskBarIcon(Config) -> Wx = wx:new(), Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"), TBI = wxTaskBarIcon:new(), - Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")), + Image = wxImage:new(filename:join(code:priv_dir(debugger), "erlang_bug.png")), + io:format("Image ~p~n",[wxImage:ok(Image)]), + Icon = wxIcon:new(filename:join(code:priv_dir(debugger), "erlang_bug.png"), [{type, ?wxBITMAP_TYPE_PNG}]), wxTaskBarIcon:setIcon(TBI, Icon, [{tooltip, "Testing wxTaskBarIcon"}]), wxWindow:show(Frame), wxTaskBarIcon:connect(TBI, taskbar_left_down, [{callback, fun(Ev,_) -> io:format("Left clicked: ~p~n",[Ev]) end}]), |