projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly unregister custom wxWebViewIE namespaces when we are done with them. Also...
[wxWidgets.git]
/
src
/
common
/
mimecmn.cpp
diff --git
a/src/common/mimecmn.cpp
b/src/common/mimecmn.cpp
index f159809a84b46db8c4e4fd9b235e2db690c98177..930f70a31edb9b75f8c07e77eaed0065407388c2 100644
(file)
--- a/
src/common/mimecmn.cpp
+++ b/
src/common/mimecmn.cpp
@@
-46,9
+46,9
@@
#include <ctype.h>
// implementation classes:
#include <ctype.h>
// implementation classes:
-#if defined(__W
XMSW
__)
+#if defined(__W
INDOWS
__)
#include "wx/msw/mimetype.h"
#include "wx/msw/mimetype.h"
-#elif ( defined(__
WXMAC
__) )
+#elif ( defined(__
DARWIN
__) )
#include "wx/osx/mimetype.h"
#elif defined(__WXPM__) || defined (__EMX__)
#include "wx/os2/mimetype.h"
#include "wx/osx/mimetype.h"
#elif defined(__WXPM__) || defined (__EMX__)
#include "wx/os2/mimetype.h"
@@
-346,9
+346,9
@@
bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
if ( iconLoc )
{
iconLoc->SetFileName(m_info->GetIconFile());
if ( iconLoc )
{
iconLoc->SetFileName(m_info->GetIconFile());
-#ifdef __W
XMSW
__
+#ifdef __W
INDOWS
__
iconLoc->SetIndex(m_info->GetIconIndex());
iconLoc->SetIndex(m_info->GetIconIndex());
-#endif // __W
XMSW
__
+#endif // __W
INDOWS
__
}
return true;
}
return true;
@@
-444,9
+444,9
@@
size_t wxFileType::GetAllCommands(wxArrayString *verbs,
if ( commands )
commands->Clear();
if ( commands )
commands->Clear();
-#if defined (__W
XMSW
__) || defined(__UNIX__)
+#if defined (__W
INDOWS
__) || defined(__UNIX__)
return m_impl->GetAllCommands(verbs, commands, params);
return m_impl->GetAllCommands(verbs, commands, params);
-#else // !__W
XMSW__ || Unix
+#else // !__W
INDOWS__ || __UNIX__
// we don't know how to retrieve all commands, so just try the 2 we know
// about
size_t count = 0;
// we don't know how to retrieve all commands, so just try the 2 we know
// about
size_t count = 0;
@@
-471,12
+471,12
@@
size_t wxFileType::GetAllCommands(wxArrayString *verbs,
}
return count;
}
return count;
-#endif // __W
XMSW
__/| __UNIX__
+#endif // __W
INDOWS
__/| __UNIX__
}
bool wxFileType::Unassociate()
{
}
bool wxFileType::Unassociate()
{
-#if defined(__W
XMSW
__)
+#if defined(__W
INDOWS
__)
return m_impl->Unassociate();
#elif defined(__UNIX__)
return m_impl->Unassociate(this);
return m_impl->Unassociate();
#elif defined(__UNIX__)
return m_impl->Unassociate(this);
@@
-490,7
+490,7
@@
bool wxFileType::SetCommand(const wxString& cmd,
const wxString& verb,
bool overwriteprompt)
{
const wxString& verb,
bool overwriteprompt)
{
-#if defined (__W
XMSW
__) || defined(__UNIX__)
+#if defined (__W
INDOWS
__) || defined(__UNIX__)
return m_impl->SetCommand(cmd, verb, overwriteprompt);
#else
wxUnusedVar(cmd);
return m_impl->SetCommand(cmd, verb, overwriteprompt);
#else
wxUnusedVar(cmd);
@@
-504,7
+504,7
@@
bool wxFileType::SetCommand(const wxString& cmd,
bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
{
wxString sTmp = cmd;
bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
{
wxString sTmp = cmd;
-#ifdef __W
XMSW
__
+#ifdef __W
INDOWS
__
// 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() )
@@
-512,7
+512,7
@@
bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
#endif
wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") );
#endif
wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") );
-#if defined (__W
XMSW
__) || defined(__UNIX__)
+#if defined (__W
INDOWS
__) || defined(__UNIX__)
return m_impl->SetDefaultIcon (cmd, index);
#else
wxUnusedVar(index);
return m_impl->SetDefaultIcon (cmd, index);
#else
wxUnusedVar(index);
@@
-610,7
+610,7
@@
wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
{
EnsureImpl();
{
EnsureImpl();
-#if defined(__W
XMSW
__) || defined(__UNIX__)
+#if defined(__W
INDOWS
__) || defined(__UNIX__)
return m_impl->Associate(ftInfo);
#else // other platforms
wxUnusedVar(ftInfo);
return m_impl->Associate(ftInfo);
#else // other platforms
wxUnusedVar(ftInfo);