Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index cc8d6c55fddca29e609e84e8d0e0416c519e24cf..f29e04c31f508a2356473187b6ee474817736952 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirctrlg.cpp
+// Name:        src/generic/dirctrlg.cpp

 // Purpose:     wxGenericDirCtrl
 // Author:      Harm van der Heijden, Robert Roebling, Julian Smart
 // Modified by:
 // Purpose:     wxGenericDirCtrl
 // Author:      Harm van der Heijden, Robert Roebling, Julian Smart
 // Modified by:


@@ -9,253 +9,256 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG || wxUSE_FILEDLG

 
 #include "wx/generic/dirctrlg.h"
 
 
 #include "wx/generic/dirctrlg.h"
 

-#include "wx/module.h"
-#include "wx/utils.h"
-#include "wx/button.h"
-#include "wx/layout.h"
-#include "wx/msgdlg.h"
-#include "wx/textctrl.h"
-#include "wx/textdlg.h"
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/button.h"
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/choice.h"
+    #include "wx/textctrl.h"
+    #include "wx/layout.h"
+    #include "wx/sizer.h"
+    #include "wx/textdlg.h"
+    #include "wx/gdicmn.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/filename.h"

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/cmndata.h"
-#include "wx/gdicmn.h"
-#include "wx/intl.h"

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

-#include "wx/icon.h"
-#include "wx/log.h"
-#include "wx/sizer.h"

 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"

-#include "wx/settings.h"

 #include "wx/artprov.h"
 #include "wx/artprov.h"

-#include "wx/hash.h"

 #include "wx/mimetype.h"
 #include "wx/mimetype.h"

-#include "wx/image.h"
-#include "wx/choice.h"

 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
 #if defined(__WXMAC__)
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
 #if defined(__WXMAC__)

-  #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/osx/private.h"  // includes mac headers

 #endif
 
 #ifdef __WXMSW__
 #include <windows.h>
 #endif
 
 #ifdef __WXMSW__
 #include <windows.h>

+#include "wx/msw/winundef.h"
+#include "wx/volume.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)
 
 // 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)

-  #include <direct.h>
-  #include <stdlib.h>
-  #include <ctype.h>
+#if !defined(__WXWINCE__)
+    #include <direct.h>

 #endif
 #endif

-
+    #include <stdlib.h>
+    #include <ctype.h>

 #endif
 
 #endif
 

-#ifdef __WXPM__
-
-#define INCL_BASE
-#include <os2.h>
-#ifndef __EMX__
-#include <direct.h>

 #endif
 #endif

-#include <stdlib.h>
-#include <ctype.h>
-extern bool wxIsDriveAvailable(const wxString& dirName);
-#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
+#endif // __OS2__

 
 #if defined(__WXMAC__)
 
 #if defined(__WXMAC__)

-#  ifdef __DARWIN__
-#    include "MoreFilesX.h"
-#  else
-#    include "MoreFilesExtras.h"
-#  endif
+//    #include "MoreFilesX.h"

 #endif
 
 #ifdef __BORLANDC__
 #endif
 
 #ifdef __BORLANDC__

-#include "dos.h"
+    #include "dos.h"

 #endif
 
 #endif
 

+extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
+

 // If compiled under Windows, this macro can cause problems
 #ifdef GetFirstChild
 #undef GetFirstChild
 #endif
 
 // If compiled under Windows, this macro can cause problems
 #ifdef GetFirstChild
 #undef GetFirstChild
 #endif
 

+bool wxIsDriveAvailable(const wxString& dirName);
+

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

-// wxGetAvailableDrives, for WINDOWS, DOS, WXPM, MAC, UNIX (returns "/")
+// wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")

 // ----------------------------------------------------------------------------
 
 size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
 {
 // ----------------------------------------------------------------------------
 
 size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
 {

-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#ifdef wxHAS_FILESYSTEM_VOLUMES

 
 

-#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]);
+#ifdef __WXWINCE__
+    // No logical drives; return "\"
+    paths.Add(wxT("\\"));
+    names.Add(wxT("\\"));
+    icon_ids.Add(wxFileIconsTable::computer);
+#elif defined(__WIN32__) && wxUSE_FSVOLUME
+    // TODO: this code (using wxFSVolumeBase) should be used for all platforms
+    //       but unfortunately wxFSVolumeBase is not implemented everywhere
+    const wxArrayString as = wxFSVolumeBase::GetVolumes();

 
 

-        int imageId = wxFileIconsTable::drive;
-        int driveType = ::GetDriveType(path);
-        switch (driveType)
+    for (size_t i = 0; i < as.GetCount(); i++)
+    {
+        wxString path = as[i];
+        wxFSVolume vol(path);
+        int imageId;
+        switch (vol.GetKind())

         {
         {

-            case DRIVE_REMOVABLE:
-                if (path == wxT("a:\\") || path == wxT("b:\\"))
+            case wxFS_VOL_FLOPPY:
+                if ( (path == wxT("a:\\")) || (path == wxT("b:\\")) )

                     imageId = wxFileIconsTable::floppy;
                 else
                     imageId = wxFileIconsTable::removeable;
                 break;
                     imageId = wxFileIconsTable::floppy;
                 else
                     imageId = wxFileIconsTable::removeable;
                 break;

-            case DRIVE_CDROM:
+            case wxFS_VOL_DVDROM:
+            case wxFS_VOL_CDROM:

                 imageId = wxFileIconsTable::cdrom;
                 break;
                 imageId = wxFileIconsTable::cdrom;
                 break;

-            case DRIVE_REMOTE:
-            case DRIVE_FIXED:
+            case wxFS_VOL_NETWORK:
+                if (path[0] == wxT('\\'))
+                    continue; // skip "\\computer\folder"
+                imageId = wxFileIconsTable::drive;
+                break;
+            case wxFS_VOL_DISK:
+            case wxFS_VOL_OTHER:

             default:
                 imageId = wxFileIconsTable::drive;
                 break;
         }
             default:
                 imageId = wxFileIconsTable::drive;
                 break;
         }

-

         paths.Add(path);
         paths.Add(path);

-        names.Add(name);
+        names.Add(vol.GetDisplayName());

         icon_ids.Add(imageId);
         icon_ids.Add(imageId);

-
-        while (driveBuffer[i] != wxT('\0'))
+    }
+#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 ))
+            {
+                const wxString path = wxFileName::GetVolumeString(
+                                        'A' + i, wxPATH_GET_SEPARATOR);
+                const wxString name = wxFileName::GetVolumeString(
+                                        'A' + i, wxPATH_NO_SEPARATOR);
+
+                // Note: If _filesys is unsupported by some compilers,
+                //       we can always replace it by DosQueryFSAttach
+                char filesysname[20];
+#ifdef __WATCOMC__
+                ULONG cbBuffer = sizeof(filesysname);
+                PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)filesysname;
+                APIRET rc = ::DosQueryFSAttach(name.fn_str(),0,FSAIL_QUERYNAME,pfsqBuffer,&cbBuffer);
+                if (rc != NO_ERROR)
+                {
+                    filesysname[0] = '\0';
+                }
+#else
+                _filesys(name.fn_str(), filesysname, sizeof(filesysname));
+#endif
+                /* FAT, LAN, HPFS, CDFS, NFS */
+                int imageId;
+                if (path == wxT("A:\\") || path == wxT("B:\\"))
+                    imageId = wxFileIconsTable::floppy;
+                else if (!strcmp(filesysname, "CDFS"))
+                    imageId = wxFileIconsTable::cdrom;
+                else if (!strcmp(filesysname, "LAN") ||
+                         !strcmp(filesysname, "NFS"))
+                    imageId = wxFileIconsTable::drive;
+                else
+                    imageId = wxFileIconsTable::drive;
+                paths.Add(path);
+                names.Add(name);
+                icon_ids.Add(imageId);
+            }

             i ++;
             i ++;

-        i ++;
-        if (driveBuffer[i] == wxT('\0'))
-            break;
+        }

     }
     }

