Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...

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

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index f159809a84b46db8c4e4fd9b235e2db690c98177..ceb86221e33482811f98075986b950eae79e2d51 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -5,7 +5,6 @@
 // Modified by:
 //  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
 // Created:     23.09.98
 // Modified by:
 //  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
 // Created:     23.09.98

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////


@@ -46,9 +45,9 @@
 #include <ctype.h>
 
 // implementation classes:
 #include <ctype.h>
 
 // implementation classes:

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     #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 +345,9 @@ bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
         if ( iconLoc )
         {
             iconLoc->SetFileName(m_info->GetIconFile());
         if ( iconLoc )
         {
             iconLoc->SetFileName(m_info->GetIconFile());

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

             iconLoc->SetIndex(m_info->GetIconIndex());
             iconLoc->SetIndex(m_info->GetIconIndex());

-#endif // __WXMSW__
+#endif // __WINDOWS__

         }
 
         return true;
         }
 
         return true;


@@ -444,9 +443,9 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( commands )
         commands->Clear();
 
     if ( commands )
         commands->Clear();
 

-#if defined (__WXMSW__)  || defined(__UNIX__)
+#if defined (__WINDOWS__)  || defined(__UNIX__)

     return m_impl->GetAllCommands(verbs, commands, params);
     return m_impl->GetAllCommands(verbs, commands, params);

-#else // !__WXMSW__ || Unix
+#else // !__WINDOWS__ || __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 +470,12 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     }
 
     return count;
     }
 
     return count;

-#endif // __WXMSW__/| __UNIX__
+#endif // __WINDOWS__/| __UNIX__

 }
 
 bool wxFileType::Unassociate()
 {
 }
 
 bool wxFileType::Unassociate()
 {

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     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 +489,7 @@ bool wxFileType::SetCommand(const wxString& cmd,
                             const wxString& verb,
                             bool overwriteprompt)
 {
                             const wxString& verb,
                             bool overwriteprompt)
 {

-#if defined (__WXMSW__)  || defined(__UNIX__)
+#if defined (__WINDOWS__)  || defined(__UNIX__)

     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxUnusedVar(cmd);
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxUnusedVar(cmd);


@@ -504,7 +503,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 __WXMSW__
+#ifdef __WINDOWS__

     // 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 +511,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 (__WXMSW__) || defined(__UNIX__)
+#if defined (__WINDOWS__) || defined(__UNIX__)

     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxUnusedVar(index);
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxUnusedVar(index);


@@ -610,7 +609,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
 {
     EnsureImpl();
 
 {
     EnsureImpl();
 

-#if defined(__WXMSW__) || defined(__UNIX__)
+#if defined(__WINDOWS__) || defined(__UNIX__)

     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxUnusedVar(ftInfo);