1. wxShell fixes: now really uses shell (it wasn't different from wxExecute!)

and also added a version which captures the programs output
2. fix for compilers which have void ftime() (my mingw does) in timercmn.cpp
3. updated console sample to test wxShell/wxExecute
4. treetest now can toggle images or change their size
5. wxTreeCtrl doesn't crash if it has no image list


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-03-03 10:31:34 +00:00
parent 914589c26c
commit 2c8e47380e
13 changed files with 380 additions and 204 deletions

View File

@@ -224,11 +224,16 @@ long wxGetUTCTime()
if (t0 != (time_t)-1 )
return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
wxLogSysError(_("Failed 2nd mktime"));
wxLogSysError(_("mktime() failed"));
}
else
{
wxLogSysError(_("gmtime() failed"));
}
wxLogSysError(_("Failed gmtime"));
}
wxLogSysError(_("Failed to get the UTC system time"));
wxLogError(_("Failed to get the UTC system time."));
return -1;
}
@@ -248,14 +253,15 @@ wxLongLong wxGetLocalTimeMillis()
val *= tp.tv_sec;
return (val + (tp.tv_usec / 1000));
}
return 0;
return 0;
#elif defined(HAVE_FTIME)
struct timeb tp;
if ( ftime(&tp) == 0 )
{
val *= tp.time;
return (val + tp.millitm);
}
// ftime() is void and not int in some mingw32 headers, so don't test the
// return code (well, it shouldn't fail anyhow...)
(void)ftime(&tp);
val *= tp.time;
return (val + tp.millitm);
#else
// We use wxGetLocalTime() to get the seconds since
// 00:00:00 Jan 1st 1970 and then whatever is available
@@ -279,6 +285,5 @@ wxLongLong wxGetLocalTimeMillis()
#endif
return val;
#endif
}