Add support for wxSL_INVERSE flag. Also uses new inverse logic to make Mac vertical...

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 2bd623bd8ccdbc0026cd07ae126e4a06005c78f1..24d1b96afb991ad0e788140056bae286bfb5cd4e 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,4 +1,4 @@
-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////

 // Name:        filedlgg.cpp
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling
 // Name:        filedlgg.cpp
 // Purpose:     wxGenericFileDialog
 // Author:      Robert Roebling


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

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -31,7 +23,7 @@
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested

-#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__)
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)

 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 
 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 


@@ -51,6 +43,7 @@
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"

+#include "wx/settings.h"

 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/filedlg.h"     // wxOPEN, wxSAVE...
 #include "wx/generic/filedlgg.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/filedlg.h"     // wxOPEN, wxSAVE...
 #include "wx/generic/filedlgg.h"


@@ -71,6 +64,11 @@
     #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


@@ -85,7 +83,7 @@
 // ----------------------------------------------------------------------------
 
 static
 // ----------------------------------------------------------------------------
 
 static

-int wxFileDataNameCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -97,7 +95,7 @@ int wxFileDataNameCompare( long data1, long data2, long data)
 }
 
 static
 }
 
 static

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

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -111,7 +109,7 @@ int wxFileDataSizeCompare( long data1, long data2, long data)
 }
 
 static
 }
 
 static

-int wxFileDataTypeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -121,11 +119,11 @@ int wxFileDataTypeCompare( long data1, long data2, long data)
      if (fd2->IsDir() && !fd1->IsDir()) return data;
      if (fd1->IsLink() && !fd2->IsLink()) return -data;
      if (fd2->IsLink() && !fd1->IsLink()) 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->GetType(), fd2->GetType() );
+     return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );

 }
 
 static
 }
 
 static

-int wxFileDataTimeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)

 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;
 {
      wxFileData *fd1 = (wxFileData*)data1;
      wxFileData *fd2 = (wxFileData*)data2;


@@ -134,15 +132,15 @@ int wxFileDataTimeCompare( long data1, long data2, long data)
      if (fd1->IsDir() && !fd2->IsDir()) return -data;
      if (fd2->IsDir() && !fd1->IsDir()) return data;
 
      if (fd1->IsDir() && !fd2->IsDir()) return -data;
      if (fd2->IsDir() && !fd1->IsDir()) return data;
 

-     return fd1->GetTime().IsLaterThan(fd2->GetTime()) ? int(data) : -int(data);
+     return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);

 }
 
 }
 

-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__OS2__)

 #define IsTopMostDir(dir)   (dir == wxT("/"))
 #endif
 
 #define IsTopMostDir(dir)   (dir == wxT("/"))
 #endif
 

-#if defined(__DOS__) || defined(__WINDOWS__)
-#define IsTopMostDir(dir)   (dir.IsEmpty())
+#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
+#define IsTopMostDir(dir)   (dir.empty())

 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
 #endif
 
 #if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)


@@ -164,15 +162,31 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
     m_type = type;
     m_image = image_id;
 
     m_type = type;
     m_image = image_id;
 

