Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for wxUSE_MIMETYPE==0 and fixes for compilation of generic wxFiledialog under DOS/Watcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-12-07 22:47:09 +00:00
parent 17386f5322
commit 4894ae18fc
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/generic/filedlgg.cpp
View File

@@ -22,8 +22,8 @@
#if wxUSE_FILEDLG #if wxUSE_FILEDLG
#ifndef __UNIX__ #if !defined(__UNIX__) && !defined(__DOS__)
#error wxFileDialog currently only supports unix #error wxFileDialog currently only supports Unix and DOS
#endif #endif
#include "wx/checkbox.h" #include "wx/checkbox.h"
@@ -52,11 +52,19 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h>
#include <pwd.h> #ifdef __UNIX__
#ifndef __VMS #include <dirent.h>
# include <grp.h> #include <pwd.h>
#ifndef __VMS
# include <grp.h>
#endif
#endif #endif
#ifdef __WATCOMC__
#include <direct.h>
#endif
# include <time.h> # include <time.h>
#include <unistd.h> #include <unistd.h>
@@ -300,6 +308,7 @@ static wxImage CutEmptyBorders(const wxImage& img)
int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime) int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
{ {
#if wxUSE_MIMETYPE
if (!extension.IsEmpty()) if (!extension.IsEmpty())
{ {
wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension); wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
@@ -331,6 +340,14 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
} }
m_HashTable.Put(extension, new wxFileIconEntry(id)); m_HashTable.Put(extension, new wxFileIconEntry(id));
return id; return id;
#else // !wxUSE_MIMETYPE
if (extension == wxT("exe"))
return FI_EXECUTABLE;
else
return FI_UNKNOWN;
#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
} }
@@ -365,7 +382,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
struct stat buff; struct stat buff;
stat( m_fileName.fn_str(), &buff ); stat( m_fileName.fn_str(), &buff );
#if !defined( __EMX__ ) && !defined(__VMS) #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
struct stat lbuff; struct stat lbuff;
lstat( m_fileName.fn_str(), &lbuff ); lstat( m_fileName.fn_str(), &lbuff );
m_isLink = S_ISLNK( lbuff.st_mode ); m_isLink = S_ISLNK( lbuff.st_mode );