-#else // !__WIN32__
-    int drive;
-
+#else // !__WIN32__, !__OS2__

     /* If we can switch to the drive, it exists. */
     /* If we can switch to the drive, it exists. */

-    for( drive = 1; drive <= 26; drive++ )
+    for ( char drive = 'A'; drive <= 'Z'; drive++ )

     {
     {

-        wxString path, name;
-        path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
-        name.Printf(wxT("%c:"), (char) (drive + 'A' - 1));
+        const wxString
+            path = wxFileName::GetVolumeString(drive, wxPATH_GET_SEPARATOR);

 
         if (wxIsDriveAvailable(path))
         {
             paths.Add(path);
 
         if (wxIsDriveAvailable(path))
         {
             paths.Add(path);

-            names.Add(name);
-            icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive);
+            names.Add(wxFileName::GetVolumeString(drive, wxPATH_NO_SEPARATOR));
+            icon_ids.Add(drive <= 2 ? wxFileIconsTable::floppy
+                                    : wxFileIconsTable::drive);

         }
     }
 #endif // __WIN32__/!__WIN32__
 
         }
     }
 #endif // __WIN32__/!__WIN32__
 

-#elif defined(__WXMAC__)
-#ifdef __DARWIN__
-    FSRef     **theVolRefs;
-    ItemCount   theVolCount;
-    char        thePath[FILENAME_MAX];
-
-    if (FSGetMountedVolumes(&theVolRefs, &theVolCount) == noErr) {
-        ItemCount index;
-        ::HLock( (Handle)theVolRefs ) ;
-        for (index = 0; index < theVolCount; ++index) {
-            // get the POSIX path associated with the FSRef
-            if ( FSRefMakePath(&((*theVolRefs)[index]),
-                                 (UInt8 *)thePath, sizeof(thePath)) != noErr ) {
-                continue;
-            }
-            // add path separator at end if necessary
-            wxString path( thePath ) ;
-            if (path.Last() != wxFILE_SEP_PATH) {
-                path += wxFILE_SEP_PATH;
-            }
-            // get Mac volume name for display
-            FSVolumeRefNum vRefNum ;
-            HFSUniStr255 volumeName ;
+#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON

 
 

-            if ( FSGetVRefNum(&((*theVolRefs)[index]), &vRefNum) != noErr ) {
-                continue;
-            }
-            if ( FSGetVInfo(vRefNum, &volumeName, NULL, NULL) != noErr ) {
-                continue;
-            }
-            // get C string from Unicode HFS name
-            //   see: http://developer.apple.com/carbon/tipsandtricks.html
-            CFStringRef cfstr = CFStringCreateWithCharacters( kCFAllocatorDefault,
-                                                              volumeName.unicode,
-                                                              volumeName.length );
-            // Do something with str
-            char *cstr = NewPtr(CFStringGetLength(cfstr) + 1);
-            if (( cstr == NULL ) ||
-                !CFStringGetCString(cfstr, cstr, CFStringGetLength(cfstr) + 1,
-                                    kCFStringEncodingMacRoman))
+    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) )

             {
             {

-                CFRelease( cstr );
-                continue;
+                icon_ids.Add(wxFileIconsTable::cdrom);

             }
             }

-            wxString name( cstr );
-            DisposePtr( cstr );
-            CFRelease( cfstr );
-
-            GetVolParmsInfoBuffer volParmsInfo;
-            UInt32 actualSize;
-            if ( FSGetVolParms(vRefNum, sizeof(volParmsInfo), &volParmsInfo, &actualSize) != noErr ) {
-                continue;
+            else
+            {
+                icon_ids.Add(wxFileIconsTable::drive);

             }
             }

+            // todo other removable

 
             paths.Add(path);
             names.Add(name);
 
             paths.Add(path);
             names.Add(name);

-
-            if ( VolIsEjectable(&volParmsInfo) )
-                icon_ids.Add(wxFileIconsTable::cdrom);
-            else
-                icon_ids.Add(wxFileIconsTable::drive);
+            volumeIndex++ ;

         }
         }

-        ::HUnlock( (Handle)theVolRefs );
-        ::DisposeHandle( (Handle)theVolRefs );

     }
     }

-#else // !__DARWIN__
-    FSSpec volume;
-    short index = 1;
-    while(1)
-    {
-        short actualCount = 0 ;
-        if (OnLine(&volume, 1, &actualCount, &index ) != noErr || actualCount==0)
-        {
-            break;
-        }

 
 

-        wxString name = wxMacFSSpec2MacFilename( &volume );
-        paths.Add(name + wxFILE_SEP_PATH);
-        names.Add(name);
-        icon_ids.Add(wxFileIconsTable::drive);
-    }
-#endif // __DARWIN__
-
-#elif defined(__UNIX__)
+#elif defined(__UNIX__) || defined(__WXPALMOS__)

     paths.Add(wxT("/"));
     names.Add(wxT("/"));
     icon_ids.Add(wxFileIconsTable::computer);
 #else
     #error "Unsupported platform in wxGenericDirCtrl!"
 #endif
     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();
 }
 
     return paths.GetCount();
 }
 


@@ -268,67 +271,80 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
 bool wxIsDriveAvailable(const wxString& dirName)
 {
     // FIXME_MGL - this method leads to hang up under Watcom for some reason
 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(':') )
+#ifdef __WATCOMC__
+    wxUnusedVar(dirName);
+#else
+    if ( dirName.length() == 3 && dirName[1u] == wxT(':') )

     {
         wxString dirNameLower(dirName.Lower());
     {
         wxString dirNameLower(dirName.Lower());

-        // VS: always return TRUE for removable media, since Win95 doesn't
+        // 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') ||
         //     like it when MS-DOS app accesses empty floppy drive
         return (dirNameLower[0u] == wxT('a') ||
                 dirNameLower[0u] == wxT('b') ||

-                wxPathExists(dirNameLower));
+                wxDirExists(dirNameLower));

     }
     else
 #endif
     }
     else
 #endif

-        return TRUE;
+        return true;

 }
 
 }
 

-#elif defined(__WINDOWS__) || defined(__WXPM__)
+#elif defined(__WINDOWS__) || defined(__OS2__)

 
 

-int setdrive(int drive)
+int setdrive(int WXUNUSED_IN_WINCE(drive))

 {
 {

-#if defined(__GNUWIN32__) && \
+#ifdef __WXWINCE__
+    return 0;
+#elif defined(__GNUWIN32__) && \

     (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
     return _chdrive(drive);
 #else
     (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
 #else

-       if (::SetCurrentDirectory(newdrive))
+    newdrive[2] = wxT('\0');

 #endif
 #endif

+#if defined(__WXMSW__)
+    if (::SetCurrentDirectory(newdrive))

 #else
     // VA doesn't know what LPSTR is and has its own set
 #else
     // VA doesn't know what LPSTR is and has its own set

-       if (DosSetCurrentDir((PSZ)newdrive))
+    if (!DosSetCurrentDir((PSZ)newdrive))

 #endif
 #endif

-               return 0;
-       else
-               return -1;
+        return 0;
+    else
+        return -1;

 #endif // !GNUWIN32
 }
 
 #endif // !GNUWIN32
 }
 

-bool wxIsDriveAvailable(const wxString& dirName)
+bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName))

 {
 {

+#ifdef __WXWINCE__
+    return false;
+#else

 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 #endif
 #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 available.
 
     // Check if this is a root directory and if so,
     // whether the drive is available.

-    if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
+    if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':'))

     {
         wxString dirNameLower(dirName.Lower());
 #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
     {
         wxString dirNameLower(dirName.Lower());
 #if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)

-        success = wxPathExists(dirNameLower);
+        success = wxDirExists(dirNameLower);

 #else
 #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 ) ;
         int currentDrive = _getdrive();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
         int err = setdrive( thisDrive ) ;


@@ -336,7 +352,7 @@ bool wxIsDriveAvailable(const wxString& dirName)
 
         if (err == -1)
         {
 
         if (err == -1)
         {

-            success = FALSE;
+            success = false;

         }
 #endif
     }
         }
 #endif
     }


