// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "mimetypebase.h"
-#endif
-
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/msw/mimetype.h"
#elif defined(__WXMAC__)
#include "wx/mac/mimetype.h"
-#elif defined(__WXPM__)
+#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
for ( ;; )
{
+ // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+ #pragma warning(push)
+ #pragma warning(disable: 1684)
+#endif
+
const wxChar *ext = va_arg(argptr, const wxChar *);
+
+#ifdef __INTELC__
+ #pragma warning(pop)
+#endif
if ( !ext )
{
// NULL terminates the list
}
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo);
+WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo)
// ============================================================================
// implementation of the wrapper classes
wxString wxFileType::ExpandCommand(const wxString& command,
const wxFileType::MessageParameters& params)
{
- bool hasFilename = FALSE;
+ bool hasFilename = false;
wxString str;
for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
str << wxT('"') << params.GetFileName() << wxT('"');
#endif
str << params.GetFileName();
- hasFilename = TRUE;
+ hasFilename = true;
break;
case wxT('t'):
// 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
if ( m_info )
{
extensions = m_info->GetExtensions();
- return TRUE;
+ return true;
}
return m_impl->GetExtensions(extensions);
bool wxFileType::GetMimeType(wxString *mimeType) const
{
- wxCHECK_MSG( mimeType, FALSE, _T("invalid parameter in GetMimeType") );
+ wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") );
if ( m_info )
{
*mimeType = m_info->GetMimeType();
- return TRUE;
+ return true;
}
return m_impl->GetMimeType(mimeType);
mimeTypes.Clear();
mimeTypes.Add(m_info->GetMimeType());
- return TRUE;
+ return true;
}
return m_impl->GetMimeTypes(mimeTypes);
#endif // __WXMSW__
}
- return TRUE;
+ return true;
}
return m_impl->GetIcon(iconLoc);
bool wxFileType::GetDescription(wxString *desc) const
{
- wxCHECK_MSG( desc, FALSE, _T("invalid parameter in GetDescription") );
+ wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") );
if ( m_info )
{
*desc = m_info->GetDescription();
- return TRUE;
+ return true;
}
return m_impl->GetDescription(desc);
wxFileType::GetOpenCommand(wxString *openCmd,
const wxFileType::MessageParameters& params) const
{
- wxCHECK_MSG( openCmd, FALSE, _T("invalid parameter in GetOpenCommand") );
+ wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") );
if ( m_info )
{
*openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
- return TRUE;
+ return true;
}
return m_impl->GetOpenCommand(openCmd, params);
wxFileType::GetPrintCommand(wxString *printCmd,
const wxFileType::MessageParameters& params) const
{
- wxCHECK_MSG( printCmd, FALSE, _T("invalid parameter in GetPrintCommand") );
+ wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") );
if ( m_info )
{
*printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
- return TRUE;
+ return true;
}
return m_impl->GetPrintCommand(printCmd, params);
{
#if defined(__WXMSW__)
return m_impl->Unassociate();
-#elif defined(__UNIX__) && !defined(__WXPM__)
+#elif defined(__UNIX__)
return m_impl->Unassociate(this);
#else
wxFAIL_MSG( _T("not implemented") ); // TODO
- return FALSE;
+ return false;
#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
+ wxUnusedVar(cmd);
+ wxUnusedVar(verb);
+ wxUnusedVar(overwriteprompt);
wxFAIL_MSG(_T("not implemented"));
- return FALSE;
+ return false;
#endif
}
// 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") );
+ 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"));
-
- return FALSE;
+ return false;
#endif
}
+//----------------------------------------------------------------------------
+// wxMimeTypesManagerFactory
+//----------------------------------------------------------------------------
+
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
+
+/* static */
+void wxMimeTypesManagerFactory::SetFactory( wxMimeTypesManagerFactory *factory )
+{
+ if (wxMimeTypesManagerFactory::m_factory)
+ delete wxMimeTypesManagerFactory::m_factory;
+
+ wxMimeTypesManagerFactory::m_factory = factory;
+}
+
+/* static */
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::GetFactory()
+{
+ if (!wxMimeTypesManagerFactory::m_factory)
+ wxMimeTypesManagerFactory::m_factory = new wxMimeTypesManagerFactory;
+
+ return wxMimeTypesManagerFactory::m_factory;
+}
+
+wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
+{
+ return new wxMimeTypesManagerImpl;
+}
// ----------------------------------------------------------------------------
// wxMimeTypesManager
void wxMimeTypesManager::EnsureImpl()
{
if ( !m_impl )
- m_impl = new wxMimeTypesManagerImpl;
+ m_impl = wxMimeTypesManagerFactory::GetFactory()->CreateMimeTypesManagerImpl();
}
bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
wxT("first MIME type can't contain wildcards") );
- // all comparaisons are case insensitive (2nd arg of IsSameAs() is FALSE)
+ // all comparaisons are case insensitive (2nd arg of IsSameAs() is false)
if ( wildcard.BeforeFirst(wxT('/')).
- IsSameAs(mimeType.BeforeFirst(wxT('/')), FALSE) )
+ IsSameAs(mimeType.BeforeFirst(wxT('/')), false) )
{
wxString strSubtype = wildcard.AfterFirst(wxT('/'));
if ( strSubtype == wxT("*") ||
- strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), FALSE) )
+ strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) )
{
// matches (either exactly or it's a wildcard)
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
wxMimeTypesManager::wxMimeTypesManager()
bool wxMimeTypesManager::Unassociate(wxFileType *ft)
{
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
return m_impl->Unassociate(ft);
#else
return ft->Unassociate();
{
EnsureImpl();
-#if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__))
+#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
void wxMimeTypesManager::Initialize(int mcapStyle,
const wxString& sExtraDir)
{
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
EnsureImpl();
m_impl->Initialize(mcapStyle, sExtraDir);
#else
- (void)mcapStyle;
- (void)sExtraDir;
+ (void)mcapStyle;
+ (void)sExtraDir;
#endif // Unix
}
// and this function clears all the data from the manager
void wxMimeTypesManager::ClearData()
{
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
EnsureImpl();
m_impl->ClearData();
{
public:
wxMimeTypeCmnModule() : wxModule() { }
- virtual bool OnInit() { return TRUE; }
+ virtual bool OnInit() { return true; }
virtual void OnExit()
{
// this avoids false memory leak allerts:
projects / wxWidgets.git / blobdiff