]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/dirctrlg.cpp
Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...
[wxWidgets.git] / src / generic / dirctrlg.cpp
index 3343b595feb0415a33116b7d5432068d5418e64c..7f1c89e741a1a0af41a94c16800a1f6ac5b0c897 100644 (file)
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dirctrlg.h"
 #endif
 
 #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
 
+#include "wx/generic/dirctrlg.h"
+#include "wx/module.h"
 #include "wx/utils.h"
-#include "wx/dialog.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/settings.h"
+#include "wx/artprov.h"
+#include "wx/hash.h"
+#include "wx/mimetype.h"
+#include "wx/image.h"
+#include "wx/choice.h"
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
-#include "wx/generic/dirctrlg.h"
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
 
 #ifdef __WXMSW__
 #include <windows.h>
 // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume
 //         older releases don't, but it should be verified and the checks modified
 //         accordingly.
-#if !defined(__GNUWIN32__) || \
-    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if !defined(__GNUWIN32__) || (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if !defined(__WXWINCE__)
   #include <direct.h>
+#endif
   #include <stdlib.h>
   #include <ctype.h>
 #endif
 
 #endif
 
-#ifdef __WXPM__
-
-#define INCL_BASE
-#include <os2.h>
-#include <direct.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#endif // __WXPM__
+#if defined(__OS2__) || defined(__DOS__)
+  #ifdef __OS2__
+    #define INCL_BASE
+    #include <os2.h>
+    #ifndef __EMX__
+      #include <direct.h>
+    #endif
+    #include <stdlib.h>
+    #include <ctype.h>
+  #endif
+  extern bool wxIsDriveAvailable(const wxString& dirName);
+#endif // __OS2__
 
 #if defined(__WXMAC__)
-#  include "MoreFilesExtras.h"
+# include "MoreFilesX.h"
 #endif
 
 #ifdef __BORLANDC__
 #undef GetFirstChild
 #endif
 
-/* Closed folder */
-static char * icon1_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"   s None  c None",
-".  c #000000",
-"+  c #c0c0c0",
-"@  c #808080",
-"#  c #ffff00",
-"$  c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
+// ----------------------------------------------------------------------------
+// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
+// ----------------------------------------------------------------------------
 
-/* Open folder */
-static char * icon2_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"   s None  c None",
-".  c #000000",
-"+  c #c0c0c0",
-"@  c #808080",
-"#  c #ffff00",
-"$  c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @$$$$$@       ",
-" @$#+#+#$@@@@@@ ",
-" @$+#+#+$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-"@@@@@@@@@@@@@#@.",
-"@$$$$$$$$$$@@+@.",
-"@$#+#+#+#+##.@@.",
-" @$#+#+#+#+#+.@.",
-" @$+#+#+#+#+#.@.",
-"  @$+#+#+#+##@..",
-"  @@@@@@@@@@@@@.",
-"   .............",
-"                ",
-"                "};
+size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
+{
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
+
+#ifdef __WXWINCE__
+    // No logical drives; return "\"
+    paths.Add(wxT("\\"));
+    names.Add(wxT("\\"));
+    icon_ids.Add(wxFileIconsTable::computer);
+#elif defined(__WIN32__)
+    wxChar driveBuffer[256];
+    size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
+    size_t i = 0;
+    while (i < n)
+    {
+        wxString path, name;
+        path.Printf(wxT("%c:\\"), driveBuffer[i]);
+        name.Printf(wxT("%c:"), driveBuffer[i]);
 
-/* File */
-static char * icon3_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 3 1",
-/* colors */
-"     s None    c None",
-".    c #000000",
-"+    c #ffffff",
-/* pixels */
-"                ",
-"  ........      ",
-"  .++++++..     ",
-"  .+.+.++.+.    ",
-"  .++++++....   ",
-"  .+.+.+++++.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  .+.+.+.+.+.   ",
-"  .+++++++++.   ",
-"  ...........   ",
-"                ",
-"                "};
+        int imageId;
+        int driveType = ::GetDriveType(path);
+        switch (driveType)
+        {
+            case DRIVE_REMOVABLE:
+                if (path == wxT("a:\\") || path == wxT("b:\\"))
+                    imageId = wxFileIconsTable::floppy;
+                else
+                    imageId = wxFileIconsTable::removeable;
+                break;
+            case DRIVE_CDROM:
+                imageId = wxFileIconsTable::cdrom;
+                break;
+            case DRIVE_REMOTE:
+            case DRIVE_FIXED:
+            default:
+                imageId = wxFileIconsTable::drive;
+                break;
+        }
 
-/* Computer */
-static char * icon4_xpm[] = {
-"16 16 7 1",
-"     s None    c None",
-".    c #808080",
-"X    c #c0c0c0",
-"o    c Black",
-"O    c Gray100",
-"+    c #008080",
-"@    c Blue",
-"    ........... ",
-"   .XXXXXXXXXX.o",
-"   .OOOOOOOOO..o",
-"   .OoooooooX..o",
-"   .Oo+...@+X..o",
-"   .Oo+XXX.+X..o",
-"   .Oo+....+X..o",
-"   .Oo++++++X..o",
-"   .OXXXXXXXX.oo",
-"   ..........o.o",
-"   ...........Xo",
-"   .XXXXXXXXXX.o",
-"  .o.o.o.o.o...o",
-" .oXoXoXoXoXo.o ",
-".XOXXXXXXXXX.o  ",
-"............o   "};
+        paths.Add(path);
+        names.Add(name);
+        icon_ids.Add(imageId);
 
-/* Drive */
-static char * icon5_xpm[] = {
-"16 16 7 1",
-"     s None    c None",
-".    c #808080",
-"X    c #c0c0c0",
-"o    c Black",
-"O    c Gray100",
-"+    c Green",
-"@    c #008000",
-"                ",
-"                ",
-"                ",
-"                ",
-"  ............. ",
-" .XXXXXXXXXXXX.o",
-".OOOOOOOOOOOO..o",
-".XXXXXXXXX+@X..o",
-".XXXXXXXXXXXX..o",
-".X..........X..o",
-".XOOOOOOOOOOX..o",
-"..............o ",
-" ooooooooooooo  ",
-"                ",
-"                ",
-"                "};
+        while (driveBuffer[i] != wxT('\0'))
+            i ++;
+        i ++;
+        if (driveBuffer[i] == wxT('\0'))
+            break;
+    }
+#elif defined(__OS2__)
+    APIRET rc;
+    ULONG ulDriveNum = 0;
+    ULONG ulDriveMap = 0;
+    rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+    if ( rc == 0)
+    {
+        size_t i = 0;
+        while (i < 26)
+        {
+            if (ulDriveMap & ( 1 << i ))
+            {
+                wxString path, name;
+                path.Printf(wxT("%c:\\"), 'A' + i);
+                name.Printf(wxT("%c:"), 'A' + i);
 
-/* CD-ROM */
-static char *icon6_xpm[] = {
-"16 16 10 1",
-"     s None    c None",
-".    c #808080",
-"X    c #c0c0c0",
-"o    c Yellow",
-"O    c Blue",
-"+    c Black",
-"@    c Gray100",
-"#    c #008080",
-"$    c Green",
-"%    c #008000",
-"        ...     ",
-"      ..XoX..   ",
-"     .O.XoXXX+  ",
-"    ...O.oXXXX+ ",
-"    .O..X.XXXX+ ",
-"   ....X.+..XXX+",
-"   .XXX.+@+.XXX+",
-"   .X@XX.+.X@@X+",
-" .....X...#XX@+ ",
-".@@@...XXo.O@X+ ",
-".@XXX..XXoXOO+  ",
-".@++++..XoX+++  ",
-".@$%@@XX+++X.+  ",
-".............+  ",
-" ++++++++++++   ",
-"                "};
+                int imageId;
+                if (path == wxT("A:\\") || path == wxT("B:\\"))
+                    imageId = wxFileIconsTable::floppy;
+                else
+                    imageId = wxFileIconsTable::drive;
+                paths.Add(path);
+                names.Add(name);
+                icon_ids.Add(imageId);
+            }
+            i ++;
+        }
+    }
+#else // !__WIN32__, !__OS2__
+    int drive;
 
