Fix bug in Unix wxFileSystemWatcher implementation when watch is deleted.

[wxWidgets.git] / tests / mbconv / convautotest.cpp

diff --git a/tests/mbconv/convautotest.cpp b/tests/mbconv/convautotest.cpp
index 4bb22253acd97f745f8b1e534e38ce3cb13cc3f9..85eac6a5bc248c76876259ea14600b48d364261a 100644 (file)
--- a/tests/mbconv/convautotest.cpp
+++ b/tests/mbconv/convautotest.cpp
@@ -17,6 +17,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_UNICODE
+

 #include "wx/convauto.h"
 
 #include "wx/mstream.h"
 #include "wx/convauto.h"
 
 #include "wx/mstream.h"


@@ -54,7 +56,7 @@ private:
     //
     // the length of the string may need to be passed explicitly if it has
     // embedded NULs, otherwise it's not necessary
     //
     // the length of the string may need to be passed explicitly if it has
     // embedded NULs, otherwise it's not necessary

-    void TestFirstChar(const char *src, wchar_t wch, int len = wxNO_LEN);
+    void TestFirstChar(const char *src, wchar_t wch, size_t len = wxNO_LEN);

 
     void Empty();
     void Short();
 
     void Empty();
     void Short();


@@ -82,14 +84,14 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(ConvAutoTestCase);
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(ConvAutoTestCase);
 

-// 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(ConvAutoTestCase, "ConvAutoTestCase");
 
 // ----------------------------------------------------------------------------
 // tests
 // ----------------------------------------------------------------------------
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ConvAutoTestCase, "ConvAutoTestCase");
 
 // ----------------------------------------------------------------------------
 // tests
 // ----------------------------------------------------------------------------
 

-void ConvAutoTestCase::TestFirstChar(const char *src, wchar_t wch, int len)
+void ConvAutoTestCase::TestFirstChar(const char *src, wchar_t wch, size_t len)

 {
     wxWCharBuffer wbuf = wxConvAuto().cMB2WC(src, len, NULL);
     CPPUNIT_ASSERT( wbuf );
 {
     wxWCharBuffer wbuf = wxConvAuto().cMB2WC(src, len, NULL);
     CPPUNIT_ASSERT( wbuf );


@@ -208,3 +210,5 @@ void ConvAutoTestCase::StreamUTF32BE()
                    "\0\0\x03\xB2",
                    20, line1, line2);
 }
                    "\0\0\x03\xB2",
                    20, line1, line2);
 }

+
+#endif // wxUSE_UNICODE