no changes, just fixed a typo in an error message

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index e079149348cc9e4fb564a31fb3cc9ae3ee264a9a..066131180fcb4ff544ebfffba4b639c2c26d2ae2 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,6 +1,6 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        filedlgg.cpp
-// Purpose:     wxFileDialog
+//////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/filedlgg.cpp
+// Purpose:     wxGenericFileDialog

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


@@ -9,786 +9,216 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "filedlgg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef __UNIX__
-#error wxFileDialog currently only supports unix
+#if wxUSE_FILEDLG
+
+// 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
 
 #endif
 

-#include "wx/filedlg.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/intl.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"
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/bmpbuttn.h"
+    #include "wx/checkbox.h"
+    #include "wx/choice.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/sizer.h"
+    #include "wx/filedlg.h"     // wxFD_OPEN, wxFD_SAVE...
+#endif

 
 

+#include "wx/longlong.h"
+#include "wx/config.h"
+#include "wx/imaglist.h"
+#include "wx/artprov.h"
+#include "wx/filefn.h"
+#include "wx/filectrl.h"
+#include "wx/generic/filedlgg.h"
+#include "wx/debug.h"

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

-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <pwd.h>
-#include <grp.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "wx/generic/home.xpm"
-#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"
-
-// ----------------------------------------------------------------------------
-// private classes - icons list management
-// ----------------------------------------------------------------------------
-
-class wxFileIconEntry : public wxObject
-{
-    public:
-        wxFileIconEntry(int i) { id = i; }
-    
-        int id;
-};
-
-
-class wxFileIconsTable
-{
-    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
-
-wxFileIconsTable::wxFileIconsTable() :
-                    m_ImageList(16, 16),
-                    m_HashTable(wxKEY_STRING)
-{
-    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)
-     */
-}
-
-
-
-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();
-    
-    unsigned x, y;
-    unsigned sr, sg, sb, smask;
-    
-    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
-    small.SetMaskColour(mr, mr, mr);
-    
-    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;
-    }
-    
-    return small.ConvertToBitmap();
-}
-
-
-int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
-{
-    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()))
-    {
-        int newid = FI_UNKNOWN;
-        m_HashTable.Put(extension, new wxFileIconEntry(newid));
-        return newid;
-    }
-    wxImage img(ic);
-    delete ft;
-    
-    int id = m_ImageList.GetImageCount();
-    if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_ImageList.Add(img.ConvertToBitmap());
-    else
-    {
-        if (img.GetWidth() != 32 || img.GetHeight() != 32)
-            img.Rescale(32, 32);
-        m_ImageList.Add(CreateAntialiasedBitmap(img));
-    }
-    m_HashTable.Put(extension, new wxFileIconEntry(id));
-    return id;
-}
-
-
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+#ifndef __WXWINCE__
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#endif

 
 

-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() );
-}
+#ifdef __UNIX__
+    #include <dirent.h>
+    #include <pwd.h>
+    #ifndef __VMS
+    # include <grp.h>
+    #endif
+#endif

 
 

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileData,wxObject);
+#ifdef __WATCOMC__
+    #include <direct.h>
+#endif

 
 

-wxFileData::wxFileData( const wxString &name, const wxString &fname )
-{
-    m_name = name;
-    m_fileName = fname;
+#ifndef __WXWINCE__
+#include <time.h>
+#endif

 
 

-    struct stat buff;
-    stat( m_fileName.fn_str(), &buff );
+#if defined(__UNIX__) || defined(__DOS__)
+#include <unistd.h>
+#endif

 
 

-#ifndef __EMX__
-    struct stat lbuff;
-    lstat( m_fileName.fn_str(), &lbuff );
-    m_isLink = S_ISLNK( lbuff.st_mode );
-    struct tm *t = localtime( &lbuff.st_mtime );
+#if defined(__WXWINCE__)
+#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))
+#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__))
+#define IsTopMostDir(dir)   (dir.empty())

 #else
 #else

-    m_isLink = FALSE;
-    struct tm *t = localtime( &buff.st_mtime );
+#define IsTopMostDir(dir)   (dir == wxT("/"))

 #endif
 
 #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_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('-')) );
-}
-
-wxString wxFileData::GetName() const
-{
-    return m_name;
-}
-
-wxString wxFileData::GetFullName() const
-{
-    return m_fileName;
-}
-
-wxString wxFileData::GetHint() const
-{
-    wxString s = m_fileName;
-    s += "  ";
-    if (m_isDir) s += _("<DIR> ");
-    else if (m_isLink) s += _("<LINK> ");
-    else
-    {
-        s += LongToString( m_size );
-        s += _(" bytes ");
-    }
-    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;
-};
-
-wxString wxFileData::GetEntry( int num )
-{
-    wxString s;
-    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 );
-            break;
-        }
-        case 4:
-            s = m_permissions;
-            break;
-        default:
-            s = wxT("No entry");
-            break;
-    }
-    return s;
-}
-
-bool wxFileData::IsDir()
-{
-    return m_isDir;
-}
-
-bool wxFileData::IsExe()
-{
-    return m_isExe;
-}
-
-bool wxFileData::IsLink()
-{
-    return m_isLink;
-}
-
-long wxFileData::GetSize()
-{
-    return m_size;
-}
-
-void wxFileData::SetNewName( const wxString &name, const wxString &fname )
-{
-    m_name = name;
-    m_fileName = fname;
-}
-
-void wxFileData::MakeItem( wxListItem &item )
-{
-    item.m_text = m_name;
-    item.ClearAttributes();
-    if (IsExe()) item.SetTextColour(*wxRED);
-    if (IsDir()) item.SetTextColour(*wxBLUE);
-    
-    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;
-
-    if (IsLink())
-    {
-        wxColour *dg = wxTheColourDatabase->FindColour( "MEDIUM GREY" );
-        item.SetTextColour(*dg);
-    }
-    item.m_data = (long)this;
-}
-

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

-//  wxFileCtrl
+// wxGenericFileDialog

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

-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
-
-BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
-    EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
-    EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
+#define  ID_LIST_MODE     (wxID_FILEDLGG    )
+#define  ID_REPORT_MODE   (wxID_FILEDLGG + 1)
+#define  ID_UP_DIR        (wxID_FILEDLGG + 2)
+#define  ID_PARENT_DIR    (wxID_FILEDLGG + 3)
+#define  ID_NEW_DIR       (wxID_FILEDLGG + 4)
+#define  ID_FILE_CTRL     (wxID_FILEDLGG + 5)
+
+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::OnOk)
+    EVT_FILECTRL_FILEACTIVATED(ID_FILE_CTRL, wxGenericFileDialog::OnFileActivated)
+
+    EVT_UPDATE_UI(ID_UP_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+    EVT_UPDATE_UI(ID_NEW_DIR, wxGenericFileDialog::OnUpdateButtonsUI)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
+bool wxGenericFileDialog::ms_lastShowHidden = false;

 
 

-
-wxFileCtrl::wxFileCtrl()
-{
-    m_dirName = wxT("/");
-    m_showHidden = FALSE;
-}
-
-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 )
-{
-    if (! g_IconsTable) g_IconsTable = new wxFileIconsTable;
-    wxImageList *imageList = g_IconsTable -> GetImageList();
-
-    SetImageList( imageList, wxIMAGE_LIST_SMALL );
-
-    m_dirName = dirName;
-    m_wild = wild;
-    m_showHidden = FALSE;
-    Update();
-}
-
-void wxFileCtrl::ChangeToListMode()
-{
-    SetSingleStyle( wxLC_LIST );
-    Update();
-}
-
-void wxFileCtrl::ChangeToReportMode()
+void wxGenericFileDialog::Init()

 {
 {

-    SetSingleStyle( wxLC_REPORT );
-    Update();
-}
+    m_bypassGenericImpl = false;

 
 

-void wxFileCtrl::ChangeToIconMode()
-{
-    SetSingleStyle( wxLC_ICON );
-    Update();
+    m_filectrl   = NULL;
+    m_upDirButton  = NULL;
+    m_newDirButton = NULL;

 }
 
 }
 

-void wxFileCtrl::ShowHidden( bool show )
+wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
+                           const wxString& message,
+                           const wxString& defaultDir,
+                           const wxString& defaultFile,
+                           const wxString& wildCard,
+                           long  style,
+                           const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name,
+                           bool  bypassGenericImpl ) : wxFileDialogBase()

 {
 {

-    m_showHidden = show;
-    Update();
+    Init();
+    Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl );

 }
 
 }
 