-/* Floppy */
-static char * icon7_xpm[] = {
-"16 16 7 1",
-"     s None    c None",
-".    c #808080",
-"X    c Gray100",
-"o    c #c0c0c0",
-"O    c Black",
-"+    c Cyan",
-"@    c Red",
-"         ......X",
-"        .ooooooO",
-"        .+++++OO",
-"        .++++++O",
-"        .++++++O",
-"        .ooooooO",
-"  .......o....oO",
-" .oooooo.o.O.XoO",
-".XXXXXXXXOOOOOO ",
-".ooooooooo@o..O ",
-".ooo....oooo..O ",
-".o..OOOO...o..O ",
-".oooXXXXoooo..O ",
-".............O  ",
-" OOOOOOOOOOOO   ",
-"                "};
+    /* If we can switch to the drive, it exists. */
+    for( drive = 1; drive <= 26; drive++ )
+    {
+        wxString path, name;
+        path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
+        name.Printf(wxT("%c:"), (char) (drive + 'A' - 1));
 
-/* Removeable */
-static char * icon8_xpm[] = {
-"16 16 7 1",
-"     s None    c None",
-".    c #808080",
-"X    c #c0c0c0",
-"o    c Black",
-"O    c Gray100",
-"+    c Red",
-"@    c #800000",
-"                ",
-"                ",
-"                ",
-"  ............. ",
-" .XXXXXXXXXXXX.o",
-".OOOOOOOOOOOO..o",
-".OXXXXXXXXXXX..o",
-".O+@.oooooo.X..o",
-".OXXOooooooOX..o",
-".OXXXOOOOOOXX..o",
-".OXXXXXXXXXXX..o",
-".O............o ",
-" ooooooooooooo  ",
-"                ",
-"                ",
-"                "};
+        if (wxIsDriveAvailable(path))
+        {
+            paths.Add(path);
+            names.Add(name);
+            icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive);
+        }
+    }
+#endif // __WIN32__/!__WIN32__
+
+#elif defined(__WXMAC__)
 
-static const int ID_DIRCTRL = 1000;
-static const int ID_TEXTCTRL = 1001;
-static const int ID_OK = 1002;
-static const int ID_CANCEL = 1003;
-static const int ID_NEW = 1004;
-//static const int ID_CHECK = 1005;
+    ItemCount volumeIndex = 1;
+    OSErr err = noErr ;
+    
+    while( noErr == err )
+    {
+        HFSUniStr255 volumeName ;
+        FSRef fsRef ;
+        FSVolumeInfo volumeInfo ;
+               err = FSGetVolumeInfo(0, volumeIndex, NULL, kFSVolInfoFlags , &volumeInfo , &volumeName, &fsRef);
+               if( noErr == err )
+               {
+                   wxString path = wxMacFSRefToPath( &fsRef ) ;
+            wxString name = wxMacHFSUniStrToString( &volumeName ) ;
+            
+            if ( (volumeInfo.flags & kFSVolFlagSoftwareLockedMask) || (volumeInfo.flags & kFSVolFlagHardwareLockedMask) )
+            {
+                icon_ids.Add(wxFileIconsTable::cdrom);
+            }
+            else
+            {
+                icon_ids.Add(wxFileIconsTable::drive);
+            }
+            // todo other removable
+            
+            paths.Add(path);
+            names.Add(name);
+            volumeIndex++ ;
+               }
+    }
+
+#elif defined(__UNIX__)
+    paths.Add(wxT("/"));
+    names.Add(wxT("/"));
+    icon_ids.Add(wxFileIconsTable::computer);
+#else
+    #error "Unsupported platform in wxGenericDirCtrl!"
+#endif
+    wxASSERT_MSG( (paths.GetCount() == names.GetCount()), wxT("The number of paths and their human readable names should be equal in number."));
+    wxASSERT_MSG( (paths.GetCount() == icon_ids.GetCount()), wxT("Wrong number of icons for available drives."));
+    return paths.GetCount();
+}
+
+// ----------------------------------------------------------------------------
+// wxIsDriveAvailable
+// ----------------------------------------------------------------------------
+
+#if defined(__DOS__)
+
+bool wxIsDriveAvailable(const wxString& dirName)
+{
+    // FIXME_MGL - this method leads to hang up under Watcom for some reason
+#ifndef __WATCOMC__
+    if ( dirName.Len() == 3 && dirName[1u] == wxT(':') )
+    {
+        wxString dirNameLower(dirName.Lower());
+        // VS: always return true for removable media, since Win95 doesn't
+        //     like it when MS-DOS app accesses empty floppy drive
+        return (dirNameLower[0u] == wxT('a') ||
+                dirNameLower[0u] == wxT('b') ||
+                wxPathExists(dirNameLower));
+    }
+    else
+#endif
+        return true;
+}
+
+#elif defined(__WINDOWS__) || defined(__OS2__)
 
-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__)
 int setdrive(int drive)
 {
-#if defined(__GNUWIN32__) && \
+#ifdef __WXWINCE__
+    wxUnusedVar(drive);
+    return 0;
+#elif defined(__GNUWIN32__) && \
     (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
     return _chdrive(drive);
 #else
-       wxChar  newdrive[3];
-
-       if (drive < 1 || drive > 31)
-               return -1;
-       newdrive[0] = (wxChar)(wxT('A') + drive - 1);
-       newdrive[1] = wxT(':');
-       newdrive[2] = wxT('\0');
-#if defined(__WXMSW__)
-#ifdef __WIN16__
-    if (wxSetWorkingDirectory(newdrive))
+    wxChar  newdrive[4];
+
+    if (drive < 1 || drive > 31)
+        return -1;
+    newdrive[0] = (wxChar)(wxT('A') + drive - 1);
+    newdrive[1] = wxT(':');
+#ifdef __OS2__
+    newdrive[2] = wxT('\\');
+    newdrive[3] = wxT('\0');
 #else
-       if (::SetCurrentDirectory(newdrive))
+    newdrive[2] = wxT('\0');
 #endif
+#if defined(__WXMSW__)
+    if (::SetCurrentDirectory(newdrive))
 #else
     // VA doesn't know what LPSTR is and has its own set
-       if (DosSetCurrentDir((PSZ)newdrive))
+    if (!DosSetCurrentDir((PSZ)newdrive))
 #endif
-               return 0;
-       else
-               return -1;
+        return 0;
+    else
+        return -1;
 #endif // !GNUWIN32
 }
 
-static bool wxIsDriveAvailable(const wxString dirName)
+bool wxIsDriveAvailable(const wxString& dirName)
 {
+#ifdef __WXWINCE__
+    wxUnusedVar(dirName);
+    return false;
+#else
 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 #endif
-    bool success = TRUE;
+    bool success = true;
 
     // Check if this is a root directory and if so,
-    // whether the drive is avaiable.
+    // whether the drive is available.
     if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());
-#if defined(__GNUWIN32__) && \
-    !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
         success = wxPathExists(dirNameLower);
 #else
+        #if defined(__OS2__)
+        // Avoid changing to drive since no media may be inserted.
+        if (dirNameLower[(size_t)0] == 'a' || dirNameLower[(size_t)0] == 'b')
+            return success;
+        #endif
         int currentDrive = _getdrive();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
         int err = setdrive( thisDrive ) ;
@@ -367,7 +331,7 @@ static bool wxIsDriveAvailable(const wxString dirName)
 
         if (err == -1)
         {
-            success = FALSE;
+            success = false;
         }
 #endif
     }
