OS/2 NativeFontInfo support

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 04542809fdb7a45a04b1d25d124da862b05e7d0a..e35d2487c560c41f8063f9d415b6a1253980385c 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -20,13 +20,14 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

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

 
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/button.h"
 #include "wx/layout.h"
 #include "wx/msgdlg.h"
 
 #include "wx/utils.h"
 #include "wx/dialog.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"


@@ -46,15 +47,37 @@
 
 #include "wx/generic/dirctrlg.h"
 
 
 #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__
+// 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>
+#endif
+
+#endif
+
+#ifdef __WXPM__
+
+#define INCL_BASE
+#include <os2.h>

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

-#endif

 
 

+#endif // __WXPM__
+
+#if defined(__WXMAC__)
+#  include "MoreFilesExtras.h"

 #endif
 
 #ifdef __BORLANDC__
 #endif
 
 #ifdef __BORLANDC__


@@ -66,7 +89,6 @@
 #undef GetFirstChild
 #endif
 
 #undef GetFirstChild
 #endif
 

-#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW

 /* Closed folder */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */
 /* Closed folder */
 static char * icon1_xpm[] = {
 /* width height ncolors chars_per_pixel */


@@ -288,16 +310,45 @@ static char * icon8_xpm[] = {
 "                ",
 "                ",
 "                "};
 "                ",
 "                ",
 "                "};

-#endif // !wxMSW

 
 

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

 
 

+#define wxID_TREECTRL          7000
+#define wxID_FILTERLISTCTRL    7001
+
+#if defined(__DOS__)
+  #ifdef __DJGPP__
+    #define setdrive(drive) setdisk(drive)
+  #endif
+#elif defined(__WXMSW__) || defined(__WXPM__)
+int setdrive(int drive)
+{
+#if defined(__GNUWIN32__) && \
+    (defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
+    return _chdrive(drive);
+#else
+       wxChar  newdrive[3];
+
+       if (drive < 1 || drive > 31)
+               return -1;
+       newdrive[0] = (wxChar)(wxT('A') + drive - 1);
+       newdrive[1] = wxT(':');
+       newdrive[2] = wxT('\0');

 #if defined(__WXMSW__)
 #if defined(__WXMSW__)

+#ifdef __WIN16__
+    if (wxSetWorkingDirectory(newdrive))
+#else
+       if (::SetCurrentDirectory(newdrive))
+#endif
+#else
+    // VA doesn't know what LPSTR is and has its own set
+       if (DosSetCurrentDir((PSZ)newdrive))
+#endif
+               return 0;
+       else
+               return -1;
+#endif // !GNUWIN32
+}
+

 static bool wxIsDriveAvailable(const wxString dirName)
 {
 #ifdef __WIN32__
 static bool wxIsDriveAvailable(const wxString dirName)
 {
 #ifdef __WIN32__


@@ -310,13 +361,14 @@ static bool wxIsDriveAvailable(const wxString dirName)
     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();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
         success = wxPathExists(dirNameLower);
 #else
         int currentDrive = _getdrive();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;

-        int err = _chdrive( thisDrive ) ;
-        _chdrive( currentDrive );
+        int err = setdrive( thisDrive ) ;
+        setdrive( currentDrive );

 
         if (err == -1)
         {
 
         if (err == -1)
         {


@@ -332,12 +384,22 @@ static bool wxIsDriveAvailable(const wxString dirName)
 }
 #endif
 
 }
 #endif
 

+// 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)
+{
+    wxString *strFirst = (wxString *)first;
+    wxString *strSecond = (wxString *)second;
+    
+    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;


@@ -346,20 +408,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& spec) const
+{
+    if (m_path.IsEmpty())
+        return FALSE;
+
+    wxDir dir;
+    {
+        wxLogNull nolog;
+        if ( !dir.Open(m_path) )
+            return FALSE;
+    }
+
+    return dir.HasFiles();

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


@@ -382,14 +472,14 @@ 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;


@@ -398,7 +488,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     Init();
 
 
     Init();
 

-    long treeStyle = wxTR_HAS_BUTTONS ; // | wxTR_EDIT_LABELS;
+    long treeStyle = wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_HIDE_ROOT;

     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
 


@@ -420,7 +510,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
         m_filterListCtrl->FillFilterList(filter, defaultFilter);
 
     m_imageList = new wxImageList(16, 16, TRUE);
         m_filterListCtrl->FillFilterList(filter, defaultFilter);
 
     m_imageList = new wxImageList(16, 16, TRUE);

-#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW

     m_imageList->Add(wxIcon(icon1_xpm));
     m_imageList->Add(wxIcon(icon2_xpm));
     m_imageList->Add(wxIcon(icon3_xpm));
     m_imageList->Add(wxIcon(icon1_xpm));
     m_imageList->Add(wxIcon(icon2_xpm));
     m_imageList->Add(wxIcon(icon3_xpm));


@@ -429,26 +518,14 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     m_imageList->Add(wxIcon(icon6_xpm));
     m_imageList->Add(wxIcon(icon7_xpm));
     m_imageList->Add(wxIcon(icon8_xpm));
     m_imageList->Add(wxIcon(icon6_xpm));
     m_imageList->Add(wxIcon(icon7_xpm));
     m_imageList->Add(wxIcon(icon8_xpm));

-#elif defined(__WXMSW__)
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CLOSED_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_OPEN_FOLDER"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_COMPUTER"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_DRIVE"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_CDROM"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FLOPPY"), wxBITMAP_TYPE_ICO_RESOURCE));
-    m_imageList->Add(wxIcon(wxT("wxICON_SMALL_REMOVEABLE"), wxBITMAP_TYPE_ICO_RESOURCE));
-#else
-#error "Sorry, we don't have icons available for this platforms."
-#endif
-    m_treeCtrl->SetImageList(m_imageList);
+    m_treeCtrl->AssignImageList(m_imageList);

 
     m_showHidden = FALSE;
 
     m_showHidden = FALSE;

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

 
     wxString rootName;
 
 
     wxString rootName;
 

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

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


@@ -469,8 +546,6 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 {
 
 wxGenericDirCtrl::~wxGenericDirCtrl()
 {

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

 }
 
 void wxGenericDirCtrl::Init()
 }
 
 void wxGenericDirCtrl::Init()


@@ -485,24 +560,16 @@ void wxGenericDirCtrl::Init()
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
 {
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
 {

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

 
 

-#ifdef __WXMSW__
-    // Windows: sections are displayed as drives

     wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
     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);
 }
 
 void wxGenericDirCtrl::SetupSections()
 {
 
     m_treeCtrl->SetItemHasChildren(id);
 }
 
 void wxGenericDirCtrl::SetupSections()
 {

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

 
 #ifdef __WIN32__
     wxChar driveBuffer[256];
 
 #ifdef __WIN32__
     wxChar driveBuffer[256];


@@ -546,7 +613,7 @@ void wxGenericDirCtrl::SetupSections()
         if (driveBuffer[i] == wxT('\0'))
             break;
     }
         if (driveBuffer[i] == wxT('\0'))
             break;
     }

-#else
+# else

     int drive;
     int currentDrive;
 
     int drive;
     int currentDrive;
 


@@ -559,21 +626,24 @@ void wxGenericDirCtrl::SetupSections()
 
         if (wxIsDriveAvailable(path))
         {
 
         if (wxIsDriveAvailable(path))
         {

-            
+

             AddSection(path, name);
         }
     }
             AddSection(path, name);
         }
     }

-#endif
-
+# endif
+#elif defined(__WXMAC__)
+    FSSpec volume ;
+    short index = 1 ;
+    while(1) {
+      short actualCount = 0 ;
+      if ( OnLine( &volume , 1 , &actualCount , &index ) != noErr || actualCount == 0 )
+        break ;
+
+      wxString name = wxMacFSSpec2MacFilename( &volume ) ;
+      AddSection(name + wxFILE_SEP_PATH, name, 0);
+    }

 #else
 #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 );
+    AddSection(wxT("/"), wxT("/"), 3/*computer icon*/);

 #endif
 }
 
 #endif
 }
 


@@ -608,7 +678,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 ) );


@@ -640,6 +710,11 @@ 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 == 0)
+        m_rootId = m_treeCtrl->GetRootItem();
+

     ExpandDir(parentId);
 }
 
     ExpandDir(parentId);
 }
 