-long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
+bool wxGenericFileDialog::Create( wxWindow *parent,
+                                  const wxString& message,
+                                  const wxString& defaultDir,
+                                  const wxString& defaultFile,
+                                  const wxString& wildCard,
+                                  long  style,
+                                  const wxPoint& pos,
+                                  const wxSize& sz,
+                                  const wxString& name,
+                                  bool  bypassGenericImpl )

 {
 {

-    long ret = -1;
-    item.m_mask = wxLIST_MASK_TEXT + wxLIST_MASK_DATA + wxLIST_MASK_IMAGE;
-    fd->MakeItem( item );
-    long my_style = GetWindowStyleFlag();
-    if (my_style & wxLC_REPORT)
-    {
-        ret = InsertItem( item );
-        for (int i = 1; i < 5; i++) SetItem( item.m_itemId, i, fd->GetEntry( i) );
-    }
-    else if (my_style & wxLC_LIST)
-    {
-        ret = InsertItem( item );
-    }
-    return ret;
-}
+    m_bypassGenericImpl = bypassGenericImpl;

 
 

-void wxFileCtrl::Update()
-{
-    long my_style = GetWindowStyleFlag();
-    int name_col_width = 0;
-    if (my_style & wxLC_REPORT)
-    {
-        if (GetColumnCount() > 0)
-            name_col_width = GetColumnWidth( 0 );
-    }
-    
-    ClearAll();
-    if (my_style & 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 );
-        InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, 120 );
-    }
-    wxFileData *fd = (wxFileData *) NULL;
-    wxListItem item;
-    item.m_itemId = 0;
-    item.m_col = 0;
+    parent = GetParentForModalDialog(parent);

 
 

-    if (m_dirName != wxT("/"))
+    if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
+                                  wildCard, style, pos, sz, name))

     {
     {

-        wxString p( wxPathOnly(m_dirName) );
-        if (p.IsEmpty()) p = wxT("/");
-        fd = new wxFileData( wxT(".."), p );
-        Add( fd, item );
-        item.m_itemId++;
+        return false;

     }
 
     }
 

-    wxString res = m_dirName + wxT("/*");
-    wxString f( wxFindFirstFile( res.GetData(), wxDIR ) );
-    while (!f.IsEmpty())
-    {
-        res = wxFileNameFromPath( f );
-        fd = new wxFileData( res, f );
-        wxString s = fd->GetName();
-        if (m_showHidden || (s[0] != wxT('.')))
-        {
-            Add( fd, item );
-            item.m_itemId++;
-        }
-        f = wxFindNextFile();
-    }
+    if (m_bypassGenericImpl)
+        return true;

 
 

-    res = m_dirName + wxT("/") + m_wild;
-    f = wxFindFirstFile( res.GetData(), wxFILE );
-    while (!f.IsEmpty())
+    if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz,
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | style, name
+                           ))

     {
     {

-        res = wxFileNameFromPath( f );
-        fd = new wxFileData( res, f );
-        wxString s = fd->GetName();
-        if (m_showHidden || (s[0] != wxT('.')))
-        {
-            Add( fd, item );
-            item.m_itemId++;
-        }
-        f = wxFindNextFile();
+        return false;

     }
 
     }
 

-    SortItems( ListCompare, 0 );
-
-    SetColumnWidth( 1, wxLIST_AUTOSIZE );
-    SetColumnWidth( 2, wxLIST_AUTOSIZE );
-    SetColumnWidth( 3, wxLIST_AUTOSIZE );
-}
-
-void wxFileCtrl::SetWild( const wxString &wild )
-{
-    m_wild = wild;
-    Update();
-}
-
-void wxFileCtrl::MakeDir()
-{
-    wxString new_name( wxT("NewName") );
-    wxString path( m_dirName );
-    path += wxT("/");
-    path += new_name;
-    if (wxFileExists(path))
-    {
-        // try NewName0, NewName1 etc.
-        int i = 0;
-        do {
-            new_name = _("NewName");
-            wxString num;
-            num.Printf( wxT("%d"), i );
-            new_name += num;
-
-            path = m_dirName;
-            path += wxT("/");
-            path += new_name;
-            i++;
-        } while (wxFileExists(path));
-    }
-
-    wxLogNull log;
-    if (!wxMkdir(path))
+#if wxUSE_CONFIG
+    if (wxConfig::Get(false))

     {
     {

-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        return;
-    }
-
-    wxFileData *fd = new wxFileData( new_name, path );
-    wxListItem item;
-    item.m_itemId = 0;
-    item.m_col = 0;
-    long id = Add( fd, item );
-
-    if (id != -1)
-    {
-        SortItems( ListCompare, 0 );
-        id = FindItem( 0, (long)fd );
-        EnsureVisible( id );
-        EditLabel( id );
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+                              &ms_lastViewStyle);
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+                              &ms_lastShowHidden);

     }
     }

-}
-
-void wxFileCtrl::GoToParentDir()
-{
-    if (m_dirName != wxT("/"))
-    {
-        wxString fname( wxFileNameFromPath(m_dirName) );
-        m_dirName = wxPathOnly( m_dirName );
-        if (m_dirName.IsEmpty()) m_dirName = wxT("/");
-        Update();
-        long id = FindItem( 0, fname );
-        if (id != -1)
-        {
-            SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-            EnsureVisible( id );
-        }
-    }
-}
-
-void wxFileCtrl::GoToHomeDir()
-{
-    wxString s = wxGetUserHome( wxString() );
-    m_dirName = s;
-    Update();
-    SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-    EnsureVisible( 0 );
-}
-
-void wxFileCtrl::GoToDir( const wxString &dir )
-{
-    m_dirName = dir;
-    Update();
-    SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-    EnsureVisible( 0 );
-}
-
-void wxFileCtrl::GetDir( wxString &dir )
-{
-    dir = m_dirName;
-}
-
-void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
-{
-    wxFileData *fd = (wxFileData*)event.m_item.m_data;
-    delete fd;
-}
-
-void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
-{
-    wxFileData *fd = (wxFileData*)event.m_item.m_data;
-    wxASSERT( fd );
-
-    if ((event.GetLabel().IsEmpty()) ||
-        (event.GetLabel() == _(".")) ||
-        (event.GetLabel() == _("..")) ||
-        (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))
-    {
-        wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-        return;
-    }
-
-    wxString new_name( wxPathOnly( fd->GetFullName() ) );
-    new_name += wxT("/");
-    new_name += event.GetLabel();
-
-    wxLogNull log;
-
-    if (wxFileExists(new_name))
-    {
-        wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-    }
-
-    if (wxRenameFile(fd->GetFullName(),new_name))
-    {
-        fd->SetNewName( new_name, event.GetLabel() );
-        SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-        EnsureVisible( event.GetItem() );
-    }
-    else
-    {
-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-    }
-}
-
-//-----------------------------------------------------------------------------
-// wxFileDialog
-//-----------------------------------------------------------------------------
-
-#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)
-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 )
-{
-    wxBeginBusyCursor();
+#endif

 
 

-    if (wxConfig::Get(FALSE))
+    if ((m_dir.empty()) || (m_dir == wxT(".")))

     {
     {

-        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
-        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+        m_dir = wxGetCwd();
+        if (m_dir.empty())
+            m_dir = wxFILE_SEP_PATH;

     }
 
     }
 

-    m_message = message;
-    m_dialogStyle = style;
+    const size_t len = m_dir.length();
+    if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
+        m_dir.Remove( len-1, 1 );

 
 

-    if (m_dialogStyle == 0) m_dialogStyle = wxOPEN;
-    if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
-        m_dialogStyle |= wxOPEN;
-
-    m_dir = defaultDir;
-    if ((m_dir.IsEmpty()) || (m_dir == wxT(".")))
-    {
-        char buf[200];
-        m_dir = getcwd( buf, sizeof(buf) );
-    }
-    m_path = defaultDir;
-    m_path += wxT("/");
-    m_path += defaultFile;
-    m_fileName = defaultFile;
-    m_wildCard = wildCard;
-    m_filterIndex = 0;

     m_filterExtension = wxEmptyString;
 
     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
-    {
-        wxASSERT_MSG( tokens.CountTokens() % 2 == 0, wxT("Wrong file type descripition") );
-        firstWildText = tokens.GetNextToken();
-        firstWild = tokens.GetNextToken();
-    }
-    if ( firstWild.Left( 2 ) == wxT("*.") )
-        m_filterExtension = firstWild.Mid( 1 );
-    if ( m_filterExtension == ".*" ) m_filterExtension = wxEmptyString;
-

     // layout
 
     // layout
 

+    const 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_BUTTON));

 #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_BUTTON));

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


@@ -796,445 +226,192 @@ 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_BUTTON));

 #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 );

 
 

-    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_BUTTON));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5);
 
     buttonsizer->Add( 20, 20 );
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5);
 
     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_BUTTON));

 #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 );
-
-    mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
-
-    wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
-    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 );
+    buttonsizer->Add( m_newDirButton, 0, wxALL, 5 );

 
 

-    if (m_dialogStyle & wxMULTIPLE)
-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER );
+    if (is_pda)
+        mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );

     else
     else

-        m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-                                wxSize(440,180), 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 ) );
-    }
-    m_choice->SetSelection( 0 );
+        mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );

 
 

-    SetAutoLayout( TRUE );
-    SetSizer( mainsizer );
+    long style2 = 0;
+    if ( HasFdFlag(wxFD_MULTIPLE) )
+        style2 |= wxFC_MULTIPLE;

 
 

-    mainsizer->Fit( this );
-    mainsizer->SetSizeHints( this );
-    
-    Centre( wxBOTH );
+    m_filectrl = new wxGenericFileCtrl( this, ID_FILE_CTRL,
+                                        m_dir, defaultFile,
+                                        wildCard,
+                                        style2,
+                                        wxDefaultPosition, wxSize(540,200)
+                                        );

 
 

-    if (m_fileName.IsEmpty())
-        m_list->SetFocus();
-    else
-        m_text->SetFocus();
+    m_filectrl->ShowHidden( ms_lastShowHidden );

 
 

-    wxEndBusyCursor();
-}
-
-wxFileDialog::~wxFileDialog()
-{
-    if (wxConfig::Get(FALSE))
+    if (ms_lastViewStyle == wxLC_LIST)

     {
     {

-        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
-        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+        m_filectrl->ChangeToListMode();

     }
     }

-}
-
-void wxFileDialog::OnChoice( wxCommandEvent &event )
-{
-    int index = (int)event.GetInt();
-    wxString *str = (wxString*) m_choice->GetClientData( index );
-    m_list->SetWild( *str );
-    m_filterIndex = index;
-    if ( str -> Left( 2 ) == wxT("*.") )
+    else if (ms_lastViewStyle == wxLC_REPORT)

     {
     {

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

     }
     }

-    else
-        m_filterExtension = wxEmptyString;
-}
-
-void wxFileDialog::OnCheck( wxCommandEvent &event )
-{
-    m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
-}
-
-void wxFileDialog::OnActivated( wxListEvent &event )
-{
-    HandleAction( event.m_item.m_text );
-}
-
-void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
-{
-    wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-    cevent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( cevent );
-}
-
-void wxFileDialog::OnSelected( wxListEvent &event )
-{
-    if (FindFocus() != m_list) return;
-
-    wxString filename( event.m_item.m_text );
-    if (filename == wxT("..")) return;
-
-    wxString dir;
-    m_list->GetDir( dir );
-    if (dir != wxT("/")) dir += wxT("/");
-    dir += filename;
-    if (wxDirExists(dir)) return;

 
 

-    m_text->SetValue( filename );
-}
-
-void wxFileDialog::HandleAction( const wxString &fn )
-{
-    wxString filename( fn );
-    wxString dir;
-    m_list->GetDir( dir );
-    if (filename.IsEmpty()) return;
-    if (filename == wxT(".")) return;
-
-    if (filename == wxT(".."))
+    if (is_pda)

     {
     {

-        m_list->GoToParentDir();
-        m_list->SetFocus();
-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
-        return;
-    }
+        // PDAs have a different screen layout
+        mainsizer->Add(m_filectrl, wxSizerFlags(1).Expand().HorzBorder());

 
 

-    if (filename == wxT("~"))
-    {
-        m_list->GoToHomeDir();
-        m_list->SetFocus();
-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
-        return;
+        wxSizer *bsizer = CreateButtonSizer(wxOK | wxCANCEL);
+        if ( bsizer )
+            mainsizer->Add(bsizer, wxSizerFlags().Expand().Border());

     }
     }

-
-    if (filename[0] == wxT('~'))
+    else // !is_pda

     {
     {

-        filename.Remove( 0, 1 );
-        wxString tmp( wxGetUserHome() );
-        tmp += wxT('/');
-        tmp += filename;
-        filename = tmp;
-    }
+        mainsizer->Add(m_filectrl, wxSizerFlags(1).Expand().DoubleHorzBorder());

 
 

-    if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
-        (filename.Find(wxT('?')) != wxNOT_FOUND))
-    {
-        if (filename.Find(wxT('/')) != wxNOT_FOUND)
-        {
-            wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
-            return;
+        wxBoxSizer *okcancelsizer = new wxBoxSizer( wxHORIZONTAL );
+        okcancelsizer->Add(new wxButton(this, wxID_OK), wxSizerFlags().DoubleBorder().Centre());
+        okcancelsizer->Add(new wxButton(this, wxID_CANCEL), wxSizerFlags().DoubleBorder().Centre());
+        mainsizer->Add(okcancelsizer, wxSizerFlags().Center());

         }
         }

-        m_list->SetWild( filename );
-        return;
-    }

 
 

