corrected detection of wchar_t under Mac OS X/Darwin

[wxWidgets.git] / samples / console / console.cpp

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 240849422659bc198537faaef59a06508a04e090..715fb19d9f407c65543fa93c2250f614caaf5f53 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include <wx/defs.h>
+#include "wx/defs.h"
 
 #if wxUSE_GUI
     #error "This sample can't be compiled in GUI mode."
@@ -25,9 +25,9 @@
 
 #include <stdio.h>
 
-#include <wx/string.h>
-#include <wx/file.h>
-#include <wx/app.h>
+#include "wx/string.h"
+#include "wx/file.h"
+#include "wx/app.h"
 
 // without this pragma, the stupid compiler precompiles #defines below so that
 // changing them doesn't "take place" later!
@@ -44,7 +44,7 @@
 //#define TEST_ARRAYS
 //#define TEST_CHARSET
 //#define TEST_CMDLINE
-#define TEST_DATETIME
+//#define TEST_DATETIME
 //#define TEST_DIR
 //#define TEST_DLLLOADER
 //#define TEST_ENVIRON
@@ -52,6 +52,7 @@
 //#define TEST_FILE
 //#define TEST_FILECONF
 //#define TEST_FILENAME
+#define TEST_FILETIME
 //#define TEST_FTP
 //#define TEST_HASH
 //#define TEST_INFO_FUNCTIONS
@@ -76,7 +77,7 @@
 //#define TEST_ZLIB
 
 #ifdef TEST_SNGLINST
-    #include <wx/snglinst.h>
+    #include "wx/snglinst.h"
 #endif // TEST_SNGLINST
 
 // ----------------------------------------------------------------------------
@@ -134,7 +135,7 @@ static wxString MakePrintable(const wxChar *s)
 
 #ifdef TEST_CHARSET
 
