concentrating content and structure region calculations

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 214a64ddabeefc8babe619776bfd6069646f2123..83c51c893efc9b138dc180f3ebfd02d1be2c92e8 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,6 +1,6 @@
-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////

 // Name:        filedlgg.cpp
 // Name:        filedlgg.cpp

-// Purpose:     wxFileDialog
+// Purpose:     wxGenericFileDialog

 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/12/98
 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/12/98


@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "filedlgg.h"
 #endif
 
 #pragma implementation "filedlgg.h"
 #endif
 


@@ -22,8 +22,9 @@
 
 #if wxUSE_FILEDLG
 
 
 #if wxUSE_FILEDLG
 

-#if !defined(__UNIX__) && !defined(__DOS__)
-#error wxFileDialog currently only supports Unix and DOS
+// NOTE : it probably also supports MAC, untested
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
+#error wxGenericFileDialog currently only supports Unix, win32 and DOS

 #endif
 
 #include "wx/checkbox.h"
 #endif
 
 #include "wx/checkbox.h"


@@ -31,20 +32,21 @@
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"

-#include "wx/filedlg.h"

 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/intl.h"

-#include "wx/listctrl.h"

 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"
 #include "wx/tokenzr.h"
 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"
 #include "wx/tokenzr.h"

-#include "wx/mimetype.h"
-#include "wx/image.h"
-#include "wx/module.h"

 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"

+#include "wx/dir.h"
+#include "wx/artprov.h"
+#include "wx/file.h"        // for wxS_IXXX constants only
+#include "wx/filedlg.h"     // wxOPEN, wxSAVE...
+#include "wx/generic/filedlgg.h"
+#include "wx/generic/dirctrlg.h" // for wxFileIconsTable

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -61,492 +63,292 @@
     #endif
 #endif
 
     #endif
 #endif
 

+#ifdef __WINDOWS__
+    #include "wx/msw/wrapwin.h"
+    #include "wx/msw/mslu.h"
+#endif
+

 #ifdef __WATCOMC__
     #include <direct.h>
 #endif
 
 #ifdef __WATCOMC__
     #include <direct.h>
 #endif
 

-# include <time.h>
+#include <time.h>
+#if defined(__UNIX__) || defined(__DOS__)

 #include <unistd.h>
 #include <unistd.h>

-
-#ifndef __DOS__
-#include "wx/generic/home.xpm"

 #endif
 #endif

-#include "wx/generic/listview.xpm"
-#include "wx/generic/repview.xpm"
-#include "wx/generic/new_dir.xpm"
-#include "wx/generic/dir_up.xpm"
-#include "wx/generic/folder.xpm"
-#include "wx/generic/deffile.xpm"
-#include "wx/generic/exefile.xpm"
-
-//-----------------------------------------------------------------------------
-//  wxFileData
-//-----------------------------------------------------------------------------
-
-class wxFileData : public wxObject
-{
-private:
-    wxString m_name;
-    wxString m_fileName;
-    long     m_size;
-    int      m_hour;
-    int      m_minute;
-    int      m_year;
-    int      m_month;
-    int      m_day;
-    wxString m_permissions;
-    bool     m_isDir;
-    bool     m_isLink;
-    bool     m_isExe;
-
-public:
-    wxFileData() { }
-    wxFileData( const wxString &name, const wxString &fname );
-    wxString GetName() const;
-    wxString GetFullName() const;
-    wxString GetHint() const;
-    wxString GetEntry( int num );
-    bool IsDir();
-    bool IsLink();
-    bool IsExe();
-    long GetSize();
-    void MakeItem( wxListItem &item );
-    void SetNewName( const wxString &name, const wxString &fname );
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFileData);
-};
-
-//-----------------------------------------------------------------------------
-//  wxFileCtrl
-//-----------------------------------------------------------------------------
-
-class wxFileCtrl : public wxListCtrl
-{
-private:
-    wxString      m_dirName;
-    bool          m_showHidden;
-    wxString      m_wild;
-
-public:
-    wxFileCtrl();
-    wxFileCtrl( wxWindow *win,
-                wxWindowID id,
-                const wxString &dirName,
-                const wxString &wild,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_LIST,
-                const wxValidator &validator = wxDefaultValidator,
-                const wxString &name = wxT("filelist") );
-    void ChangeToListMode();
-    void ChangeToReportMode();
-    void ChangeToIconMode();
-    void ShowHidden( bool show = TRUE );
-    long Add( wxFileData *fd, wxListItem &item );
-    void Update();
-    virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
-    void MakeDir();
-    void GoToParentDir();
-    void GoToHomeDir();
-    void GoToDir( const wxString &dir );
-    void SetWild( const wxString &wild );
-    void GetDir( wxString &dir );
-    void OnListDeleteItem( wxListEvent &event );
-    void OnListDeleteAllItems( wxListEvent &event );
-    void OnListEndLabelEdit( wxListEvent &event );
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFileCtrl);
-    DECLARE_EVENT_TABLE()
-};

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// private classes - icons list management
+// private functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class wxFileIconEntry : public wxObject
+static
+int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data)

 {
 {

-public:
-    wxFileIconEntry(int i) { id = i; }
-
-    int id;
-};
-
+     wxFileData *fd1 = (wxFileData*)data1;
+     wxFileData *fd2 = (wxFileData*)data2;
+     if (fd1->GetFileName() == wxT("..")) return -data;
+     if (fd2->GetFileName() == wxT("..")) return data;
+     if (fd1->IsDir() && !fd2->IsDir()) return -data;
+     if (fd2->IsDir() && !fd1->IsDir()) return data;
+     return data*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
+}

 
 

-class wxFileIconsTable
+static
+int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data)

 {
 {

-public:
-    wxFileIconsTable();
-
-    int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
-    wxImageList *GetImageList() { return &m_ImageList; }
-
-protected:
-    wxImageList m_ImageList;
-    wxHashTable m_HashTable;
-};
-
-static wxFileIconsTable *g_IconsTable = NULL;
-
-#define FI_FOLDER     0
-#define FI_UNKNOWN    1
-#define FI_EXECUTABLE 2
+     wxFileData *fd1 = (wxFileData*)data1;
+     wxFileData *fd2 = (wxFileData*)data2;
+     if (fd1->GetFileName() == wxT("..")) return -data;
+     if (fd2->GetFileName() == wxT("..")) return data;
+     if (fd1->IsDir() && !fd2->IsDir()) return -data;
+     if (fd2->IsDir() && !fd1->IsDir()) return data;
+     if (fd1->IsLink() && !fd2->IsLink()) return -data;
+     if (fd2->IsLink() && !fd1->IsLink()) return data;
+     return data*(fd1->GetSize() - fd2->GetSize());
+}

 
 

-wxFileIconsTable::wxFileIconsTable() :
-                    m_ImageList(16, 16),
-                    m_HashTable(wxKEY_STRING)
+static
+int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data)

 {
 {

-    m_HashTable.DeleteContents(TRUE);
-    m_ImageList.Add(wxBitmap(folder_xpm));  // FI_FOLDER
-    m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
-    if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
-    {                                       // FI_EXECUTABLE
-        m_ImageList.Add(wxBitmap(exefile_xpm));
-        m_HashTable.Delete(_T("exe"));
-        m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
-    }
-    /* else put into list by GetIconID
-       (KDE defines application/x-executable for *.exe and has nice icon)
-     */
+     wxFileData *fd1 = (wxFileData*)data1;
+     wxFileData *fd2 = (wxFileData*)data2;
+     if (fd1->GetFileName() == wxT("..")) return -data;
+     if (fd2->GetFileName() == wxT("..")) return data;
+     if (fd1->IsDir() && !fd2->IsDir()) return -data;
+     if (fd2->IsDir() && !fd1->IsDir()) return data;
+     if (fd1->IsLink() && !fd2->IsLink()) return -data;
+     if (fd2->IsLink() && !fd1->IsLink()) return data;
+     return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );

 }
 
 }
 

+static
+int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
+{
+     wxFileData *fd1 = (wxFileData*)data1;
+     wxFileData *fd2 = (wxFileData*)data2;
+     if (fd1->GetFileName() == wxT("..")) return -data;
+     if (fd2->GetFileName() == wxT("..")) return data;
+     if (fd1->IsDir() && !fd2->IsDir()) return -data;
+     if (fd2->IsDir() && !fd1->IsDir()) return data;
+
+     return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
+}

 
 

+#if defined(__UNIX__) && !defined(__OS2__)
+#define IsTopMostDir(dir)   (dir == wxT("/"))
+#endif

 
 

-#if wxUSE_MIMETYPE
-// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
-//     one icon and we won't resize it
+#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
+#define IsTopMostDir(dir)   (dir.IsEmpty())
+#endif

 
 

-static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
-{
-    wxImage small(16, 16);
-    unsigned char *p1, *p2, *ps;
-    unsigned char mr = img.GetMaskRed(),
-                  mg = img.GetMaskGreen(),
-                  mb = img.GetMaskBlue();
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+// defined in src/generic/dirctrlg.cpp
+extern bool wxIsDriveAvailable(const wxString& dirName);
+#endif

 
 

-    unsigned x, y;
-    unsigned sr, sg, sb, smask;
+// defined in src/generic/dirctrlg.cpp
+extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids);

 
 

-    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
-    small.SetMaskColour(mr, mr, mr);
+//-----------------------------------------------------------------------------
+//  wxFileData
+//-----------------------------------------------------------------------------

 
 

-    for (y = 0; y < 16; y++)
-    {
-        for (x = 0; x < 16; x++)
-        {
-            sr = sg = sb = smask = 0;
-            if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
-                sr += p1[0], sg += p1[1], sb += p1[2];
-            else smask++;
-            p1 += 3;
-            if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
-                sr += p1[0], sg += p1[1], sb += p1[2];
-            else smask++;
-            p1 += 3;
-            if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
-                sr += p2[0], sg += p2[1], sb += p2[2];
-            else smask++;
-            p2 += 3;
-            if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
-                sr += p2[0], sg += p2[1], sb += p2[2];
-            else smask++;
-            p2 += 3;
-
-            if (smask > 2)
-                ps[0] = ps[1] = ps[2] = mr;
-            else
-                ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
-            ps += 3;
-        }
-        p1 += 32 * 3, p2 += 32 * 3;
-    }
+wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
+{
+    m_fileName = fileName;
+    m_filePath = filePath;
+    m_type = type;
+    m_image = image_id;

 
 

-    return small.ConvertToBitmap();
+    ReadData();

 }
 
 }
 

-// finds empty borders and return non-empty area of image:
-static wxImage CutEmptyBorders(const wxImage& img)
+void wxFileData::Copy( const wxFileData& fileData )

 {
 {

-    unsigned char mr = img.GetMaskRed(),
-                  mg = img.GetMaskGreen(),
-                  mb = img.GetMaskBlue();
-    unsigned char *dt = img.GetData(), *dttmp;
-    unsigned w = img.GetWidth(), h = img.GetHeight();
-
-    unsigned top, bottom, left, right, i;
-    bool empt;
-
-#define MK_DTTMP(x,y)      dttmp = dt + ((x + y * w) * 3)
-#define NOEMPTY_PIX(empt)  if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;}
-
-    for (empt = TRUE, top = 0; empt && top < h; top++)
-    {
-        MK_DTTMP(0, top);
-        for (i = 0; i < w; i++, dttmp+=3)
-            NOEMPTY_PIX(empt)
-    }
-    for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--)
-    {
-        MK_DTTMP(0, bottom);
-        for (i = 0; i < w; i++, dttmp+=3)
-            NOEMPTY_PIX(empt)
-    }
-    for (empt = TRUE, left = 0; empt && left < w; left++)
-    {
-        MK_DTTMP(left, 0);
-        for (i = 0; i < h; i++, dttmp+=3*w)
-            NOEMPTY_PIX(empt)
-    }
-    for (empt = TRUE, right = w-1; empt && right > left; right--)
-    {
-        MK_DTTMP(right, 0);
-        for (i = 0; i < h; i++, dttmp+=3*w)
-            NOEMPTY_PIX(empt)
-    }
-    top--, left--, bottom++, right++;
-
-    return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
+    m_fileName = fileData.GetFileName();
+    m_filePath = fileData.GetFilePath();
+    m_size = fileData.GetSize();
+    m_dateTime = fileData.GetDateTime();
+    m_permissions = fileData.GetPermissions();
+    m_type = fileData.GetType();
+    m_image = GetImageId();

 }
 }

-#endif // wxUSE_MIMETYPE

 
 

-
-
-int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
+void wxFileData::ReadData()

 {
 {

-#if wxUSE_MIMETYPE
-    if (!extension.IsEmpty())
-    {
-        wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
-        if (entry) return (entry -> id);
-    }
-
-    wxFileType *ft = (mime.IsEmpty()) ?
-                   wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
-                   wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
-    wxIcon ic;
-    if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok()))
+    if (IsDrive())

     {
     {

-        int newid = FI_UNKNOWN;
-        m_HashTable.Put(extension, new wxFileIconEntry(newid));
-        return newid;
+        m_size = 0;
+        return;

     }
     }

-    wxImage img(ic);
-    delete ft;

 
 

-    int id = m_ImageList.GetImageCount();
-    if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_ImageList.Add(img.ConvertToBitmap());
-    else
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+    // c:\.. is a drive don't stat it
+    if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))

     {
     {

-        if (img.GetWidth() != 32 || img.GetHeight() != 32)
-            m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
-        else
-            m_ImageList.Add(CreateAntialiasedBitmap(img));
+        m_type = is_drive;
+        m_size = 0;
+        return;

     }
     }

-    m_HashTable.Put(extension, new wxFileIconEntry(id));
-    return id;
-
-#else // !wxUSE_MIMETYPE
-
-    if (extension == wxT("exe"))
-        return FI_EXECUTABLE;
-    else
-        return FI_UNKNOWN;
-#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
-}
-
-
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+#endif // __DOS__ || __WINDOWS__

 
 

-static
-int ListCompare( long data1, long data2, long WXUNUSED(data) )
-{
-     wxFileData *fd1 = (wxFileData*)data1 ;
-     wxFileData *fd2 = (wxFileData*)data2 ;
-     if (fd1->GetName() == wxT("..")) return -1;
-     if (fd2->GetName() == wxT("..")) return 1;
-     if (fd1->IsDir() && !fd2->IsDir()) return -1;
-     if (fd2->IsDir() && !fd1->IsDir()) return 1;
-     return wxStrcmp( fd1->GetName(), fd2->GetName() );
-}
+    wxStructStat buff;

 
 

-//-----------------------------------------------------------------------------
-//  wxFileData
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileData,wxObject);
-
-wxFileData::wxFileData( const wxString &name, const wxString &fname )
-{
-    m_name = name;
-    m_fileName = fname;
-
-    struct stat buff;
-    stat( m_fileName.fn_str(), &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
-    m_isLink = FALSE;
-    struct tm *t = localtime( &buff.st_mtime );
+#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
+    lstat( m_filePath.fn_str(), &buff );
+    m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
+#else // no lstat()
+    wxStat( m_filePath, &buff );

 #endif
 
 #endif
 

-//  struct passwd *user = getpwuid( buff.st_uid );
-//  struct group *grp = getgrgid( buff.st_gid );
+    m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
+    m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;

 
 

-    m_isDir = S_ISDIR( buff.st_mode );
-    m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
+    // try to get a better icon
+    if (m_image == wxFileIconsTable::file)
+    {
+        if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
+       {
+            m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
+       } else if (IsExe())
+       {
+            m_image = wxFileIconsTable::executable;
+       }
+    }

 
     m_size = buff.st_size;
 
 
     m_size = buff.st_size;
 

-    m_hour = t->tm_hour;
-    m_minute = t->tm_min;
-    m_month = t->tm_mon+1;
-    m_day = t->tm_mday;
-    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('-')) );
+    m_dateTime = buff.st_mtime;
+
+#if defined(__UNIX__)
+    m_permissions.Printf(_T("%c%c%c%c%c%c%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('-'),
+                         buff.st_mode & wxS_IRGRP ? _T('r') : _T('-'),
+                         buff.st_mode & wxS_IWGRP ? _T('w') : _T('-'),
+                         buff.st_mode & wxS_IXGRP ? _T('x') : _T('-'),
+                         buff.st_mode & wxS_IROTH ? _T('r') : _T('-'),
+                         buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
+                         buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
+#elif defined(__WIN32__)
+    DWORD attribs = GetFileAttributes(m_filePath);
+    if (attribs != (DWORD)-1)
+    {
+        m_permissions.Printf(_T("%c%c%c%c"),
+                             attribs & FILE_ATTRIBUTE_ARCHIVE  ? _T('A') : _T(' '),
+                             attribs & FILE_ATTRIBUTE_READONLY ? _T('R') : _T(' '),
+                             attribs & FILE_ATTRIBUTE_HIDDEN   ? _T('H') : _T(' '),
+                             attribs & FILE_ATTRIBUTE_SYSTEM   ? _T('S') : _T(' '));
+    }
+#endif

 }
 
 }
 

