Use default GUI font for wxMessageDialog and wxFileDialog.

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 089b0719964d1a89218a28ff468b46dc9627e3a2..3ac318ce0bf3a76c3d63f987e0f2292f2bde9a6c 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(__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
 #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
     // 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
 #ifdef __UNIX__
                       && !str.StartsWith(_T("test "))
 #endif // Unix


@@ -410,12 +412,16 @@ bool wxFileType::Unassociate()
 #endif
 }
 
 #endif
 }
 

-bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb,
-bool overwriteprompt)
+bool wxFileType::SetCommand(const wxString& cmd,
+                            const wxString& verb,
+                            bool overwriteprompt)

 {
 #if defined (__WXMSW__)  || defined(__UNIX__)
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
 {
 #if defined (__WXMSW__)  || defined(__UNIX__)
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else

+    wxUnusedVar(cmd);
+    wxUnusedVar(verb);
+    wxUnusedVar(overwriteprompt);

     wxFAIL_MSG(_T("not implemented"));
     return false;
 #endif
     wxFAIL_MSG(_T("not implemented"));
     return false;
 #endif


@@ -428,15 +434,15 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
     // 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") );
 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else
 #endif
     wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );
 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else

+    wxUnusedVar(index);

     wxFAIL_MSG(_T("not implemented"));
     wxFAIL_MSG(_T("not implemented"));

-

     return false;
 #endif
 }
     return false;
 #endif
 }


@@ -504,6 +510,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
 #if defined(__WXMSW__) || defined(__UNIX__)
     return m_impl->Associate(ftInfo);
 #else // other platforms
 #if defined(__WXMSW__) || defined(__UNIX__)
     return m_impl->Associate(ftInfo);
 #else // other platforms

+    wxUnusedVar(ftInfo);

     wxFAIL_MSG( _T("not implemented") ); // TODO
     return NULL;
 #endif // platforms
     wxFAIL_MSG( _T("not implemented") ); // TODO
     return NULL;
 #endif // platforms