Patch from Neil H.

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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 2a2bba6bf72894b53677a086e059922172ed2085..c56008620eb1bc057f89a4031cfa2d1be0de1453 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -317,8 +317,10 @@ static const char * icon8_xpm[] = {
 
 #if defined(__DOS__)
 
 
 #if defined(__DOS__)
 

-static bool wxIsDriveAvailable(const wxString dirName)
+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());
     if ( dirName.Len() == 3 && dirName[1u] == wxT(':') )
     {
         wxString dirNameLower(dirName.Lower());


@@ -329,6 +331,7 @@ static bool wxIsDriveAvailable(const wxString dirName)
                 wxPathExists(dirNameLower));
     }
     else
                 wxPathExists(dirNameLower));
     }
     else

+#endif

         return TRUE;
 }
 
         return TRUE;
 }
 


@@ -363,7 +366,7 @@ int setdrive(int drive)
 #endif // !GNUWIN32
 }
 
 #endif // !GNUWIN32
 }
 

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

 {
 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 {
 #ifdef __WIN32__
     UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);


@@ -404,7 +407,7 @@ static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const v
 {
     wxString *strFirst = (wxString *)first;
     wxString *strSecond = (wxString *)second;
 {
     wxString *strFirst = (wxString *)first;
     wxString *strSecond = (wxString *)second;

-    
+

     return strFirst->CmpNoCase(*strSecond);
 }
 
     return strFirst->CmpNoCase(*strSecond);
 }
 


@@ -451,7 +454,7 @@ bool wxDirItemData::HasSubDirs() const
     return dir.HasSubDirs();
 }
 
     return dir.HasSubDirs();
 }
 

-bool wxDirItemData::HasFiles(const wxString& spec) const
+bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const

 {
     if (m_path.IsEmpty())
         return FALSE;
 {
     if (m_path.IsEmpty())
         return FALSE;


@@ -575,8 +578,8 @@ void wxGenericDirCtrl::Init()
 void wxGenericDirCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;
 void wxGenericDirCtrl::ShowHidden( bool show )
 {
     m_showHidden = show;

-    
-    // reparse FIXME 
+
+    // reparse FIXME

 }
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
 }
 
 void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)