-#include <wx/fontmap.h>
+#include "wx/fontmap.h"
 
 static void TestCharset()
 {
@@ -174,8 +175,8 @@ static void TestCharset()
 
 #ifdef TEST_CMDLINE
 
-#include <wx/cmdline.h>
-#include <wx/datetime.h>
+#include "wx/cmdline.h"
+#include "wx/datetime.h"
 
 static void ShowCmdLine(const wxCmdLineParser& parser)
 {
@@ -216,7 +217,7 @@ static void ShowCmdLine(const wxCmdLineParser& parser)
 
 #ifdef TEST_DIR
 
-#include <wx/dir.h>
+#include "wx/dir.h"
 
 #ifdef __UNIX__
     static const wxChar *ROOTDIR = _T("/");
@@ -348,7 +349,7 @@ static void TestDirTraverse()
 
 #ifdef TEST_DLLLOADER
 
-#include <wx/dynlib.h>
+#include "wx/dynlib.h"
 
 static void TestDllLoad()
 {
@@ -372,7 +373,7 @@ static void TestDllLoad()
     }
     else
     {
-        typedef int (*strlenType)(char *);
+        typedef int (*strlenType)(const char *);
         strlenType pfnStrlen = (strlenType)wxDllLoader::GetSymbol(dllHandle, FUNC_NAME);
         if ( !pfnStrlen )
         {
@@ -403,7 +404,7 @@ static void TestDllLoad()
 
 #ifdef TEST_ENVIRON
 
-#include <wx/utils.h>
+#include "wx/utils.h"
 
 static wxString MyGetEnv(const wxString& var)
 {
@@ -440,7 +441,7 @@ static void TestEnvironment()
 
 #ifdef TEST_EXECUTE
 
-#include <wx/utils.h>
+#include "wx/utils.h"
 
 static void TestExecute()
 {
@@ -507,9 +508,9 @@ static void TestExecute()
 
 #ifdef TEST_FILE
 
-#include <wx/file.h>
-#include <wx/ffile.h>
-#include <wx/textfile.h>
+#include "wx/file.h"
+#include "wx/ffile.h"
+#include "wx/textfile.h"
 
 static void TestFileRead()
 {
@@ -642,8 +643,8 @@ static void TestFileCopy()
 
 #ifdef TEST_FILECONF
 
-#include <wx/confbase.h>
-#include <wx/fileconf.h>
+#include "wx/confbase.h"
+#include "wx/fileconf.h"
 
 static const struct FileConfTestData
 {
@@ -705,7 +706,7 @@ static void TestFileConfRead()
 
 #ifdef TEST_FILENAME
 
-#include <wx/filename.h>
+#include "wx/filename.h"
 
 static struct FileNameInfo
 {
@@ -788,13 +789,55 @@ static void TestFileNameCwd()
 
 #endif // TEST_FILENAME
 
+// ----------------------------------------------------------------------------
+// wxFileName time functions
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_FILETIME
+
+#include <wx/filename.h>
+#include <wx/datetime.h>
+
+static void TestFileGetTimes()
+{
+    wxFileName fn(_T("testdata.fc"));
+
+    wxDateTime dtAccess, dtMod, dtChange;
+    if ( !fn.GetTimes(&dtAccess, &dtMod, &dtChange) )
+    {
+        wxPrintf(_T("ERROR: GetTimes() failed.\n"));
+    }
+    else
+    {
+        static const wxChar *fmt = _T("%Y-%b-%d %H:%M:%S");
+
+        wxPrintf(_T("File times for '%s':\n"), fn.GetFullPath().c_str());
+        wxPrintf(_T("Access:      \t%s\n"), dtAccess.Format(fmt).c_str());
+        wxPrintf(_T("Mod/creation:\t%s\n"), dtMod.Format(fmt).c_str());
+        wxPrintf(_T("Change:      \t%s\n"), dtChange.Format(fmt).c_str());
+    }
+}
+
+static void TestFileSetTimes()
+{
+    wxFileName fn(_T("testdata.fc"));
+
+    wxDateTime dtAccess, dtMod, dtChange;
+    if ( !fn.Touch() )
+    {
+        wxPrintf(_T("ERROR: Touch() failed.\n"));
+    }
+}
+
+#endif // TEST_FILETIME
+
 // ----------------------------------------------------------------------------
 // wxHashTable
 // ----------------------------------------------------------------------------
 
 #ifdef TEST_HASH
 
-#include <wx/hash.h>
+#include "wx/hash.h"
 
 struct Foo
 {
@@ -811,7 +854,7 @@ size_t Foo::count = 0;
 WX_DECLARE_LIST(Foo, wxListFoos);
 WX_DECLARE_HASH(Foo, wxListFoos, wxHashFoos);
 
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
 
 WX_DEFINE_LIST(wxListFoos);
 
@@ -880,10 +923,10 @@ static void TestHash()
 
 #ifdef TEST_LIST
 
-#include <wx/list.h>
+#include "wx/list.h"
 
 WX_DECLARE_LIST(Bar, wxListBars);
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxListBars);
 
 static void TestListCtor()
@@ -1213,7 +1256,7 @@ static void TestDefaultLang()
 
 #ifdef TEST_MIME
 
-#include <wx/mimetype.h>
+#include "wx/mimetype.h"
 
 static void TestMimeEnum()
 {
@@ -1362,7 +1405,36 @@ static void TestMimeAssociate()
 
 #ifdef TEST_INFO_FUNCTIONS
 
-#include <wx/utils.h>
+#include "wx/utils.h"
+
+static void TestDiskInfo()
+{
+    puts("*** Testing wxGetDiskSpace() ***");
+
+    for ( ;; )
+    {
+        char pathname[128];
+        printf("\nEnter a directory name: ");
+        if ( !fgets(pathname, WXSIZEOF(pathname), stdin) )
+            break;
+
+        // kill the last '\n'
+        pathname[strlen(pathname) - 1] = 0;
+
+        wxLongLong total, free;
+        if ( !wxGetDiskSpace(pathname, &total, &free) )
+        {
+            wxPuts(_T("ERROR: wxGetDiskSpace failed."));
+        }
+        else
+        {
+            wxPrintf(_T("%sKb total, %sKb free on '%s'.\n"),
+                    (total / 1024).ToString().c_str(),
+                    (free / 1024).ToString().c_str(),
+                    pathname);
+        }
+    }
+}
 
 static void TestOsInfo()
 {
@@ -1401,8 +1473,8 @@ static void TestUserInfo()
 
 #ifdef TEST_LONGLONG
 
-#include <wx/longlong.h>
-#include <wx/timer.h>
+#include "wx/longlong.h"
+#include "wx/timer.h"
 
 // make a 64 bit number from 4 16 bit ones
 #define MAKE_LL(x1, x2, x3, x4) wxLongLong((x1 << 16) | x2, (x3 << 16) | x3)
@@ -1410,6 +1482,17 @@ static void TestUserInfo()
 // get a random 64 bit number
 #define RAND_LL()   MAKE_LL(rand(), rand(), rand(), rand())
 
+static const long testLongs[] =
+{
+    0,
+    1,
+    -1,
+    LONG_MAX,
+    LONG_MIN,
+    0x1234,
+    -0x1234
+};
+
 #if wxUSE_LONGLONG_WX
 inline bool operator==(const wxLongLongWx& a, const wxLongLongNative& b)
     { return a.GetHi() == b.GetHi() && a.GetLo() == b.GetLo(); }
@@ -1635,17 +1718,6 @@ static void TestLongLongComparison()
 #if wxUSE_LONGLONG_WX
     puts("*** Testing wxLongLong comparison ***\n");
 
-    static const long testLongs[] =
-    {
-        0,
-        1,
-        -1,
-        LONG_MAX,
-        LONG_MIN,
-        0x1234,
-        -0x1234
-    };
-
     static const long ls[2] =
     {
         0x1234,
@@ -1654,7 +1726,7 @@ static void TestLongLongComparison()
 
     wxLongLongWx lls[2];
     lls[0] = ls[0];
-    lls[1] = ls[1]; 
+    lls[1] = ls[1];
 
     for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
     {
@@ -1681,6 +1753,23 @@ static void TestLongLongComparison()
 #endif // wxUSE_LONGLONG_WX
 }
 
+static void TestLongLongPrint()
+{
+    wxPuts(_T("*** Testing wxLongLong printing ***\n"));
+
+    for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
+    {
+        wxLongLong ll = testLongs[n];
+        wxPrintf(_T("%ld == %s\n"), testLongs[n], ll.ToString().c_str());
+    }
+
+    wxLongLong ll(0x12345678, 0x87654321);
+    wxPrintf(_T("0x1234567887654321 = %s\n"), ll.ToString().c_str());
+
+    ll.Negate();
+    wxPrintf(_T("-0x1234567887654321 = %s\n"), ll.ToString().c_str());
+}
+
 #undef MAKE_LL
 #undef RAND_LL
 
@@ -1717,7 +1806,7 @@ static void TestPathList()
 
 #ifdef TEST_REGEX
 
-#include <wx/regex.h>
+#include "wx/regex.h"
 
 static void TestRegExCompile()
 {
@@ -1944,8 +2033,8 @@ static void TestRegExInteractive()
 
 #ifdef TEST_REGCONF
 
-#include <wx/confbase.h>
-#include <wx/msw/regconf.h>
+#include "wx/confbase.h"
+#include "wx/msw/regconf.h"
 
 static void TestRegConfWrite()
 {
@@ -1957,7 +2046,7 @@ static void TestRegConfWrite()
 
 #ifdef TEST_REGISTRY
 
-#include <wx/msw/registry.h>
+#include "wx/msw/registry.h"
 
 // I chose this one because I liked its name, but it probably only exists under
 // NT
@@ -2066,9 +2155,9 @@ static void TestRegistryAssociation()
 
 #ifdef TEST_SOCKETS
 
-#include <wx/socket.h>
-#include <wx/protocol/protocol.h>
-#include <wx/protocol/http.h>
+#include "wx/socket.h"
+#include "wx/protocol/protocol.h"
+#include "wx/protocol/http.h"
 
 static void TestSocketServer()
 {
@@ -2198,7 +2287,7 @@ static void TestSocketClient()
 
 #ifdef TEST_FTP
 
-#include <wx/protocol/ftp.h>
+#include "wx/protocol/ftp.h"
 
 static wxFTP ftp;
 
@@ -2522,8 +2611,8 @@ static void TestFtpUpload()
 
 #ifdef TEST_STREAMS
 
-#include <wx/wfstream.h>
-#include <wx/mstream.h>
+#include "wx/wfstream.h"
+#include "wx/mstream.h"
 
 static void TestFileStream()
 {
@@ -2575,8 +2664,8 @@ static void TestMemoryStream()
 
 #ifdef TEST_TIMER
 
-#include <wx/timer.h>
-#include <wx/utils.h>
+#include "wx/timer.h"
+#include "wx/utils.h"
 
 static void TestStopWatch()
 {
@@ -2625,7 +2714,7 @@ static void TestStopWatch()
 
 #ifdef TEST_VCARD
 
-#include <wx/vcard.h>
+#include "wx/vcard.h"
 
 static void DumpVObject(size_t level, const wxVCardObject& vcard)
 {
@@ -2867,10 +2956,10 @@ static void TestVCardWrite()
 
 #ifdef TEST_WCHAR
 
-#include <wx/strconv.h>
-#include <wx/fontenc.h>
-#include <wx/encconv.h>
-#include <wx/buffer.h>
+#include "wx/strconv.h"
+#include "wx/fontenc.h"
+#include "wx/encconv.h"
+#include "wx/buffer.h"
 
 static void TestUtf8()
 {
@@ -3006,8 +3095,8 @@ static void TestZipFileSystem()
 
 #ifdef TEST_ZLIB
 
-#include <wx/zstream.h>
-#include <wx/wfstream.h>
+#include "wx/zstream.h"
+#include "wx/wfstream.h"
 
 static const wxChar *FILENAME_GZ = _T("test.gz");
 static const char *TEST_DATA = "hello and hello again";
@@ -3060,9 +3149,8 @@ static void TestZlibStreamRead()
 
 #include <math.h>
 
-#include <wx/date.h>
-
-#include <wx/datetime.h>
+#include "wx/date.h"
+#include "wx/datetime.h"
 
 // the test data
 struct Date
@@ -4094,7 +4182,7 @@ static void TestTimeCompatibility()
 
 #ifdef TEST_THREADS
 
-#include <wx/thread.h>
+#include "wx/thread.h"
 
 static size_t gs_counter = (size_t)-1;
 static wxCriticalSection gs_critsect;
@@ -4858,13 +4946,17 @@ int main(int argc, char **argv)
 #ifdef TEST_CMDLINE
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
+        { wxCMD_LINE_SWITCH, _T("h"), _T("help"), "show this help message",
+            wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
         { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
         { wxCMD_LINE_SWITCH, "q", "quiet",   "be quiet" },
 
         { wxCMD_LINE_OPTION, "o", "output",  "output file" },
         { wxCMD_LINE_OPTION, "i", "input",   "input dir" },
-        { wxCMD_LINE_OPTION, "s", "size",    "output block size", wxCMD_LINE_VAL_NUMBER },
-        { wxCMD_LINE_OPTION, "d", "date",    "output file date", wxCMD_LINE_VAL_DATE },
+        { wxCMD_LINE_OPTION, "s", "size",    "output block size",
+            wxCMD_LINE_VAL_NUMBER },
+        { wxCMD_LINE_OPTION, "d", "date",    "output file date",
+            wxCMD_LINE_VAL_DATE },
 
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file",
             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
@@ -5028,6 +5120,11 @@ int main(int argc, char **argv)
     }
 #endif // TEST_FILENAME
 
+#ifdef TEST_FILETIME
+    TestFileGetTimes();
+    TestFileSetTimes();
+#endif // TEST_FILETIME
+
 #ifdef TEST_FTP
     wxLog::AddTraceMask(FTP_TRACE_MASK);
     if ( TestFtpConnect() )
@@ -5084,8 +5181,9 @@ int main(int argc, char **argv)
         TestAddition();
         TestLongLongConversion();
         TestBitOperations();
+        TestLongLongComparison();
     }
-    TestLongLongComparison();
+    TestLongLongPrint();
 #endif // TEST_LONGLONG
 
 #ifdef TEST_HASH
@@ -5105,8 +5203,12 @@ int main(int argc, char **argv)
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
-    TestOsInfo();
-    TestUserInfo();
+    TestDiskInfo();
+    if ( 0 )
+    {
+        TestOsInfo();
+        TestUserInfo();
+    }
 #endif // TEST_INFO_FUNCTIONS
 
 #ifdef TEST_PATHLIST