-wxString wxFileData::GetName() const
+wxString wxFileData::GetFileType() const

 {
 {

-    return m_name;
+    if (IsDir())
+        return _("<DIR>");
+    else if (IsLink())
+        return _("<LINK>");
+    else if (IsDrive())
+        return _("<DRIVE>");
+   else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
+        return m_fileName.AfterLast(wxT('.'));
+
+    return wxEmptyString;

 }
 
 }
 

-wxString wxFileData::GetFullName() const
+wxString wxFileData::GetModificationTime() const

 {
 {

-    return m_fileName;
+    // want time as 01:02 so they line up nicely, no %r in WIN32
+    return m_dateTime.FormatDate() + wxT(" ") + m_dateTime.Format(wxT("%I:%M:%S %p"));

 }
 
 wxString wxFileData::GetHint() const
 {
 }
 
 wxString wxFileData::GetHint() const
 {

-    wxString s = m_fileName;
-    s += "  ";
-    if (m_isDir) s += _("<DIR> ");
-    else if (m_isLink) s += _("<LINK> ");
-    else
+    wxString s = m_filePath;
+    s += wxT("  ");
+
+    if (IsDir())
+        s += _("<DIR>");
+    else if (IsLink())
+        s += _("<LINK>");
+    else if (IsDrive())
+        s += _("<DRIVE>");
+    else // plain file
+        s += wxString::Format( _("%ld bytes"), m_size );
+
+    s += wxT(' ');
+
+    if ( !IsDrive() )

     {
     {

-        s += LongToString( m_size );
-        s += _(" bytes ");
+        s << GetModificationTime()
+          << wxT("  ")
+          << m_permissions;

     }
     }

-    s += IntToString( m_day );
-    s += wxT(".");
-    s += IntToString( m_month );
-    s += wxT(".");
-    s += IntToString( m_year );
-    s += wxT("  ");
-    s += IntToString( m_hour );
-    s += wxT(":");
-    s += IntToString( m_minute );
-    s += wxT("  ");
-    s += m_permissions;
+

     return s;
 };
 
     return s;
 };
 

-wxString wxFileData::GetEntry( int num )
+wxString wxFileData::GetEntry( fileListFieldType num ) const

 {
     wxString s;
 {
     wxString s;

-    switch (num)
+    switch ( num )

     {
     {

-        case 0:
-        {
-            s = m_name;
-        }
-        break;
-        case 1:
-        {
-            if (m_isDir) s = _("<DIR>");
-            else if (m_isLink) s = _("<LINK>");
-            else s = LongToString( m_size );
-        }
-        break;
-        case 2:
-        {
-            if (m_day < 10) s = wxT("0"); else s = wxT("");
-            s += IntToString( m_day );
-            s += wxT(".");
-            if (m_month < 10) s += wxT("0");
-            s += IntToString( m_month );
-            s += wxT(".");
-            s += IntToString( m_year );
-        }
-        break;
-        case 3:
-        {
-            if (m_hour < 10) s = wxT("0"); else s = wxT("");
-            s += IntToString( m_hour );
-            s += wxT(":");
-            if (m_minute < 10) s += wxT("0");
-            s += IntToString( m_minute );
+        case FileList_Name:
+            s = m_fileName;

             break;
             break;

-        }
-        case 4:
-            s = m_permissions;
+
+        case FileList_Size:
+            if (!IsDir() && !IsLink() && !IsDrive())
+                s.Printf(_T("%ld"), m_size);

             break;
             break;

-        default:
-            s = wxT("No entry");
+
+        case FileList_Type:
+            s = GetFileType();

             break;
             break;

-    }
-    return s;
-}

 
 

-bool wxFileData::IsDir()
-{
-    return m_isDir;
-}
+        case FileList_Time:
+                if (!IsDrive())
+                s = GetModificationTime();
+            break;

 
 

-bool wxFileData::IsExe()
-{
-    return m_isExe;
-}
+#if defined(__UNIX__) || defined(__WIN32__)
+        case FileList_Perm:
+            s = m_permissions;
+            break;
+#endif // defined(__UNIX__) || defined(__WIN32__)

 
 

-bool wxFileData::IsLink()
-{
-    return m_isLink;
-}
+        default:
+            wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
+    }

 
 

-long wxFileData::GetSize()
-{
-    return m_size;
+    return s;

 }
 
 }
 

-void wxFileData::SetNewName( const wxString &name, const wxString &fname )
+void wxFileData::SetNewName( const wxString &filePath, const wxString &fileName )

 {
 {

-    m_name = name;
-    m_fileName = fname;
+    m_fileName = fileName;
+    m_filePath = filePath;

 }
 
 void wxFileData::MakeItem( wxListItem &item )
 {
 }
 
 void wxFileData::MakeItem( wxListItem &item )
 {

-    item.m_text = m_name;
+    item.m_text = m_fileName;

     item.ClearAttributes();
     item.ClearAttributes();

-    if (IsExe()) item.SetTextColour(*wxRED);
-    if (IsDir()) item.SetTextColour(*wxBLUE);
-
+    if (IsExe())
+        item.SetTextColour(*wxRED);

     if (IsDir())
     if (IsDir())

-        item.m_image = FI_FOLDER;
-    else if (IsExe())
-        item.m_image = FI_EXECUTABLE;
-    else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
-        item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
-    else
-        item.m_image = FI_UNKNOWN;
+        item.SetTextColour(*wxBLUE);
+
+    item.m_image = m_image;

 
     if (IsLink())
     {
 
     if (IsLink())
     {

-        wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
-        item.SetTextColour(*dg);
+        wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") );
+        if ( dg.Ok() )
+            item.SetTextColour(dg);

     }
     item.m_data = (long)this;
 }
     }
     item.m_data = (long)this;
 }


@@ -555,64 +357,95 @@ void wxFileData::MakeItem( wxListItem &item )
 //  wxFileCtrl
 //-----------------------------------------------------------------------------
 
 //  wxFileCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
+IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)

 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
     EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)
     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
     EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)
     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)

+    EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick)

 END_EVENT_TABLE()
 
 
 wxFileCtrl::wxFileCtrl()
 {
 END_EVENT_TABLE()
 
 
 wxFileCtrl::wxFileCtrl()
 {

-#if defined(__UNIX__)
-    m_dirName = wxT("/");
-#elif defined(__DOS__)
-    m_dirName = wxT("C:\\");
-#endif

     m_showHidden = FALSE;
     m_showHidden = FALSE;

+    m_sort_foward = 1;
+    m_sort_field = wxFileData::FileList_Name;

 }
 
 }
 