@@ -345,17 +361,21 @@ bool wxIsDriveAvailable(const wxString& dirName)
 #endif
 
     return success;
 #endif
 
     return success;

+#endif

 }
 }

-#endif // __WINDOWS__ || __WXPM__
+#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.
 
 // 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);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -371,15 +391,11 @@ wxDirItemData::wxDirItemData(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] == '.');
      * 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_isExpanded = FALSE;
+    m_isHidden = false;
+    m_isExpanded = false;

     m_isDir = isDir;
 }
 
     m_isDir = isDir;
 }
 

-wxDirItemData::~wxDirItemData()
-{
-}
-

 void wxDirItemData::SetNewDirName(const wxString& path)
 {
     m_path = path;
 void wxDirItemData::SetNewDirName(const wxString& path)
 {
     m_path = path;


@@ -388,14 +404,14 @@ void wxDirItemData::SetNewDirName(const wxString& path)
 
 bool wxDirItemData::HasSubDirs() const
 {
 
 bool wxDirItemData::HasSubDirs() const
 {

-    if (m_path.IsEmpty())
-        return FALSE;
+    if (m_path.empty())
+        return false;

 
     wxDir dir;
     {
         wxLogNull nolog;
         if ( !dir.Open(m_path) )
 
     wxDir dir;
     {
         wxLogNull nolog;
         if ( !dir.Open(m_path) )

-            return FALSE;
+            return false;

     }
 
     return dir.HasSubDirs();
     }
 
     return dir.HasSubDirs();


@@ -403,14 +419,14 @@ bool wxDirItemData::HasSubDirs() const
 
 bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 {
 
 bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 {

-    if (m_path.IsEmpty())
-        return FALSE;
+    if (m_path.empty())
+        return false;

 
     wxDir dir;
     {
         wxLogNull nolog;
         if ( !dir.Open(m_path) )
 
     wxDir dir;
     {
         wxLogNull nolog;
         if ( !dir.Open(m_path) )

-            return FALSE;
+            return false;

     }
 
     return dir.HasFiles();
     }
 
     return dir.HasFiles();


@@ -420,13 +436,11 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
-

 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
 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()
 
   EVT_SIZE                    (wxGenericDirCtrl::OnSize)
 END_EVENT_TABLE()
 


@@ -435,8 +449,28 @@ wxGenericDirCtrl::wxGenericDirCtrl(void)
     Init();
 }
 
     Init();
 }
 

+void wxGenericDirCtrl::ExpandRoot()
+{
+    ExpandDir(m_rootId); // automatically expand first level
+
+    // Expand and select the default path
+    if (!m_defaultPath.empty())
+    {
+        ExpandPath(m_defaultPath);
+    }
+#ifdef __UNIX__
+    else
+    {
+        // On Unix, there's only one node under the (hidden) root node. It
+        // represents the / path, so the user would always have to expand it;
+        // let's do it ourselves
+        ExpandPath( wxT("/") );
+    }
+#endif
+}
+

 bool wxGenericDirCtrl::Create(wxWindow *parent,
 bool wxGenericDirCtrl::Create(wxWindow *parent,

-                              const wxWindowID id,
+                              const wxWindowID treeid,

                               const wxString& dir,
                               const wxPoint& pos,
                               const wxSize& size,
                               const wxString& dir,
                               const wxPoint& pos,
                               const wxSize& size,


@@ -445,37 +479,47 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
                               int defaultFilter,
                               const wxString& name)
 {
                               int defaultFilter,
                               const wxString& name)
 {

-    if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
-        return FALSE;
+    if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name))
+        return false;

 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

+    SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));

 
     Init();
 
 
     Init();
 

-    long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
+    long treeStyle = wxTR_HAS_BUTTONS;
+
+    // On Windows CE, if you hide the root, you get a crash when
+    // attempting to access data for children of the root item.
+#ifndef __WXWINCE__
+    treeStyle |= wxTR_HIDE_ROOT;
+#endif
+
+#ifdef __WXGTK20__
+    treeStyle |= wxTR_NO_LINES;
+#endif

 
     if (style & wxDIRCTRL_EDIT_LABELS)
         treeStyle |= wxTR_EDIT_LABELS;
 
 
     if (style & wxDIRCTRL_EDIT_LABELS)
         treeStyle |= wxTR_EDIT_LABELS;
 

-    if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
-        treeStyle |= wxNO_BORDER;
-    else
-        treeStyle |= wxBORDER_SUNKEN;
+    if (style & wxDIRCTRL_MULTIPLE)
+        treeStyle |= wxTR_MULTIPLE;

 
 

-    long filterStyle = 0;

     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)

-        filterStyle |= wxNO_BORDER;
-    else
-        filterStyle |= wxBORDER_SUNKEN;
+        treeStyle |= wxNO_BORDER;

 
 

-    m_treeCtrl = new wxTreeCtrl(this, wxID_TREECTRL, pos, size, treeStyle);
+    m_treeCtrl = CreateTreeCtrl(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);
+    if (!filter.empty())
+        m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);

 
     m_defaultPath = dir;
     m_filter = filter;
 
 
     m_defaultPath = dir;
     m_filter = filter;
 

+    if (m_filter.empty())
+        m_filter = wxFileSelectorDefaultWildcardStr;
+

     SetFilterIndex(defaultFilter);
 
     if (m_filterListCtrl)
     SetFilterIndex(defaultFilter);
 
     if (m_filterListCtrl)


@@ -483,12 +527,12 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList());
 
 
     m_treeCtrl->SetImageList(wxTheFileIconsTable->GetSmallImageList());
 

-    m_showHidden = FALSE;
-    wxDirItemData* rootData = new wxDirItemData(wxT(""), wxT(""), TRUE);
+    m_showHidden = false;
+    wxDirItemData* rootData = new wxDirItemData(wxEmptyString, wxEmptyString, true);

 
     wxString rootName;
 
 
     wxString rootName;
 

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

     rootName = _("Computer");
 #else
     rootName = _("Sections");
     rootName = _("Computer");
 #else
     rootName = _("Sections");


@@ -496,15 +540,13 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);
 
     m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
     m_treeCtrl->SetItemHasChildren(m_rootId);

-    ExpandDir(m_rootId); // automatically expand first level

 
 

-    // Expand and select the default path
-    if (!m_defaultPath.IsEmpty())
-        ExpandPath(m_defaultPath);
+    ExpandRoot();

 
 

+    SetInitialSize(size);

     DoResize();
 
     DoResize();
 

-    return TRUE;
+    return true;

 }
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 }
 
 wxGenericDirCtrl::~wxGenericDirCtrl()


@@ -513,29 +555,53 @@ wxGenericDirCtrl::~wxGenericDirCtrl()
 
 void wxGenericDirCtrl::Init()
 {
 
 void wxGenericDirCtrl::Init()
 {

-    m_showHidden = FALSE;
+    m_showHidden = false;

     m_currentFilter = 0;
     m_currentFilterStr = wxEmptyString; // Default: any file
     m_treeCtrl = NULL;
     m_filterListCtrl = NULL;
 }
 
     m_currentFilter = 0;
     m_currentFilterStr = wxEmptyString; // Default: any file
     m_treeCtrl = NULL;
     m_filterListCtrl = NULL;
 }
 

+wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle)
+{
+    return new wxTreeCtrl(parent, treeid, pos, size, treeStyle);
+}
+

 void wxGenericDirCtrl::ShowHidden( bool show )
 {
 void wxGenericDirCtrl::ShowHidden( bool show )
 {

+    if ( m_showHidden == show )
+        return;
+

     m_showHidden = show;
 
     m_showHidden = show;
 

-    wxString path = GetPath();
-    ReCreateTree();
-    SetPath(path);
+    if ( HasFlag(wxDIRCTRL_MULTIPLE) )
+    {
+        wxArrayString paths;
+        GetPaths(paths);
+        ReCreateTree();
+        for ( unsigned n = 0; n < paths.size(); n++ )
+        {
+            ExpandPath(paths[n]);
+        }
+    }
+    else
+    {
+        wxString path = GetPath();
+        ReCreateTree();
+        SetPath(path);
+    }

 }
 
 }
 

-void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
+const wxTreeItemId
+wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)

 {
 {

-    wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE);
+    wxDirItemData *dir_item = new wxDirItemData(path,name,true);

 
 

-    wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
+    wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item);

 
 

-    m_treeCtrl->SetItemHasChildren(id);
+    m_treeCtrl->SetItemHasChildren(treeid);
+
+    return treeid;

 }
 
 void wxGenericDirCtrl::SetupSections()
 }
 
 void wxGenericDirCtrl::SetupSections()


@@ -545,10 +611,23 @@ void wxGenericDirCtrl::SetupSections()
 
     size_t n, count = wxGetAvailableDrives(paths, names, icons);
 
 
     size_t n, count = wxGetAvailableDrives(paths, names, icons);
 

+#ifdef __WXGTK20__
+    wxString home = wxGetHomeDir();
+    AddSection( home, _("Home directory"), 1);
+    home += wxT("/Desktop");
+    AddSection( home, _("Desktop"), 1);
+#endif
+

     for (n = 0; n < count; n++)
     for (n = 0; n < count; n++)

-    {

         AddSection(paths[n], names[n], icons[n]);
         AddSection(paths[n], names[n], icons[n]);

-    }
+}
+
+void wxGenericDirCtrl::SetFocus()
+{
+    // we don't need focus ourselves, give it to the tree so that the user
+    // could navigate it
+    if (m_treeCtrl)
+        m_treeCtrl->SetFocus();

 }
 
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
 }
 
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)


@@ -570,9 +649,12 @@ void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
 
 void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
 {
 
 void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
 {

-    if ((event.GetLabel().IsEmpty()) ||
-        (event.GetLabel() == _(".")) ||
-        (event.GetLabel() == _("..")) ||
+    if (event.IsEditCancelled())
+        return;
+
+    if ((event.GetLabel().empty()) ||
+        (event.GetLabel() == wxT(".")) ||
+        (event.GetLabel() == wxT("..")) ||

         (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) ||
         (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) ||
         (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND))
         (event.GetLabel().Find(wxT('/')) != wxNOT_FOUND) ||
         (event.GetLabel().Find(wxT('\\')) != wxNOT_FOUND) ||
         (event.GetLabel().Find(wxT('|')) != wxNOT_FOUND))


@@ -583,8 +665,8 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
         return;
     }
 
         return;
     }
 

-    wxTreeItemId id = event.GetItem();
-    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id );
+    wxTreeItemId treeid = event.GetItem();
+    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid );

     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );


@@ -620,7 +702,6 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
     //     ctor when wxTR_HIDE_ROOT was specified
 
     if (!m_rootId.IsOk())
     //     ctor when wxTR_HIDE_ROOT was specified
 
     if (!m_rootId.IsOk())

-

         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);
         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);


@@ -639,28 +720,23 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
     if (!data->m_isExpanded)
         return;
 
     if (!data->m_isExpanded)
         return;
 

-    data->m_isExpanded = FALSE;
-    long cookie;
-    /* Workaround because DeleteChildren has disapeared (why?) and
-     * CollapseAndReset doesn't work as advertised (deletes parent too) */
-    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(parentId, cookie);
-    }
+    data->m_isExpanded = false;
+
+    m_treeCtrl->Freeze();
+    if (parentId != m_treeCtrl->GetRootItem())
+        m_treeCtrl->CollapseAndReset(parentId);
+    m_treeCtrl->DeleteChildren(parentId);
+    m_treeCtrl->Thaw();

 }
 
 }
 

-void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
+void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)

 {
     wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
 
     if (data->m_isExpanded)
         return;
 
 {
     wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
 
     if (data->m_isExpanded)
         return;
 

-    data->m_isExpanded = TRUE;
+    data->m_isExpanded = true;

 
     if (parentId == m_treeCtrl->GetRootItem())
     {
 
     if (parentId == m_treeCtrl->GetRootItem())
     {


@@ -674,12 +750,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     wxString dirName(data->m_path);
 
 
     wxString dirName(data->m_path);
 

-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)
+#if (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__DOS__) || defined(__OS2__)

     // Check if this is a root directory and if so,
     // whether the drive is avaiable.
     if (!wxIsDriveAvailable(dirName))
     {
     // 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;
     }
         //wxMessageBox(wxT("Sorry, this drive is not available."));
         return;
     }


@@ -688,7 +764,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
 

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

     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif


@@ -715,87 +791,112 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                     dirs.Add(eachFilename);
                 }
             }
                     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
 
     // Now do the filenames -- but only if we're allowed to

-    if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
+    if (!HasFlag(wxDIRCTRL_DIR_ONLY))

     {
     {

-        wxLogNull log;
-

         d.Open(dirName);
 
         if (d.IsOpened())
         {
         d.Open(dirName);
 
         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, curFilter, 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);

     }
 
     }
 

+    // Now we really know whether we have any children so tell the tree control
+    // about it.
+    m_treeCtrl->SetItemHasChildren(parentId, !dirs.empty() || !filenames.empty());
+

     // Add the sorted dirs
     size_t i;
     // Add the sorted dirs
     size_t i;

-    for (i = 0; i < dirs.Count(); i++)
+    for (i = 0; i < dirs.GetCount(); i++)

     {
     {

-        wxString eachFilename(dirs[i]);
+        eachFilename = dirs[i];

         path = dirName;
         if (!wxEndsWithPathSeparator(path))
             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 
         path = dirName;
         if (!wxEndsWithPathSeparator(path))
             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 

-        wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE);
-        wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename,
+        wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true);
+        wxTreeItemId treeid = AppendItem( parentId, eachFilename,

                                       wxFileIconsTable::folder, -1, dir_item);
                                       wxFileIconsTable::folder, -1, dir_item);

-        m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
+        m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open,

                                   wxTreeItemIcon_Expanded );
 
                                   wxTreeItemIcon_Expanded );
 

-        // Has this got any children? If so, make it expandable.
-        // (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)) )
-        {
-            m_treeCtrl->SetItemHasChildren(id);
-        }
+        // assume that it does have children by default as it can take a long
+        // time to really check for this (think remote drives...)
+        //
+        // and if we're wrong, we'll correct the icon later if
+        // the user really tries to open this item
+        m_treeCtrl->SetItemHasChildren(treeid);

     }
 
     // Add the sorted filenames
     }
 
     // Add the sorted filenames

