compilation fixes for !wxUSE_FONTMAP

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 11de9801ba2204bd1f160d423ea2bc2580977042..fc22b03128b011fa8f68633451895c808a9401fc 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1336,7 +1336,10 @@ wxString wxFindFirstFile(const wxChar *spec, int flags)
     wxString result;
     gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
     if ( result.IsEmpty() )
+    {
         wxDELETE(gs_dir);
+        return result;
+    }
 
     return gs_dirPath + result;
 }
@@ -1349,7 +1352,10 @@ wxString wxFindNextFile()
     gs_dir->GetNext(&result);
     
     if ( result.IsEmpty() )
+    {
         wxDELETE(gs_dir);
+        return result;
+    }
     
     return gs_dirPath + result;
 }
@@ -1439,6 +1445,14 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
     delete [] cbuf;
   }
 #endif
+
+#ifdef __DJGPP__
+  // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths with 
+  //     / deliminers. We don't like that.
+  for (wxChar *ch = buf; *ch; ch++)
+    if (*ch == wxT('/')) *ch = wxT('\\');
+#endif
+
   return buf;
 }