#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
+ #include "wx/crt.h"
#endif //WX_PRECOMP
#include "wx/file.h"
// implementation classes:
#if defined(__WXMSW__)
#include "wx/msw/mimetype.h"
-#elif defined(__WXMAC__)
- #include "wx/mac/mimetype.h"
+#elif ( defined(__WXMAC__) )
+ #include "wx/osx/mimetype.h"
#elif defined(__WXPM__) || defined (__EMX__)
#include "wx/os2/mimetype.h"
#undef __UNIX__
// wxFileTypeInfo
// ----------------------------------------------------------------------------
-void wxFileTypeInfo::VarArgInit(const wxString& mimeType,
- const wxString& openCmd,
- const wxString& printCmd,
- const wxString& desc,
- ...)
+void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType,
+ const wxString& openCmd,
+ const wxString& printCmd,
+ const wxString& desc,
+ va_list argptr)
{
- va_list argptr;
- va_start(argptr, desc);
-
m_mimeType = mimeType;
m_openCmd = openCmd;
m_printCmd = printCmd;
m_exts.Add(ext.GetString());
}
+}
+
+void wxFileTypeInfo::VarArgInit(const wxString *mimeType,
+ const wxString *openCmd,
+ const wxString *printCmd,
+ const wxString *desc,
+ ...)
+{
+ va_list argptr;
+ va_start(argptr, desc);
+
+ DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr);
va_end(argptr);
}
{
bool hasFilename = false;
+ // We consider that only the file names with spaces in them need to be
+ // handled specially. This is not perfect, but this can be done easily
+ // under all platforms while handling the file names with quotes in them,
+ // for example, needs to be done differently.
+ const bool needToQuoteFilename = params.GetFileName().find_first_of(" \t")
+ != wxString::npos;
+
wxString str;
for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
if ( *pc == wxT('%') ) {
switch ( *++pc ) {
case wxT('s'):
- // '%s' expands into file name (quoted because it might
- // contain spaces) - except if there are already quotes
- // there because otherwise some programs may get confused
- // by double double quotes
-#if 0
- if ( *(pc - 2) == wxT('"') )
- str << params.GetFileName();
- else
+ // don't quote the file name if it's already quoted: notice
+ // that we check for a quote following it and not preceding
+ // it as at least under Windows we can have commands
+ // containing "file://%s" (with quotes) in them so the
+ // argument may be quoted even if there is no quote
+ // directly before "%s" itself
+ if ( needToQuoteFilename && pc[1] != '"' )
str << wxT('"') << params.GetFileName() << wxT('"');
-#endif
- str << params.GetFileName();
+ else
+ str << params.GetFileName();
hasFilename = true;
break;
// test now carried out on reading file so test should never get here
if ( !hasFilename && !str.empty()
#ifdef __UNIX__
- && !str.StartsWith(_T("test "))
+ && !str.StartsWith(wxT("test "))
#endif // Unix
- ) {
- str << wxT(" < '") << params.GetFileName() << wxT('\'');
+ )
+ {
+ str << wxT(" < ");
+ if ( needToQuoteFilename )
+ str << '"';
+ str << params.GetFileName();
+ if ( needToQuoteFilename )
+ str << '"';
}
return str;
bool wxFileType::GetMimeType(wxString *mimeType) const
{
- wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") );
+ wxCHECK_MSG( mimeType, false, wxT("invalid parameter in GetMimeType") );
if ( m_info )
{
bool wxFileType::GetDescription(wxString *desc) const
{
- wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") );
+ wxCHECK_MSG( desc, false, wxT("invalid parameter in GetDescription") );
if ( m_info )
{
wxFileType::GetOpenCommand(wxString *openCmd,
const wxFileType::MessageParameters& params) const
{
- wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") );
+ wxCHECK_MSG( openCmd, false, wxT("invalid parameter in GetOpenCommand") );
if ( m_info )
{
wxFileType::GetPrintCommand(wxString *printCmd,
const wxFileType::MessageParameters& params) const
{
- wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") );
+ wxCHECK_MSG( printCmd, false, wxT("invalid parameter in GetPrintCommand") );
if ( m_info )
{
if ( GetOpenCommand(&cmd, params) )
{
if ( verbs )
- verbs->Add(_T("Open"));
+ verbs->Add(wxT("Open"));
if ( commands )
commands->Add(cmd);
count++;
if ( GetPrintCommand(&cmd, params) )
{
if ( verbs )
- verbs->Add(_T("Print"));
+ verbs->Add(wxT("Print"));
if ( commands )
commands->Add(cmd);
#elif defined(__UNIX__)
return m_impl->Unassociate(this);
#else
- wxFAIL_MSG( _T("not implemented") ); // TODO
+ wxFAIL_MSG( wxT("not implemented") ); // TODO
return false;
#endif
}
wxUnusedVar(cmd);
wxUnusedVar(verb);
wxUnusedVar(overwriteprompt);
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return false;
#endif
}
if ( sTmp.empty() )
GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
#endif
- wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );
+ wxCHECK_MSG( !sTmp.empty(), false, wxT("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(wxT("not implemented"));
return false;
#endif
}
return m_impl->Associate(ftInfo);
#else // other platforms
wxUnusedVar(ftInfo);
- wxFAIL_MSG( _T("not implemented") ); // TODO
+ wxFAIL_MSG( wxT("not implemented") ); // TODO
return NULL;
#endif // platforms
}
wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
{
EnsureImpl();
- wxFileType *ft = m_impl->GetFileTypeFromExtension(ext);
+
+ wxString::const_iterator i = ext.begin();
+ const wxString::const_iterator end = ext.end();
+ wxString extWithoutDot;
+ if ( i != end && *i == '.' )
+ extWithoutDot.assign(++i, ext.end());
+ else
+ extWithoutDot = ext;
+
+ wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") );
+
+ wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
if ( !ft ) {
// check the fallbacks
return ft;
}
-bool wxMimeTypesManager::ReadMailcap(const wxString& filename, bool fallback)
-{
- EnsureImpl();
- return m_impl->ReadMailcap(filename, fallback);
-}
-
-bool wxMimeTypesManager::ReadMimeTypes(const wxString& filename)
-{
- EnsureImpl();
- return m_impl->ReadMimeTypes(filename);
-}
-
void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
{
EnsureImpl();
if ( gs_mimeTypesManager.m_impl != NULL )
{
- delete gs_mimeTypesManager.m_impl;
- gs_mimeTypesManager.m_impl = NULL;
+ wxDELETE(gs_mimeTypesManager.m_impl);
gs_mimeTypesManager.m_fallbacks.Clear();
}
}
projects / wxWidgets.git / blobdiff