+    ReadData();
+}
+
+void wxFileData::Copy( const wxFileData& fileData )
+{
+    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();
+}
+
+void wxFileData::ReadData()
+{

     if (IsDrive())
     {
         m_size = 0;
         return;
     }
 
     if (IsDrive())
     {
         m_size = 0;
         return;
     }
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

     // c:\.. is a drive don't stat it
     // c:\.. is a drive don't stat it

-    if ((fileName == wxT("..")) && (filePath.length() <= 5))
+    if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))

     {
         m_type = is_drive;
         m_size = 0;
     {
         m_type = is_drive;
         m_size = 0;


@@ -182,11 +196,17 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
 
     wxStructStat buff;
 
 
     wxStructStat buff;
 

-#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
+#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()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK( buff.st_mode ) != 0 ? is_link : 0;
 #else // no lstat()

+    // only translate to file charset if we don't go by our
+    // wxStat implementation
+#ifndef wxNEED_WX_UNISTD_H
+    wxStat( m_filePath.fn_str() , &buff );
+#else

     wxStat( m_filePath, &buff );
     wxStat( m_filePath, &buff );

+#endif

 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;


@@ -195,13 +215,16 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
     // try to get a better icon
     if (m_image == wxFileIconsTable::file)
     {
     // try to get a better icon
     if (m_image == wxFileIconsTable::file)
     {

-        if (IsExe())
+        if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
+        {
+            m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
+        } else if (IsExe())
+        {

             m_image = wxFileIconsTable::executable;
             m_image = wxFileIconsTable::executable;

-        else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
-            m_image = wxTheFileIconsTable->GetIconID(m_fileName.AfterLast(wxT('.')));
+        }

     }
 
     }
 

-    m_size = buff.st_size;
+    m_size = (long)buff.st_size;

 
     m_dateTime = buff.st_mtime;
 
 
     m_dateTime = buff.st_mtime;
 


@@ -217,7 +240,7 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)
                          buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
                          buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
 #elif defined(__WIN32__)

-    DWORD attribs = GetFileAttributes(filePath);
+    DWORD attribs = GetFileAttributes(m_filePath);

     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),
     if (attribs != (DWORD)-1)
     {
         m_permissions.Printf(_T("%c%c%c%c"),


@@ -229,7 +252,7 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
 #endif
 }
 
 #endif
 }
 

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

 {
     if (IsDir())
         return _("<DIR>");
 {
     if (IsDir())
         return _("<DIR>");


@@ -237,7 +260,7 @@ wxString wxFileData::GetType() const
         return _("<LINK>");
     else if (IsDrive())
         return _("<DRIVE>");
         return _("<LINK>");
     else if (IsDrive())
         return _("<DRIVE>");

-   else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
+   else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)

         return m_fileName.AfterLast(wxT('.'));
 
     return wxEmptyString;
         return m_fileName.AfterLast(wxT('.'));
 
     return wxEmptyString;


@@ -253,24 +276,25 @@ wxString wxFileData::GetHint() const
 {
     wxString s = m_filePath;
     s += wxT("  ");
 {
     wxString s = m_filePath;
     s += wxT("  ");

+

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

-        s += wxT("<DIR> ");
+        s += _("<DIR>");

     else if (IsLink())
     else if (IsLink())

-        s += wxT("<LINK> ");
+        s += _("<LINK>");

     else if (IsDrive())
     else if (IsDrive())

+        s += _("<DRIVE>");
+    else // plain file
+        s += wxString::Format( _("%ld bytes"), m_size );
+
+    s += wxT(' ');
+
+    if ( !IsDrive() )

     {
     {

-        s += wxT("<DRIVE> ");
-        return s;
-    }
-    else
-    {
-        s += wxString::Format( "%ld", m_size );
-        s += wxT(" bytes ");
+        s << GetModificationTime()
+          << wxT("  ")
+          << m_permissions;

     }
 
     }
 

-    s += GetModificationTime();
-    s += wxT("  ");
-    s += m_permissions;

     return s;
 };
 
     return s;
 };
 


@@ -289,7 +313,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
             break;
 
         case FileList_Type:
             break;
 
         case FileList_Type:

-            s = GetType();
+            s = GetFileType();

             break;
 
         case FileList_Time:
             break;
 
         case FileList_Time:


@@ -329,8 +353,9 @@ void wxFileData::MakeItem( wxListItem &item )
 
     if (IsLink())
     {
 
     if (IsLink())
     {

-        wxColour *dg = wxTheColourDatabase->FindColour( _T("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;
 }


@@ -342,15 +367,16 @@ void wxFileData::MakeItem( wxListItem &item )
 IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
 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)
-    EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick)
+    EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileCtrl::OnListDeleteItem)
+    EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileCtrl::OnListDeleteAllItems)
+    EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileCtrl::OnListEndLabelEdit)
+    EVT_LIST_COL_CLICK(wxID_ANY, wxFileCtrl::OnListColClick)

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

-    m_showHidden = FALSE;
+    m_showHidden = false;

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


@@ -448,6 +474,23 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
     return ret;
 }
 
     return ret;
 }
 

