projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better fix
[wxWidgets.git]
/
tests
/
test.cpp
diff --git
a/tests/test.cpp
b/tests/test.cpp
index 0da0b1de6b3337e8593dfac88daca1f7bcd5ea37..d65ec1fbfa1144fd4e6ebdf39a6fc036ec0061c9 100644
(file)
--- a/
tests/test.cpp
+++ b/
tests/test.cpp
@@
-29,23
+29,27
@@
using CppUnit::TestFactoryRegistry;
using CppUnit::TextUi::TestRunner;
using CppUnit::CompilerOutputter;
using CppUnit::TextUi::TestRunner;
using CppUnit::CompilerOutputter;
-using std::string;
-using std::vector;
-using std::auto_ptr;
-using std::cout;
+using namespace std;
+
+#if wxUSE_GUI
+ typedef wxApp TestAppBase;
+#else
+ typedef wxAppConsole TestAppBase;
+#endif
// The application class
//
// The application class
//
-class TestApp : public
wxAppConsol
e
+class TestApp : public
TestAppBas
e
{
public:
TestApp();
// standard overrides
{
public:
TestApp();
// standard overrides
- void OnInitCmdLine(wxCmdLineParser& parser);
- bool OnCmdLineParsed(wxCmdLineParser& parser);
- bool OnInit();
- int OnRun();
+ virtual void OnInitCmdLine(wxCmdLineParser& parser);
+ virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+ virtual bool OnInit();
+ virtual int OnRun();
+ virtual int OnExit();
private:
void List(Test *test, const string& parent = "") const;
private:
void List(Test *test, const string& parent = "") const;
@@
-68,6
+72,9
@@
TestApp::TestApp()
//
bool TestApp::OnInit()
{
//
bool TestApp::OnInit()
{
+ if ( !TestAppBase::OnInit() )
+ return false;
+
cout << "Test program for wxWidgets\n"
<< "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
cout << "Test program for wxWidgets\n"
<< "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
@@
-78,14
+85,19
@@
bool TestApp::OnInit()
cout << "\n";
#endif
cout << "\n";
#endif
- return wxAppConsole::OnInit();
+#if wxUSE_GUI
+ // create a hidden parent window to be used as parent for the GUI controls
+ new wxFrame(NULL, wxID_ANY, "Hidden wx test frame");
+#endif // wxUSE_GUI
+
+ return true;
};
// The table of command line options
//
void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
{
};
// The table of command line options
//
void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
{
-
wxAppConsol
e::OnInitCmdLine(parser);
+
TestAppBas
e::OnInitCmdLine(parser);
static const wxCmdLineEntryDesc cmdLineDesc[] = {
{ wxCMD_LINE_SWITCH, "l", "list",
static const wxCmdLineEntryDesc cmdLineDesc[] = {
{ wxCMD_LINE_SWITCH, "l", "list",
@@
-115,7
+127,7
@@
bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
- return
wxAppConsol
e::OnCmdLineParsed(parser);
+ return
TestAppBas
e::OnCmdLineParsed(parser);
}
// Run
}
// Run
@@
-155,6
+167,15
@@
int TestApp::OnRun()
: EXIT_FAILURE;
}
: EXIT_FAILURE;
}
+int TestApp::OnExit()
+{
+#if wxUSE_GUI
+ delete GetTopWindow();
+#endif // wxUSE_GUI
+
+ return 0;
+}
+
// List the tests
//
void TestApp::List(Test *test, const string& parent /*=""*/) const
// List the tests
//
void TestApp::List(Test *test, const string& parent /*=""*/) const