diff options
| author | Dan Gudmundsson <[email protected]> | 2010-11-26 15:34:24 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-26 15:34:24 +0100 |
| commit | 7d64d49f19eb014188e0f3ff7cb3705255389f10 (patch) | |
| tree | fd66f55cd4fd716e370cca57e07aed774916cb66 /lib/wx/test | |
| parent | df277325374eb49198e907fd19854058c211bf3d (diff) | |
| parent | 5e31685980cd1b2fa344b5c3be866ed74c0e9754 (diff) | |
| download | otp-7d64d49f19eb014188e0f3ff7cb3705255389f10.tar.gz otp-7d64d49f19eb014188e0f3ff7cb3705255389f10.tar.bz2 otp-7d64d49f19eb014188e0f3ff7cb3705255389f10.zip | |
Merge branch 'dgud/wx/misc-bugs/OTP-8951' into dev
* dgud/wx/misc-bugs/OTP-8951:
Add wxSystemSettings
Avoid eternal loops when quiting
Diffstat (limited to 'lib/wx/test')
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 6f43247d74..7b8d510d40 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -58,7 +58,8 @@ all(suite) -> helpFrame, htmlWindow, listCtrlSort, - radioBox + radioBox, + systemSettings ]. %% The test cases @@ -392,3 +393,17 @@ radioBox(Config) -> wxWindow:show(Frame), wx_test_lib:wx_destroy(Frame,Config). + + +systemSettings(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo); +systemSettings(Config) -> + Wx = wx:new(), + Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"), + + ?m({_,_,_,_}, wxSystemSettings:getColour(?wxSYS_COLOUR_DESKTOP)), + ?mt(wxFont, wxSystemSettings:getFont(?wxSYS_SYSTEM_FONT)), + ?m(true, is_integer(wxSystemSettings:getMetric(?wxSYS_MOUSE_BUTTONS))), + ?m(true, is_integer(wxSystemSettings:getScreenType())), + + wxWindow:show(Frame), + wx_test_lib:wx_destroy(Frame,Config). |