X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb8351273293517a8ba01cc0f9b9f5b5560d8d95..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 8a9a0705c6..b996573935 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -110,7 +110,6 @@ #define TEST_DIR #define TEST_DYNLIB #define TEST_ENVIRON - #define TEST_EXECUTE #define TEST_FILE #define TEST_FILECONF #define TEST_FILENAME @@ -135,7 +134,6 @@ #define TEST_TEXTSTREAM #define TEST_THREADS #define TEST_TIMER - // #define TEST_VCARD -- don't enable this (VZ) // #define TEST_VOLUME --FIXME! (RN) #define TEST_WCHAR #define TEST_ZIP @@ -575,93 +573,6 @@ static void TestEnvironment() #endif // TEST_ENVIRON -// ---------------------------------------------------------------------------- -// wxExecute -// ---------------------------------------------------------------------------- - -#ifdef TEST_EXECUTE - -#include "wx/utils.h" - -static void TestExecute() -{ - wxPuts(_T("*** testing wxExecute ***")); - -#ifdef __UNIX__ - #define COMMAND "echo hi" - #define ASYNC_COMMAND "xclock" - #define SHELL_COMMAND "echo hi from shell" - #define REDIRECT_COMMAND "cat -n Makefile" -#elif defined(__WXMSW__) - #define COMMAND "command.com /c echo hi" - #define ASYNC_COMMAND "notepad" - #define SHELL_COMMAND "echo hi" - #define REDIRECT_COMMAND COMMAND -#else - #error "no command to exec" -#endif // OS - - wxPrintf(_T("Testing wxShell: ")); - fflush(stdout); - if ( wxShell(_T(SHELL_COMMAND)) ) - wxPuts(_T("Ok.")); - else - wxPuts(_T("ERROR.")); - - wxPrintf(_T("Testing wxExecute: ")); - fflush(stdout); - if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 ) - wxPuts(_T("Ok.")); - else - wxPuts(_T("ERROR.")); - - wxPrintf(_T("Testing async wxExecute: ")); - fflush(stdout); - int pid = wxExecute(ASYNC_COMMAND); - if ( pid != 0 ) - { - wxPuts(_T("Ok (command launched).")); - if ( wxKill(pid) == -1 ) - wxPuts("ERROR: failed to kill child process."); - } - else - wxPuts(_T("ERROR.")); - - wxPrintf(_T("Testing wxExecute with redirection:\n")); - wxArrayString output; - if ( wxExecute(_T(REDIRECT_COMMAND), output) != 0 ) - { - wxPuts(_T("ERROR.")); - } - else - { - // don't show too much output, MAX_LINES is enough - static const unsigned MAX_LINES = 20; - - const unsigned count = output.size(); - for ( unsigned n = 0; - n < (count > MAX_LINES ? MAX_LINES/2 : count); - n++ ) - { - wxPrintf("%04u:\t%s\n", n + 1, output[n]); - } - - if ( count > MAX_LINES ) - { - wxPrintf("... skipping %u lines...\n", count - MAX_LINES); - - for ( unsigned n = count - MAX_LINES/2; n < count; n++ ) - { - wxPrintf("%04u:\t%s\n", n + 1, output[n]); - } - } - - wxPuts(_T("Ok.")); - } -} - -#endif // TEST_EXECUTE - // ---------------------------------------------------------------------------- // file // ---------------------------------------------------------------------------- @@ -1760,7 +1671,7 @@ static void TestRegExInteractive() #undef wxPrintf #undef wxSprintf - // NB: do _not_ use ATTRIBUTE_PRINTF here, we have some invalid formats + // NB: do _not_ use WX_ATTRIBUTE_PRINTF here, we have some invalid formats // in the tests below int wxPrintf( const wxChar *format, ... ); int wxSprintf( wxChar *str, const wxChar *format, ... ); @@ -2455,6 +2366,7 @@ static void TestSocketClient() #ifdef TEST_FTP #include "wx/protocol/ftp.h" +#include "wx/protocol/log.h" #define FTP_ANONYMOUS @@ -3026,248 +2938,6 @@ void TestTimer() #endif // TEST_TIMER -// ---------------------------------------------------------------------------- -// vCard support -// ---------------------------------------------------------------------------- - -#ifdef TEST_VCARD - -#include "wx/vcard.h" - -static void DumpVObject(size_t level, const wxVCardObject& vcard) -{ - void *cookie; - wxVCardObject *vcObj = vcard.GetFirstProp(&cookie); - while ( vcObj ) - { - wxPrintf(_T("%s%s"), - wxString(_T('\t'), level).c_str(), - vcObj->GetName().c_str()); - - wxString value; - switch ( vcObj->GetType() ) - { - case wxVCardObject::String: - case wxVCardObject::UString: - { - wxString val; - vcObj->GetValue(&val); - value << _T('"') << val << _T('"'); - } - break; - - case wxVCardObject::Int: - { - unsigned int i; - vcObj->GetValue(&i); - value.Printf(_T("%u"), i); - } - break; - - case wxVCardObject::Long: - { - unsigned long l; - vcObj->GetValue(&l); - value.Printf(_T("%lu"), l); - } - break; - - case wxVCardObject::None: - break; - - case wxVCardObject::Object: - value = _T(""); - break; - - default: - value = _T(""); - } - - if ( !!value ) - wxPrintf(_T(" = %s"), value.c_str()); - wxPutchar('\n'); - - DumpVObject(level + 1, *vcObj); - - delete vcObj; - vcObj = vcard.GetNextProp(&cookie); - } -} - -static void DumpVCardAddresses(const wxVCard& vcard) -{ - wxPuts(_T("\nShowing all addresses from vCard:\n")); - - size_t nAdr = 0; - void *cookie; - wxVCardAddress *addr = vcard.GetFirstAddress(&cookie); - while ( addr ) - { - wxString flagsStr; - int flags = addr->GetFlags(); - if ( flags & wxVCardAddress::Domestic ) - { - flagsStr << _T("domestic "); - } - if ( flags & wxVCardAddress::Intl ) - { - flagsStr << _T("international "); - } - if ( flags & wxVCardAddress::Postal ) - { - flagsStr << _T("postal "); - } - if ( flags & wxVCardAddress::Parcel ) - { - flagsStr << _T("parcel "); - } - if ( flags & wxVCardAddress::Home ) - { - flagsStr << _T("home "); - } - if ( flags & wxVCardAddress::Work ) - { - flagsStr << _T("work "); - } - - wxPrintf(_T("Address %u:\n") - "\tflags = %s\n" - "\tvalue = %s;%s;%s;%s;%s;%s;%s\n", - ++nAdr, - flagsStr.c_str(), - addr->GetPostOffice().c_str(), - addr->GetExtAddress().c_str(), - addr->GetStreet().c_str(), - addr->GetLocality().c_str(), - addr->GetRegion().c_str(), - addr->GetPostalCode().c_str(), - addr->GetCountry().c_str() - ); - - delete addr; - addr = vcard.GetNextAddress(&cookie); - } -} - -static void DumpVCardPhoneNumbers(const wxVCard& vcard) -{ - wxPuts(_T("\nShowing all phone numbers from vCard:\n")); - - size_t nPhone = 0; - void *cookie; - wxVCardPhoneNumber *phone = vcard.GetFirstPhoneNumber(&cookie); - while ( phone ) - { - wxString flagsStr; - int flags = phone->GetFlags(); - if ( flags & wxVCardPhoneNumber::Voice ) - { - flagsStr << _T("voice "); - } - if ( flags & wxVCardPhoneNumber::Fax ) - { - flagsStr << _T("fax "); - } - if ( flags & wxVCardPhoneNumber::Cellular ) - { - flagsStr << _T("cellular "); - } - if ( flags & wxVCardPhoneNumber::Modem ) - { - flagsStr << _T("modem "); - } - if ( flags & wxVCardPhoneNumber::Home ) - { - flagsStr << _T("home "); - } - if ( flags & wxVCardPhoneNumber::Work ) - { - flagsStr << _T("work "); - } - - wxPrintf(_T("Phone number %u:\n") - "\tflags = %s\n" - "\tvalue = %s\n", - ++nPhone, - flagsStr.c_str(), - phone->GetNumber().c_str() - ); - - delete phone; - phone = vcard.GetNextPhoneNumber(&cookie); - } -} - -static void TestVCardRead() -{ - wxPuts(_T("*** Testing wxVCard reading ***\n")); - - wxVCard vcard(_T("vcard.vcf")); - if ( !vcard.IsOk() ) - { - wxPuts(_T("ERROR: couldn't load vCard.")); - } - else - { - // read individual vCard properties - wxVCardObject *vcObj = vcard.GetProperty("FN"); - wxString value; - if ( vcObj ) - { - vcObj->GetValue(&value); - delete vcObj; - } - else - { - value = _T(""); - } - - wxPrintf(_T("Full name retrieved directly: %s\n"), value.c_str()); - - - if ( !vcard.GetFullName(&value) ) - { - value = _T(""); - } - - wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str()); - - // now show how to deal with multiply occurring properties - DumpVCardAddresses(vcard); - DumpVCardPhoneNumbers(vcard); - - // and finally show all - wxPuts(_T("\nNow dumping the entire vCard:\n") - "-----------------------------\n"); - - DumpVObject(0, vcard); - } -} - -static void TestVCardWrite() -{ - wxPuts(_T("*** Testing wxVCard writing ***\n")); - - wxVCard vcard; - if ( !vcard.IsOk() ) - { - wxPuts(_T("ERROR: couldn't create vCard.")); - } - else - { - // set some fields - vcard.SetName("Zeitlin", "Vadim"); - vcard.SetFullName("Vadim Zeitlin"); - vcard.SetOrganization("wxWidgets", "R&D"); - - // just dump the vCard back - wxPuts(_T("Entire vCard follows:\n")); - wxPuts(vcard.Write()); - } -} - -#endif // TEST_VCARD - // ---------------------------------------------------------------------------- // wxVolume tests // ---------------------------------------------------------------------------- @@ -4339,10 +4009,6 @@ int main(int argc, char **argv) TestEnvironment(); #endif // TEST_ENVIRON -#ifdef TEST_EXECUTE - TestExecute(); -#endif // TEST_EXECUTE - #ifdef TEST_FILECONF TestFileConfRead(); #endif // TEST_FILECONF @@ -4403,6 +4069,7 @@ int main(int argc, char **argv) // wxFTP cannot be a static variable as its ctor needs to access // wxWidgets internals after it has been initialized ftp = new wxFTP; + ftp->SetLog(new wxProtocolLog(FTP_TRACE_MASK)); if ( TestFtpConnect() ) { @@ -4543,11 +4210,6 @@ int main(int argc, char **argv) wxUsleep(3000); #endif // TEST_USLEEP -#ifdef TEST_VCARD - TestVCardRead(); - TestVCardWrite(); -#endif // TEST_VCARD - #ifdef TEST_VOLUME TestFSVolume(); #endif // TEST_VOLUME