Removed redundant DoEnable

[wxWidgets.git] / tests / filekind / filekind.cpp

diff --git a/tests/filekind/filekind.cpp b/tests/filekind/filekind.cpp
index 7cb6aa38ca4ef9538af03ab8675a8fed50b5ce34..a7d81f81a45a6efbc5c33cdd807c01ec9255b39b 100644 (file)
--- a/tests/filekind/filekind.cpp
+++ b/tests/filekind/filekind.cpp
@@ -4,7 +4,7 @@
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Mike Wetherell
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Mike Wetherell

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #include "testprec.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "testprec.h"


@@ -18,6 +18,8 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if wxUSE_STREAMS
+

 #ifdef __UNIX__
     #include <sys/socket.h>
 #endif
 #ifdef __UNIX__
     #include <sys/socket.h>
 #endif


@@ -30,7 +32,11 @@
 #include "wx/sckstrm.h"
 #include "wx/mstream.h"
 
 #include "wx/sckstrm.h"
 #include "wx/mstream.h"
 

-#if wxUSE_STREAMS
+#ifdef __VISUALC__
+    #define isatty _isatty
+    #define fdopen _fdopen
+    #define fileno _fileno
+#endif

 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case


@@ -47,7 +53,9 @@ class FileKindTestCase : public CppUnit::TestCase
 #endif
         CPPUNIT_TEST(Stdin);
         CPPUNIT_TEST(MemoryStream);
 #endif
         CPPUNIT_TEST(Stdin);
         CPPUNIT_TEST(MemoryStream);

+#if wxUSE_SOCKETS

         CPPUNIT_TEST(SocketStream);
         CPPUNIT_TEST(SocketStream);

+#endif

     CPPUNIT_TEST_SUITE_END();
 
     void File();
     CPPUNIT_TEST_SUITE_END();
 
     void File();


@@ -55,7 +63,9 @@ class FileKindTestCase : public CppUnit::TestCase
     void Socket();
     void Stdin();
     void MemoryStream();
     void Socket();
     void Stdin();
     void MemoryStream();

+#if wxUSE_SOCKETS

     void SocketStream();
     void SocketStream();

+#endif

 
     void TestFILE(wxFFile& file, bool expected);
     void TestFd(wxFile& file, bool expected);
 
     void TestFILE(wxFFile& file, bool expected);
     void TestFd(wxFile& file, bool expected);


@@ -103,7 +113,7 @@ void FileKindTestCase::File()
 {
     TempFile tmp; // put first
     wxFile file;
 {
     TempFile tmp; // put first
     wxFile file;

-    tmp.m_name = wxFileName::CreateTempFileName(_T("wxft"), &file);
+    tmp.m_name = wxFileName::CreateTempFileName(wxT("wxft"), &file);

     TestFd(file, true);
     file.Close();
 
     TestFd(file, true);
     file.Close();
 


@@ -196,7 +206,7 @@ void FileKindTestCase::Stdin()
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(FileKindTestCase);
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(FileKindTestCase);
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FileKindTestCase, "FileKindTestCase");
 
 #endif // wxUSE_STREAMS
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(FileKindTestCase, "FileKindTestCase");
 
 #endif // wxUSE_STREAMS