@@ -376,25 +340,29 @@ static bool wxIsDriveAvailable(const wxString dirName)
 #endif
 
     return success;
-}
 #endif
+}
+#endif // __WINDOWS__ || __OS2__
+
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
+
+
+
+#if wxUSE_DIRDLG
 
 // Function which is called by quick sort. We want to override the default wxArrayString behaviour,
 // and sort regardless of case.
-static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const void *second)
+static int wxCMPFUNC_CONV wxDirCtrlStringCompareFunction(const wxString& strFirst, const wxString& strSecond)
 {
-    wxString *strFirst = (wxString *)first;
-    wxString *strSecond = (wxString *)second;
-    
-    return strFirst->CmpNoCase(*strSecond);
+    return strFirst.CmpNoCase(strSecond);
 }
 
 //-----------------------------------------------------------------------------
-// wxDirItemDataEx
+// wxDirItemData
 //-----------------------------------------------------------------------------
 
-wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name,
-                                 bool isDir)
+wxDirItemData::wxDirItemData(const wxString& path, const wxString& name,
+                             bool isDir)
 {
     m_path = path;
     m_name = name;
@@ -402,34 +370,118 @@ wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name,
      * In UnixLand we just check whether the first char is a dot
      * For FileNameFromPath read LastDirNameInThisPath ;-) */
     // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.');
-    m_isHidden = FALSE;
-    // m_hasSubDirs is no longer needed
-    m_hasSubDirs = TRUE; // HasSubDirs();
-    m_isExpanded = FALSE;
+    m_isHidden = false;
+    m_isExpanded = false;
     m_isDir = isDir;
 }
 
-wxDirItemDataEx::~wxDirItemDataEx()
+wxDirItemData::~wxDirItemData()
 {
 }
 
-void wxDirItemDataEx::SetNewDirName( wxString path )
+void wxDirItemData::SetNewDirName(const wxString& path)
 {
     m_path = path;
-    m_name = wxFileNameFromPath( path );
+    m_name = wxFileNameFromPath(path);
+}
+
+bool wxDirItemData::HasSubDirs() const
+{
+    if (m_path.IsEmpty())
+        return false;
+
+    wxDir dir;
+    {
+        wxLogNull nolog;
+        if ( !dir.Open(m_path) )
+            return false;
+    }
+
+    return dir.HasSubDirs();
+}
+
+bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
+{
+    if (m_path.IsEmpty())
+        return false;
+
+    wxDir dir;
+    {
+        wxLogNull nolog;
+        if ( !dir.Open(m_path) )
+            return false;
+    }
+
+    return dir.HasFiles();
 }
 
 //-----------------------------------------------------------------------------
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGenericDirCtrlStyle )
+
+wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
+    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
+    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
+    wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
+
+wxEND_FLAGS( wxGenericDirCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Filter , wxString , SetFilter , GetFilter  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, EMPTY_MACROVALUE , 0, wxT("Helpstring"), wxT("group") )
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath ,
+                 wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter )
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
+#endif
 
 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
-  EVT_TREE_ITEM_EXPANDING     (-1, wxGenericDirCtrl::OnExpandItem)
-  EVT_TREE_ITEM_COLLAPSED     (-1, wxGenericDirCtrl::OnCollapseItem)
-  EVT_TREE_BEGIN_LABEL_EDIT   (-1, wxGenericDirCtrl::OnBeginEditItem)
-  EVT_TREE_END_LABEL_EDIT     (-1, wxGenericDirCtrl::OnEndEditItem)
+  EVT_TREE_ITEM_EXPANDING     (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
+  EVT_TREE_ITEM_COLLAPSED     (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
+  EVT_TREE_BEGIN_LABEL_EDIT   (wxID_TREECTRL, wxGenericDirCtrl::OnBeginEditItem)
+  EVT_TREE_END_LABEL_EDIT     (wxID_TREECTRL, wxGenericDirCtrl::OnEndEditItem)
   EVT_SIZE                    (wxGenericDirCtrl::OnSize)
 END_EVENT_TABLE()
 
@@ -439,31 +491,40 @@ wxGenericDirCtrl::wxGenericDirCtrl(void)
 }
 
 bool wxGenericDirCtrl::Create(wxWindow *parent,
-                     const wxWindowID id,
-                     const wxString& dir,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     long style,
-                     const wxString& filter,
-                     int defaultFilter,
-                     const wxString& name )
+                              const wxWindowID id,
+                              const wxString& dir,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& filter,
+                              int defaultFilter,
+                              const wxString& name)
 {
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
-        return FALSE;
+        return false;
 
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     Init();
 
-    long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS;
+    long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
+
+    if (style & wxDIRCTRL_EDIT_LABELS)
+        treeStyle |= wxTR_EDIT_LABELS;
+
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
+    else
+        treeStyle |= wxBORDER_SUNKEN;
 
     long filterStyle = 0;
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         filterStyle |= wxNO_BORDER;
+    else
+        filterStyle |= wxBORDER_SUNKEN;
 
-    m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
+    m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL,
+                                wxPoint(0,0), GetClientSize(), treeStyle);
 
     if (!filter.IsEmpty() && (style & wxDIRCTRL_SHOW_FILTERS))
         m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
@@ -476,23 +537,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     if (m_filterListCtrl)
         m_filterListCtrl->FillFilterList(filter, defaultFilter);
 
-    m_imageList = new wxImageList(16, 16, TRUE);
-    m_imageList->Add(wxIcon(icon1_xpm));
-    m_imageList->Add(wxIcon(icon2_xpm));
-    m_imageList->Add(wxIcon(icon3_xpm));
-    m_imageList->Add(wxIcon(icon4_xpm));
-    m_imageList->Add(wxIcon(icon5_xpm));
-    m_imageList->Add(wxIcon(icon6_xpm));
-    m_imageList->Add(wxIcon(icon7_xpm));
-    m_imageList->Add(wxIcon(icon8_xpm));
-    m_treeCtrl->SetImageList(m_imageList);
+    m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList());
 
-    m_showHidden = FALSE;
-    wxDirItemDataEx* rootData = new wxDirItemDataEx(wxT(""), wxT(""), TRUE);
+    m_showHidden = false;
+    wxDirItemData* rootData = new wxDirItemData(wxEmptyString, wxEmptyString, true);
 
     wxString rootName;
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__)
     rootName = _("Computer");
 #else
     rootName = _("Sections");
@@ -500,135 +552,63 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);
-    m_treeCtrl->Expand(m_rootId); // automatically expand first level
+    ExpandDir(m_rootId); // automatically expand first level
 
     // Expand and select the default path
     if (!m_defaultPath.IsEmpty())
         ExpandPath(m_defaultPath);
 
+    SetBestSize(size);
     DoResize();
 
-    return TRUE;
+    return true;
 }
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 {
-   m_treeCtrl->SetImageList(NULL);
-   delete m_imageList;
 }
 
 void wxGenericDirCtrl::Init()
 {
-    m_showHidden = FALSE;
-    m_imageList = NULL;
+    m_showHidden = false;
     m_currentFilter = 0;
     m_currentFilterStr = wxEmptyString; // Default: any file
     m_treeCtrl = NULL;
     m_filterListCtrl = NULL;
 }
 
-void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
+void wxGenericDirCtrl::ShowHidden( bool show )
 {
-    wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE);
-
-#if defined(__WXMSW__) || defined(__WXPM__)
-    // Windows and OS/2: sections are displayed as drives
-    wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
-#else
-    // Unix: sections are displayed as folders
-    wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item);
-    m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );
-#endif
-    // TODO: other operating systems.
+    m_showHidden = show;
 
-    m_treeCtrl->SetItemHasChildren(id);
+    wxString path = GetPath();
+    ReCreateTree();
+    SetPath(path);
 }
 
-void wxGenericDirCtrl::SetupSections()
+const wxTreeItemId
+wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
 {
-#if defined(__WXMSW__) || defined(__WXPM__)
-
-# ifdef __WIN32__
-    wxChar driveBuffer[256];
-    size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
-    size_t i = 0;
-    while (i < n)
-    {
-        wxString path, name;
-        path.Printf(wxT("%c:\\"), driveBuffer[i]);
-        name.Printf(wxT("(%c:)"), driveBuffer[i]);
+    wxDirItemData *dir_item = new wxDirItemData(path,name,true);
 
-        int imageId = 4;
-        int driveType = ::GetDriveType(path);
-        switch (driveType)
-        {
-            case DRIVE_REMOVABLE:
-                if (path == wxT("a:\\") || path == wxT("b:\\"))
-                    imageId = 6; // Floppy
-                else
-                    imageId = 7;
-                break;
-            case DRIVE_FIXED:
-                imageId = 4;
-                break;
-            case DRIVE_REMOTE:
-                imageId = 4;
-                break;
-            case DRIVE_CDROM:
-                imageId = 5;
-                break;
-            default:
-                imageId = 4;
-                break;
-        }
+    wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);
 
-        AddSection(path, name, imageId);
+    m_treeCtrl->SetItemHasChildren(id);
 
-        while (driveBuffer[i] != wxT('\0'))
-            i ++;
-        i ++;
-        if (driveBuffer[i] == wxT('\0'))
-            break;
-    }
-# else
-    int drive;
-    int currentDrive;
+    return id;
+}
 
-    /* If we can switch to the drive, it exists. */
-    for( drive = 1; drive <= 26; drive++ )
-    {
-        wxString path, name;
-        path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
-        name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1));
+void wxGenericDirCtrl::SetupSections()
+{
+    wxArrayString paths, names;
+    wxArrayInt icons;
 
-        if (wxIsDriveAvailable(path))
-        {
+    size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
-            AddSection(path, name);
-        }
-    }
-# endif
-#elif defined(__WXMAC__)
-    FSSpec volume ;
-    short index = 1 ;
-    while(1) {
-      short actualCount = 0 ;
-      if ( OnLine( &volume , 1 , &actualCount , &index ) != noErr || actualCount == 0 )
-        break ;
-
-      wxString name = wxMacFSSpec2MacFilename( &volume ) ;
-      AddSection(name + wxFILE_SEP_PATH, name, 0);
+    for (n = 0; n < count; n++)
+    {
+        AddSection(paths[n], names[n], icons[n]);
     }
-#else
-  AddSection(wxT("/"), _("The Computer"), 0);
-  AddSection(wxGetHomeDir(), _("My Home"), 0 );
-  AddSection(wxT("/mnt"), _("Mounted Devices"), 0 );
-  AddSection(wxT("/usr/local"), _("User Local"), 0 );
-  AddSection(wxT("/usr"), _("User"), 0 );
-  AddSection(wxT("/var"), _("Variables"), 0 );
-  AddSection(wxT("/etc"), _("Etcetera"), 0 );
-  AddSection(wxT("/tmp"), _("Temporary"), 0 );
-#endif
 }
 
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
@@ -641,7 +621,7 @@ void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
     }
 
     // don't rename the individual sections
-    if (m_treeCtrl->GetParent( event.GetItem() ) == m_rootId)
+    if (m_treeCtrl->GetItemParent( event.GetItem() ) == m_rootId)
     {
         event.Veto();
         return;
@@ -653,7 +633,9 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     if ((event.GetLabel().IsEmpty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
-        (event.GetLabel().First( wxT("/") ) != wxNOT_FOUND))
+        (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) ||
+        (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) ||
+        (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND))
     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
         dialog.ShowModal();
@@ -662,7 +644,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     }
 
     wxTreeItemId id = event.GetItem();
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_treeCtrl->GetItemData( id );
+    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );
@@ -694,41 +676,53 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 {
     wxTreeItemId parentId = event.GetItem();
 
+    // VS: this is needed because the event handler is called from wxTreeCtrl
+    //     ctor when wxTR_HIDE_ROOT was specified
+
+    if (!m_rootId.IsOk())
+
+        m_rootId = m_treeCtrl->GetRootItem();
+
     ExpandDir(parentId);
 }
 
 void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
-    wxTreeItemId child, parent = event.GetItem();
+    CollapseDir(event.GetItem());
+}
+
+void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
+{
+    wxTreeItemId child;
 
-    wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(event.GetItem());
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
     if (!data->m_isExpanded)
         return;
 
-    data->m_isExpanded = FALSE;
-    long cookie;
+    data->m_isExpanded = false;
+    wxTreeItemIdValue cookie;
     /* Workaround because DeleteChildren has disapeared (why?) and
      * CollapseAndReset doesn't work as advertised (deletes parent too) */
-    child = m_treeCtrl->GetFirstChild(parent, cookie);
+    child = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (child.IsOk())
     {
         m_treeCtrl->Delete(child);
         /* Not GetNextChild below, because the cookie mechanism can't
          * handle disappearing children! */
-        child = m_treeCtrl->GetFirstChild(parent, cookie);
+        child = m_treeCtrl->GetFirstChild(parentId, cookie);
     }
 }
 
 void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 {
-    wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(parentId);
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
 
     if (data->m_isExpanded)
         return;
 
-    data->m_isExpanded = TRUE;
+    data->m_isExpanded = true;
 
-    if (parentId == m_rootId)
+    if (parentId == m_treeCtrl->GetRootItem())
     {
         SetupSections();
         return;
@@ -740,12 +734,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     wxString dirName(data->m_path);
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
     // Check if this is a root directory and if so,
     // whether the drive is avaiable.
     if (!wxIsDriveAvailable(dirName))
     {
-        data->m_isExpanded = FALSE;
+        data->m_isExpanded = false;
         //wxMessageBox(wxT("Sorry, this drive is not available."));
         return;
     }
@@ -754,7 +748,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
@@ -770,7 +764,9 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     if (d.IsOpened())
     {
-        if (d.GetFirst(& eachFilename, wxEmptyString, wxDIR_DIRS))
+        int style = wxDIR_DIRS;
+        if (m_showHidden) style |= wxDIR_HIDDEN;
+        if (d.GetFirst(& eachFilename, wxEmptyString, style))
         {
             do
             {
@@ -779,10 +775,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                     dirs.Add(eachFilename);
                 }
             }
-            while (d.GetNext(& eachFilename)) ;
+            while (d.GetNext(&eachFilename));
         }
     }
-    dirs.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+    dirs.Sort(wxDirCtrlStringCompareFunction);
 
     // Now do the filenames -- but only if we're allowed to
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
@@ -793,19 +789,29 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
         if (d.IsOpened())
         {
-            if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES))
+            int style = wxDIR_FILES;
+            if (m_showHidden) style |= wxDIR_HIDDEN;
+            // Process each filter (ex: "JPEG Files (*.jpg;*.jpeg)|*.jpg;*.jpeg")
+            wxStringTokenizer strTok;
+            wxString curFilter;
+            strTok.SetString(m_currentFilterStr,wxT(";"));
+            while(strTok.HasMoreTokens())
             {
-                do
+                curFilter = strTok.GetNextToken();
+                if (d.GetFirst(& eachFilename, m_currentFilterStr, style))
                 {
-                    if ((eachFilename != wxT(".")) && (eachFilename != wxT("..")))
+                    do
                     {
-                        filenames.Add(eachFilename);
+                        if ((eachFilename != wxT(".")) && (eachFilename != wxT("..")))
+                        {
+                            filenames.Add(eachFilename);
+                        }
                     }
+                    while (d.GetNext(& eachFilename));
                 }
-                while (d.GetNext(& eachFilename)) ;
             }
         }
-        filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+        filenames.Sort(wxDirCtrlStringCompareFunction);
     }
 
     // Add the sorted dirs
@@ -814,33 +820,26 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     {
         wxString eachFilename(dirs[i]);
         path = dirName;
-        if (path.Last() != wxFILE_SEP_PATH)
+        if (!wxEndsWithPathSeparator(path))
             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 
-        wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE);
-        wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item);
-        m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );
+        wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true);
+        wxTreeItemId id = AppendItem( parentId, eachFilename,
+                                      wxFileIconsTable::folder, -1, dir_item);
+        m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
+                                  wxTreeItemIcon_Expanded );
 
         // Has this got any children? If so, make it expandable.
-        int options = wxDIR_DEFAULT;
-        if (GetWindowStyle() & wxDIRCTRL_DIR_ONLY) // If only showing dirs, then we specify dirs only here
+        // (There are two situations when a dir has children: either it
+        // has subdirectories or it contains files that weren't filtered
+        // out. The latter only applies to dirctrl with files.)
+        if ( dir_item->HasSubDirs() ||
+             (((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) &&
+               dir_item->HasFiles(m_currentFilterStr)) )
         {
-            options = wxDIR_DIRS;
+            m_treeCtrl->SetItemHasChildren(id);
         }
-
-        wxLogNull log;
-        wxDir dir2;
-        if (dir2.Open(path))
-        {
-            wxString str;
-            // Have to test for wxDIR_DIRS separately in case m_currentFilterStr is non-empty and
-            // and filters out any directories
-            if (dir2.GetFirst(& str, m_currentFilterStr, options) || dir2.GetFirst(& str, wxEmptyString, wxDIR_DIRS))
-            {
-                m_treeCtrl->SetItemHasChildren(id);
-            }
-    }
     }
 
     // Add the sorted filenames
@@ -850,16 +849,25 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
         {
             wxString eachFilename(filenames[i]);
             path = dirName;
-            if (path.Last() != wxFILE_SEP_PATH)
+            if (!wxEndsWithPathSeparator(path))
                 path += wxString(wxFILE_SEP_PATH);
             path += eachFilename;
             //path = dirName + wxString(wxT("/")) + eachFilename;
-            wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE);
-            (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);
+            wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,false);
+            int image_id = wxFileIconsTable::file;
+            if (eachFilename.Find(wxT('.')) != wxNOT_FOUND)
+                image_id = wxTheFileIconsTable->GetIconID(eachFilename.AfterLast(wxT('.')));
+            (void) AppendItem( parentId, eachFilename, image_id, -1, dir_item);
         }
     }
 }
 
+void wxGenericDirCtrl::ReCreateTree()
+{
+    CollapseDir(m_treeCtrl->GetRootItem());
+    ExpandDir(m_treeCtrl->GetRootItem());
+}
+
 // Find the child that matches the first part of 'path'.
 // E.g. if a child path is "/usr" and 'path' is "/usr/include"
 // then the child for /usr is returned.
@@ -875,24 +883,24 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
     path2 += wxString(wxFILE_SEP_PATH);
 
     // In MSW or PM, case is not significant
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
     path2.MakeLower();
 #endif
 
-    long cookie;
+    wxTreeItemIdValue cookie;
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
-        wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
 
-        if (data && data->m_path != "")
+        if (data && !data->m_path.IsEmpty())
         {
             wxString childPath(data->m_path);
-            if (childPath.Last() != wxFILE_SEP_PATH)
+            if (!wxEndsWithPathSeparator(childPath))
                 childPath += wxString(wxFILE_SEP_PATH);
 
             // In MSW and PM, case is not significant
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
             childPath.MakeLower();
 #endif
 
@@ -902,15 +910,15 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
                 if (childPath == path3)
                 {
                     if (path3.Len() == path2.Len())
-                        done = TRUE;
+                        done = true;
                     else
-                        done = FALSE;
+                        done = false;
                     return childId;
                 }
             }
         }
 
-        childId = m_treeCtrl->GetNextChild(childId, cookie);
+        childId = m_treeCtrl->GetNextChild(parentId, cookie);
     }
     wxTreeItemId invalid;
     return invalid;
@@ -920,7 +928,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
 // and select the given tree item.
 bool wxGenericDirCtrl::ExpandPath(const wxString& path)
 {
-    bool done = FALSE;
+    bool done = false;
     wxTreeItemId id = FindChild(m_rootId, path, done);
     wxTreeItemId lastId = id; // The last non-zero id
     while (id.IsOk() && !done)
@@ -933,7 +941,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
     }
     if (lastId.IsOk())
     {
-        wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(lastId);
+        wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId);
         if (data->m_isDir)
         {
             m_treeCtrl->Expand(lastId);
@@ -941,18 +949,18 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
         if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
         {
             // Find the first file in this directory
-            long cookie;
+            wxTreeItemIdValue cookie;
             wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
-            bool selectedChild = FALSE;
+            bool selectedChild = false;
             while (childId.IsOk())
             {
-                wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
+                wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
 
-                if (data && data->m_path != "" && !data->m_isDir)
+                if (data && data->m_path != wxEmptyString && !data->m_isDir)
                 {
                     m_treeCtrl->SelectItem(childId);
                     m_treeCtrl->EnsureVisible(childId);
-                    selectedChild = TRUE;
+                    selectedChild = true;
                     break;
                 }
                 childId = m_treeCtrl->GetNextChild(lastId, cookie);
@@ -969,10 +977,10 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
             m_treeCtrl->EnsureVisible(lastId);
         }
 
-        return TRUE;
+        return true;
     }
     else
-        return FALSE;
+        return false;
 }
 
 wxString wxGenericDirCtrl::GetPath() const
@@ -980,7 +988,7 @@ wxString wxGenericDirCtrl::GetPath() const
     wxTreeItemId id = m_treeCtrl->GetSelection();
     if (id)
     {
-        wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(id);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
         return data->m_path;
     }
     else
@@ -992,7 +1000,7 @@ wxString wxGenericDirCtrl::GetFilePath() const
     wxTreeItemId id = m_treeCtrl->GetSelection();
     if (id)
     {
-        wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(id);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
         if (data->m_isDir)
             return wxEmptyString;
         else
@@ -1013,7 +1021,7 @@ void wxGenericDirCtrl::SetPath(const wxString& path)
 #if 0
 void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
 {
-    wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(id);
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id);
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
@@ -1024,7 +1032,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri
 
     wxString dirName(data->m_path);
 
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
@@ -1078,55 +1086,26 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
 bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description)
 {
     wxArrayString filters, descriptions;
-    int count = ParseFilter(filterStr, filters, descriptions);
+    int count = wxParseCommonDialogsFilter(filterStr, descriptions, filters);
     if (count > 0 && n < count)
     {
         filter = filters[n];
         description = descriptions[n];
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
 // Parses the global filter, returning the number of filters.
 // Returns 0 if none or if there's a problem.
-// filterStr is in the form:
-//
-// "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
-
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
 int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
 {
-    wxString str(filterStr);
-
-    wxString description, filter;
-    int pos;
-    bool finished = FALSE;
-    do
-    {
-        pos = str.Find(wxT('|'));
-        if (pos == -1)
-            return 0; // Problem
-        description = str.Left(pos);
-        str = str.Mid(pos+1);
-        pos = str.Find(wxT('|'));
-        if (pos == -1)
-        {
-            filter = str;
-            finished = TRUE;
-        }
-        else
-        {
-            filter = str.Left(pos);
-            str = str.Mid(pos+1);
-        }
-        descriptions.Add(description);
-        filters.Add(filter);
-    }
-    while (!finished) ;
-
-    return filters.Count();
+    return wxParseCommonDialogsFilter(filterStr, descriptions, filters );
 }
+#endif // WXWIN_COMPATIBILITY_2_4
 
 void wxGenericDirCtrl::DoResize()
 {
@@ -1137,6 +1116,22 @@ void wxGenericDirCtrl::DoResize()
         wxSize filterSz ;
         if (m_filterListCtrl)
         {
+#ifdef __WXMSW__
+            // For some reason, this is required in order for the
+            // correct control height to always be returned, rather
+            // than the drop-down list height which is sometimes returned.
+            wxSize oldSize = m_filterListCtrl->GetSize();
+            m_filterListCtrl->SetSize(wxDefaultCoord,
+                                      wxDefaultCoord,
+                                      oldSize.x+10,
+                                      wxDefaultCoord,
+                                      wxSIZE_USE_EXISTING);
+            m_filterListCtrl->SetSize(wxDefaultCoord,
+                                      wxDefaultCoord,
+                                      oldSize.x,
+                                      wxDefaultCoord,
+                                      wxSIZE_USE_EXISTING);
+#endif
             filterSz = m_filterListCtrl->GetSize();
             sz.y -= (filterSz.y + verticalSpacing);
         }
@@ -1156,6 +1151,26 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
     DoResize();
 }
 
+wxTreeItemId wxGenericDirCtrl::AppendItem (const wxTreeItemId & parent,
+                                           const wxString & text,
+                                           int image, int selectedImage,
+                                           wxTreeItemData * data)
+{
+  wxTreeCtrl *treeCtrl = GetTreeCtrl ();
+
+  wxASSERT (treeCtrl);
+
+  if (treeCtrl)
+  {
+    return treeCtrl->AppendItem (parent, text, image, selectedImage, data);
+  }
+  else
+  {
+    return wxTreeItemId();
+  }
+}
+
+
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
@@ -1163,7 +1178,7 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
 IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice)
 
 BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
-    EVT_CHOICE(-1, wxDirFilterListCtrl::OnSelFilter)
+    EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
 END_EVENT_TABLE()
 
 bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id,
@@ -1190,8 +1205,7 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 
     // If the filter has changed, the view is out of date, so
     // collapse the tree.
-    m_dirCtrl->GetTreeCtrl()->Collapse(m_dirCtrl->GetRootId());
-    m_dirCtrl->GetTreeCtrl()->Expand(m_dirCtrl->GetRootId());
+    m_dirCtrl->ReCreateTree();
 
     // Try to restore the selection, or at least the directory
     m_dirCtrl->ExpandPath(currentPath);
@@ -1201,215 +1215,471 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
 {
     Clear();
     wxArrayString descriptions, filters;
-    size_t n = (size_t) m_dirCtrl->ParseFilter(filter, filters, descriptions);
+    size_t n = (size_t) wxParseCommonDialogsFilter(filter, filters, descriptions);
 
     if (n > 0 && defaultFilter < (int) n)
     {
-        size_t i = 0;
-        for (i = 0; i < n; i++)
+        for (size_t i = 0; i < n; i++)
             Append(descriptions[i]);
         SetSelection(defaultFilter);
     }
 }
+#endif // wxUSE_DIRDLG
 
-// wxGenericDirDialog implementation
-// This should be moved into dirdlgg.cpp eventually
-
-BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
-    EVT_BUTTON(wxID_OK,  wxGenericDirDialog::OnOK)
-    EVT_BUTTON(wxID_NEW,  wxGenericDirDialog::OnNew)
-    EVT_BUTTON               (wxID_NEW,     wxGenericDirDialog::OnNew)
-    EVT_CLOSE(wxGenericDirDialog::OnCloseWindow)
-    EVT_TREE_KEY_DOWN        (-1,   wxGenericDirDialog::OnTreeKeyDown)
-    EVT_TREE_SEL_CHANGED     (-1,   wxGenericDirDialog::OnTreeSelected)
-    EVT_TEXT_ENTER           (ID_TEXTCTRL,  wxGenericDirDialog::OnOK)
-END_EVENT_TABLE()
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
 
-wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
-        const wxString& defaultPath, long style, const wxPoint& pos, const wxSize& sz, const wxString& name):
-   wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name)
-{
-    m_dirCtrl = NULL;
-    m_path = defaultPath;
+// ----------------------------------------------------------------------------
+// wxFileIconsTable icons
+// ----------------------------------------------------------------------------
+
+/* Open folder */
+static const char * file_icons_tbl_folder_open_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"   s None  c None",
+".  c #000000",
+"+  c #c0c0c0",
+"@  c #808080",
+"#  c #ffff00",
+"$  c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @$$$$$@       ",
+" @$#+#+#$@@@@@@ ",
+" @$+#+#+$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+"@@@@@@@@@@@@@#@.",
+"@$$$$$$$$$$@@+@.",
+"@$#+#+#+#+##.@@.",
+" @$#+#+#+#+#+.@.",
+" @$+#+#+#+#+#.@.",
+"  @$+#+#+#+##@..",
+"  @@@@@@@@@@@@@.",
+"   .............",
+"                ",
+"                "};
 
-    wxBusyCursor cursor;
+/* Computer */
+static const char * file_icons_tbl_computer_xpm[] = {
+"16 16 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c #008080",
+"@    c Blue",
+"    ........... ",
+"   .XXXXXXXXXX.o",
+"   .OOOOOOOOO..o",
+"   .OoooooooX..o",
+"   .Oo+...@+X..o",
+"   .Oo+XXX.+X..o",
+"   .Oo+....+X..o",
+"   .Oo++++++X..o",
+"   .OXXXXXXXX.oo",
+"   ..........o.o",
+"   ...........Xo",
+"   .XXXXXXXXXX.o",
+"  .o.o.o.o.o...o",
+" .oXoXoXoXoXo.o ",
+".XOXXXXXXXXX.o  ",
+"............o   "};
 
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+/* Drive */
+static const char * file_icons_tbl_drive_xpm[] = {
+"16 16 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Green",
+"@    c #008000",
+"                ",
+"                ",
+"                ",
+"                ",
+"  ............. ",
+" .XXXXXXXXXXXX.o",
+".OOOOOOOOOOOO..o",
+".XXXXXXXXX+@X..o",
+".XXXXXXXXXXXX..o",
+".X..........X..o",
+".XOOOOOOOOOOX..o",
+"..............o ",
+" ooooooooooooo  ",
+"                ",
+"                ",
+"                "};
 
-    // 1) dir ctrl
-    m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
-        defaultPath, wxPoint(5, 5),
-        wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);
+/* CD-ROM */
+static const char *file_icons_tbl_cdrom_xpm[] = {
+"16 16 10 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Yellow",
+"O    c Blue",
+"+    c Black",
+"@    c Gray100",
+"#    c #008080",
+"$    c Green",
+"%    c #008000",
+"        ...     ",
+"      ..XoX..   ",
+"     .O.XoXXX+  ",
+"    ...O.oXXXX+ ",
+"    .O..X.XXXX+ ",
+"   ....X.+..XXX+",
+"   .XXX.+@+.XXX+",
+"   .X@XX.+.X@@X+",
+" .....X...#XX@+ ",
+".@@@...XXo.O@X+ ",
+".@XXX..XXoXOO+  ",
+".@++++..XoX+++  ",
+".@$%@@XX+++X.+  ",
+".............+  ",
+" ++++++++++++   ",
+"                "};
 
-    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+/* Floppy */
+static const char * file_icons_tbl_floppy_xpm[] = {
+"16 16 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c Gray100",
+"o    c #c0c0c0",
+"O    c Black",
+"+    c Cyan",
+"@    c Red",
+"         ......X",
+"        .ooooooO",
+"        .+++++OO",
+"        .++++++O",
+"        .++++++O",
+"        .ooooooO",
+"  .......o....oO",
+" .oooooo.o.O.XoO",
+".XXXXXXXXOOOOOO ",
+".ooooooooo@o..O ",
+".ooo....oooo..O ",
+".o..OOOO...o..O ",
+".oooXXXXoooo..O ",
+".............O  ",
+" OOOOOOOOOOOO   ",
+"                "};
 
-    // 2) text ctrl
-    m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
-    topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+/* Removeable */
+static const char * file_icons_tbl_removeable_xpm[] = {
+"16 16 7 1",
+"     s None    c None",
+".    c #808080",
+"X    c #c0c0c0",
+"o    c Black",
+"O    c Gray100",
+"+    c Red",
+"@    c #800000",
+"                ",
+"                ",
+"                ",
+"  ............. ",
+" .XXXXXXXXXXXX.o",
+".OOOOOOOOOOOO..o",
+".OXXXXXXXXXXX..o",
+".O+@.oooooo.X..o",
+".OXXOooooooOX..o",
+".OXXXOOOOOOXX..o",
+".OXXXXXXXXXXX..o",
+".O............o ",
+" ooooooooooooo  ",
+"                ",
+"                ",
+"                "};
 
-#if wxUSE_STATLINE
-    // 3) Static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+// ----------------------------------------------------------------------------
+// wxFileIconsTable & friends
+// ----------------------------------------------------------------------------
 
-    // 4) Buttons
-    wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
-    wxButton* okButton = new wxButton(this, wxID_OK, _("OK"));
-    buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
-    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
-    buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
+// global instance of a wxFileIconsTable
+wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL;
 
-    // I'm not convinced we need a New button, and we tend to get annoying
-    // accidental-editing with label editing enabled.
-#if 0
-    wxButton* newButton = new wxButton( this, wxID_NEW, _("New...") );
-    buttonsizer->Add( newButton, 0, wxLEFT|wxRIGHT, 10 );
-#endif
+// A module to allow icons table cleanup
 
-    topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
+class wxFileIconsTableModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
+public:
+    wxFileIconsTableModule() {}
+    bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
+    void OnExit()
+    {
+        if (wxTheFileIconsTable)
+        {
+            delete wxTheFileIconsTable;
+            wxTheFileIconsTable = NULL;
+        }
+    }
+};
 
-    okButton->SetDefault();
-    m_dirCtrl->SetFocus();
+IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
 
-    SetAutoLayout( TRUE );
-    SetSizer( topsizer );
+class wxFileIconEntry : public wxObject
+{
+public:
+    wxFileIconEntry(int i) { id = i; }
 
-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );
+    int id;
+};
 
-    Centre( wxBOTH );
+wxFileIconsTable::wxFileIconsTable()
+{
+    m_HashTable = NULL;
+    m_smallImageList = NULL;
 }
 
-void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+wxFileIconsTable::~wxFileIconsTable()
 {
-    EndModal(wxID_CANCEL);
+    if (m_HashTable)
+    {
+        WX_CLEAR_HASH_TABLE(*m_HashTable);
+        delete m_HashTable;
+    }
+    if (m_smallImageList) delete m_smallImageList;
 }
 
-void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+// delayed initialization - wait until first use (wxArtProv not created yet)
+void wxFileIconsTable::Create()
 {
-    m_path = m_input->GetValue();
-    // Does the path exist? (User may have typed anything in m_input)
-    if (wxPathExists(m_path)) {
-        // OK, path exists, we're done.
-        EndModal(wxID_OK);
-        return;
-    }
-    // Interact with user, find out if the dir is a typo or to be created
-    wxString msg( _("The directory ") );
-    msg = msg + m_path;
-    msg = msg + _("\ndoes not exist\nCreate it now?") ;
-    wxMessageDialog dialog(this, msg, _("Directory does not exist"), wxYES_NO | wxICON_WARNING );
-    if ( dialog.ShowModal() == wxID_YES ) {
-        // Okay, let's make it
-        wxLogNull log;
-        if (wxMkdir(m_path)) {
-            // The new dir was created okay.
-            EndModal(wxID_OK);
-            return;
-        }
-        else {
-            // Trouble...
-            msg = _("Failed to create directory ")+m_path+
-                _("\n(Do you have the required permissions?)");
-            wxMessageDialog errmsg(this, msg, _("Error creating directory"), wxOK | wxICON_ERROR);
-            errmsg.ShowModal();
-            // We still don't have a valid dir. Back to the main dialog.
-        }
+    wxCHECK_RET(!m_smallImageList && !m_HashTable, wxT("creating icons twice"));
+    m_HashTable = new wxHashTable(wxKEY_STRING);
+    m_smallImageList = new wxImageList(16, 16);
+
+    // folder:
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));
+    // folder_open
+    m_smallImageList->Add(wxIcon(file_icons_tbl_folder_open_xpm));
+    // computer
+    m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm));
+    // drive
+    m_smallImageList->Add(wxIcon(file_icons_tbl_drive_xpm));
+    // cdrom
+    m_smallImageList->Add(wxIcon(file_icons_tbl_cdrom_xpm));
+    // floppy
+    m_smallImageList->Add(wxIcon(file_icons_tbl_floppy_xpm));
+    // removeable
+    m_smallImageList->Add(wxIcon(file_icons_tbl_removeable_xpm));
+    // file
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));
+    // executable
+    if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
+    {
+        m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE,
+                                                       wxART_CMN_DIALOG,
+                                                       wxSize(16, 16)));
+        delete m_HashTable->Get(_T("exe"));
+        m_HashTable->Delete(_T("exe"));
+        m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable));
     }
-    // User has answered NO to create dir.
+    /* else put into list by GetIconID
+       (KDE defines application/x-executable for *.exe and has nice icon)
+     */
 }
 
-void wxGenericDirDialog::SetPath(const wxString& path)
+wxImageList *wxFileIconsTable::GetSmallImageList()
 {
-    m_dirCtrl->SetPath(path);
-    m_path = path;
+    if (!m_smallImageList)
+        Create();
+
+    return m_smallImageList;
 }
 
-wxString wxGenericDirDialog::GetPath(void) const
+#if wxUSE_MIMETYPE && wxUSE_IMAGE
+// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
+//     one icon and we won't resize it
+
+static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
 {
-    return m_path;
+    const unsigned int size = 16;
+
+    wxImage smallimg (size, size);
+    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 * size*2, ps = smallimg.GetData();
+    smallimg.SetMaskColour(mr, mr, mr);
+
+    for (y = 0; y < size; y++)
+    {
+        for (x = 0; x < size; 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 += size*2 * 3, p2 += size*2 * 3;
+    }
+
+    return wxBitmap(smallimg);
 }
 
-int wxGenericDirDialog::ShowModal()
+// This function is currently not unused anymore
+#if 0
+// finds empty borders and return non-empty area of image:
+static wxImage CutEmptyBorders(const wxImage& img)
 {
-    //m_input->SetValue( m_path );
-    return wxDialog::ShowModal();
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+    unsigned char *dt = img.GetData(), *dttmp;
+    unsigned w = img.GetWidth(), h = img.GetHeight();
+
+    unsigned top, bottom, left, right, i;
+    bool empt;
+
+#define MK_DTTMP(x,y)      dttmp = dt + ((x + y * w) * 3)
+#define NOEMPTY_PIX(empt)  if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = false; break;}
+
+    for (empt = true, top = 0; empt && top < h; top++)
+    {
+        MK_DTTMP(0, top);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = true, bottom = h-1; empt && bottom > top; bottom--)
+    {
+        MK_DTTMP(0, bottom);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = true, left = 0; empt && left < w; left++)
+    {
+        MK_DTTMP(left, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = true, right = w-1; empt && right > left; right--)
+    {
+        MK_DTTMP(right, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    top--, left--, bottom++, right++;
+
+    return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
 }
+#endif // #if 0
 
-void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
+#endif // wxUSE_MIMETYPE
+
+int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 {
-    if (!m_dirCtrl)
-        return;
+    if (!m_smallImageList)
+        Create();
 
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem());
-    if (data)
-       m_input->SetValue( data->m_path );
-};
+#if wxUSE_MIMETYPE
+    if (!extension.IsEmpty())
+    {
+        wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
+        if (entry) return (entry -> id);
+    }
 
-void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
-{
-    if (!m_dirCtrl)
-        return;
+    wxFileType *ft = (mime.IsEmpty()) ?
+                   wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
+                   wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
 
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
-    if (data)
-        m_input->SetValue( data->m_path );
-};
+    wxIconLocation iconLoc;
+    wxIcon ic;
 
-void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
-{
-    wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
-    if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
-        (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
     {
-        wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
-                            _("Create directory"), wxOK | wxICON_INFORMATION );
-        msg.ShowModal();
-        return;
+        wxLogNull logNull;
+        if ( ft && ft->GetIcon(&iconLoc) )
+        {
+            ic = wxIcon( iconLoc.GetFileName() );
+        }
     }
 
-    wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
-    wxASSERT( data );
+    delete ft;
 
-    wxString new_name( wxT("NewName") );
-    wxString path( data->m_path );
-    if (path.Last() != wxFILE_SEP_PATH)
-        path += wxFILE_SEP_PATH;
-    path += new_name;
-    if (wxFileExists(path))
+    if ( !ic.Ok() )
     {
-        // try NewName0, NewName1 etc.
-        int i = 0;
-        do {
-            new_name = wxT("NewName");
-            wxString num;
-            num.Printf( wxT("%d"), i );
-            new_name += num;
-
-            path = data->m_path;
-            if (path.Last() != wxFILE_SEP_PATH)
-                path += wxFILE_SEP_PATH;
-            path += new_name;
-            i++;
-        } while (wxFileExists(path));
+        int newid = file;
+        m_HashTable->Put(extension, new wxFileIconEntry(newid));
+        return newid;
     }
 
-    wxLogNull log;
-    if (!wxMkdir(path))
+    wxBitmap bmp;
+    bmp.CopyFromIcon(ic);
+
+    if ( !bmp.Ok() )
     {
-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        return;
+        int newid = file;
+        m_HashTable->Put(extension, new wxFileIconEntry(newid));
+        return newid;
+    }
+
+    const unsigned int size = 16;
+
+    int id = m_smallImageList->GetImageCount();
+    if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
+    {
+        m_smallImageList->Add(bmp);
     }
+#if wxUSE_IMAGE
+    else
+    {
+        wxImage img = bmp.ConvertToImage();
+
+        if ((img.GetWidth() != size*2) || (img.GetHeight() != size*2))
+//            m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(size*2, size*2)));
+            m_smallImageList->Add(CreateAntialiasedBitmap(img.Rescale(size*2, size*2)));
+        else
+            m_smallImageList->Add(CreateAntialiasedBitmap(img));
+    }
+#endif // wxUSE_IMAGE
+
+    m_HashTable->Put(extension, new wxFileIconEntry(id));
+    return id;
 
-    wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE );
+#else // !wxUSE_MIMETYPE
 
-    // TODO: THIS CODE DOESN'T WORK YET. We need to avoid duplication of the first child
-    // of the parent.
-    wxTreeItemId new_id = m_dirCtrl->GetTreeCtrl()->AppendItem( parent, new_name, 0, 0, new_data );
-    m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
-    m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
+    wxUnusedVar(mime);
+    if (extension == wxT("exe"))
+        return executable;
+    else
+        return file;
+#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
 }
 
-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG