using ordinary Show for popup windows as on MSW which activates it as well, I'll...

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

diff --git a/tests/uris/uris.cpp b/tests/uris/uris.cpp
index 66dd225ecb4f09c0aeb034631fcdadb97089a8df..ff892a2be7d4b63b60bc297073c8eef5a0a384bc 100644 (file)
--- a/tests/uris/uris.cpp
+++ b/tests/uris/uris.cpp
@@ -88,7 +88,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( URITestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( URITestCase );
 

-// 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( URITestCase, "URITestCase" );
 
 URITestCase::URITestCase()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( URITestCase, "URITestCase" );
 
 URITestCase::URITestCase()


@@ -327,6 +327,7 @@ void URITestCase::Unescaping()
     CPPUNIT_ASSERT_EQUAL( unescaped, wxURI::Unescape(escaped) );
 
 
     CPPUNIT_ASSERT_EQUAL( unescaped, wxURI::Unescape(escaped) );
 
 

+#if wxUSE_UNICODE

     escaped = "http://ru.wikipedia.org/wiki/"
               "%D0%A6%D0%B5%D0%BB%D0%BE%D0%B5_%D1%87%D0%B8%D1%81%D0%BB%D0%BE";
 
     escaped = "http://ru.wikipedia.org/wiki/"
               "%D0%A6%D0%B5%D0%BB%D0%BE%D0%B5_%D1%87%D0%B8%D1%81%D0%BB%D0%BE";
 


@@ -338,6 +339,7 @@ void URITestCase::Unescaping()
                             "\xD1\x87\xD0\xB8\xD1\x81\xD0\xBB\xD0\xBE"
                           ),
                           unescaped );
                             "\xD1\x87\xD0\xB8\xD1\x81\xD0\xBB\xD0\xBE"
                           ),
                           unescaped );

+#endif // wxUSE_UNICODE

 }
 
 void URITestCase::FileScheme()
 }
 
 void URITestCase::FileScheme()


@@ -409,7 +411,7 @@ void URITestCase::URLCompat()
         wxInputStream* is = urlProblem.GetInputStream();
         CPPUNIT_ASSERT(is != NULL);
 
         wxInputStream* is = urlProblem.GetInputStream();
         CPPUNIT_ASSERT(is != NULL);
 

-        wxFile fOut(_T("test.html"), wxFile::write);
+        wxFile fOut(wxT("test.html"), wxFile::write);

         wxASSERT(fOut.IsOpened());
 
         char buf[1001];
         wxASSERT(fOut.IsOpened());
 
         char buf[1001];