Use NSBox with the NSBoxSeparator box type

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d878e874faab5f0f0014390798a91c23b9a96206..45e2d8f4cef83d1d3191f86d74af94037210722e 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "dirctrlg.h"
 #endif
 
 #pragma implementation "dirctrlg.h"
 #endif
 


@@ -20,13 +20,16 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/defs.h"
+#if wxUSE_DIRDLG

 
 

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

 #include "wx/utils.h"
 #include "wx/utils.h"

-#include "wx/dialog.h"

 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"

+#include "wx/textctrl.h"

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


@@ -39,20 +42,33 @@
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/settings.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"
+#include "wx/filedlg.h"  // for wxFileDialogBase::ParseWildcard

 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
 
 #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>
 
 
 #ifdef __WXMSW__
 #include <windows.h>
 

-#ifndef __GNUWIN32__
-#include <direct.h>
-#include <stdlib.h>
-#include <ctype.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(__WXWINCE__)
+  #include <direct.h>
+#endif
+  #include <stdlib.h>
+  #include <ctype.h>

 #endif
 
 #endif
 #endif
 
 #endif


@@ -61,12 +77,22 @@
 
 #define INCL_BASE
 #include <os2.h>
 
 #define INCL_BASE
 #include <os2.h>

+#ifndef __EMX__

 #include <direct.h>
 #include <direct.h>

+#endif

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

-
+extern bool wxIsDriveAvailable(const wxString& dirName);

 #endif // __WXPM__
 
 #endif // __WXPM__
 

+#if defined(__WXMAC__)
+#  ifdef __DARWIN__
+#    include "MoreFilesX.h"
+#  else
+#    include "MoreFilesExtras.h"
+#  endif
+#endif
+

 #ifdef __BORLANDC__
 #include "dos.h"
 #endif
 #ifdef __BORLANDC__
 #include "dos.h"
 #endif


@@ -76,238 +102,205 @@
 #undef GetFirstChild
 #endif
 
 #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, WXPM, 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(__WXPM__)
+
+#ifdef __WXWINCE__
+    // No logical drives; return "\"
+    paths.Add(wxT("\\"));
+    names.Add(wxT("\\"));
+    return 1;
+#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 = wxFileIconsTable::drive;
+        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;
+    }
+#else // !__WIN32__
+    int drive;

 
 

-/* 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.+  ",
-".............+  ",
-" ++++++++++++   ",
-"                "};
+    /* 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));

 
 

-/* 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 (wxIsDriveAvailable(path))
+        {
+            paths.Add(path);
+            names.Add(name);
+            icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive);
+        }
+    }
+#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 , wxConvLocal) ;
+            if (path.Last() != wxFILE_SEP_PATH) {
+                path += wxFILE_SEP_PATH;
+            }
+            // get Mac volume name for display
+            FSVolumeRefNum vRefNum ;
+            HFSUniStr255 volumeName ;

 
 

-/* 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 ( 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))
+            {
+                CFRelease( cstr );
+                continue;
+            }
+            wxString name( cstr , wxConvLocal );
+            DisposePtr( cstr );
+            CFRelease( cfstr );
+
+            GetVolParmsInfoBuffer volParmsInfo;
+            UInt32 actualSize;
+            if ( FSGetVolParms(vRefNum, sizeof(volParmsInfo), &volParmsInfo, &actualSize) != noErr ) {
+                continue;
+            }

 
 

-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;
+            paths.Add(path);
+            names.Add(name);
+
+            if ( VolIsEjectable(&volParmsInfo) )
+                icon_ids.Add(wxFileIconsTable::cdrom);
+            else
+                icon_ids.Add(wxFileIconsTable::drive);
+        }
+        ::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__)
+    paths.Add(wxT("/"));
+    names.Add(wxT("/"));
+    icon_ids.Add(wxFileIconsTable::computer);
+#else
+    #error "Unsupported platform in wxGenericDirCtrl!"
+#endif
+    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(__WXPM__)

 
 

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

 int setdrive(int drive)
 {
 int setdrive(int drive)
 {

+#ifdef __WXWINCE__
+    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)
        wxChar  newdrive[3];
 
        if (drive < 1 || drive > 31)


@@ -316,11 +309,7 @@ int setdrive(int drive)
        newdrive[1] = wxT(':');
        newdrive[2] = wxT('\0');
 #if defined(__WXMSW__)
        newdrive[1] = wxT(':');
        newdrive[2] = wxT('\0');
 #if defined(__WXMSW__)

-#ifdef __WIN16__
-    if (wxSetWorkingDirectory(newdrive))
-#else

        if (::SetCurrentDirectory(newdrive))
        if (::SetCurrentDirectory(newdrive))

-#endif

 #else
     // VA doesn't know what LPSTR is and has its own set
        if (DosSetCurrentDir((PSZ)newdrive))
 #else
     // VA doesn't know what LPSTR is and has its own set
        if (DosSetCurrentDir((PSZ)newdrive))


@@ -328,21 +317,25 @@ int setdrive(int drive)
                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__
+    return FALSE;
+#else

 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 #endif
     bool success = TRUE;
 
     // Check if this is a root directory and if so,
 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 #endif
     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 (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
     {
         wxString dirNameLower(dirName.Lower());

-#if defined(__GNUWIN32__)
+#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)

         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();
         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();


@@ -361,25 +354,24 @@ static bool wxIsDriveAvailable(const wxString dirName)
 #endif
 
     return success;
 #endif
 
     return success;

-}

 #endif
 #endif

+}
+#endif // __WINDOWS__ || __WXPM__
+

 
 // 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 LINKAGEMODE wxDirCtrlStringCompareFunction(wxString* strFirst, 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;
 {
     m_path = path;
     m_name = name;


@@ -388,20 +380,48 @@ wxDirItemDataEx::wxDirItemDataEx(const wxString& path, const wxString& name,
      * For FileNameFromPath read LastDirNameInThisPath ;-) */
     // m_isHidden = (bool)(wxFileNameFromPath(*m_path)[0] == '.');
     m_isHidden = FALSE;
      * 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_isDir = isDir;
 }
 
     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_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();

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


@@ -410,6 +430,13 @@ void wxDirItemDataEx::SetNewDirName( wxString path )
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
 

+/*
+TODO PROPERTIES
+       defaultfolder string
+       filter string
+       (long) defaultfilter)
+*/
+

 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (-1, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (-1, wxGenericDirCtrl::OnCollapseItem)
 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (-1, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (-1, wxGenericDirCtrl::OnCollapseItem)


@@ -424,29 +451,37 @@ wxGenericDirCtrl::wxGenericDirCtrl(void)
 }
 
 bool wxGenericDirCtrl::Create(wxWindow *parent,
 }
 
 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;
 
 {
     if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return FALSE;
 

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

 
     Init();
 
 
     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;
     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;
 
     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, pos, size, treeStyle);
 


@@ -461,23 +496,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     if (m_filterListCtrl)
         m_filterListCtrl->FillFilterList(filter, defaultFilter);
 
     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;
 
     m_showHidden = FALSE;

-    wxDirItemDataEx* rootData = new wxDirItemDataEx(wxT(""), wxT(""), TRUE);
+    wxDirItemData* rootData = new wxDirItemData(wxT(""), wxT(""), TRUE);

 
     wxString rootName;
 
 
     wxString rootName;
 

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

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


@@ -485,7 +511,7 @@ 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);

-    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())
 
     // Expand and select the default path
     if (!m_defaultPath.IsEmpty())


@@ -498,112 +524,49 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 {
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 {

-   m_treeCtrl->SetImageList(NULL);
-   delete m_imageList;

 }
 
 void wxGenericDirCtrl::Init()
 {
     m_showHidden = FALSE;
 }
 
 void wxGenericDirCtrl::Init()
 {
     m_showHidden = FALSE;

-    m_imageList = NULL;

     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;
 }
 

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

 {
 {

-    wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE);
+    m_showHidden = show;

 
 

-#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_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__)
+    wxDirItemData *dir_item = new wxDirItemData(path,name,TRUE);

 
 

-#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]);
+    wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);

 
 

-        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;
-        }
-
-        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);
-        }
+    for (n = 0; n < count; n++)
+    {
+        AddSection(paths[n], names[n], icons[n]);

     }
     }

-#endif
-
-#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)
 }
 
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)


@@ -616,7 +579,7 @@ void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
     }
 
     // don't rename the individual sections
     }
 
     // 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;
     {
         event.Veto();
         return;


@@ -628,7 +591,9 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     if ((event.GetLabel().IsEmpty()) ||
         (event.GetLabel() == _(".")) ||
         (event.GetLabel() == _("..")) ||
     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();
     {
         wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
         dialog.ShowModal();


@@ -637,7 +602,7 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
     }
 
     wxTreeItemId id = event.GetItem();
     }
 
     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 ) );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );


@@ -669,41 +634,53 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 {
     wxTreeItemId parentId = event.GetItem();
 
 {
     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);
 }
 
     ExpandDir(parentId);
 }
 

-void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
+void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
+{
+    CollapseDir(event.GetItem());
+}
+
+void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)

 {
 {

-    wxTreeItemId child, parent = event.GetItem();
+    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;
     if (!data->m_isExpanded)
         return;
 
     data->m_isExpanded = FALSE;

-    long cookie;
+    wxTreeItemIdValue cookie;

     /* Workaround because DeleteChildren has disapeared (why?) and
      * CollapseAndReset doesn't work as advertised (deletes parent too) */
     /* 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! */
     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)
 {
     }
 }
 
 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;
 
 
     if (data->m_isExpanded)
         return;
 
     data->m_isExpanded = TRUE;
 

-    if (parentId == m_rootId)
+    if (parentId == m_treeCtrl->GetRootItem())

     {
         SetupSections();
         return;
     {
         SetupSections();
         return;


@@ -715,7 +692,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     wxString dirName(data->m_path);
 
 
     wxString dirName(data->m_path);
 

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

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


@@ -729,7 +706,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(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)

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


@@ -745,7 +722,9 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     if (d.IsOpened())
     {
 
     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
             {
         {
             do
             {


@@ -754,10 +733,10 @@ 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
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
 
     // Now do the filenames -- but only if we're allowed to
     if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)


@@ -777,10 +756,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                         filenames.Add(eachFilename);
                     }
                 }
                         filenames.Add(eachFilename);
                     }
                 }

-                while (d.GetNext(& eachFilename)) ;
+                while (d.GetNext(& eachFilename));

             }
         }
             }
         }

-        filenames.Sort((wxArrayString::CompareFunction) wxDirCtrlStringCompareFunction);
+        filenames.Sort(wxDirCtrlStringCompareFunction);

     }
 
     // Add the sorted dirs
     }
 
     // Add the sorted dirs


@@ -789,33 +768,26 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
     {
         wxString eachFilename(dirs[i]);
         path = dirName;
     {
         wxString eachFilename(dirs[i]);
         path = dirName;

-        if (path.Last() != wxFILE_SEP_PATH)
+        if (!wxEndsWithPathSeparator(path))

             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 
             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.
 
         // 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
     }
 
     // Add the sorted filenames


@@ -825,16 +797,25 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
         {
             wxString eachFilename(filenames[i]);
             path = dirName;
         {
             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;
                 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.
 // 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.


@@ -850,24 +831,24 @@ 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(__WXMSW__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXPM__)

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

-    long cookie;
+    wxTreeItemIdValue cookie;

     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
     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);
         {
             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
                 childPath += wxString(wxFILE_SEP_PATH);
 
             // In MSW and PM, case is not significant

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

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


@@ -885,7 +866,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
             }
         }
 
             }
         }
 

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

     }
     wxTreeItemId invalid;
     return invalid;
     }
     wxTreeItemId invalid;
     return invalid;


@@ -908,7 +889,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
     }
     if (lastId.IsOk())
     {
     }
     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);
         if (data->m_isDir)
         {
             m_treeCtrl->Expand(lastId);


@@ -916,14 +897,14 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
         if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
         {
             // Find the first file in this directory
         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;
             while (childId.IsOk())
             {
             wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
             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 != wxT("") && !data->m_isDir)

                 {
                     m_treeCtrl->SelectItem(childId);
                     m_treeCtrl->EnsureVisible(childId);
                 {
                     m_treeCtrl->SelectItem(childId);
                     m_treeCtrl->EnsureVisible(childId);


@@ -955,7 +936,7 @@ wxString wxGenericDirCtrl::GetPath() const
     wxTreeItemId id = m_treeCtrl->GetSelection();
     if (id)
     {
     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
         return data->m_path;
     }
     else


@@ -967,7 +948,7 @@ wxString wxGenericDirCtrl::GetFilePath() const
     wxTreeItemId id = m_treeCtrl->GetSelection();
     if (id)
     {
     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
         if (data->m_isDir)
             return wxEmptyString;
         else


@@ -988,7 +969,7 @@ void wxGenericDirCtrl::SetPath(const wxString& path)
 #if 0
 void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
 {
 #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;
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;


@@ -1060,47 +1041,17 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
         description = descriptions[n];
         return TRUE;
     }
         description = descriptions[n];
         return TRUE;
     }

-    else
-        return FALSE;
+
+    return FALSE;

 }
 
 // Parses the global filter, returning the number of filters.
 // Returns 0 if none or if there's a problem.
 }
 
 // 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)
 {
 
 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 wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters );

 }
 
 void wxGenericDirCtrl::DoResize()
 }
 
 void wxGenericDirCtrl::DoResize()


@@ -1112,6 +1063,14 @@ 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);
         }


@@ -1131,6 +1090,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
 //-----------------------------------------------------------------------------


@@ -1165,8 +1144,7 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 
     // If the filter has changed, the view is out of date, so
     // collapse the tree.
 
     // 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);
 
     // Try to restore the selection, or at least the directory
     m_dirCtrl->ExpandPath(currentPath);


@@ -1187,202 +1165,426 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
     }
 }
 
     }
 }
 

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

 
 

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

 
 

-    wxBusyCursor cursor;
+/* 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 */
+"                ",
+"   @@@@@        ",
+"  @$$$$$@       ",
+" @$#+#+#$@@@@@@ ",
+" @$+#+#+$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+"@@@@@@@@@@@@@#@.",
+"@$$$$$$$$$$@@+@.",
+"@$#+#+#+#+##.@@.",
+" @$#+#+#+#+#+.@.",
+" @$+#+#+#+#+#.@.",
+"  @$+#+#+#+##@..",
+"  @@@@@@@@@@@@@.",
+"   .............",
+"                ",
+"                "};

 
 

-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+/* 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   "};

 
 

-    // 1) dir ctrl
-    m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
-        defaultPath, wxPoint(5, 5),
-        wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);
+/* 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  ",
+"                ",
+"                ",
+"                "};

 
 

-    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+/* 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.+  ",
+".............+  ",
+" ++++++++++++   ",
+"                "};

 
 

-    // 2) text ctrl
-    m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
-    topsizer->Add( m_input, 0, 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   ",
+"                "};

 
 

-#if wxUSE_STATLINE
-    // 3) Static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+/* 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  ",
+"                ",
+"                ",
+"                "};

 
 

-    // 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 );
+// ----------------------------------------------------------------------------
+// wxFileIconsTable & friends
+// ----------------------------------------------------------------------------

 
 

-    // 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
+// global instance of a wxFileIconsTable
+wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL;

 
 

-    topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
+// A module to allow icons table cleanup

 
 

-    okButton->SetDefault();
-    m_dirCtrl->SetFocus();
+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;
+        }
+    }
+};

 
 

-    SetAutoLayout( TRUE );
-    SetSizer( topsizer );
+IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)

 
 

-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );
+class wxFileIconEntry : public wxObject
+{
+public:
+    wxFileIconEntry(int i) { id = i; }

 
 

-    Centre( wxBOTH );
-}
+    int id;
+};

 
 

-void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+wxFileIconsTable::wxFileIconsTable()

 {
 {

-    EndModal(wxID_CANCEL);
+    m_HashTable = NULL;
+    m_smallImageList = NULL;

 }
 
 }
 

-void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+wxFileIconsTable::~wxFileIconsTable()

 {
 {

-    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.
-        }
+    if (m_HashTable)
+    {
+        WX_CLEAR_HASH_TABLE(*m_HashTable);
+        delete m_HashTable;

     }
     }

-    // User has answered NO to create dir.
+    if (m_smallImageList) delete m_smallImageList;

 }
 
 }
 

-void wxGenericDirDialog::SetPath(const wxString& path)
+// delayed initialization - wait until first use (wxArtProv not created yet)
+void wxFileIconsTable::Create()

 {
 {

-    m_dirCtrl->SetPath(path);
-    m_path = path;
+    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));
+    // 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));
+    // executable
+    if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
+    {
+        m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG));
+        delete m_HashTable->Get(_T("exe"));
+        m_HashTable->Delete(_T("exe"));
+        m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable));
+    }
+    /* else put into list by GetIconID
+       (KDE defines application/x-executable for *.exe and has nice icon)
+     */

 }
 
 }
 

-wxString wxGenericDirDialog::GetPath(void) const
+wxImageList *wxFileIconsTable::GetSmallImageList()

 {
 {

-    return m_path;
+    if (!m_smallImageList)
+        Create();
+
+    return m_smallImageList;

 }
 
 }
 

-int wxGenericDirDialog::ShowModal()
+#if wxUSE_MIMETYPE
+// VS: we don't need this function w/o wxMimeTypesManager because we'll only have
+//     one icon and we won't resize it
+
+static wxBitmap CreateAntialiasedBitmap(const wxImage& img)

 {
 {

-    //m_input->SetValue( m_path );
-    return wxDialog::ShowModal();
+    wxImage smallimg (16, 16);
+    unsigned char *p1, *p2, *ps;
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+
+    unsigned x, y;
+    unsigned sr, sg, sb, smask;
+
+    p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = smallimg.GetData();
+    smallimg.SetMaskColour(mr, mr, mr);
+
+    for (y = 0; y < 16; y++)
+    {
+        for (x = 0; x < 16; x++)
+        {
+            sr = sg = sb = smask = 0;
+            if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
+                sr += p1[0], sg += p1[1], sb += p1[2];
+            else smask++;
+            p1 += 3;
+            if (p1[0] != mr || p1[1] != mg || p1[2] != mb)
+                sr += p1[0], sg += p1[1], sb += p1[2];
+            else smask++;
+            p1 += 3;
+            if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
+                sr += p2[0], sg += p2[1], sb += p2[2];
+            else smask++;
+            p2 += 3;
+            if (p2[0] != mr || p2[1] != mg || p2[2] != mb)
+                sr += p2[0], sg += p2[1], sb += p2[2];
+            else smask++;
+            p2 += 3;
+
+            if (smask > 2)
+                ps[0] = ps[1] = ps[2] = mr;
+            else
+                ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
+            ps += 3;
+        }
+        p1 += 32 * 3, p2 += 32 * 3;
+    }
+
+    return wxBitmap(smallimg);

 }
 
 }
 

-void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
+// finds empty borders and return non-empty area of image:
+static wxImage CutEmptyBorders(const wxImage& img)

 {
 {

-    if (!m_dirCtrl)
-        return;
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+    unsigned char *dt = img.GetData(), *dttmp;
+    unsigned w = img.GetWidth(), h = img.GetHeight();

 
 

-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem());
-    if (data)
-       m_input->SetValue( data->m_path );
-};
+    unsigned top, bottom, left, right, i;
+    bool empt;

 
 

-void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
-{
-    if (!m_dirCtrl)
-        return;
+#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;}

 
 

-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
-    if (data)
-        m_input->SetValue( data->m_path );
-};
+    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 // wxUSE_MIMETYPE

 
 

-void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
+int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)

 {
 {

-    wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
-    if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
-        (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
+    if (!m_smallImageList)
+        Create();
+
+#if wxUSE_MIMETYPE
+    if (!extension.IsEmpty())

     {
     {

-        wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
-                            _("Create directory"), wxOK | wxICON_INFORMATION );
-        msg.ShowModal();
-        return;
+        wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
+        if (entry) return (entry -> id);

     }
 
     }
 

-    wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
-    wxASSERT( data );
+    wxFileType *ft = (mime.IsEmpty()) ?
+                   wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
+                   wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);

 
 

-    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))
+    wxIconLocation iconLoc;
+    wxIcon ic;
+    if ( ft && ft->GetIcon(&iconLoc) )

     {
     {

-        // 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));
+        ic = wxIcon(iconLoc);

     }
 
     }
 

-    wxLogNull log;
-    if (!wxMkdir(path))
+    delete ft;
+
+    if ( !ic.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;

     }
 
     }
 

-    wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE );
+    wxBitmap tmpBmp;
+    tmpBmp.CopyFromIcon(ic);
+    wxImage img = tmpBmp.ConvertToImage();

 
 

-    // 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 );
+    int id = m_smallImageList->GetImageCount();
+    if (img.GetWidth() == 16 && img.GetHeight() == 16)
+        m_smallImageList->Add(wxBitmap(img));
+    else
+    {
+        if (img.GetWidth() != 32 || img.GetHeight() != 32)
+            m_smallImageList->Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+        else
+            m_smallImageList->Add(CreateAntialiasedBitmap(img));
+    }
+    m_HashTable->Put(extension, new wxFileIconEntry(id));
+    return id;
+
+#else // !wxUSE_MIMETYPE
+
+    if (extension == wxT("exe"))
+        return executable;
+    else
+        return file;
+#endif // wxUSE_MIMETYPE/!wxUSE_MIMETYPE

 }
 }

+
+#endif // wxUSE_DIRDLG