+void wxFileCtrl::UpdateItem(const wxListItem &item)
+{
+    wxFileData *fd = (wxFileData*)GetItemData(item);
+    wxCHECK_RET(fd, wxT("invalid filedata"));
+
+    fd->ReadData();
+
+    SetItemText(item, fd->GetFileName());
+    SetItemImage(item, fd->GetImageId());
+
+    if (GetWindowStyleFlag() & wxLC_REPORT)
+    {
+        for (int i = 1; i < wxFileData::FileList_Max; i++)
+            SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );
+    }
+}
+

 void wxFileCtrl::UpdateFiles()
 {
     // don't do anything before ShowModal() call which sets m_dirName
 void wxFileCtrl::UpdateFiles()
 {
     // don't do anything before ShowModal() call which sets m_dirName


@@ -456,28 +499,28 @@ void wxFileCtrl::UpdateFiles()
 
     wxBusyCursor bcur; // this may take a while...
 
 
     wxBusyCursor bcur; // this may take a while...
 

-    FreeAllItemsData();

     DeleteAllItems();
 
     DeleteAllItems();
 

-    wxFileData *fd = (wxFileData *) NULL;

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

-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)

     if ( IsTopMostDir(m_dirName) )
     if ( IsTopMostDir(m_dirName) )

-        {
+    {

         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)
         wxArrayString names, paths;
         wxArrayInt icons;
         size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
         for (n=0; n<count; n++)

-            {
-            fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
-                Add(fd, item);
+        {
+            wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
+            if (Add(fd, item) != -1)

                 item.m_itemId++;
                 item.m_itemId++;

-            }
+            else
+                delete fd;

         }
         }

+    }

     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {
     else
 #endif // defined(__DOS__) || defined(__WINDOWS__)
     {


@@ -485,19 +528,21 @@ void wxFileCtrl::UpdateFiles()
         if ( !IsTopMostDir(m_dirName) )
         {
             wxString p(wxPathOnly(m_dirName));
         if ( !IsTopMostDir(m_dirName) )
         {
             wxString p(wxPathOnly(m_dirName));

-#ifdef __UNIX__
-            if (p.IsEmpty()) p = wxT("/");
+#if defined(__UNIX__) && !defined(__OS2__)
+            if (p.empty()) p = wxT("/");

 #endif // __UNIX__
 #endif // __UNIX__

-            fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
-            Add(fd, item);
+            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;

         }
 
         wxString dirname(m_dirName);
         }
 
         wxString dirname(m_dirName);

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

         if (dirname.length() == 2 && dirname[1u] == wxT(':'))
             dirname << wxT('\\');
         if (dirname.length() == 2 && dirname[1u] == wxT(':'))
             dirname << wxT('\\');

-#endif // defined(__DOS__) || defined(__WINDOWS__)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

         wxDir dir(dirname);
 
         if ( dir.IsOpened() )
         wxDir dir(dirname);
 
         if ( dir.IsOpened() )


@@ -515,9 +560,12 @@ void wxFileCtrl::UpdateFiles()
             cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
             while (cont)
             {
             cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
             while (cont)
             {

-                fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
-                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);
             }
 
                 cont = dir.GetNext(&f);
             }
 


@@ -530,9 +578,12 @@ void wxFileCtrl::UpdateFiles()
                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {
                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {

-                    fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
-                    Add(fd, item);
+                    wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
+                    if (Add(fd, item) != -1)

                     item.m_itemId++;
                     item.m_itemId++;

+                    else
+                        delete fd;
+

                     cont = dir.GetNext(&f);
                 }
             }
                     cont = dir.GetNext(&f);
                 }
             }


@@ -595,6 +646,8 @@ void wxFileCtrl::MakeDir()
         EnsureVisible( id );
         EditLabel( id );
     }
         EnsureVisible( id );
         EditLabel( id );
     }

+    else
+        delete fd;

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


@@ -606,19 +659,19 @@ void wxFileCtrl::GoToParentDir()
             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 defined(__DOS__) || defined(__WINDOWS__)
-        if (!m_dirName.IsEmpty())
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+        if (!m_dirName.empty())

         {
             if (m_dirName.Last() == wxT('.'))
         {
             if (m_dirName.Last() == wxT('.'))

-                m_dirName = wxT("");
+                m_dirName = wxEmptyString;

         }
 #elif defined(__UNIX__)
         }
 #elif defined(__UNIX__)

-        if (m_dirName.IsEmpty())
+        if (m_dirName.empty())

             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );
             m_dirName = wxT("/");
 #endif
         UpdateFiles();
         long id = FindItem( 0, fname );

-        if (id != -1)
+        if (id != wxNOT_FOUND)

         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );
         {
             SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
             EnsureVisible( id );


@@ -642,10 +695,15 @@ void wxFileCtrl::GoToDir( const wxString &dir )
     EnsureVisible( 0 );
 }
 
     EnsureVisible( 0 );
 }
 

-void wxFileCtrl::FreeItemData(const wxListItem& item)
+void wxFileCtrl::FreeItemData(wxListItem& item)

 {
 {

-    wxFileData *fd = (wxFileData*)item.m_data;
-    delete fd;
+    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 )


@@ -653,6 +711,11 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
     FreeItemData(event.m_item);
 }
 
     FreeItemData(event.m_item);
 }
 

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

 void wxFileCtrl::FreeAllItemsData()
 {
     wxListItem item;
 void wxFileCtrl::FreeAllItemsData()
 {
     wxListItem item;


@@ -672,7 +735,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
     wxASSERT( fd );
 

-    if ((event.GetLabel().IsEmpty()) ||
+    if ((event.GetLabel().empty()) ||

         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
         (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))


@@ -700,6 +763,7 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     {
         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


@@ -765,6 +829,9 @@ void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
 
 wxFileCtrl::~wxFileCtrl()
 {
 
 wxFileCtrl::~wxFileCtrl()
 {

+    // Normally the data are freed via an EVT_LIST_DELETE_ALL_ITEMS event and
+    // wxFileCtrl::OnListDeleteAllItems. But if the event is generated after
+    // the destruction of the wxFileCtrl we need to free any data here:

     FreeAllItemsData();
 }
 
     FreeAllItemsData();
 }
 


@@ -783,7 +850,7 @@ wxFileCtrl::~wxFileCtrl()
 #define  ID_ACTIVATED     (wxID_FILEDLGG + 11)
 #define  ID_CHECK         (wxID_FILEDLGG + 12)
 
 #define  ID_ACTIVATED     (wxID_FILEDLGG + 11)
 #define  ID_CHECK         (wxID_FILEDLGG + 12)
 

-IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog,wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)

 
 BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
         EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList)
 
 BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
         EVT_BUTTON(ID_LIST_MODE, wxGenericFileDialog::OnList)


@@ -801,7 +868,7 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
 END_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
 END_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;

-bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
+bool wxGenericFileDialog::ms_lastShowHidden = false;

 
 wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& message,
 
 wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& message,


@@ -809,11 +876,31 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& defaultFile,
                            const wxString& wildCard,
                            long style,
                            const wxString& defaultFile,
                            const wxString& wildCard,
                            long style,

-                           const wxPoint& pos )
-            : wxDialog( parent, -1, message, pos, wxDefaultSize,
-                        wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )
+                           const wxPoint& pos,
+                           bool bypassGenericImpl )
+                    :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)

 {
 {

-    if (wxConfig::Get(FALSE))
+    m_bypassGenericImpl = bypassGenericImpl;
+
+    if (!m_bypassGenericImpl)
+        Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
+}
+
+bool wxGenericFileDialog::Create( wxWindow *parent,
+                                  const wxString& message,
+                                  const wxString& WXUNUSED(defaultDir),
+                                  const wxString& defaultFile,
+                                  const wxString& wildCard,
+                                  long WXUNUSED(style),
+                                  const wxPoint& pos )
+{
+    if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
+    {
+        return false;
+    }
+
+    if (wxConfig::Get(false))

     {
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
                               &ms_lastViewStyle);
     {
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
                               &ms_lastViewStyle);


@@ -821,15 +908,11 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                               &ms_lastShowHidden);
     }
 
                               &ms_lastShowHidden);
     }
 

-    m_message = message;
-    m_dialogStyle = style;
-

     if (m_dialogStyle == 0)
         m_dialogStyle = wxOPEN;
     if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
         m_dialogStyle |= wxOPEN;
 
     if (m_dialogStyle == 0)
         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();