-wxFileCtrl::wxFileCtrl( wxWindow *win, wxWindowID id,
-    const wxString &dirName, const wxString &wild,
-    const wxPoint &pos, const wxSize &size,
-    long style, const wxValidator &validator, const wxString &name ) :
-  wxListCtrl( win, id, pos, size, style, validator, name )
+wxFileCtrl::wxFileCtrl(wxWindow *win,
+                       wxWindowID id,
+                       const wxString& wild,
+                       bool showHidden,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator &validator,
+                       const wxString &name)
+          : wxListCtrl(win, id, pos, size, style, validator, name),
+            m_wild(wild)

 {
 {

-    if (! g_IconsTable) g_IconsTable = new wxFileIconsTable;
-    wxImageList *imageList = g_IconsTable -> GetImageList();
+    wxImageList *imageList = wxTheFileIconsTable->GetSmallImageList();

 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 
 
     SetImageList( imageList, wxIMAGE_LIST_SMALL );
 

-    m_dirName = dirName;
-    m_wild = wild;
-    m_showHidden = FALSE;
-    Update();
+    m_showHidden = showHidden;
+
+    m_sort_foward = 1;
+    m_sort_field = wxFileData::FileList_Name;
+
+    m_dirName = wxT("*");
+
+    if (style & wxLC_REPORT)
+        ChangeToReportMode();

 }
 
 void wxFileCtrl::ChangeToListMode()
 {
 }
 
 void wxFileCtrl::ChangeToListMode()
 {

+    ClearAll();

     SetSingleStyle( wxLC_LIST );
     SetSingleStyle( wxLC_LIST );

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::ChangeToReportMode()
 {
 }
 
 void wxFileCtrl::ChangeToReportMode()
 {

+    ClearAll();

     SetSingleStyle( wxLC_REPORT );
     SetSingleStyle( wxLC_REPORT );

-    Update();
+
+    // do this since WIN32 does mm/dd/yy UNIX does mm/dd/yyyy
+    // don't hardcode since mm/dd is dd/mm elsewhere
+    int w, h;
+    wxDateTime dt(22, wxDateTime::Dec, 2002, 22, 22, 22);
+    wxString txt = dt.FormatDate() + wxT("22") + dt.Format(wxT("%I:%M:%S %p"));
+    GetTextExtent(txt, &w, &h);
+
+    InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, w );
+    InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, w/2 );
+    InsertColumn( 2, _("Type"), wxLIST_FORMAT_LEFT, w/2 );
+    InsertColumn( 3, _("Modified"), wxLIST_FORMAT_LEFT, w );
+#if defined(__UNIX__)
+    GetTextExtent(wxT("Permissions 2"), &w, &h);
+    InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, w );
+#elif defined(__WIN32__)
+    GetTextExtent(wxT("Attributes 2"), &w, &h);
+    InsertColumn( 4, _("Attributes"), wxLIST_FORMAT_LEFT, w );
+#endif
+
+    UpdateFiles();

 }
 
 }
 

-void wxFileCtrl::ChangeToIconMode()
+void wxFileCtrl::ChangeToSmallIconMode()

 {
 {

-    SetSingleStyle( wxLC_ICON );
-    Update();
+    ClearAll();
+    SetSingleStyle( wxLC_SMALL_ICON );
+    UpdateFiles();

 }
 
 void wxFileCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;
 }
 
 void wxFileCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;

-    Update();
+    UpdateFiles();

 }
 
 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 }
 
 long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )


@@ -623,117 +456,148 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)
     {
     long my_style = GetWindowStyleFlag();
     if (my_style & wxLC_REPORT)
     {

-#ifdef __UNIX__
-        const int noEntries = 5;
-#else
-        const int noEntries = 4;
-#endif

         ret = InsertItem( item );
         ret = InsertItem( item );

-        for (int i = 1; i < noEntries; i++) 
-            SetItem( item.m_itemId, i, fd->GetEntry( i) );
+        for (int i = 1; i < wxFileData::FileList_Max; i++)
+            SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );

     }
     }

-    else if (my_style & wxLC_LIST)
+    else if ((my_style & wxLC_LIST) || (my_style & wxLC_SMALL_ICON))

     {
         ret = InsertItem( item );
     }
     return ret;
 }
 
     {
         ret = InsertItem( item );
     }
     return ret;
 }
 

-void wxFileCtrl::Update()
+void wxFileCtrl::UpdateItem(const wxListItem &item)

 {
 {

-    long my_style = GetWindowStyleFlag();
-    int name_col_width = 0;
-    if (my_style & wxLC_REPORT)
-    {
-        if (GetColumnCount() > 0)
-            name_col_width = GetColumnWidth( 0 );
-    }
+    wxFileData *fd = (wxFileData*)GetItemData(item);
+    wxCHECK_RET(fd, wxT("invalid filedata"));

 
 

-    ClearAll();
-    if (my_style & wxLC_REPORT)
+    fd->ReadData();
+
+    SetItemText(item, fd->GetFileName());
+    SetItemImage(item, fd->GetImageId(), fd->GetImageId());
+
+    if (GetWindowStyleFlag() & wxLC_REPORT)

     {
     {

-        if (name_col_width < 140) name_col_width = 140;
-        InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, name_col_width );
-        InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
-        InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
-        InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
-#ifdef __UNIX__
-        InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
-#endif
+        for (int i = 1; i < wxFileData::FileList_Max; i++)
+            SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );

     }
     }

-    wxFileData *fd = (wxFileData *) NULL;
+}
+
+void wxFileCtrl::UpdateFiles()
+{
+    // don't do anything before ShowModal() call which sets m_dirName
+    if ( m_dirName == wxT("*") )
+        return;
+
+    wxBusyCursor bcur; // this may take a while...
+
+    DeleteAllItems();
+

     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
 
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
 

-    if (m_dirName != wxT("/"))
-    {
-        wxString p( wxPathOnly(m_dirName) );
-        if (p.IsEmpty()) p = wxT("/");
-        fd = new wxFileData( wxT(".."), p );
-        Add( fd, item );
-        item.m_itemId++;
-    }
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
+    if ( IsTopMostDir(m_dirName) )
+        {
+        wxArrayString names, paths;
+        wxArrayInt icons;
+        size_t n, count = wxGetAvailableDrives(paths, names, icons);

 
 

-#if defined(__UNIX__)
-    wxString res = m_dirName + wxT("/*");
-#elif defined(__DOS__)
-    wxString res = m_dirName + wxT("\\*.*");
-#endif
-    wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
-    while (!f.IsEmpty())
+        for (n=0; n<count; n++)
+            {
+            wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
+            if (Add(fd, item) != -1)
+                item.m_itemId++;
+            else
+                delete fd;
+            }
+        }
+    else
+#endif // defined(__DOS__) || defined(__WINDOWS__)

     {
     {

-        res = wxFileNameFromPath( f );
-        fd = new wxFileData( res, f );
-        wxString s = fd->GetName();
-        if (m_showHidden || (s[0u] != wxT('.')))
+        // Real directory...
+        if ( !IsTopMostDir(m_dirName) )

         {
         {

-            Add( fd, item );
+            wxString p(wxPathOnly(m_dirName));
+#if defined(__UNIX__) && !defined(__OS2__)
+            if (p.IsEmpty()) p = wxT("/");
+#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;

         }
         }

-        f = wxFindNextFile();
-    }

 
 

-    // Tokenize the wildcard string, so we can handle more than 1 
-    // search pattern in a wildcard.
-    wxStringTokenizer tokenWild( m_wild, ";" );
-    while ( tokenWild.HasMoreTokens() )
-    {
-        res = m_dirName + wxFILE_SEP_PATH + tokenWild.GetNextToken();
-        f = wxFindFirstFile( res.GetData(), wxFILE );
-        while (!f.IsEmpty())
+        wxString dirname(m_dirName);
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+        if (dirname.length() == 2 && dirname[1u] == wxT(':'))
+            dirname << wxT('\\');
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+        wxDir dir(dirname);
+
+        if ( dir.IsOpened() )

         {
         {

-            res = wxFileNameFromPath( f );
-            fd = new wxFileData( res, f );
-            wxString s = fd->GetName();
-            if (m_showHidden || (s[0u] != wxT('.')))
+            wxString dirPrefix(dirname);
+            if (dirPrefix.Last() != wxFILE_SEP_PATH)
+                dirPrefix += wxFILE_SEP_PATH;
+
+            int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
+
+            bool cont;
+            wxString f;
+
+            // Get the directories first (not matched against wildcards):
+            cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
+            while (cont)

             {
             {

-                Add( fd, item );
+                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;
+
+                cont = dir.GetNext(&f);
+            }
+
+            // Tokenize the wildcard string, so we can handle more than 1
+            // search pattern in a wildcard.
+            wxStringTokenizer tokenWild(m_wild, wxT(";"));
+            while ( tokenWild.HasMoreTokens() )
+            {
+                cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
+                                        wxDIR_FILES | hiddenFlag);
+                while (cont)
+                {
+                    wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
+                    if (Add(fd, item) != -1)
+                    item.m_itemId++;
+                    else
+                        delete fd;
+
+                    cont = dir.GetNext(&f);
+                }

             }
             }

-            f = wxFindNextFile();

         }
     }
 
         }
     }
 

