Applied BMP patch.

Applied deferred wxBitmapButton patch.
  Added error checking to wxFileStream and wxFFileStream.
  Corrected activate event things.

  All these patches work in the stable branch, the
   dev-branch does not currently compile.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-04-22 10:20:56 +00:00
parent b06a6b20d5
commit 942bef71b0
5 changed files with 109 additions and 60 deletions

View File

@@ -48,19 +48,6 @@
#include "wx/msw/winundef.h"
#endif
// at least some of these are required for file mod time
#ifdef __WXGTK__
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <pwd.h>
#ifndef __VMS
# include <grp.h>
#endif
# include <time.h>
#include <unistd.h>
#endif
// ============================================================================
// implementation
// ============================================================================
@@ -167,24 +154,8 @@ bool wxFileName::DirExists( const wxString &dir )
wxDateTime wxFileName::GetModificationTime()
{
#ifdef __WXGTK__
struct stat buff;
stat( GetFullName().fn_str(), &buff );
wxDateTime ret( wxFileModificationTime( GetFullPath() ) );
#if !defined( __EMX__ ) && !defined(__VMS)
struct stat lbuff;
lstat( GetFullName().fn_str(), &lbuff );
struct tm *t = localtime( &lbuff.st_mtime );
#else
struct tm *t = localtime( &buff.st_mtime );
#endif
wxDateTime ret( t->tm_mday, (wxDateTime::Month)t->tm_mon, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec );
#else
wxDateTime ret = wxDateTime::Now();
#endif
return ret;
}
@@ -607,7 +578,7 @@ wxString wxFileName::GetLongPath() const
s_triedToLoad = TRUE;
wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
short avoidCompilerWarning = 0;
short avoidCompilerWarning = 0;
if ( avoidCompilerWarning ) // dllKernel )
{
// may succeed or fail depending on the Windows version