@@ -842,35 +925,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     m_path = m_dir;
     m_path += wxFILE_SEP_PATH;
     m_path += defaultFile;
     m_path = m_dir;
     m_path += wxFILE_SEP_PATH;
     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 == wxT(".*") )
-        m_filterExtension = wxEmptyString;
-

     // layout
 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
     // layout
 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);


@@ -882,14 +938,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     wxBitmapButton *but;
 
     but = new wxBitmapButton(this, ID_LIST_MODE,
     wxBitmapButton *but;
 
     but = new wxBitmapButton(this, ID_LIST_MODE,

-                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));
+                             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 );
 
     but = new wxBitmapButton(this, ID_REPORT_MODE,
 #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,

-                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));
+                             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


@@ -898,7 +954,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     buttonsizer->Add( 30, 5, 1 );
 
     m_upDirButton = new wxBitmapButton(this, ID_UP_DIR,
     buttonsizer->Add( 30, 5, 1 );
 
     m_upDirButton = new wxBitmapButton(this, ID_UP_DIR,

-                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON));

 #if wxUSE_TOOLTIPS
     m_upDirButton->SetToolTip( _("Go to parent directory") );
 #endif
 #if wxUSE_TOOLTIPS
     m_upDirButton->SetToolTip( _("Go to parent directory") );
 #endif


@@ -906,7 +962,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
     but = new wxBitmapButton(this, ID_PARENT_DIR,
 
 #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));
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));

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


@@ -916,7 +972,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 #endif //!__DOS__
 
     m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR,
 #endif //!__DOS__
 
     m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR,

-                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON));

 #if wxUSE_TOOLTIPS
     m_newDirButton->SetToolTip( _("Create new directory") );
 #endif
 #if wxUSE_TOOLTIPS
     m_newDirButton->SetToolTip( _("Create new directory") );
 #endif


@@ -929,8 +985,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if (is_pda)
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if (is_pda)

-        staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
-    m_static = new wxStaticText( this, -1, m_dir );
+        staticsizer->Add( new wxStaticText( this, wxID_ANY, _("Current directory:") ), 0, wxRIGHT, 10 );
+    m_static = new wxStaticText( this, wxID_ANY, m_dir );

     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 


@@ -939,7 +995,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,
         style2 |= wxLC_SINGLE_SEL;
 
     m_list = new wxFileCtrl( this, ID_LIST_CTRL,

-                             firstWild, ms_lastShowHidden,
+                             _T(""), ms_lastShowHidden,

                              wxDefaultPosition, wxSize(540,200),
                              style2);
 
                              wxDefaultPosition, wxSize(540,200),
                              style2);
 


@@ -948,23 +1004,18 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 
         // PDAs have a different screen layout
         mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
 

-        wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
-        m_choice = new wxChoice( this, ID_CHOICE );
-        choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
-        mainsizer->Add( choicesizer, 0, wxEXPAND );
-

         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 );
 
         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 = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
-        m_check->SetValue( ms_lastShowHidden );
-        textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
+        m_check = NULL;
+        m_choice = new wxChoice( this, ID_CHOICE );
+        textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );

 
         buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
         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 );
+        buttonsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxALL, 5 );
+        buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 );

         mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
     }
     else
         mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
     }
     else


@@ -974,7 +1025,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         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 );
         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 );
+        textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );

         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );


@@ -983,20 +1034,13 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
         m_check->SetValue( ms_lastShowHidden );
         choicesizer->Add( m_check, 0, 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 );
+        choicesizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 10 );

         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 
         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 );
+    SetWildcard(wildCard);

 
 

-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );

     SetSizer( mainsizer );
 
     mainsizer->Fit( this );
     SetSizer( mainsizer );
 
     mainsizer->Fit( this );


@@ -1005,22 +1049,27 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     Centre( wxBOTH );
 
     m_text->SetFocus();
     Centre( wxBOTH );
 
     m_text->SetFocus();

