AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small warning+PCH fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2010-06-21 21:46:29 +00:00
parent 81ec0e15af
commit 995202d020
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/filename/filenametest.cpp
View File

@ -596,7 +596,7 @@ void FileNameTestCase::TestCreateTempFileName()
#ifdef __WXMSW__ #ifdef __WXMSW__
{ "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true }, { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true },
{ "c:\\a\\directory\\which\\does\\not\\exist", "", false }, { "c:\\a\\directory\\which\\does\\not\\exist", "", false },
#else if defined( __UNIX__ ) #elif defined( __UNIX__ )
{ "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true }, { "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true },
{ "/tmp/foo", "/tmp", true }, { "/tmp/foo", "/tmp", true },
{ "/tmp/a/directory/which/does/not/exist", "", false }, { "/tmp/a/directory/which/does/not/exist", "", false },

8
tests/interactive/output.cpp
View File

@ -21,6 +21,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/app.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// conditional compilation // conditional compilation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -381,7 +383,6 @@ void InteractiveOutputTestCase::TestStackWalk()
// standard paths // standard paths
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/stdpaths.h" #include "wx/stdpaths.h"
#include "wx/wxchar.h" // wxPrintf #include "wx/wxchar.h" // wxPrintf
@ -425,8 +426,9 @@ void InteractiveOutputTestCase::TestStandardPaths()
#undef TEST_VOLUME #undef TEST_VOLUME
#endif #endif
#include "wx/volume.h" #ifdef TEST_VOLUME
#include "wx/volume.h"
static const wxChar *volumeKinds[] = static const wxChar *volumeKinds[] =
{ {
wxT("floppy"), wxT("floppy"),
@ -437,6 +439,8 @@ static const wxChar *volumeKinds[] =
wxT("other volume"), wxT("other volume"),
}; };
#endif
void InteractiveOutputTestCase::TestFSVolume() void InteractiveOutputTestCase::TestFSVolume()
{ {
#ifdef TEST_VOLUME #ifdef TEST_VOLUME