-    SortItems( ListCompare, 0 );
-
-    if (my_style & wxLC_REPORT)
-    {
-       SetColumnWidth( 1, wxLIST_AUTOSIZE );
-       SetColumnWidth( 2, wxLIST_AUTOSIZE );
-       SetColumnWidth( 3, wxLIST_AUTOSIZE );
-    }
+    SortItems(m_sort_field, m_sort_foward);

 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 {
 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 {

+    if (wild.Find(wxT('|')) != wxNOT_FOUND)
+        return;
+

     m_wild = wild;
     m_wild = wild;

-    Update();
+    UpdateFiles();

 }
 
 void wxFileCtrl::MakeDir()
 {
 }
 
 void wxFileCtrl::MakeDir()
 {

-    wxString new_name( wxT("NewName") );
+    wxString new_name( _("NewName") );

     wxString path( m_dirName );
     path += wxFILE_SEP_PATH;
     path += new_name;
     wxString path( m_dirName );
     path += wxFILE_SEP_PATH;
     path += new_name;


@@ -762,7 +626,7 @@ void wxFileCtrl::MakeDir()
         return;
     }
 
         return;
     }
 

-    wxFileData *fd = new wxFileData( new_name, path );
+    wxFileData *fd = new wxFileData( path, new_name, wxFileData::is_dir, wxFileIconsTable::folder );

     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;


@@ -770,24 +634,35 @@ void wxFileCtrl::MakeDir()
 
     if (id != -1)
     {
 
     if (id != -1)
     {

-        SortItems( ListCompare, 0 );
+        SortItems(m_sort_field, m_sort_foward);

         id = FindItem( 0, (long)fd );
         EnsureVisible( id );
         EditLabel( id );
     }
         id = FindItem( 0, (long)fd );
         EnsureVisible( id );
         EditLabel( id );
     }

+    else
+        delete fd;

 }
 
 void wxFileCtrl::GoToParentDir()
 {
 }
 
 void wxFileCtrl::GoToParentDir()
 {

-    if (m_dirName != wxT("/"))
+    if (!IsTopMostDir(m_dirName))

     {
         size_t len = m_dirName.Len();
     {
         size_t len = m_dirName.Len();

-        if (m_dirName[len-1] == wxFILE_SEP_PATH)
+        if (wxEndsWithPathSeparator(m_dirName))

             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
             m_dirName.Remove( len-1, 1 );
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );

-        if (m_dirName.IsEmpty()) m_dirName = wxT("/");
-        Update();
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+        if (!m_dirName.IsEmpty())
+        {
+            if (m_dirName.Last() == wxT('.'))
+                m_dirName = wxT("");
+        }
+#elif defined(__UNIX__)
+        if (m_dirName.IsEmpty())
+            m_dirName = wxT("/");
+#endif
+        UpdateFiles();

         long id = FindItem( 0, fname );
         if (id != -1)
         {
         long id = FindItem( 0, fname );
         if (id != -1)
         {


@@ -800,32 +675,41 @@ void wxFileCtrl::GoToParentDir()
 void wxFileCtrl::GoToHomeDir()
 {
     wxString s = wxGetUserHome( wxString() );
 void wxFileCtrl::GoToHomeDir()
 {
     wxString s = wxGetUserHome( wxString() );

-    m_dirName = s;
-    Update();
-    SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-    EnsureVisible( 0 );
+    GoToDir(s);

 }
 
 void wxFileCtrl::GoToDir( const wxString &dir )
 {
 }
 
 void wxFileCtrl::GoToDir( const wxString &dir )
 {

+    if (!wxDirExists(dir)) return;
+

     m_dirName = dir;
     m_dirName = dir;

-    Update();
+    UpdateFiles();

     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );
 }
 
     SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     EnsureVisible( 0 );
 }
 

-void wxFileCtrl::GetDir( wxString &dir )
+void wxFileCtrl::FreeItemData(wxListItem& item)

 {
 {

-    dir = m_dirName;
+    if ( item.m_data )
+    {
+        wxFileData *fd = (wxFileData*)item.m_data;
+        delete fd;
+
+        item.m_data = 0;
+    }

 }
 
 void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
 {
 }
 
 void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
 {

-    wxFileData *fd = (wxFileData*)event.m_item.m_data;
-    delete fd;
+    FreeItemData(event.m_item);

 }
 
 }
 

-void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+void wxFileCtrl::OnListDeleteAllItems( wxListEvent &event )
+{
+    FreeAllItemsData();
+}
+
+void wxFileCtrl::FreeAllItemsData()

 {
     wxListItem item;
     item.m_mask = wxLIST_MASK_DATA;
 {
     wxListItem item;
     item.m_mask = wxLIST_MASK_DATA;


@@ -834,10 +718,7 @@ void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
     while ( item.m_itemId != -1 )
     {
         GetItem( item );
     while ( item.m_itemId != -1 )
     {
         GetItem( item );

-        wxFileData *fd = (wxFileData*)item.m_data;
-        delete fd;
-        item.m_data = 0;
-        SetItem( item );
+        FreeItemData(item);

         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
 }
         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
 }


@@ -858,7 +739,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
         return;
     }
 
         return;
     }
 

-    wxString new_name( wxPathOnly( fd->GetFullName() ) );
+    wxString new_name( wxPathOnly( fd->GetFilePath() ) );

     new_name += wxFILE_SEP_PATH;
     new_name += event.GetLabel();
 
     new_name += wxFILE_SEP_PATH;
     new_name += event.GetLabel();
 


@@ -871,10 +752,11 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
         event.Veto();
     }
 
         event.Veto();
     }
 

-    if (wxRenameFile(fd->GetFullName(),new_name))
+    if (wxRenameFile(fd->GetFilePath(),new_name))

     {
         fd->SetNewName( new_name, event.GetLabel() );
         SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
     {
         fd->SetNewName( new_name, event.GetLabel() );
         SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );

+        UpdateItem( event.GetItem() );

         EnsureVisible( event.GetItem() );
     }
     else
         EnsureVisible( event.GetItem() );
     }
     else


@@ -885,120 +767,163 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     }
 }
 
     }
 }
 