+
+    return true;

 }
 
 wxGenericFileDialog::~wxGenericFileDialog()
 {
 }
 
 wxGenericFileDialog::~wxGenericFileDialog()
 {

-    if (wxConfig::Get(FALSE))
+    if (!m_bypassGenericImpl)

     {
     {

-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
-                               ms_lastViewStyle);
-        wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
-                               ms_lastShowHidden);
-    }
+        if (wxConfig::Get(false))
+        {
+            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);
+        const int count = m_choice->GetCount();
+        for ( int i = 0; i < count; i++ )
+        {
+            delete (wxString *)m_choice->GetClientData(i);
+        }

     }
 }
 
     }
 }
 


@@ -1033,6 +1082,18 @@ int wxGenericFileDialog::ShowModal()
     return wxDialog::ShowModal();
 }
 
     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 wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 {
     wxString *str = (wxString*) m_choice->GetClientData( filterindex );
 void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 {
     wxString *str = (wxString*) m_choice->GetClientData( filterindex );


@@ -1050,6 +1111,25 @@ void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
     }
 }
 
     }
 }
 

+void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
+{
+    wxFileDialogBase::SetWildcard(wildCard);
+
+    wxArrayString wildDescriptions, wildFilters;
+    const size_t count = wxParseCommonDialogsFilter(m_wildCard,
+                                                    wildDescriptions,
+                                                    wildFilters);
+    wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
+
+    m_choice->Clear();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
+    }
+
+    SetFilterIndex( 0 );
+}
+

 void wxGenericFileDialog::SetFilterIndex( int filterindex )
 {
     m_choice->SetSelection( filterindex );
 void wxGenericFileDialog::SetFilterIndex( int filterindex )
 {
     m_choice->SetSelection( filterindex );


@@ -1079,7 +1159,7 @@ void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
     GetEventHandler()->ProcessEvent( cevent );
 }
 
     GetEventHandler()->ProcessEvent( cevent );
 }
 

-static bool ignoreChanges = FALSE;
+static bool ignoreChanges = false;

 
 void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
 {
 
 void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
 {


@@ -1111,18 +1191,23 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event )
     dir += filename;
     if (wxDirExists(dir)) return;
 
     dir += filename;
     if (wxDirExists(dir)) return;
 

-    ignoreChanges = TRUE;
+    ignoreChanges = true;

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

-    ignoreChanges = FALSE;
+    ignoreChanges = false;

 }
 
 void wxGenericFileDialog::HandleAction( const wxString &fn )
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();
 }
 
 void wxGenericFileDialog::HandleAction( const wxString &fn )
 {
     wxString filename( fn );
     wxString dir = m_list->GetDir();

-    if (filename.IsEmpty()) return;
+    if (filename.empty()) return;

     if (filename == wxT(".")) 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();
     if (filename == wxT(".."))
     {
         m_list->GoToParentDir();


@@ -1140,13 +1225,9 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         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 = wxString(wxGetUserHome()) + filename.Remove(0, 1);

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


@@ -1177,6 +1258,14 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
         return;
     }
 
         return;
     }
 

+    // they really wanted a dir, but it doesn't exist
+    if (want_dir)
+    {
+        wxMessageBox(_("Directory doesn't exist."), _("Error"),
+                     wxOK | wxICON_ERROR );
+        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
     // 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


@@ -1184,13 +1273,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
     //     file without extension as well?
     if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
     {
     //     file without extension as well?
     if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
     {

-        wxString ext;
-        wxSplitPath(filename, NULL, NULL, &ext);
-        if ( ext.empty() )
-        {
-            // append the first extension of the filter string
-            filename += m_filterExtension.BeforeFirst(_T(';'));
-        }
+        filename = AppendExtension(filename, m_filterExtension);

     }
 
     // check that the file [doesn't] exist if necessary
     }
 
     // check that the file [doesn't] exist if necessary


@@ -1199,8 +1282,7 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
                 wxFileExists( filename ) )
     {
         wxString msg;
                 wxFileExists( filename ) )
     {
         wxString msg;

-        msg.Printf( _("File '%s' already exists, do you really want to "
-                     "overwrite it?"), filename.c_str() );
+        msg.Printf( _("File '%s' already exists, do you really want to overwrite it?"), filename.c_str() );

 
         if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
             return;
 
         if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
             return;


@@ -1221,7 +1303,7 @@ void wxGenericFileDialog::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);
         }


