X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/099d4217df87a8b84e514c3c31550d21a8d2b8c2..851b3a889f69c33b8a94bf9c626141b7f1cadbbb:/src/generic/filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 1bb598fe6c..1d6430340f 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -254,7 +254,7 @@ wxFileIconsTable::wxFileIconsTable() :
 
 static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
 {
-    wxImage small(16, 16);
+    wxImage smallimg (16, 16);
     unsigned char *p1, *p2, *ps;
     unsigned char mr = img.GetMaskRed(),
                   mg = img.GetMaskGreen(),
@@ -263,8 +263,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
     unsigned x, y;
     unsigned sr, sg, sb, smask;
 
-    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
-    small.SetMaskColour(mr, mr, mr);
+    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData();
+    smallimg.SetMaskColour(mr, mr, mr);
 
     for (y = 0; y < 16; y++)
     {
@@ -297,7 +297,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         p1 += 32 * 3, p2 += 32 * 3;
     }
 
-    return wxBitmap(small);
+    return wxBitmap(smallimg);
 }
 
 // finds empty borders and return non-empty area of image:
@@ -366,16 +366,11 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
-#ifdef __WIN32__
-    wxBitmap myBitmap (ic.GetWidth(), ic.GetHeight() ) ;
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.DrawIcon(ic,0,0);
-    memDC.SelectObject( wxNullBitmap );
-    wxImage img = myBitmap.ConvertToImage();
-#else
-    wxImage img = ic.ConvertToImage();
-#endif
+    
+    wxBitmap tmpBmp;
+    tmpBmp.CopyFromIcon(ic);
+    wxImage img = tmpBmp.ConvertToImage();
+    
     delete ft;
 
     int id = m_ImageList.GetImageCount();
@@ -445,33 +440,29 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     if (name.length() == 2 && name[1u] == wxT(':'))
     {
         m_isDir = TRUE;
-        m_isExe = m_isLink = FALSE;
+        m_isExe =
+        m_isLink = FALSE;
         m_size = 0;
         return;
     }
-#endif
+#endif // __DOS__ || __WINDOWS__
 
     wxStructStat buff;
-    wxStat( m_fileName, &buff );
 
 #if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
-    struct stat lbuff;
-    lstat( m_fileName.fn_str(), &lbuff );
-    m_isLink = S_ISLNK( lbuff.st_mode );
-    struct tm *t = localtime( &lbuff.st_mtime );
-#else
+    lstat( m_fileName.fn_str(), &buff );
+    m_isLink = S_ISLNK( buff.st_mode );
+#else // no lstat()
+    wxStat( m_fileName, &buff );
     m_isLink = FALSE;
-    struct tm *t = localtime( &buff.st_mtime );
 #endif
 
-//  struct passwd *user = getpwuid( buff.st_uid );
-//  struct group *grp = getgrgid( buff.st_gid );
-
-    m_isDir = S_ISDIR( buff.st_mode );
-    m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
+    m_isDir = (buff.st_mode & S_IFDIR) != 0;
+    m_isExe = (buff.st_mode & wxS_IXUSR) != 0;
 
     m_size = buff.st_size;
 
+    const struct tm * const t = localtime( &buff.st_mtime );
     m_hour = t->tm_hour;
     m_minute = t->tm_min;
     m_month = t->tm_mon+1;
@@ -479,21 +470,10 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     m_year = t->tm_year;
     m_year += 1900;
 
-    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('-')) );
+    m_permissions.Printf(_T("%c%c%c"),
+                         buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'),
+                         buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'),
+                         buff.st_mode & wxS_IXUSR ? _T('x') : _T('-'));
 }
 
 wxString wxFileData::GetName() const
@@ -1307,13 +1287,13 @@ void wxFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
         // not get the file whose name they typed.
         if (m_list->GetSelectedItemCount() > 0)
         {
-    	    long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
+            long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
                 wxLIST_STATE_SELECTED);
             while ( item != -1 )
-    	    {
+            {
                 m_list->SetItemState(item,0, wxLIST_STATE_SELECTED);
                 item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-    	    }
+            }
         }
     }
 }