+void wxFileCtrl::OnListColClick( wxListEvent &event )
+{
+    int col = event.GetColumn();
+
+    switch (col)
+    {
+        case wxFileData::FileList_Name :
+        case wxFileData::FileList_Size :
+        case wxFileData::FileList_Type :
+        case wxFileData::FileList_Time : break;
+        default : return;
+    }
+
+    if ((wxFileData::fileListFieldType)col == m_sort_field)
+        m_sort_foward = !m_sort_foward;
+    else
+        m_sort_field = (wxFileData::fileListFieldType)col;
+
+    SortItems(m_sort_field, m_sort_foward);
+}
+
+void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
+{
+    m_sort_field = field;
+    m_sort_foward = foward;
+    long sort_dir = foward ? 1 : -1;
+
+    switch (m_sort_field)
+    {
+        case wxFileData::FileList_Name :
+        {
+            wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataNameCompare, sort_dir);
+            break;
+        }
+        case wxFileData::FileList_Size :
+        {
+             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataSizeCompare, sort_dir);
+            break;
+        }
+        case wxFileData::FileList_Type :
+        {
+             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTypeCompare, sort_dir);
+             break;
+        }
+        case wxFileData::FileList_Time :
+        {
+             wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTimeCompare, sort_dir);
+             break;
+        }
+        default : break;
+    }
+}
+
+wxFileCtrl::~wxFileCtrl()
+{
+}
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxFileDialog
+// wxGenericFileDialog

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define  ID_LIST_MODE     wxID_FILEDLGG
-#define  ID_REPORT_MODE   wxID_FILEDLGG + 1
-#define  ID_UP_DIR        wxID_FILEDLGG + 5
-#define  ID_PARENT_DIR    wxID_FILEDLGG + 6
-#define  ID_NEW_DIR       wxID_FILEDLGG + 7
-#define  ID_CHOICE        wxID_FILEDLGG + 8
-#define  ID_TEXT          wxID_FILEDLGG + 9
-#define  ID_LIST_CTRL     wxID_FILEDLGG + 10
-#define  ID_ACTIVATED     wxID_FILEDLGG + 11
-#define  ID_CHECK         wxID_FILEDLGG + 12
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
-
-BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
-        EVT_BUTTON(ID_LIST_MODE, wxFileDialog::OnList)
-        EVT_BUTTON(ID_REPORT_MODE, wxFileDialog::OnReport)
-        EVT_BUTTON(ID_UP_DIR, wxFileDialog::OnUp)
-        EVT_BUTTON(ID_PARENT_DIR, wxFileDialog::OnHome)
-        EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew)
-        EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk)
-        EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected)
-        EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
-        EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
-        EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
-        EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
+#define  ID_LIST_MODE     (wxID_FILEDLGG    )
+#define  ID_REPORT_MODE   (wxID_FILEDLGG + 1)
+#define  ID_UP_DIR        (wxID_FILEDLGG + 5)
+#define  ID_PARENT_DIR    (wxID_FILEDLGG + 6)
+#define  ID_NEW_DIR       (wxID_FILEDLGG + 7)
+#define  ID_CHOICE        (wxID_FILEDLGG + 8)
+#define  ID_TEXT          (wxID_FILEDLGG + 9)
+#define  ID_LIST_CTRL     (wxID_FILEDLGG + 10)
+#define  ID_ACTIVATED     (wxID_FILEDLGG + 11)
+#define  ID_CHECK         (wxID_FILEDLGG + 12)
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)
+
+BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
+        EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList)
+        EVT_BUTTON(ID_REPORT_MODE, wxGenericFileDialog::OnReport)
+        EVT_BUTTON(ID_UP_DIR, wxGenericFileDialog::OnUp)
+        EVT_BUTTON(ID_PARENT_DIR, wxGenericFileDialog::OnHome)
+        EVT_BUTTON(ID_NEW_DIR, wxGenericFileDialog::OnNew)
+        EVT_BUTTON(wxID_OK, wxGenericFileDialog::OnListOk)
+        EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxGenericFileDialog::OnSelected)
+        EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxGenericFileDialog::OnActivated)
+        EVT_CHOICE(ID_CHOICE,wxGenericFileDialog::OnChoiceFilter)
+        EVT_TEXT_ENTER(ID_TEXT,wxGenericFileDialog::OnTextEnter)
+        EVT_TEXT(ID_TEXT,wxGenericFileDialog::OnTextChange)
+        EVT_CHECKBOX(ID_CHECK,wxGenericFileDialog::OnCheck)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-long wxFileDialog::s_lastViewStyle = wxLC_LIST;
-bool wxFileDialog::s_lastShowHidden = FALSE;
-
-wxFileDialog::wxFileDialog(wxWindow *parent,
-                 const wxString& message,
-                 const wxString& defaultDir,
-                 const wxString& defaultFile,
-                 const wxString& wildCard,
-                 long style,
-                 const wxPoint& pos ) :
-  wxDialog( parent, -1, message, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
+long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
+bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
+
+wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
+                           const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFile,
+                           const wxString& wildCard,
+                           long style,
+                           const wxPoint& pos )
+                    :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)

 {
 {

-    wxBeginBusyCursor();
+    wxDialog::Create( parent, -1, message, pos, wxDefaultSize,
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );

 
     if (wxConfig::Get(FALSE))
     {
 
     if (wxConfig::Get(FALSE))
     {

-        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
-        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+                              &ms_lastViewStyle);
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+                              &ms_lastShowHidden);

     }
 
     }
 

-    m_message = message;
-    m_dialogStyle = style;
-
-    if (m_dialogStyle == 0) m_dialogStyle = wxOPEN;
+    if (m_dialogStyle == 0)
+        m_dialogStyle = wxOPEN;

     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
         m_dialogStyle |= wxOPEN;
 
     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
         m_dialogStyle |= wxOPEN;
 

-    m_dir = defaultDir;

     if ((m_dir.empty()) || (m_dir == wxT(".")))
     {
         m_dir = wxGetCwd();
     }
     if ((m_dir.empty()) || (m_dir == wxT(".")))
     {
         m_dir = wxGetCwd();
     }

-    
+

     size_t len = m_dir.Len();
     size_t len = m_dir.Len();

-    if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
+    if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))

         m_dir.Remove( len-1, 1 );
 
     m_path = m_dir;
     m_path += wxFILE_SEP_PATH;
     m_path += defaultFile;
         m_dir.Remove( len-1, 1 );
 
     m_path = m_dir;
     m_path += wxFILE_SEP_PATH;
     m_path += defaultFile;

-    m_fileName = defaultFile;
-    m_wildCard = wildCard;
-    m_filterIndex = 0;

     m_filterExtension = wxEmptyString;
 
     // interpret wildcards
     m_filterExtension = wxEmptyString;
 
     // interpret wildcards

-
-    if (m_wildCard.IsEmpty())
-        m_wildCard = _("All files (*)|*");
-
-    wxStringTokenizer tokens( m_wildCard, wxT("|") );
-    wxString firstWild;
-    wxString firstWildText;
-    if (tokens.CountTokens() == 1)
-    {
-        firstWildText = tokens.GetNextToken();
-        firstWild = firstWildText;
-    }
-    else
+    wxArrayString wildDescriptions, wildFilters;
+    if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )

     {
     {

-        wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );
-        firstWildText = tokens.GetNextToken();
-        firstWild = tokens.GetNextToken();
+        wxFAIL_MSG( wxT("Wrong file type description") );

     }
     }

-    if ( firstWild.Left( 2 ) == wxT("*.") )
-        m_filterExtension = firstWild.Mid( 1 );
-    if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString;

 
     // layout
 
 
     // layout
 

+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+

     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxBitmapButton *but;
 
     wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
 
     wxBoxSizer *buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxBitmapButton *but;
 

-    but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
+    but = new wxBitmapButton(this, ID_LIST_MODE,
+                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 

-    but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
+    but = new wxBitmapButton(this, ID_REPORT_MODE,
+                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif


@@ -1006,14 +931,16 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     buttonsizer->Add( 30, 5, 1 );
 
 
     buttonsizer->Add( 30, 5, 1 );
 

-    but = new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
+    m_upDirButton = new wxBitmapButton(this, ID_UP_DIR,
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    but->SetToolTip( _("Go to parent directory") );
+    m_upDirButton->SetToolTip( _("Go to parent directory") );

 #endif
 #endif

-    buttonsizer->Add( but, 0, wxALL, 5 );
+    buttonsizer->Add( m_upDirButton, 0, wxALL, 5 );

 
 

-#ifndef __DOS__ // VS: Home directory is senseless in MS-DOS...
-    but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+#ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
+    but = new wxBitmapButton(this, ID_PARENT_DIR,
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif


@@ -1022,52 +949,78 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 

-    but = new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
+    m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR,
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    but->SetToolTip( _("Create new directory") );
+    m_newDirButton->SetToolTip( _("Create new directory") );

 #endif
 #endif

-    buttonsizer->Add( but, 0, wxALL, 5 );
+    buttonsizer->Add( m_newDirButton, 0, wxALL, 5 );

 
 

-    mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
+    if (is_pda)
+        mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+    else
+        mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );

 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );

-    staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
+    if (is_pda)
+        staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );

     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 

-    if (m_dialogStyle & wxMULTIPLE)
-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                 wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER );
+    long style2 = ms_lastViewStyle | wxSUNKEN_BORDER;
+    if ( !(m_dialogStyle & wxMULTIPLE) )
+        style2 |= wxLC_SINGLE_SEL;
+
+    m_list = new wxFileCtrl( this, ID_LIST_CTRL,
+                             wildFilters[0], ms_lastShowHidden,
+                             wxDefaultPosition, wxSize(540,200),
+                             style2);
+
+    if (is_pda)
+    {
+        // PDAs have a different screen layout
+        mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+
+        wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+        textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
+        mainsizer->Add( textsizer, 0, wxEXPAND );
+
+        m_check = NULL;
+        m_choice = new wxChoice( this, ID_CHOICE );
+        textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
+
+        buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+        buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
+        buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 );
+        mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
+    }

     else
     else

-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                 wxSize(540,200), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
-    m_list -> ShowHidden(s_lastShowHidden);
-    mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
-
-    wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
-    m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
-    textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
-    textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
-    mainsizer->Add( textsizer, 0, wxEXPAND );
-
-    wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
-    m_choice = new wxChoice( this, ID_CHOICE );
-    choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
-    m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
-    m_check->SetValue( s_lastShowHidden );
-    choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
-    choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
-    mainsizer->Add( choicesizer, 0, wxEXPAND );
-
-    m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
-    while (tokens.HasMoreTokens())

     {
     {

-        firstWildText = tokens.GetNextToken();
-        firstWild = tokens.GetNextToken();
-        m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
+        mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
+
+        wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+        m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+        textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+        textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+        mainsizer->Add( textsizer, 0, wxEXPAND );
+
+        wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
+        m_choice = new wxChoice( this, ID_CHOICE );
+        choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
+        m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+        m_check->SetValue( ms_lastShowHidden );
+        choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
+        choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
+        mainsizer->Add( choicesizer, 0, wxEXPAND );
+    }
+
+    for (size_t n=0; n<wildFilters.GetCount(); n++)
+    {
+        m_choice->Append( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) );

     }
     }

