small warning+PCH fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index a45a5db035182cdc92af6233e989d9905f5e3582..dee7cd081ce378975b4de7d04379a551e84e180a 100644 (file)
--- a/tests/filename/filenametest.cpp
+++ b/tests/filename/filenametest.cpp
@@ -596,7 +596,7 @@ void FileNameTestCase::TestCreateTempFileName()
 #ifdef __WXMSW__
         { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true },
         { "c:\\a\\directory\\which\\does\\not\\exist", "", false },
 #ifdef __WXMSW__
         { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true },
         { "c:\\a\\directory\\which\\does\\not\\exist", "", false },

-#else if defined( __UNIX__ )
+#elif defined( __UNIX__ )

         { "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true },
         { "/tmp/foo", "/tmp", true },
         { "/tmp/a/directory/which/does/not/exist", "", false },
         { "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true },
         { "/tmp/foo", "/tmp", true },
         { "/tmp/a/directory/which/does/not/exist", "", false },

diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
index 308d2427b76298e75707c9499657aa8b9ebec958..4c33078b9f2d6740acce95515aa68a5df95c6d14 100644 (file)
--- a/tests/interactive/output.cpp
+++ b/tests/interactive/output.cpp
@@ -21,6 +21,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #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/wxchar.h"      // wxPrintf
 
 #include "wx/stdpaths.h"
 #include "wx/wxchar.h"      // wxPrintf
 


@@ -425,8 +426,9 @@ void InteractiveOutputTestCase::TestStandardPaths()
     #undef TEST_VOLUME
 #endif
 
     #undef TEST_VOLUME
 #endif
 

-#include "wx/volume.h"
+#ifdef TEST_VOLUME

 
 

+#include "wx/volume.h"

 static const wxChar *volumeKinds[] =
 {
     wxT("floppy"),
 static const wxChar *volumeKinds[] =
 {
     wxT("floppy"),


@@ -437,6 +439,8 @@ static const wxChar *volumeKinds[] =
     wxT("other volume"),
 };
 
     wxT("other volume"),
 };
 

+#endif
+

 void InteractiveOutputTestCase::TestFSVolume()
 {
 #ifdef TEST_VOLUME
 void InteractiveOutputTestCase::TestFSVolume()
 {
 #ifdef TEST_VOLUME