-    if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
+    if (!HasFlag(wxDIRCTRL_DIR_ONLY))

     {
     {

-        for (i = 0; i < filenames.Count(); i++)
+        for (i = 0; i < filenames.GetCount(); i++)

         {
         {

-            wxString eachFilename(filenames[i]);
+            eachFilename = filenames[i];

             path = dirName;
             if (!wxEndsWithPathSeparator(path))
                 path += wxString(wxFILE_SEP_PATH);
             path += eachFilename;
             //path = dirName + wxString(wxT("/")) + eachFilename;
             path = dirName;
             if (!wxEndsWithPathSeparator(path))
                 path += wxString(wxFILE_SEP_PATH);
             path += eachFilename;
             //path = dirName + wxString(wxT("/")) + eachFilename;

-            wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,FALSE);
+            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('.')));
             int image_id = wxFileIconsTable::file;
             if (eachFilename.Find(wxT('.')) != wxNOT_FOUND)
                 image_id = wxTheFileIconsTable->GetIconID(eachFilename.AfterLast(wxT('.')));

-            (void)m_treeCtrl->AppendItem( parentId, eachFilename, image_id, -1, dir_item);
+            (void) AppendItem( parentId, eachFilename, image_id, -1, dir_item);

         }
     }
 }
 
         }
     }
 }
 

+void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
+{
+    // ExpandDir() will not actually expand the tree node, just populate it
+    PopulateNode(parentId);
+}
+

 void wxGenericDirCtrl::ReCreateTree()
 {
     CollapseDir(m_treeCtrl->GetRootItem());
 void wxGenericDirCtrl::ReCreateTree()
 {
     CollapseDir(m_treeCtrl->GetRootItem());

-    ExpandDir(m_treeCtrl->GetRootItem());
+    ExpandRoot();
+}
+
+void wxGenericDirCtrl::CollapseTree()
+{
+    wxTreeItemIdValue cookie;
+    wxTreeItemId child = m_treeCtrl->GetFirstChild(m_rootId, cookie);
+    while (child.IsOk())
+    {
+        CollapseDir(child);
+        child = m_treeCtrl->GetNextChild(m_rootId, cookie);
+    }

 }
 
 // Find the child that matches the first part of 'path'.
 }
 
 // Find the child that matches the first part of 'path'.


@@ -813,36 +914,36 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
     path2 += wxString(wxFILE_SEP_PATH);
 
     // In MSW or PM, case is not significant
     path2 += wxString(wxFILE_SEP_PATH);
 
     // In MSW or PM, case is not significant

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

     path2.MakeLower();
 #endif
 
     path2.MakeLower();
 #endif
 

-    long cookie;
+    wxTreeItemIdValue cookie;

     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
         wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
 
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
         wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
 

-        if (data && !data->m_path.IsEmpty())
+        if (data && !data->m_path.empty())

         {
             wxString childPath(data->m_path);
             if (!wxEndsWithPathSeparator(childPath))
                 childPath += wxString(wxFILE_SEP_PATH);
 
             // In MSW and PM, case is not significant
         {
             wxString childPath(data->m_path);
             if (!wxEndsWithPathSeparator(childPath))
                 childPath += wxString(wxFILE_SEP_PATH);
 
             // In MSW and PM, case is not significant

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

             childPath.MakeLower();
 #endif
 
             childPath.MakeLower();
 #endif
 

-            if (childPath.Len() <= path2.Len())
+            if (childPath.length() <= path2.length())

             {
             {

-                wxString path3 = path2.Mid(0, childPath.Len());
+                wxString path3 = path2.Mid(0, childPath.length());

                 if (childPath == path3)
                 {
                 if (childPath == path3)
                 {

-                    if (path3.Len() == path2.Len())
-                        done = TRUE;
+                    if (path3.length() == path2.length())
+                        done = true;

                     else
                     else

-                        done = FALSE;
+                        done = false;

                     return childId;
                 }
             }
                     return childId;
                 }
             }


@@ -858,79 +959,134 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
 // and select the given tree item.
 bool wxGenericDirCtrl::ExpandPath(const wxString& path)
 {
 // and select the given tree item.
 bool wxGenericDirCtrl::ExpandPath(const wxString& path)
 {

-    bool done = FALSE;
-    wxTreeItemId id = FindChild(m_rootId, path, done);
-    wxTreeItemId lastId = id; // The last non-zero id
-    while (id.IsOk() && !done)
+    bool done = false;
+    wxTreeItemId treeid = FindChild(m_rootId, path, done);
+    wxTreeItemId lastId = treeid; // The last non-zero treeid
+    while (treeid.IsOk() && !done)

     {
     {

-        ExpandDir(id);
+        ExpandDir(treeid);

 
 

-        id = FindChild(id, path, done);
-        if (id.IsOk())
-            lastId = id;
+        treeid = FindChild(treeid, path, done);
+        if (treeid.IsOk())
+            lastId = treeid;

     }
     }

-    if (lastId.IsOk())
+    if (!lastId.IsOk())
+        return false;
+
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId);
+    if (data->m_isDir)

     {
     {

-        wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(lastId);
-        if (data->m_isDir)
-        {
-            m_treeCtrl->Expand(lastId);
-        }
-        if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
+        m_treeCtrl->Expand(lastId);
+    }
+    if (HasFlag(wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
+    {
+        // Find the first file in this directory
+        wxTreeItemIdValue cookie;
+        wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
+        bool selectedChild = false;
+        while (childId.IsOk())

         {
         {

-            // Find the first file in this directory
-            long cookie;
-            wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
-            bool selectedChild = FALSE;
-            while (childId.IsOk())
-            {
-                wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
+            data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);

 
 

-                if (data && data->m_path != wxT("") && !data->m_isDir)
-                {
-                    m_treeCtrl->SelectItem(childId);
-                    m_treeCtrl->EnsureVisible(childId);
-                    selectedChild = TRUE;
-                    break;
-                }
-                childId = m_treeCtrl->GetNextChild(lastId, cookie);
-            }
-            if (!selectedChild)
+            if (data && data->m_path != wxEmptyString && !data->m_isDir)

             {
             {

-                m_treeCtrl->SelectItem(lastId);
-                m_treeCtrl->EnsureVisible(lastId);
+                m_treeCtrl->SelectItem(childId);
+                m_treeCtrl->EnsureVisible(childId);
+                selectedChild = true;
+                break;

             }
             }

+            childId = m_treeCtrl->GetNextChild(lastId, cookie);

         }
         }

-        else
+        if (!selectedChild)

         {
             m_treeCtrl->SelectItem(lastId);
             m_treeCtrl->EnsureVisible(lastId);
         }
         {
             m_treeCtrl->SelectItem(lastId);
             m_treeCtrl->EnsureVisible(lastId);
         }

-
-        return TRUE;

     }
     else
     }
     else

-        return FALSE;
+    {
+        m_treeCtrl->SelectItem(lastId);
+        m_treeCtrl->EnsureVisible(lastId);
+    }
+
+    return true;

 }
 
 }
 

+
+bool wxGenericDirCtrl::CollapsePath(const wxString& path)
+{
+    bool done           = false;
+    wxTreeItemId treeid     = FindChild(m_rootId, path, done);
+    wxTreeItemId lastId = treeid; // The last non-zero treeid
+
+    while ( treeid.IsOk() && !done )
+    {
+        CollapseDir(treeid);
+
+        treeid = FindChild(treeid, path, done);
+
+        if ( treeid.IsOk() )
+            lastId = treeid;
+    }
+
+    if ( !lastId.IsOk() )
+        return false;
+
+    m_treeCtrl->SelectItem(lastId);
+    m_treeCtrl->EnsureVisible(lastId);
+
+    return true;
+}
+
+

 wxString wxGenericDirCtrl::GetPath() const
 {
 wxString wxGenericDirCtrl::GetPath() const
 {

-    wxTreeItemId id = m_treeCtrl->GetSelection();
-    if (id)
+    // Allow calling GetPath() in multiple selection from OnSelFilter
+    if (m_treeCtrl->HasFlag(wxTR_MULTIPLE))
+    {
+        wxArrayTreeItemIds items;
+        m_treeCtrl->GetSelections(items);
+        if (items.size() > 0)
+        {
+            // return first string only
+            wxTreeItemId treeid = items[0];
+            wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+            return data->m_path;
+        }
+
+        return wxEmptyString;
+    }
+
+    wxTreeItemId treeid = m_treeCtrl->GetSelection();
+    if (treeid)

     {
     {

-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);

         return data->m_path;
     }
     else
         return wxEmptyString;
 }
 
         return data->m_path;
     }
     else
         return wxEmptyString;
 }
 

+void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const
+{
+    paths.clear();
+
+    wxArrayTreeItemIds items;
+    m_treeCtrl->GetSelections(items);
+    for ( unsigned n = 0; n < items.size(); n++ )
+    {
+        wxTreeItemId treeid = items[n];
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+        paths.Add(data->m_path);
+    }
+}
+

 wxString wxGenericDirCtrl::GetFilePath() const
 {
 wxString wxGenericDirCtrl::GetFilePath() const
 {

-    wxTreeItemId id = m_treeCtrl->GetSelection();
-    if (id)
+    wxTreeItemId treeid = m_treeCtrl->GetSelection();
+    if (treeid)

     {
     {

-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);

         if (data->m_isDir)
             return wxEmptyString;
         else
         if (data->m_isDir)
             return wxEmptyString;
         else


@@ -940,6 +1096,21 @@ wxString wxGenericDirCtrl::GetFilePath() const
         return wxEmptyString;
 }
 
         return wxEmptyString;
 }
 

+void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const
+{
+    paths.clear();
+
+    wxArrayTreeItemIds items;
+    m_treeCtrl->GetSelections(items);
+    for ( unsigned n = 0; n < items.size(); n++ )
+    {
+        wxTreeItemId treeid = items[n];
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+        if ( !data->m_isDir )
+            paths.Add(data->m_path);
+    }
+}
+

 void wxGenericDirCtrl::SetPath(const wxString& path)
 {
     m_defaultPath = path;
 void wxGenericDirCtrl::SetPath(const wxString& path)
 {
     m_defaultPath = path;


@@ -947,11 +1118,48 @@ void wxGenericDirCtrl::SetPath(const wxString& path)
         ExpandPath(path);
 }
 
         ExpandPath(path);
 }
 

+void wxGenericDirCtrl::SelectPath(const wxString& path, bool select)
+{
+    bool done = false;
+    wxTreeItemId treeid = FindChild(m_rootId, path, done);
+    wxTreeItemId lastId = treeid; // The last non-zero treeid
+    while ( treeid.IsOk() && !done )
+    {
+        treeid = FindChild(treeid, path, done);
+        if ( treeid.IsOk() )
+            lastId = treeid;
+    }
+    if ( !lastId.IsOk() )
+        return;
+
+    if ( done )
+    {
+        m_treeCtrl->SelectItem(treeid, select);
+    }
+}
+
+void wxGenericDirCtrl::SelectPaths(const wxArrayString& paths)
+{
+    if ( HasFlag(wxDIRCTRL_MULTIPLE) )
+    {
+        UnselectAll();
+        for ( unsigned n = 0; n < paths.size(); n++ )
+        {
+            SelectPath(paths[n]);
+        }
+    }
+}
+
+void wxGenericDirCtrl::UnselectAll()
+{
+    m_treeCtrl->UnselectAll();
+}
+

 // Not used
 #if 0
 // Not used
 #if 0

-void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
+void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames)

 {
 {

-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id);
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid);

 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;


@@ -962,7 +1170,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri
 
     wxString dirName(data->m_path);
 
 
     wxString dirName(data->m_path);
 

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__OS2__)

     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif


@@ -998,73 +1206,55 @@ void wxGenericDirCtrl::SetFilterIndex(int n)
     if (ExtractWildcard(m_filter, n, f, d))
         m_currentFilterStr = f;
     else
     if (ExtractWildcard(m_filter, n, f, d))
         m_currentFilterStr = f;
     else

+#ifdef __UNIX__
+        m_currentFilterStr = wxT("*");
+#else

         m_currentFilterStr = wxT("*.*");
         m_currentFilterStr = wxT("*.*");

+#endif

 }
 
 void wxGenericDirCtrl::SetFilter(const wxString& filter)
 {
     m_filter = filter;
 
 }
 
 void wxGenericDirCtrl::SetFilter(const wxString& filter)
 {
     m_filter = filter;
 

+    if (!filter.empty() && !m_filterListCtrl)
+        m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
+    else if (filter.empty() && m_filterListCtrl)
+    {
+        m_filterListCtrl->Destroy();
+        m_filterListCtrl = NULL;
+    }
+

     wxString f, d;
     if (ExtractWildcard(m_filter, m_currentFilter, f, d))
         m_currentFilterStr = f;
     else
     wxString f, d;
     if (ExtractWildcard(m_filter, m_currentFilter, f, d))
         m_currentFilterStr = f;
     else

+#ifdef __UNIX__
+        m_currentFilterStr = wxT("*");
+#else

         m_currentFilterStr = wxT("*.*");
         m_currentFilterStr = wxT("*.*");

+#endif
+    // current filter index is meaningless after filter change, set it to zero
+    SetFilterIndex(0);
+    if (m_filterListCtrl)
+        m_filterListCtrl->FillFilterList(m_filter, 0);

 }
 
 // Extract description and actual filter from overall filter string
 bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description)
 {
     wxArrayString filters, descriptions;
 }
 
 // Extract description and actual filter from overall filter string
 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];
     if (count > 0 && n < count)
     {
         filter = filters[n];
         description = descriptions[n];

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

-// 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"
-
-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();
-}

 
 void wxGenericDirCtrl::DoResize()
 {
 
 void wxGenericDirCtrl::DoResize()
 {


@@ -1075,14 +1265,6 @@ void wxGenericDirCtrl::DoResize()
         wxSize filterSz ;
         if (m_filterListCtrl)
         {
         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(-1, -1, oldSize.x+10, -1, wxSIZE_USE_EXISTING);
-            m_filterListCtrl->SetSize(-1, -1, oldSize.x, -1, wxSIZE_USE_EXISTING);
-#endif

             filterSz = m_filterListCtrl->GetSize();
             sz.y -= (filterSz.y + verticalSpacing);
         }
             filterSz = m_filterListCtrl->GetSize();
             sz.y -= (filterSz.y + verticalSpacing);
         }


@@ -1102,6 +1284,26 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
     DoResize();
 }
 
     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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------


@@ -1109,16 +1311,25 @@ void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
 IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice)
 
 BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
 IMPLEMENT_CLASS(wxDirFilterListCtrl, wxChoice)
 
 BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)

-    EVT_CHOICE(-1, wxDirFilterListCtrl::OnSelFilter)
+    EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id,
-              const wxPoint& pos,
-              const wxSize& size,
-              long style)
+bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
+                                 const wxWindowID treeid,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style)

 {
     m_dirCtrl = parent;
 {
     m_dirCtrl = parent;

-    return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
+
+    // by default our border style is determined by the style of our parent
+    if ( !(style & wxBORDER_MASK) )
+    {
+        style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN
+                                                        : wxBORDER_NONE;
+    }
+
+    return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style);

 }
 
 void wxDirFilterListCtrl::Init()
 }
 
 void wxDirFilterListCtrl::Init()