-    m_choice->SetSelection( 0 );
+    SetFilterIndex( 0 );

 
     SetAutoLayout( TRUE );
     SetSizer( mainsizer );
 
     SetAutoLayout( TRUE );
     SetSizer( mainsizer );


@@ -1077,87 +1030,147 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
 
     Centre( wxBOTH );
 

-/*
-    if (m_fileName.IsEmpty())
-        m_list->SetFocus();
-    else
-*/
-        m_text->SetFocus();
-
-    wxEndBusyCursor();
+    m_text->SetFocus();

 }
 
 }
 

-wxFileDialog::~wxFileDialog()
+wxGenericFileDialog::~wxGenericFileDialog()

 {
     if (wxConfig::Get(FALSE))
     {
 {
     if (wxConfig::Get(FALSE))
     {

-        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
-        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+                               ms_lastViewStyle);
+        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+                               ms_lastShowHidden);
+    }
+
+    const int count = m_choice->GetCount();
+    for ( int i = 0; i < count; i++ )
+    {
+        delete (wxString *)m_choice->GetClientData(i);
+    }
+}
+
+int wxGenericFileDialog::ShowModal()
+{
+    m_list->GoToDir(m_dir);
+    UpdateControls();
+    m_text->SetValue(m_fileName);
+
+    return wxDialog::ShowModal();
+}
+
+bool wxGenericFileDialog::Show( bool show )
+{
+    if (show)
+    {
+        m_list->GoToDir(m_dir);
+        UpdateControls();
+        m_text->SetValue(m_fileName);

     }
     }

+
+    return wxDialog::Show( show );

 }
 
 }
 

-void wxFileDialog::OnChoice( wxCommandEvent &event )
+void wxGenericFileDialog::DoSetFilterIndex(int filterindex)

 {
 {

-    int index = (int)event.GetInt();
-    wxString *str = (wxString*) m_choice->GetClientData( index );
+    wxString *str = (wxString*) m_choice->GetClientData( filterindex );

     m_list->SetWild( *str );
     m_list->SetWild( *str );

-    m_filterIndex = index;
-    if ( str -> Left( 2 ) == wxT("*.") )
+    m_filterIndex = filterindex;
+    if ( str->Left(2) == wxT("*.") )

     {
     {

-        m_filterExtension = str -> Mid( 1 );
-        if (m_filterExtension == ".*") m_filterExtension = wxEmptyString;
+        m_filterExtension = str->Mid(1);
+        if (m_filterExtension == _T(".*"))
+            m_filterExtension.clear();

     }
     else
     }
     else

-        m_filterExtension = wxEmptyString;
+    {
+        m_filterExtension.clear();
+    }
+}
+
+void wxGenericFileDialog::SetFilterIndex( int filterindex )
+{
+    m_choice->SetSelection( filterindex );
+
+    DoSetFilterIndex(filterindex);
+}
+
+void wxGenericFileDialog::OnChoiceFilter( wxCommandEvent &event )
+{
+    DoSetFilterIndex((int)event.GetInt());

 }
 
 }
 

-void wxFileDialog::OnCheck( wxCommandEvent &event )
+void wxGenericFileDialog::OnCheck( wxCommandEvent &event )

 {
 {

-    m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
+    m_list->ShowHidden( (ms_lastShowHidden = event.GetInt() != 0) );

 }
 
 }
 

-void wxFileDialog::OnActivated( wxListEvent &event )
+void wxGenericFileDialog::OnActivated( wxListEvent &event )

 {
     HandleAction( event.m_item.m_text );
 }
 
 {
     HandleAction( event.m_item.m_text );
 }
 

-void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )

 {
     wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     cevent.SetEventObject( this );
     GetEventHandler()->ProcessEvent( cevent );
 }
 
 {
     wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     cevent.SetEventObject( this );
     GetEventHandler()->ProcessEvent( cevent );
 }
 

-void wxFileDialog::OnSelected( wxListEvent &event )
+static bool ignoreChanges = FALSE;
+
+void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    if (FindFocus() != m_list) return;
+    if (!ignoreChanges)
+    {
+        // Clear selections.  Otherwise when the user types in a value they may
+        // not get the file whose name they typed.
+        if (m_list->GetSelectedItemCount() > 0)
+        {
+            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);
+            }
+        }
+    }
+}

 
 

+void wxGenericFileDialog::OnSelected( wxListEvent &event )
+{

     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;
 
     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;
 

-    wxString dir;
-    m_list->GetDir( dir );
-    if (dir != wxT("/")) dir += wxFILE_SEP_PATH;
+    wxString dir = m_list->GetDir();
+    if (!IsTopMostDir(dir))
+        dir += wxFILE_SEP_PATH;

     dir += filename;
     if (wxDirExists(dir)) return;
 
     dir += filename;
     if (wxDirExists(dir)) return;
 

+    ignoreChanges = TRUE;

     m_text->SetValue( filename );
     m_text->SetValue( filename );

+    ignoreChanges = FALSE;

 }
 
 }
 

-void wxFileDialog::HandleAction( const wxString &fn )
+void wxGenericFileDialog::HandleAction( const wxString &fn )

 {
     wxString filename( fn );
 {
     wxString filename( fn );

-    wxString dir;
-    m_list->GetDir( dir );
+    wxString dir = m_list->GetDir();

     if (filename.IsEmpty()) return;
     if (filename == wxT(".")) return;
 
     if (filename.IsEmpty()) return;
     if (filename == wxT(".")) return;
 

+    // "some/place/" means they want to chdir not try to load "place"
+    bool want_dir = filename.Last() == wxFILE_SEP_PATH;
+    if (want_dir)
+        filename = filename.RemoveLast();
+

     if (filename == wxT(".."))
     {
         m_list->GoToParentDir();
         m_list->SetFocus();
     if (filename == wxT(".."))
     {
         m_list->GoToParentDir();
         m_list->SetFocus();

-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
+        UpdateControls();

         return;
     }
 
         return;
     }
 


@@ -1166,18 +1179,13 @@ void wxFileDialog::HandleAction( const wxString &fn )
     {
         m_list->GoToHomeDir();
         m_list->SetFocus();
     {
         m_list->GoToHomeDir();
         m_list->SetFocus();

-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
+        UpdateControls();

         return;
     }
 
         return;
     }
 

-    if (filename[0u] == wxT('~'))
+    if (filename.BeforeFirst(wxT('/')) == wxT("~"))

     {
     {

-        filename.Remove( 0, 1 );
-        wxString tmp( wxGetUserHome() );
-        tmp += wxT('/');
-        tmp += filename;
-        filename = tmp;
+        filename = wxGetUserHome() + filename.Remove(0, 1);

     }
 #endif // __UNIX__
 
     }
 #endif // __UNIX__
 


@@ -1193,8 +1201,9 @@ void wxFileDialog::HandleAction( const wxString &fn )
         return;
     }
 
         return;
     }
 

-    if (dir != wxT("/")) dir += wxFILE_SEP_PATH;
-    if (filename[0u] != wxT('/'))
+    if (!IsTopMostDir(dir))
+        dir += wxFILE_SEP_PATH;
+    if (!wxIsAbsolutePath(filename))

     {
         dir += filename;
         filename = dir;
     {
         dir += filename;
         filename = dir;


@@ -1203,42 +1212,45 @@ void wxFileDialog::HandleAction( const wxString &fn )
     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );
     if (wxDirExists(filename))
     {
         m_list->GoToDir( filename );

-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
+        UpdateControls();

         return;
     }
 
         return;
     }
 

-
-    if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
+    // they really wanted a dir, but it doesn't exist
+    if (want_dir)

     {
     {

-        if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
-            filename << m_filterExtension;
-        if (wxFileExists( filename ))
-        {
-            wxString msg;
-            msg.Printf( _("File '%s' already exists, do you really want to "
-                         "overwrite it?"), filename.c_str() );
+        wxMessageBox(_("Directory doesn't exist."), _("Error"),
+                     wxOK | wxICON_ERROR );
+        return;
+    }

 
 

-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
-                return;
-        }
+    // append the default extension to the filename if it doesn't have any
+    //
+    // VZ: the logic of testing for !wxFileExists() only for the open file
+    //     dialog is not entirely clear to me, why don't we allow saving to a
+    //     file without extension as well?
+    if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
+    {
+        filename = AppendExtension(filename, m_filterExtension);

     }
     }

