added test for wxScopeGuard

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 089b0719964d1a89218a28ff468b46dc9627e3a2..e6ca2e5f6352d815104f1e3bed4417471cd188a4 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -56,6 +56,8 @@
 #elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
     #undef __UNIX__
+#elif defined(__DOS__)
+    #include "wx/msdos/mimetype.h"
 #else // Unix
     #include "wx/unix/mimetype.h"
 #endif
@@ -196,7 +198,7 @@ wxString wxFileType::ExpandCommand(const wxString& command,
     // know of the correct solution, try to guess what we have to do.
 
     // test now carried out on reading file so test should never get here
-    if ( !hasFilename && !str.IsEmpty()
+    if ( !hasFilename && !str.empty()
 #ifdef __UNIX__
                       && !str.StartsWith(_T("test "))
 #endif // Unix
@@ -428,7 +430,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
-        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxT(""), wxT("")));
+        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #endif
     wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );