1 files changed, 33 insertions, 19 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 6f43247d74..79e6833e9b 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. 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
@@ -24,8 +24,9 @@
 %%%-------------------------------------------------------------------
 -module(wx_class_SUITE).
 
--export([all/0, init_per_suite/1, end_per_suite/1, 
-	 init_per_testcase/2, fin_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_suite/1, end_per_suite/1, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -compile(export_all).
 
@@ -42,24 +43,23 @@ init_per_testcase(Func,Config) ->
     wx_test_lib:init_per_testcase(Func,Config).
 end_per_testcase(Func,Config) -> 
     wx_test_lib:end_per_testcase(Func,Config).
-fin_per_testcase(Func,Config) -> %% For test_server
-    wx_test_lib:end_per_testcase(Func,Config).
 
 %% SUITE specification
-all() ->
-    all(suite).
-all(suite) ->
-    [
-     calendarCtrl, 
-     treeCtrl,
-     notebook,
-     staticBoxSizer,
-     clipboard,
-     helpFrame,
-     htmlWindow,
-     listCtrlSort,
-     radioBox
-    ].
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [calendarCtrl, treeCtrl, notebook, staticBoxSizer,
+     clipboard, helpFrame, htmlWindow, listCtrlSort,
+     radioBox, systemSettings].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
 
 %% The test cases
 
@@ -392,3 +392,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).