-    else if ( m_dialogStyle & wxOPEN )
+
+    // check that the file [doesn't] exist if necessary
+    if ( (m_dialogStyle & wxSAVE) &&
+            (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+                wxFileExists( filename ) )

     {
     {

-        if ( !wxFileExists( filename ) )
-            if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                  filename.AfterLast( wxT('.') ).Find( wxFILE_SEP_PATH ) != wxNOT_FOUND)
-                filename << m_filterExtension;
+        wxString msg;
+        msg.Printf( _("File '%s' already exists, do you really want to overwrite it?"), filename.c_str() );

 
 

-        if ( m_dialogStyle & wxFILE_MUST_EXIST )
-        {
-            if ( !wxFileExists( filename ) )
-            {
-                wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
-                return;
-            }
-        }
+        if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
+            return;
+    }
+    else if ( (m_dialogStyle & wxOPEN) &&
+                (m_dialogStyle & wxFILE_MUST_EXIST) &&
+                    !wxFileExists(filename) )
+    {
+        wxMessageBox(_("Please choose an existing file."), _("Error"),
+                     wxOK | wxICON_ERROR );

     }
 
     SetPath( filename );
     }
 
     SetPath( filename );


@@ -1249,7 +1261,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 

-        if ( cwd != wxGetWorkingDirectory() )
+        if ( cwd != wxGetCwd() )

         {
             wxSetWorkingDirectory(cwd);
         }
         {
             wxSetWorkingDirectory(cwd);
         }


@@ -1259,57 +1271,53 @@ void wxFileDialog::HandleAction( const wxString &fn )
     wxDialog::OnOK(event);
 }
 
     wxDialog::OnOK(event);
 }
 

-void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )

 {
     HandleAction( m_text->GetValue() );
 }
 
 {
     HandleAction( m_text->GetValue() );
 }
 

-void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )

 {
     m_list->ChangeToListMode();
 {
     m_list->ChangeToListMode();

-    s_lastViewStyle = wxLC_LIST;
+    ms_lastViewStyle = wxLC_LIST;

     m_list->SetFocus();
 }
 
     m_list->SetFocus();
 }
 

-void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )

 {
     m_list->ChangeToReportMode();
 {
     m_list->ChangeToReportMode();

-    s_lastViewStyle = wxLC_REPORT;
+    ms_lastViewStyle = wxLC_REPORT;

     m_list->SetFocus();
 }
 
     m_list->SetFocus();
 }
 

-void wxFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )

 {
     m_list->GoToParentDir();
     m_list->SetFocus();
 {
     m_list->GoToParentDir();
     m_list->SetFocus();

-    wxString dir;
-    m_list->GetDir( dir );
-    m_static->SetLabel( dir );
+    UpdateControls();

 }
 
 }
 

-void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )

 {
     m_list->GoToHomeDir();
     m_list->SetFocus();
 {
     m_list->GoToHomeDir();
     m_list->SetFocus();

-    wxString dir;
-    m_list->GetDir( dir );
-    m_static->SetLabel( dir );
+    UpdateControls();

 }
 
 }
 

-void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
+void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )

 {
     m_list->MakeDir();
 }
 
 {
     m_list->MakeDir();
 }
 

-void wxFileDialog::SetPath( const wxString& path )
+void wxGenericFileDialog::SetPath( const wxString& path )

 {
     // not only set the full path but also update filename and dir
     m_path = path;
 {
     // not only set the full path but also update filename and dir
     m_path = path;

-    if ( !!path )
+    if ( !path.empty() )

     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);

-        if (!ext.IsEmpty())
+        if (!ext.empty())

         {
             m_fileName += wxT(".");
             m_fileName += ext;
         {
             m_fileName += wxT(".");
             m_fileName += ext;


@@ -1317,7 +1325,7 @@ void wxFileDialog::SetPath( const wxString& path )
     }
 }
 
     }
 }
 

-void wxFileDialog::GetPaths( wxArrayString& paths ) const
+void wxGenericFileDialog::GetPaths( wxArrayString& paths ) const

 {
     paths.Empty();
     if (m_list->GetSelectedItemCount() == 0)
 {
     paths.Empty();
     if (m_list->GetSelectedItemCount() == 0)


@@ -1328,9 +1336,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
 
     paths.Alloc( m_list->GetSelectedItemCount() );
 
 
     paths.Alloc( m_list->GetSelectedItemCount() );
 

-    wxString dir;
-    m_list->GetDir( dir );
-    if (dir != wxT("/")) dir += wxFILE_SEP_PATH;
+    wxString dir = m_list->GetDir();
+#ifdef __UNIX__
+    if (dir != wxT("/"))
+#endif
+        dir += wxFILE_SEP_PATH;

 
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT;
 
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT;


@@ -1345,7 +1355,7 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
     }
 }
 
     }
 }
 

-void wxFileDialog::GetFilenames(wxArrayString& files) const
+void wxGenericFileDialog::GetFilenames(wxArrayString& files) const

 {
     files.Empty();
     if (m_list->GetSelectedItemCount() == 0)
 {
     files.Empty();
     if (m_list->GetSelectedItemCount() == 0)


@@ -1368,103 +1378,24 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     }
 }
 
     }
 }
 

-
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-wxString
-wxFileSelectorEx(const wxChar *message,
-                 const wxChar *default_path,
-                 const wxChar *default_filename,
-                 int *WXUNUSED(indexDefaultExtension),
-                 const wxChar *wildcard,
-                 int flags,
-                 wxWindow *parent,
-                 int x, int y)
-{
-    // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, wxT(""),
-                          wildcard, flags, parent, x, y);
-}
-
-wxString wxFileSelector( const wxChar *title,
-                      const wxChar *defaultDir, const wxChar *defaultFileName,
-                      const wxChar *defaultExtension, const wxChar *filter, int flags,
-                      wxWindow *parent, int x, int y )
-{
-    wxString filter2;
-    if ( defaultExtension && !filter )
-        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
-    else if ( filter )
-        filter2 = filter;
-
-    wxString defaultDirString;
-    if (defaultDir)
-        defaultDirString = defaultDir;
-
-    wxString defaultFilenameString;
-    if (defaultFileName)
-        defaultFilenameString = defaultFileName;
-
-    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
-
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        return fileDialog.GetPath();
-    }
-    else
-    {
-        return wxEmptyString;
-    }
-}
-
-wxString wxLoadFileSelector( const wxChar *what, const wxChar *ext, const wxChar *default_name, wxWindow *parent )
-{
-    wxString prompt = wxString::Format(_("Load %s file"), what);
-
-    if (*ext == wxT('.'))
-        ext++;
-
-    wxString wild = wxString::Format(_T("*.%s"), ext);
-
-    return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
-                          ext, wild, 0, parent);
-}
-
-wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
-         wxWindow *parent )
+void wxGenericFileDialog::UpdateControls()

 {
 {

-    wxChar *ext = (wxChar *)extension;
-
-    wxString prompt = wxString::Format(_("Save %s file"), what);
-
-    if (*ext == wxT('.'))
-        ext++;
+    wxString dir = m_list->GetDir();
+    m_static->SetLabel(dir);

 
 

-    wxString wild = wxString::Format(_T("*.%s"), ext);
+    bool enable = !IsTopMostDir(dir);
+    m_upDirButton->Enable(enable);

 
 

-    return wxFileSelector(prompt, (const wxChar *) NULL, default_name,
-                          ext, wild, 0, parent);
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+    m_newDirButton->Enable(enable);
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 }
 
 }
 

+#ifdef USE_GENERIC_FILEDIALOG

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);

 
 

-
-
-
-// A module to allow icons table cleanup
-
-class wxFileDialogGenericModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxFileDialogGenericModule)
-public:
-    wxFileDialogGenericModule() {}
-    bool OnInit() { return TRUE; }
-    void OnExit() { if (g_IconsTable) {delete g_IconsTable; g_IconsTable = NULL;} }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
+#endif // USE_GENERIC_FILEDIALOG

 
 #endif // wxUSE_FILEDLG
 
 #endif // wxUSE_FILEDLG

+