@@ -1130,210 +1341,129 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 {
     int sel = GetSelection();
 
 {
     int sel = GetSelection();
 

-    wxString currentPath = m_dirCtrl->GetPath();
+    if (m_dirCtrl->HasFlag(wxDIRCTRL_MULTIPLE))
+    {
+        wxArrayString paths;
+        m_dirCtrl->GetPaths(paths);

 
 

-    m_dirCtrl->SetFilterIndex(sel);
+        m_dirCtrl->SetFilterIndex(sel);

 
 

-    // If the filter has changed, the view is out of date, so
-    // collapse the tree.
-    m_dirCtrl->ReCreateTree();
+        // If the filter has changed, the view is out of date, so
+        // collapse the tree.
+        m_dirCtrl->ReCreateTree();

 
 

-    // Try to restore the selection, or at least the directory
-    m_dirCtrl->ExpandPath(currentPath);
+        // Expand and select the previously selected paths
+        for (unsigned int i = 0; i < paths.GetCount(); i++)
+        {
+            m_dirCtrl->ExpandPath(paths.Item(i));
+        }
+    }
+    else
+    {
+        wxString currentPath = m_dirCtrl->GetPath();
+
+        m_dirCtrl->SetFilterIndex(sel);
+        m_dirCtrl->ReCreateTree();
+
+        // Try to restore the selection, or at least the directory
+        m_dirCtrl->ExpandPath(currentPath);
+    }

 }
 
 void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter)
 {
     Clear();
     wxArrayString descriptions, filters;
 }
 
 void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter)
 {
     Clear();
     wxArrayString descriptions, filters;

-    size_t n = (size_t) m_dirCtrl->ParseFilter(filter, filters, descriptions);
+    size_t n = (size_t) wxParseCommonDialogsFilter(filter, descriptions, filters);

 
     if (n > 0 && defaultFilter < (int) n)
     {
 
     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);
     }
 }
             Append(descriptions[i]);
         SetSelection(defaultFilter);
     }
 }

+#endif // wxUSE_DIRDLG
+
+#if wxUSE_DIRDLG || wxUSE_FILEDLG

 
 // ----------------------------------------------------------------------------
 // wxFileIconsTable icons
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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",
+#ifndef __WXGTK20__
+/* Computer (c) Julian Smart */
+static const char* const file_icons_tbl_computer_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 42 1",
+"r c #4E7FD0",
+"$ c #7198D9",
+"; c #DCE6F6",
+"q c #FFFFFF",
+"u c #4A7CCE",
+"# c #779DDB",
+"w c #95B2E3",
+"y c #7FA2DD",
+"f c #3263B4",
+"= c #EAF0FA",
+"< c #B1C7EB",
+"% c #6992D7",
+"9 c #D9E4F5",
+"o c #9BB7E5",
+"6 c #F7F9FD",
+", c #BED0EE",
+"3 c #F0F5FC",
+"1 c #A8C0E8",
+"  c None",
+"0 c #FDFEFF",
+"4 c #C4D5F0",
+"@ c #81A4DD",
+"e c #4377CD",
+"- c #E2EAF8",
+"i c #9FB9E5",
+"> c #CCDAF2",
+"+ c #89A9DF",
+"s c #5584D1",
+"t c #5D89D3",
+": c #D2DFF4",
+"5 c #FAFCFE",
+"2 c #F5F8FD",
+"8 c #DFE8F7",
+"& c #5E8AD4",
+"X c #638ED5",
+"a c #CEDCF2",
+"p c #90AFE2",
+"d c #2F5DA9",
+"* c #5282D0",
+"7 c #E5EDF9",
+". c #A2BCE6",
+"O c #8CACE0",

 /* pixels */
 "                ",
 /* pixels */
 "                ",