-    if (dir != wxT("/")) dir += wxT("/");
-    if (filename[0] != wxT('/'))
-    {
-        dir += filename;
-        filename = dir;
-    }
+    SetAutoLayout( true );
+    SetSizer( mainsizer );

 
 

-    if (wxDirExists(filename))
+    if (!is_pda)

     {
     {

-        m_list->GoToDir( filename );
-        m_list->GetDir( dir );
-        m_static->SetLabel( dir );
-        return;
-    }
+        mainsizer->Fit( this );
+        mainsizer->SetSizeHints( this );

 
 

+        Centre( wxBOTH );
+    }

 
 

-    if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
-    {
-        if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                filename.AfterLast( wxT('.') ).Find( wxT('/') ) != 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() );
+    return true;
+}

 
 

-            if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
-                return;
-        }
-    }
-    else if ( m_dialogStyle & wxOPEN )
+wxGenericFileDialog::~wxGenericFileDialog()
+{
+    if (!m_bypassGenericImpl)

     {
     {

-        if ( !wxFileExists( filename ) )
-            if (filename.Find( wxT('.') ) == wxNOT_FOUND ||
-                  filename.AfterLast( wxT('.') ).Find( wxT('/') ) != wxNOT_FOUND)
-                filename << m_filterExtension;
-
-        if ( m_dialogStyle & wxFILE_MUST_EXIST )
+#if wxUSE_CONFIG
+        if (wxConfig::Get(false))

         {
         {

-            if ( !wxFileExists( filename ) )
-            {
-                wxMessageBox(_("Please choose an existing file."), _("Error"), wxOK | wxICON_ERROR );
-                return;
-            }
+            wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+                                   ms_lastViewStyle);
+            wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+                                   ms_lastShowHidden);

         }
         }

+#endif

     }
     }