@@ -647,7 +722,7 @@ void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 {
     wxTreeItemId child, parent = event.GetItem();
 
 {
     wxTreeItemId child, parent = event.GetItem();
 

-    wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(event.GetItem());
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(event.GetItem());

     if (!data->m_isExpanded)
         return;
 
     if (!data->m_isExpanded)
         return;
 


@@ -667,14 +742,14 @@ void wxGenericDirCtrl::OnCollapseItem(wxTreeEvent &event )
 
 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;


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

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || 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))


@@ -700,7 +775,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;
 

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

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


@@ -716,7 +791,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 
     if (d.IsOpened())
     {
 
     if (d.IsOpened())
     {

-        if (d.GetFirst(& eachFilename, wxEmptyString, wxDIR_DIRS))
+        if (d.GetFirst(& eachFilename, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN))

         {
             do
             {
         {
             do
             {


@@ -725,10 +800,10 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                     dirs.Add(eachFilename);
                 }
             }
                     dirs.Add(eachFilename);
                 }
             }

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

         }
     }
         }
     }

-    dirs.Sort();
+    dirs.Sort((wxArrayString::CompareFunction) 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)


@@ -736,7 +811,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
         wxLogNull log;
 
         d.Open(dirName);
         wxLogNull log;
 
         d.Open(dirName);

-        
+

         if (d.IsOpened())
         {
             if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES))
         if (d.IsOpened())
         {
             if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES))


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

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

             }
         }
             }
         }

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

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


@@ -764,29 +839,20 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 
             path += wxString(wxFILE_SEP_PATH);
         path += eachFilename;
 

-        wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE);
+        wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,TRUE);

         wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item);
         m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );
         wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item);
         m_treeCtrl->SetItemImage( id, 1, 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


@@ -800,7 +866,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                 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);
+            wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,FALSE);

             (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);
         }
     }
             (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);
         }
     }


@@ -812,36 +878,36 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done)
 {
     wxString path2(path);
 wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done)
 {
     wxString path2(path);

-    
+

     // Make sure all separators are as per the current platform
     path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH));
     path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH));
     // Make sure all separators are as per the current platform
     path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH));
     path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH));

-    
+

     // Append a separator to foil bogus substring matching
     path2 += wxString(wxFILE_SEP_PATH);
     // Append a separator to foil bogus substring matching
     path2 += wxString(wxFILE_SEP_PATH);

-    
-    // In MSW, case is not significant
-#ifdef __WXMSW__
+
+    // In MSW or PM, case is not significant
+#if defined(__WXMSW__) || defined(__WXPM__)

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

-    
+

     long cookie;
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {
     long cookie;
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
     while (childId.IsOk())
     {

-        wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
-        
-        if (data && data->m_path != "")
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(childId);
+
+        if (data && !data->m_path.IsEmpty())

         {
             wxString childPath(data->m_path);
             if (childPath.Last() != wxFILE_SEP_PATH)
                 childPath += wxString(wxFILE_SEP_PATH);
         {
             wxString childPath(data->m_path);
             if (childPath.Last() != wxFILE_SEP_PATH)
                 childPath += wxString(wxFILE_SEP_PATH);

-            
-            // In MSW, case is not significant
-#ifdef __WXMSW__
+
+            // In MSW and PM, case is not significant
+#if defined(__WXMSW__) || defined(__WXPM__)

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

-            
+

             if (childPath.Len() <= path2.Len())
             {
                 wxString path3 = path2.Mid(0, childPath.Len());
             if (childPath.Len() <= path2.Len())
             {
                 wxString path3 = path2.Mid(0, childPath.Len());


@@ -855,8 +921,8 @@ 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;


@@ -869,7 +935,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
     bool done = FALSE;
     wxTreeItemId id = FindChild(m_rootId, path, done);
     wxTreeItemId lastId = id; // The last non-zero id
     bool done = FALSE;
     wxTreeItemId id = FindChild(m_rootId, path, done);
     wxTreeItemId lastId = id; // The last non-zero id

-    while (id.IsOK() && !done)
+    while (id.IsOk() && !done)

     {
         ExpandDir(id);
 
     {
         ExpandDir(id);
 


@@ -879,7 +945,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);


@@ -892,8 +958,8 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
             bool selectedChild = FALSE;
             while (childId.IsOk())
             {
             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)
                 {
                     m_treeCtrl->SelectItem(childId);
                 if (data && data->m_path != "" && !data->m_isDir)
                 {
                     m_treeCtrl->SelectItem(childId);


@@ -926,7 +992,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


@@ -938,7 +1004,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


@@ -959,7 +1025,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;


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

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

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


@@ -1031,8 +1097,8 @@ 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.
 }
 
 // Parses the global filter, returning the number of filters.


@@ -1097,7 +1163,7 @@ void wxGenericDirCtrl::DoResize()
 }
 
 
 }
 
 

-void wxGenericDirCtrl::OnSize(wxSizeEvent &event)
+void wxGenericDirCtrl::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     DoResize();
 }
 {
     DoResize();
 }


@@ -1126,12 +1192,12 @@ void wxDirFilterListCtrl::Init()
     m_dirCtrl = NULL;
 }
 
     m_dirCtrl = NULL;
 }
 

-void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& event)
+void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))

 {
     int sel = GetSelection();
 
     wxString currentPath = m_dirCtrl->GetPath();
 {
     int sel = GetSelection();
 
     wxString currentPath = m_dirCtrl->GetPath();

-        
+

     m_dirCtrl->SetFilterIndex(sel);
 
     // If the filter has changed, the view is out of date, so
     m_dirCtrl->SetFilterIndex(sel);
 
     // If the filter has changed, the view is out of date, so


@@ -1158,202 +1224,5 @@ 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;
-
-    wxBusyCursor cursor;
-
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-
-    // 1) dir ctrl
-    m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
-        defaultPath, wxPoint(5, 5),
-        wxSize(300, 200), wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER);
-
-    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
-
-    // 2) text ctrl
-    m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
-    topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
-
-#if wxUSE_STATLINE
-    // 3) Static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
-
-    // 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 );
-
-    // 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
-
-    topsizer->Add( buttonsizer, 0, wxALL | wxCENTER, 10 );
-
-    okButton->SetDefault();
-    m_dirCtrl->SetFocus();
-
-    SetAutoLayout( TRUE );
-    SetSizer( topsizer );
-
-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );
-
-    Centre( wxBOTH );
-}
-
-void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    EndModal(wxID_CANCEL);
-}
-
-void wxGenericDirDialog::OnOK(wxCommandEvent& event)
-{
-    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.
-        }
-    }
-    // User has answered NO to create dir.
-}

 
 

-void wxGenericDirDialog::SetPath(const wxString& path)
-{
-    m_dirCtrl->SetPath(path);
-    m_path = path;
-}
-
-wxString wxGenericDirDialog::GetPath(void) const
-{
-    return m_path;
-}
-
-int wxGenericDirDialog::ShowModal()
-{
-    //m_input->SetValue( m_path );
-    return wxDialog::ShowModal();
-}
-
-void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
-{
-    if (!m_dirCtrl)
-        return;
-
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem());
-    if (data)
-       m_input->SetValue( data->m_path );
-};
-
-void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
-{
-    if (!m_dirCtrl)
-        return;
-
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
-    if (data)
-        m_input->SetValue( data->m_path );
-};
-
-void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
-{
-    wxTreeItemId id = m_dirCtrl->GetTreeCtrl()->GetSelection();
-    if ((id == m_dirCtrl->GetTreeCtrl()->GetRootItem()) ||
-        (m_dirCtrl->GetTreeCtrl()->GetParent(id) == m_dirCtrl->GetTreeCtrl()->GetRootItem()))
-    {
-        wxMessageDialog msg(this, _("You cannot add a new directory to this section."),
-                            _("Create directory"), wxOK | wxICON_INFORMATION );
-        msg.ShowModal();
-        return;
-    }
-
-    wxTreeItemId parent = id ; // m_dirCtrl->GetTreeCtrl()->GetParent( id );
-    wxDirItemDataEx *data = (wxDirItemDataEx*)m_dirCtrl->GetTreeCtrl()->GetItemData( parent );
-    wxASSERT( data );
-
-    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))
-    {
-        // 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));
-    }
-
-    wxLogNull log;
-    if (!wxMkdir(path))
-    {
-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        return;
-    }
-
-    wxDirItemDataEx *new_data = new wxDirItemDataEx( path, new_name, TRUE );
-
-    // 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 );
-}
+#endif // wxUSE_DIRDLG