From 8115f9e70ff034658e4564ffc13fe66e36481b1e Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 8 Aug 2002 21:41:16 +0000 Subject: [PATCH] Adapted to Unicode compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/filedlgg.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 086bb8f0cb..87eab5073c 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -409,8 +409,8 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) } #endif - struct stat buff; - wxStat( m_fileName.fn_str(), &buff ); + wxStructStat buff; + wxStat( m_fileName, &buff ); #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS)) struct stat lbuff; @@ -437,10 +437,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname ) m_year = t->tm_year; m_year += 1900; - m_permissions.sprintf( wxT("%c%c%c"), - ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')), - ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')), - ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) ); + char buffer[10]; + sprintf( buffer, "%c%c%c", + ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? 'r' : '-'), + ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? 'w' : '-'), + ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? 'x' : '-') ); +#if wxUSE_UNICODE + m_permissions = wxConvUTF8.cMB2WC( buffer ); +#else + m_permissions = buffer; +#endif + +// m_permissions.sprintf( wxT("%c%c%c"), +// ((( buff.st_mode & S_IRUSR ) == S_IRUSR ) ? wxT('r') : wxT('-')), +// ((( buff.st_mode & S_IWUSR ) == S_IWUSR ) ? wxT('w') : wxT('-')), +// ((( buff.st_mode & S_IXUSR ) == S_IXUSR ) ? wxT('x') : wxT('-')) ); } wxString wxFileData::GetName() const