-
-    SetPath( filename );
-
-    wxCommandEvent event;
-    wxDialog::OnOK(event);

 }
 
 }
 

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

 {
 {

-    HandleAction( m_text->GetValue() );
-}
+    m_filectrl->SetDirectory(m_dir);

 
 

-void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
-{
-    m_list->ChangeToListMode();
-    s_lastViewStyle = wxLC_LIST;
-    m_list->SetFocus();
+    return wxDialog::ShowModal();

 }
 
 }
 

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

 {
 {

-    m_list->ChangeToReportMode();
-    s_lastViewStyle = wxLC_REPORT;
-    m_list->SetFocus();
-}
+    // Called by ShowModal, so don't repeate the update
+#ifndef __WIN32__
+    if (show)
+    {
+        m_filectrl->SetDirectory(m_dir);
+    }
+#endif

 
 

-void wxFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )
-{
-    m_list->GoToParentDir();
-    m_list->SetFocus();
-    wxString dir;
-    m_list->GetDir( dir );
-    m_static->SetLabel( dir );
+    return wxDialog::Show( show );

 }
 
 }
 

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

 {
 {

-    m_list->GoToHomeDir();
-    m_list->SetFocus();
-    wxString dir;
-    m_list->GetDir( dir );
-    m_static->SetLabel( dir );
-}
+    wxArrayString selectedFiles;
+    m_filectrl->GetFilenames(selectedFiles);

 
 

-void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
-{
-    m_list->MakeDir();
-}
+    if (selectedFiles.Count() == 0)
+        return;

 
 

-void wxFileDialog::SetPath( const wxString& path )
-{
-    // not only set the full path but also update filename and dir
-    m_path = path;
-    if ( !!path )
+    if (selectedFiles.Count() == 1)

     {
     {

-        wxString ext;
-        wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        if (!ext.IsEmpty())
-        {
-            m_fileName += wxT(".");
-            m_fileName += ext;
-        }
+        SetPath( selectedFiles[0] );

     }
     }

+
+    EndModal(wxID_OK);

 }
 
 }
 

-void wxFileDialog::GetPaths( wxArrayString& paths ) const
+void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    paths.Empty();
-    if (m_list->GetSelectedItemCount() == 0)
-    {
-        paths.Add( GetPath() );
-        return;
-    }
-
-    paths.Alloc( m_list->GetSelectedItemCount() );
-
-    wxString dir;
-    m_list->GetDir( dir );
-    if (dir != wxT("/")) dir += wxT("/");
-
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT;
-
-    item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) {
-        m_list->GetItem( item );
-        paths.Add( dir + item.m_text );
-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
-            wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    }
+    m_filectrl->ChangeToListMode();
+    ms_lastViewStyle = wxLC_LIST;
+    m_filectrl->GetFileList()->SetFocus();

 }
 
 }
 

-void wxFileDialog::GetFilenames(wxArrayString& files) const
+void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    files.Empty();
-    if (m_list->GetSelectedItemCount() == 0)
-    {
-        files.Add( GetFilename() );
-        return;
-    }
-    files.Alloc( m_list->GetSelectedItemCount() );
-
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT;
-
-    item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) {
-        m_list->GetItem( item );
-        files.Add( item.m_text );
-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
-            wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    }
+    m_filectrl->ChangeToReportMode();
+    ms_lastViewStyle = wxLC_REPORT;
+    m_filectrl->GetFileList()->SetFocus();

 }
 
 }
 

-
-
-// ----------------------------------------------------------------------------
-// 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)
+void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, wxT(""),
-                          wildcard, flags, parent, x, y);
+    m_filectrl->GoToParentDir();
+    m_filectrl->GetFileList()->SetFocus();

 }
 
 }
 

-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 )
+void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    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;
-    }
+    m_filectrl->GoToHomeDir();
+    m_filectrl->SetFocus();

 }
 
 }
 

-wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
+void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )

 {
 {

-    wxChar *ext = (wxChar *)extension;
-
-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
-
-    if (*ext == wxT('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, wxT("*.%s"), ext);
-
-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+    m_filectrl->GetFileList()->MakeDir();

 }
 
 }
 

-wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
-         wxWindow *parent )
+void wxGenericFileDialog::OnFileActivated( wxFileCtrlEvent &WXUNUSED(event) )

 {
 {

-    wxChar *ext = (wxChar *)extension;
-
-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
-
-    if (*ext == wxT('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, wxT("*.%s"), ext);
-
-    return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
+    wxCommandEvent dummy;
+    OnOk( dummy );

 }
 
 }
 

+void wxGenericFileDialog::OnUpdateButtonsUI(wxUpdateUIEvent& event)
+{
+    // surprisingly, we can be called before m_filectrl is set in Create() as
+    // wxFileCtrl ctor itself can generate idle events, so we need this test
+    if ( m_filectrl )
+        event.Enable( !IsTopMostDir(m_filectrl->GetShownDirectory()) );
+}

 
 

+#ifdef wxHAS_GENERIC_FILEDIALOG

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)

 
 

+#endif // wxHAS_GENERIC_FILEDIALOG

 
 

-
-// 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 // wxUSE_FILEDLG