applying patch 1622389, fixing two memory leaks

[wxWidgets.git] / src / mac / classic / mimetmac.cpp

diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp
index ff6ef1d39f9eaaff497b4c47cd06c158d86447ce..6636261d9a394862a473806fabc9ce54d6d4f994 100644 (file)
--- a/src/mac/classic/mimetmac.cpp
+++ b/src/mac/classic/mimetmac.cpp
@@ -1,45 +1,37 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mac/mimetype.cpp
+// Name:        src/mac/classic/mimetype.cpp

 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     classes and functions to manage MIME types
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence (part of wxExtra library)
+// Licence:     wxWindows licence (part of wxExtra library)

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef    __GNUG__
-#pragma implementation "mimetype.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
-#endif
+#include "wx/mac/mimetype.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-  #include "wx/string.h"
-  #if wxUSE_GUI
-    #include "wx/icon.h"
-  #endif
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #if wxUSE_GUI
+        #include "wx/icon.h"
+    #endif

 #endif //WX_PRECOMP
 
 
 #endif //WX_PRECOMP
 
 

-#include "wx/log.h"

 #include "wx/file.h"
 #include "wx/file.h"

-#include "wx/intl.h"
-#include "wx/dynarray.h"

 #include "wx/confbase.h"
 
 #include "wx/confbase.h"
 

-#include "wx/mac/mimetype.h"
-

 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>
 


@@ -48,59 +40,59 @@ class WXDLLEXPORT wxIcon;
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
 {
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
 {
 }
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const
 {
 }
 
 bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const
 {

-    return FALSE;
+    return false;

 }
 
 // @@ this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
 }
 
 // @@ this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {
 }
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 {

-    if ( m_strFileType.Length() > 0 )
+    if ( !m_strFileType.empty() )

     {
         *mimeType = m_strFileType ;
     {
         *mimeType = m_strFileType ;

-        return TRUE ;
+        return true ;

     }
     else
     }
     else

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 {
     wxString s;
 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 {
     wxString s;

-    
+

     if (GetMimeType(&s))
     {
         mimeTypes.Clear();
         mimeTypes.Add(s);
     if (GetMimeType(&s))
     {
         mimeTypes.Clear();
         mimeTypes.Add(s);

-        return TRUE;
+        return true;

     }
     }

-    else 
-        return FALSE;
+    else
+        return false;

 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
 {
     // no such file type or no value or incorrect icon entry
 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
 {
     // no such file type or no value or incorrect icon entry

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 {
 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 {

-    return FALSE;
+    return false;

 }
 
 size_t
 }
 
 size_t


@@ -223,6 +215,5 @@ wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 bool
 wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {
 bool
 wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {

-    return FALSE;
+    return false;

 }
 }

-