@@ -1346,161 +1428,15 @@ void wxGenericFileDialog::UpdateControls()
     bool enable = !IsTopMostDir(dir);
     m_upDirButton->Enable(enable);
 
     bool enable = !IsTopMostDir(dir);
     m_upDirButton->Enable(enable);
 

-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

     m_newDirButton->Enable(enable);
     m_newDirButton->Enable(enable);

-#endif // defined(__DOS__) || defined(__WINDOWS__)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)

 }
 
 #ifdef USE_GENERIC_FILEDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 
 }
 
 #ifdef USE_GENERIC_FILEDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
 

-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-// common part of both wxFileSelectorEx() and wxFileSelector()
-static wxString
-DoSelectFile(const wxChar *title,
-             const wxChar *defaultDir,
-             const wxChar *defaultFileName,
-             const wxChar *defaultExtension,
-             int *indexDefaultExtension,
-             const wxChar *filter,
-             int flags,
-             wxWindow *parent,
-             int x,
-             int y)
-{
-    // the filter may be either given explicitly or created automatically from
-    // the default extension
-    wxString filterReal;
-    if ( filter )
-    {
-        // the user has specified the filter explicitly, use it
-        filterReal = filter;
-    }
-    else if ( !wxIsEmpty(defaultExtension) )
-    {
-        // create the filter to match the given extension
-        filterReal << wxT("*.") << defaultExtension;
-    }
-
-    wxFileDialog fileDialog(parent,
-                            title,
-                            defaultDir,
-                            defaultFileName,
-                            filterReal,
-                            flags,
-                            wxPoint(x, y));
-
-    wxString path;
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        path = fileDialog.GetPath();
-        if ( indexDefaultExtension )
-        {
-            *indexDefaultExtension = fileDialog.GetFilterIndex();
-        }
-    }
-
-    return path;
-}
-
-wxString
-wxFileSelectorEx(const wxChar *title,
-                 const wxChar *defaultDir,
-                 const wxChar *defaultFileName,
-                 int *indexDefaultExtension,
-                 const wxChar *filter,
-                 int flags,
-                 wxWindow *parent,
-                 int x,
-                 int y)
-{
-    return DoSelectFile(title,
-                        defaultDir,
-                        defaultFileName,
-                        wxT(""),                // def ext determined by index
-                        indexDefaultExtension,
-                        filter,
-                        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)
-{
-    return DoSelectFile(title,
-                        defaultDir,
-                        defaultFileName,
-                        defaultExtension,
-                        NULL,               // not interested in filter index
-                        filter,
-                        flags,
-                        parent,
-                        x,
-                        y);
-}
-
-static wxString GetWildcardString(const wxChar *ext)
-{
-    wxString wild;
-    if ( ext )
-    {
-        if ( *ext == wxT('.') )
-            ext++;
-
-        wild << _T("*.") << ext;
-    }
-    else // no extension specified
-    {
-        wild = wxFileSelectorDefaultWildcardStr;
-    }
-
-    return wild;
-}
-
-wxString wxLoadFileSelector(const wxChar *what,
-                            const wxChar *ext,
-                            const wxChar *nameDef,
-                            wxWindow *parent)
-{
-    wxString prompt;
-    if ( what && *what )
-        prompt = wxString::Format(_("Load %s file"), what);
-    else
-        prompt = _("Load file");
-
-    return wxFileSelector(prompt, NULL, nameDef, ext,
-                          GetWildcardString(ext), 0, parent);
-}
-
-wxString wxSaveFileSelector(const wxChar *what,
-                            const wxChar *ext,
-                            const wxChar *nameDef,
-                            wxWindow *parent)
-{
-    wxString prompt;
-    if ( what && *what )
-        prompt = wxString::Format(_("Save %s file"), what);
-    else
-        prompt = _("Save file");
-
-    return wxFileSelector(prompt, NULL, nameDef, ext,
-                          GetWildcardString(ext), 0, parent);
-}
-

 #endif // USE_GENERIC_FILEDIALOG
 
 #endif // wxUSE_FILEDLG
 #endif // USE_GENERIC_FILEDIALOG
 
 #endif // wxUSE_FILEDLG