X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b5e5f48053ab30f80367a2f5b32834260080ab6..20bfc1c29fbaa99564e5e7150270965190a701f2:/src/generic/filedlgg.cpp
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 0d3d25fd0f..83a751a5bb 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -135,12 +135,10 @@ int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
}
-#if defined(__UNIX__) && !defined(__OS2__)
-#define IsTopMostDir(dir) (dir == wxT("/"))
-#endif
-
#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
#define IsTopMostDir(dir) (dir.empty())
+#else
+#define IsTopMostDir(dir) (dir == wxT("/"))
#endif
// defined in src/generic/dirctrlg.cpp
@@ -263,7 +261,7 @@ wxString wxFileData::GetFileType() const
return _("");
else if (IsDrive())
return _("");
- else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
+ else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
return m_fileName.AfterLast(wxT('.'));
return wxEmptyString;
@@ -320,7 +318,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
break;
case FileList_Time:
- if (!IsDrive())
+ if (!IsDrive())
s = GetModificationTime();
break;
@@ -536,7 +534,7 @@ void wxFileCtrl::UpdateFiles()
#endif // __UNIX__
wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;
}
@@ -565,7 +563,7 @@ void wxFileCtrl::UpdateFiles()
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;
@@ -583,7 +581,7 @@ void wxFileCtrl::UpdateFiles()
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;