Updated to new PyCrust

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d20e028b0def03ff79497133ae112609de6e24ec..32e05b5adf596b7be416a5b7337313f5367e55aa 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"


@@ -48,11 +49,29 @@
 
 #ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef __WXMSW__
 #include <windows.h>

+
+#ifndef __GNUWIN32__

 #include <direct.h>
 #include <stdlib.h>
 #include <ctype.h>
 #endif
 
 #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>
+
+#endif // __WXPM__
+
+#if defined(__WXMAC__)
+#  include "MoreFilesExtras.h"
+#endif
+

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


@@ -62,7 +81,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 */


@@ -284,7 +302,6 @@ static char * icon8_xpm[] = {
 "                ",
 "                ",
 "                "};
 "                ",
 "                ",
 "                "};

-#endif // !wxMSW

 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;
 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;


@@ -293,7 +310,31 @@ static const int ID_CANCEL = 1003;
 static const int ID_NEW = 1004;
 //static const int ID_CHECK = 1005;
 
 static const int ID_NEW = 1004;
 //static const int ID_CHECK = 1005;
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXPM__)
+int setdrive(int drive)
+{
+       wxChar  newdrive[3];
+
+       if (drive < 1 || drive > 31)
+               return -1;
+       newdrive[0] = (wxChar)(wxT('A') + drive - 1);
+       newdrive[1] = wxT(':');
+       newdrive[2] = wxT('\0');
+#if defined(__WXMSW__)
+#ifdef __WIN16__
+    if (wxSetWorkingDirectory(newdrive))
+#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;
+}
+

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


@@ -306,15 +347,19 @@ 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__)
+        success = wxPathExists(dirNameLower);
+#else

         int currentDrive = _getdrive();
         int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
         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)
         {
             success = FALSE;
         }
 
         if (err == -1)
         {
             success = FALSE;
         }

+#endif

     }
 #ifdef __WIN32__
     (void) SetErrorMode(errorMode);
     }
 #ifdef __WIN32__
     (void) SetErrorMode(errorMode);


@@ -324,6 +369,16 @@ 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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDirItemDataEx
 //-----------------------------------------------------------------------------


@@ -354,32 +409,6 @@ void wxDirItemDataEx::SetNewDirName( wxString path )
     m_name = wxFileNameFromPath( path );
 }
 
     m_name = wxFileNameFromPath( path );
 }
 

-// No longer used, and takes a very long time
-bool wxDirItemDataEx::HasSubDirs()
-{
-    if (m_path.IsEmpty())
-        return TRUE;
-
-    // On WIN32, must check if this volume is mounted or
-    // we get an error dialog for e.g. drive a:
-#ifdef __WIN32__
-    if (!wxIsDriveAvailable(m_path))
-        return FALSE;
-#endif
-
-    wxString search = m_path;
-    
-    if (m_path.Last() != wxFILE_SEP_PATH)
-    {
-        search += wxString(wxFILE_SEP_PATH);
-    }
-    search += wxT("*");
-
-    wxLogNull log;
-    wxString path = wxFindFirstFile( search, wxDIR );
-    return (bool)(!path.IsNull());
-}
-

 //-----------------------------------------------------------------------------
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------


@@ -438,7 +467,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));


@@ -447,18 +475,6 @@ 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_showHidden = FALSE;
     m_treeCtrl->SetImageList(m_imageList);
 
     m_showHidden = FALSE;


@@ -466,7 +482,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
 
     wxString rootName;
 
 
     wxString rootName;
 

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

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


@@ -505,8 +521,8 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
 {
     wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE);
 
 {
     wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE);
 

-#ifdef __WXMSW__
-    // Windows: sections are displayed as drives
+#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, imageId, -1, dir_item);
 #else
     // Unix: sections are displayed as folders


@@ -520,7 +536,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
 
 void wxGenericDirCtrl::SetupSections()
 {
 
 void wxGenericDirCtrl::SetupSections()
 {

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

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


@@ -577,12 +593,22 @@ void wxGenericDirCtrl::SetupSections()
 
         if (wxIsDriveAvailable(path))
         {
 
         if (wxIsDriveAvailable(path))
         {

-            
+

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

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

 #else
   AddSection(wxT("/"), _("The Computer"), 0);
   AddSection(wxGetHomeDir(), _("My Home"), 0 );
 #else
   AddSection(wxT("/"), _("The Computer"), 0);
   AddSection(wxGetHomeDir(), _("My Home"), 0 );


@@ -704,21 +730,21 @@ 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))
     {
         data->m_isExpanded = FALSE;
     // Check if this is a root directory and if so,
     // whether the drive is avaiable.
     if (!wxIsDriveAvailable(dirName))
     {
         data->m_isExpanded = FALSE;

-        wxMessageBox(wxT("Sorry, this drive is not available."));
-          return;
+        //wxMessageBox(wxT("Sorry, this drive is not available."));
+        return;

     }
 #endif
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
 
     }
 #endif
 
     // 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


@@ -746,7 +772,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
             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)


@@ -754,7 +780,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))


@@ -769,7 +795,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
                 while (d.GetNext(& eachFilename)) ;
             }
         }
                 while (d.GetNext(& eachFilename)) ;
             }
         }

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

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


@@ -785,7 +811,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
         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 );
         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 );

-        
+

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


@@ -830,36 +856,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);
     long cookie;
     wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);

-    while (childId != 0)
+    while (childId.IsOk())

     {
         wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
     {
         wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);

-        
+

         if (data && data->m_path != "")
         {
             wxString childPath(data->m_path);
             if (childPath.Last() != wxFILE_SEP_PATH)
                 childPath += wxString(wxFILE_SEP_PATH);
         if (data && data->m_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());


@@ -873,7 +899,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
                 }
             }
         }
                 }
             }
         }

-        
+

         childId = m_treeCtrl->GetNextChild(childId, cookie);
     }
     wxTreeItemId invalid;
         childId = m_treeCtrl->GetNextChild(childId, cookie);
     }
     wxTreeItemId invalid;


@@ -887,15 +913,15 @@ 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 > 0) && !done)
+    while (id.IsOk() && !done)

     {
         ExpandDir(id);
 
         id = FindChild(id, path, done);
     {
         ExpandDir(id);
 
         id = FindChild(id, path, done);

-        if (id != 0)
+        if (id.IsOk())

             lastId = id;
     }
             lastId = id;
     }

-    if (lastId > 0)
+    if (lastId.IsOk())

     {
         wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(lastId);
         if (data->m_isDir)
     {
         wxDirItemDataEx *data = (wxDirItemDataEx *) m_treeCtrl->GetItemData(lastId);
         if (data->m_isDir)


@@ -908,10 +934,10 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
             long cookie;
             wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
             bool selectedChild = FALSE;
             long cookie;
             wxTreeItemId childId = m_treeCtrl->GetFirstChild(lastId, cookie);
             bool selectedChild = FALSE;

-            while (childId != 0)
+            while (childId.IsOk())

             {
                 wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
             {
                 wxDirItemDataEx* data = (wxDirItemDataEx*) 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);


@@ -988,7 +1014,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


@@ -1049,8 +1075,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.


@@ -1115,7 +1141,7 @@ void wxGenericDirCtrl::DoResize()
 }
 
 
 }
 
 

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

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


@@ -1144,12 +1170,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


@@ -1244,12 +1270,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     Centre( wxBOTH );
 }
 
     Centre( wxBOTH );
 }
 

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

 {
     EndModal(wxID_CANCEL);
 }
 
 {
     EndModal(wxID_CANCEL);
 }
 

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

 {
     m_path = m_input->GetValue();
     // Does the path exist? (User may have typed anything in m_input)
 {
     m_path = m_input->GetValue();
     // Does the path exist? (User may have typed anything in m_input)


@@ -1375,3 +1401,5 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
     m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
     m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
 }
     m_dirCtrl->GetTreeCtrl()->EnsureVisible( new_id );
     m_dirCtrl->GetTreeCtrl()->EditLabel( new_id );
 }

+
+#endif // wxUSE_DIRDLG