-"   @@@@@        ",
-"  @$$$$$@       ",
-" @$#+#+#$@@@@@@ ",
-" @$+#+#+$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-"@@@@@@@@@@@@@#@.",
-"@$$$$$$$$$$@@+@.",
-"@$#+#+#+#+##.@@.",
-" @$#+#+#+#+#+.@.",
-" @$+#+#+#+#+#.@.",
-"  @$+#+#+#+##@..",
-"  @@@@@@@@@@@@@.",
-"   .............",
-"                ",
-"                "};
-
-/* 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   "};
-
-/* 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  ",
-"                ",
-"                ",
-"                "};
-
-/* 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.+  ",
-".............+  ",
-" ++++++++++++   ",
-"                "};
-
-/* 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   ",
-"                "};
-
-/* 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  ",
-"                ",
-"                ",
-"                "};
+"  .XXXXXXXXXXX  ",
+"  oXO++@#$%&*X  ",
+"  oX=-;:>,<1%X  ",
+"  oX23=-;:4,$X  ",
+"  oX5633789:@X  ",
+"  oX05623=78+X  ",
+"  oXqq05623=OX  ",
+"  oX,,,,,<<<$X  ",
+"  wXXXXXXXXXXe  ",
+"  XrtX%$$y@+O,, ",
+"  uyiiiiiiiii@< ",
+" ouiiiiiiiiiip<a",
+" rustX%$$y@+Ow,,",
+" dfffffffffffffd",
+"                "
+};
+#endif // !GTK+ 2

 
 // ----------------------------------------------------------------------------
 // wxFileIconsTable & friends
 // ----------------------------------------------------------------------------
 
 // global instance of a wxFileIconsTable
 
 // ----------------------------------------------------------------------------
 // wxFileIconsTable & friends
 // ----------------------------------------------------------------------------
 
 // global instance of a wxFileIconsTable

-wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL;
+wxFileIconsTable* wxTheFileIconsTable = NULL;

 
 // A module to allow icons table cleanup
 
 
 // A module to allow icons table cleanup
 


@@ -1342,14 +1472,10 @@ class wxFileIconsTableModule: public wxModule
 DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
 public:
     wxFileIconsTableModule() {}
 DECLARE_DYNAMIC_CLASS(wxFileIconsTableModule)
 public:
     wxFileIconsTableModule() {}

-    bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return TRUE; }
+    bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }

     void OnExit()
     {
     void OnExit()
     {

-        if (wxTheFileIconsTable)
-        {
-            delete wxTheFileIconsTable;
-            wxTheFileIconsTable = NULL;
-        }
+        wxDELETE(wxTheFileIconsTable);

     }
 };
 
     }
 };
 


@@ -1358,9 +1484,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
 class wxFileIconEntry : public wxObject
 {
 public:
 class wxFileIconEntry : public wxObject
 {
 public:

-    wxFileIconEntry(int i) { id = i; }
+    wxFileIconEntry(int i) { iconid = i; }

 
 

-    int id;
+    int iconid;

 };
 
 wxFileIconsTable::wxFileIconsTable()
 };
 
 wxFileIconsTable::wxFileIconsTable()


@@ -1371,7 +1497,11 @@ wxFileIconsTable::wxFileIconsTable()
 
 wxFileIconsTable::~wxFileIconsTable()
 {
 
 wxFileIconsTable::~wxFileIconsTable()
 {

-    if (m_HashTable) delete m_HashTable;
+    if (m_HashTable)
+    {
+        WX_CLEAR_HASH_TABLE(*m_HashTable);
+        delete m_HashTable;
+    }

     if (m_smallImageList) delete m_smallImageList;
 }
 
     if (m_smallImageList) delete m_smallImageList;
 }
 


@@ -1382,29 +1512,52 @@ void wxFileIconsTable::Create()
     m_HashTable = new wxHashTable(wxKEY_STRING);
     m_smallImageList = new wxImageList(16, 16);
 
     m_HashTable = new wxHashTable(wxKEY_STRING);
     m_smallImageList = new wxImageList(16, 16);
 

-    m_HashTable->DeleteContents(TRUE);

     // folder:
     // folder:

-    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // folder_open
     // folder_open

-    m_smallImageList->Add(wxIcon(file_icons_tbl_folder_open_xpm));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FOLDER_OPEN,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // computer
     // computer

+#ifdef __WXGTK20__
+    // GTK24 uses this icon in the file open dialog
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));
+#else

     m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm));
     m_smallImageList->Add(wxIcon(file_icons_tbl_computer_xpm));

+#endif

     // drive
     // drive

-    m_smallImageList->Add(wxIcon(file_icons_tbl_drive_xpm));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // cdrom
     // cdrom

-    m_smallImageList->Add(wxIcon(file_icons_tbl_cdrom_xpm));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_CDROM,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // floppy
     // floppy

-    m_smallImageList->Add(wxIcon(file_icons_tbl_floppy_xpm));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_FLOPPY,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // removeable
     // removeable

-    m_smallImageList->Add(wxIcon(file_icons_tbl_removeable_xpm));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_REMOVABLE,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // file
     // file

-    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG));
+    m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE,
+                                                   wxART_CMN_DIALOG,
+                                                   wxSize(16, 16)));

     // executable
     // executable

-    if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
+    if (GetIconID(wxEmptyString, wxT("application/x-executable")) == file)

     {
     {

-        m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG));
-        m_HashTable->Delete(_T("exe"));
-        m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable));
+        m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE,
+                                                       wxART_CMN_DIALOG,
+                                                       wxSize(16, 16)));
+        delete m_HashTable->Get(wxT("exe"));
+        m_HashTable->Delete(wxT("exe"));
+        m_HashTable->Put(wxT("exe"), new wxFileIconEntry(executable));

     }
     /* else put into list by GetIconID
        (KDE defines application/x-executable for *.exe and has nice icon)
     }
     /* else put into list by GetIconID
        (KDE defines application/x-executable for *.exe and has nice icon)


@@ -1419,13 +1572,15 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
     return m_smallImageList;
 }
 
     return m_smallImageList;
 }
 

-#if wxUSE_MIMETYPE
+#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

 // 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)
 {
 // 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)
 {

-    wxImage smallimg (16, 16);
+    const unsigned int size = 16;
+
+    wxImage smallimg (size, size);

     unsigned char *p1, *p2, *ps;
     unsigned char mr = img.GetMaskRed(),
                   mg = img.GetMaskGreen(),
     unsigned char *p1, *p2, *ps;
     unsigned char mr = img.GetMaskRed(),
                   mg = img.GetMaskGreen(),


@@ -1434,12 +1589,12 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
     unsigned x, y;
     unsigned sr, sg, sb, smask;
 
     unsigned x, y;
     unsigned sr, sg, sb, smask;
 

-    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData();
+    p1 = img.GetData(), p2 = img.GetData() + 3 * size*2, ps = smallimg.GetData();

     smallimg.SetMaskColour(mr, mr, mr);
 
     smallimg.SetMaskColour(mr, mr, mr);
 

-    for (y = 0; y < 16; y++)
+    for (y = 0; y < size; y++)

     {
     {

-        for (x = 0; x < 16; x++)
+        for (x = 0; x < size; x++)

         {
             sr = sg = sb = smask = 0;
             if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
         {
             sr = sg = sb = smask = 0;
             if (p1[0] != mr || p1[1] != mg || p1[2] != mb)


@@ -1462,15 +1617,21 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
             if (smask > 2)
                 ps[0] = ps[1] = ps[2] = mr;
             else
             if (smask > 2)
                 ps[0] = ps[1] = ps[2] = mr;
             else

-                ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
+            {
+                ps[0] = (unsigned char)(sr >> 2);
+                ps[1] = (unsigned char)(sg >> 2);
+                ps[2] = (unsigned char)(sb >> 2);
+            }

             ps += 3;
         }
             ps += 3;
         }

-        p1 += 32 * 3, p2 += 32 * 3;
+        p1 += size*2 * 3, p2 += size*2 * 3;

     }
 
     return wxBitmap(smallimg);
 }
 
     }
 
     return wxBitmap(smallimg);
 }
 

+// 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)
 {
 // finds empty borders and return non-empty area of image:
 static wxImage CutEmptyBorders(const wxImage& img)
 {


@@ -1484,27 +1645,27 @@ static wxImage CutEmptyBorders(const wxImage& img)
     bool empt;
 
 #define MK_DTTMP(x,y)      dttmp = dt + ((x + y * w) * 3)
     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;}
+#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++)
+    for (empt = true, top = 0; empt && top < h; top++)

     {
         MK_DTTMP(0, top);
         for (i = 0; i < w; i++, dttmp+=3)
             NOEMPTY_PIX(empt)
     }
     {
         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--)
+    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)
     }
     {
         MK_DTTMP(0, bottom);
         for (i = 0; i < w; i++, dttmp+=3)
             NOEMPTY_PIX(empt)
     }

-    for (empt = TRUE, left = 0; empt && left < w; left++)
+    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)
     }
     {
         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--)
+    for (empt = true, right = w-1; empt && right > left; right--)

     {
         MK_DTTMP(right, 0);
         for (i = 0; i < h; i++, dttmp+=3*w)
     {
         MK_DTTMP(right, 0);
         for (i = 0; i < h; i++, dttmp+=3*w)


@@ -1514,6 +1675,8 @@ static wxImage CutEmptyBorders(const wxImage& img)
 
     return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
 }
 
     return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
 }

+#endif // #if 0
+

 #endif // wxUSE_MIMETYPE
 
 int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 #endif // wxUSE_MIMETYPE
 
 int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)


@@ -1522,44 +1685,72 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         Create();
 
 #if wxUSE_MIMETYPE
         Create();
 
 #if wxUSE_MIMETYPE

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

     {
         wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
     {
         wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);

-        if (entry) return (entry -> id);
+        if (entry) return (entry -> iconid);

     }
 
     }
 

-    wxFileType *ft = (mime.IsEmpty()) ?
+    wxFileType *ft = (mime.empty()) ?

                    wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
                    wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
                    wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
                    wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);

+
+    wxIconLocation iconLoc;

     wxIcon ic;
     wxIcon ic;

-    if (ft == NULL || (!ft->GetIcon(&ic)) || (!ic.Ok()))
+
+    {
+        wxLogNull logNull;
+        if ( ft && ft->GetIcon(&iconLoc) )
+        {
+            ic = wxIcon( iconLoc );
+        }
+    }
+
+    delete ft;
+
+    if ( !ic.Ok() )

     {
         int newid = file;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
 
     {
         int newid = file;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
 

-    wxBitmap tmpBmp;
-    tmpBmp.CopyFromIcon(ic);
-    wxImage img = tmpBmp.ConvertToImage();
+    wxBitmap bmp;
+    bmp.CopyFromIcon(ic);

 
 

-    delete ft;
+    if ( !bmp.Ok() )
+    {
+        int newid = file;
+        m_HashTable->Put(extension, new wxFileIconEntry(newid));
+        return newid;
+    }

 
 

-    int id = m_smallImageList->GetImageCount();
-    if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_smallImageList->Add(wxBitmap(img));
+    const unsigned int size = 16;
+
+    int treeid = m_smallImageList->GetImageCount();
+    if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
+    {
+        m_smallImageList->Add(bmp);
+    }
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)

     else
     {
     else
     {

-        if (img.GetWidth() != 32 || img.GetHeight() != 32)
-            m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+        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));
     }
         else
             m_smallImageList->Add(CreateAntialiasedBitmap(img));
     }

-    m_HashTable->Put(extension, new wxFileIconEntry(id));
-    return id;
+#endif // wxUSE_IMAGE
+
+    m_HashTable->Put(extension, new wxFileIconEntry(treeid));
+    return treeid;

 
 #else // !wxUSE_MIMETYPE
 
 
 #else // !wxUSE_MIMETYPE
 

+    wxUnusedVar(mime);

     if (extension == wxT("exe"))
         return executable;
     else
     if (extension == wxT("exe"))
         return executable;
     else


@@ -1567,4 +1758,4 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 #endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
 }
 
 #endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE
 }
 

-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG