Use temp directory and don't prepend two backslashes, on WinCE

[wxWidgets.git] / src / unix / mimetype.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index d8f03b387601958927ebb91a523b315511e64a1b..8c2ddad03e862c56b88bd96a7daed2ab09641a9b 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -27,18 +27,7 @@
 //    will be preserved during unassociate
 // 9) KDE does not yet handle multiple actions; Netscape mode never will
 
 //    will be preserved during unassociate
 // 9) KDE does not yet handle multiple actions; Netscape mode never will
 

-/*
-    TODO: this file is a mess, we need to split it and reformet/review
-          everything (VZ)
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
+// TODO: this file is a mess, we need to split it and review everything (VZ)

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


@@ -55,8 +44,7 @@
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"
 
 #ifndef WX_PRECOMP
   #include "wx/string.h"

-#endif //WX_PRECOMP
-
+#endif

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


@@ -87,7 +75,7 @@
 class wxMimeTypeCommands
 {
 public:
 class wxMimeTypeCommands
 {
 public:

-    wxMimeTypeCommands() { }
+    wxMimeTypeCommands() {}

 
     wxMimeTypeCommands(const wxArrayString& verbs,
                        const wxArrayString& commands)
 
     wxMimeTypeCommands(const wxArrayString& verbs,
                        const wxArrayString& commands)


@@ -113,8 +101,8 @@ public:
 
     void Add(const wxString& s)
     {
 
     void Add(const wxString& s)
     {

-        m_verbs.Add(s.BeforeFirst(_T('=')));
-        m_commands.Add(s.AfterFirst(_T('=')));
+        m_verbs.Add(s.BeforeFirst(wxT('=')));
+        m_commands.Add(s.AfterFirst(wxT('=')));

     }
 
     // access the commands
     }
 
     // access the commands


@@ -143,12 +131,12 @@ public:
     // get a "verb=command" string
     wxString GetVerbCmd(size_t n) const
     {
     // get a "verb=command" string
     wxString GetVerbCmd(size_t n) const
     {

-        return m_verbs[n] + _T('=') + m_commands[n];
+        return m_verbs[n] + wxT('=') + m_commands[n];

     }
 
 private:
     }
 
 private:

-    wxArrayString m_verbs,
-                  m_commands;
+    wxArrayString m_verbs;
+    wxArrayString m_commands;

 };
 
 // this class extends wxTextFile
 };
 
 // this class extends wxTextFile


@@ -159,13 +147,14 @@ class wxMimeTextFile : public wxTextFile
 public:
     // constructors
     wxMimeTextFile () : wxTextFile () {};
 public:
     // constructors
     wxMimeTextFile () : wxTextFile () {};

-    wxMimeTextFile (const wxString& strFile) : wxTextFile (strFile)  {  };
+    wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) {};

 
     int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0)
     {
         size_t i = iStart;
         int nResult = wxNOT_FOUND;
 
     int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0)
     {
         size_t i = iStart;
         int nResult = wxNOT_FOUND;

-        if (i>=GetLineCount()) return wxNOT_FOUND;
+        if (i >= GetLineCount())
+            return wxNOT_FOUND;

 
         wxString sTest = sSearch;
         sTest.MakeLower();
 
         wxString sTest = sSearch;
         sTest.MakeLower();


@@ -173,11 +162,13 @@ public:
 
         if (bIncludeComments)
         {
 
         if (bIncludeComments)
         {

-            while ( (i < GetLineCount())   )
+            while ( i < GetLineCount() )

             {
             {

-                sLine = GetLine (i);
+                sLine = GetLine(i);

                 sLine.MakeLower();
                 sLine.MakeLower();

-                if (sLine.Contains(sTest)) nResult = (int) i;
+                if (sLine.Contains(sTest))
+                    nResult = (int) i;
+

                 i++;
             }
         }
                 i++;
             }
         }


@@ -185,22 +176,28 @@ public:
         {
             while ( (i < GetLineCount()) )
             {
         {
             while ( (i < GetLineCount()) )
             {

-                sLine = GetLine (i);
+                sLine = GetLine(i);

                 sLine.MakeLower();
                 if ( ! sLine.StartsWith(wxT("#")))
                 {
                 sLine.MakeLower();
                 if ( ! sLine.StartsWith(wxT("#")))
                 {

-                    if (sLine.Contains(sTest)) nResult = (int) i;
+                    if (sLine.Contains(sTest))
+                        nResult = (int) i;

                 }
                 }

+

                 i++;
             }
         }
                 i++;
             }
         }

+

         return  nResult;
     }
 
     bool CommentLine(int nIndex)
     {
         return  nResult;
     }
 
     bool CommentLine(int nIndex)
     {

-        if (nIndex <0) return false;
-        if (nIndex >= (int)GetLineCount() ) return false;
+        if (nIndex < 0)
+            return false;
+        if (nIndex >= (int)GetLineCount() )
+            return false;
+

         GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#"));
         return true;
     }
         GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#"));
         return true;
     }


@@ -208,22 +205,29 @@ public:
     bool CommentLine(const wxString & sTest)
     {
         int nIndex = pIndexOf(sTest);
     bool CommentLine(const wxString & sTest)
     {
         int nIndex = pIndexOf(sTest);

-        if (nIndex <0) return false;
-        if (nIndex >= (int)GetLineCount() ) return false;
+        if (nIndex < 0)
+            return false;
+        if (nIndex >= (int)GetLineCount() )
+            return false;
+

         GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#"));
         return true;
     }
 
         GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#"));
         return true;
     }
 

-    wxString GetVerb (size_t i)
+    wxString GetVerb(size_t i)

     {
     {

-        if (i > GetLineCount() ) return wxEmptyString;
+        if (i > GetLineCount() )
+            return wxEmptyString;
+

         wxString sTmp = GetLine(i).BeforeFirst(wxT('='));
         return sTmp;
     }
 
         wxString sTmp = GetLine(i).BeforeFirst(wxT('='));
         return sTmp;
     }
 

-    wxString GetCmd (size_t i)
+    wxString GetCmd(size_t i)

     {
     {

-        if (i > GetLineCount() ) return wxEmptyString;
+        if (i > GetLineCount() )
+            return wxEmptyString;
+

         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;
     }
         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;
     }


@@ -237,10 +241,10 @@ class WXDLLEXPORT wxIcon;
 // ----------------------------------------------------------------------------
 
 // MIME code tracing mask
 // ----------------------------------------------------------------------------
 
 // MIME code tracing mask

-#define TRACE_MIME _T("mime")
+#define TRACE_MIME wxT("mime")

 
 // give trace messages about the results of mailcap tests
 
 // give trace messages about the results of mailcap tests

-#define TRACE_MIME_TEST _T("mimetest")
+#define TRACE_MIME_TEST wxT("mimetest")

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -353,60 +357,62 @@ static bool IsKnownUnimportantField(const wxString& field);
 // just before the field name.
 
 
 // just before the field name.
 
 

-bool wxMimeTypesManagerImpl::CheckGnomeDirsExist ()
+bool wxMimeTypesManagerImpl::CheckGnomeDirsExist()

 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
     wxString sTmp = gnomedir;
     sTmp = sTmp + wxT("/.gnome");
 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
     wxString sTmp = gnomedir;
     sTmp = sTmp + wxT("/.gnome");

-    if (! wxDir::Exists ( sTmp ) )
+    if (! wxDir::Exists( sTmp ) )

     {
     {

-        if (!wxMkdir ( sTmp ))
+        if (!wxMkdir( sTmp ))

         {
         {

-            wxLogError(_("Failed to create directory %s/.gnome."), sTmp.c_str());
+            wxLogError(wxT("Failed to create directory %s/.gnome."), sTmp.c_str());

             return false;
         }
     }
             return false;
         }
     }

+

     sTmp = sTmp + wxT("/mime-info");
     sTmp = sTmp + wxT("/mime-info");

-    if (! wxDir::Exists ( sTmp ) )
+    if (! wxDir::Exists( sTmp ) )

     {
     {

-        if (!wxMkdir ( sTmp ))
+        if (!wxMkdir( sTmp ))

         {
         {

-            wxLogError(_("Failed to create directory %s/mime-info."), sTmp.c_str());
+            wxLogError(wxT("Failed to create directory %s/mime-info."), sTmp.c_str());

             return false;
         }
     }
             return false;
         }
     }

-    return true;

 
 

+    return true;

 }
 
 }
 

-
-

 bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
 
 bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
 

-    wxMimeTextFile outfile ( gnomedir + wxT("/.gnome/mime-info/user.keys"));
+    wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.keys"));

     // if this fails probably Gnome is not installed ??
     // create it anyway as a private mime store
 
 #if defined(__WXGTK20__) && wxUSE_UNICODE
     // if this fails probably Gnome is not installed ??
     // create it anyway as a private mime store
 
 #if defined(__WXGTK20__) && wxUSE_UNICODE

-    if (! outfile.Open ( wxConvUTF8) )
+    if (! outfile.Open( wxConvUTF8) )

 #else
 #else

-    if (! outfile.Open () )
+    if (! outfile.Open() )

 #endif
     {
 #endif
     {

-        if (delete_index) return false;
-        if (!CheckGnomeDirsExist() ) return false;
-        outfile.Create ();
+        if (delete_index)
+            return false;
+        if (!CheckGnomeDirsExist() )
+            return false;
+
+        outfile.Create();

     }
 
     wxString sTmp, strType = m_aTypes[index];
     int nIndex = outfile.pIndexOf(strType);
     if ( nIndex == wxNOT_FOUND )
     {
     }
 
     wxString sTmp, strType = m_aTypes[index];
     int nIndex = outfile.pIndexOf(strType);
     if ( nIndex == wxNOT_FOUND )
     {

-        outfile.AddLine ( strType + wxT(':') );
+        outfile.AddLine( strType + wxT(':') );

         // see file:/usr/doc/gnome-libs-devel-1.0.40/devel-docs/mime-type-handling.txt
         // as this does not deal with internationalisation
         //        wxT( "\t[en_US]") + verb + wxT ('=') + cmd + wxT(" %f");
         // see file:/usr/doc/gnome-libs-devel-1.0.40/devel-docs/mime-type-handling.txt
         // as this does not deal with internationalisation
         //        wxT( "\t[en_US]") + verb + wxT ('=') + cmd + wxT(" %f");


@@ -414,14 +420,15 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
         size_t count = entries->GetCount();
         for ( size_t i = 0; i < count; i++ )
         {
         size_t count = entries->GetCount();
         for ( size_t i = 0; i < count; i++ )
         {

-            sTmp = entries->GetVerbCmd(i);
+            sTmp = entries->GetVerbCmd( i );

             sTmp.Replace( wxT("%s"), wxT("%f") );
             sTmp.Replace( wxT("%s"), wxT("%f") );

-            sTmp = wxT ( "\t") + sTmp;
-            outfile.AddLine ( sTmp );
+            sTmp = wxT( "\t") + sTmp;
+            outfile.AddLine( sTmp );

         }
         }

+

         //for international use do something like this
         //for international use do something like this

-        //outfile.AddLine ( wxString( "\t[en_US]icon-filename=") + cmd );
-        outfile.AddLine ( wxT( "\ticon-filename=") + m_aIcons[index] );
+        //outfile.AddLine( wxString( "\t[en_US]icon-filename=") + cmd );
+        outfile.AddLine( wxT( "\ticon-filename=") + m_aIcons[index] );

     }
     else
     {
     }
     else
     {


@@ -431,22 +438,24 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
         wxMimeTypeCommands sOld;
         size_t nOld = nIndex + 1;
         bool oldEntryEnd = false;
         wxMimeTypeCommands sOld;
         size_t nOld = nIndex + 1;
         bool oldEntryEnd = false;

-        while ( (nOld < outfile.GetLineCount() )&& (!oldEntryEnd))
+        while ( (nOld < outfile.GetLineCount() ) && !oldEntryEnd)

         {
             sTmp = outfile.GetLine(nOld);
             if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) )
             {
                 // we have another line to deal with
                 outfile.CommentLine(nOld);
         {
             sTmp = outfile.GetLine(nOld);
             if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) )
             {
                 // we have another line to deal with
                 outfile.CommentLine(nOld);

-                nOld ++;
+                nOld++;
+

                 // add the line to our store
                 if ((!delete_index) && (sTmp[0u] == wxT('\t')))
                     sOld.Add(sTmp);
             }
                 // add the line to our store
                 if ((!delete_index) && (sTmp[0u] == wxT('\t')))
                     sOld.Add(sTmp);
             }

-            // next mimetpye ??or blank line
+            // next mimetpye ?? or blank line

             else
                 oldEntryEnd = true;
         }
             else
                 oldEntryEnd = true;
         }

+

         // list of entries in our data; these should all be in sOld,
         // though sOld may also contain other entries , eg flags
         if (!delete_index)
         // list of entries in our data; these should all be in sOld,
         // though sOld may also contain other entries , eg flags
         if (!delete_index)


@@ -456,61 +465,67 @@ bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index)
             for (i=0; i < entries->GetCount(); i++)
             {
                 // replace any entries in sold that match verbs we know
             for (i=0; i < entries->GetCount(); i++)
             {
                 // replace any entries in sold that match verbs we know

-                sOld.AddOrReplaceVerb ( entries->GetVerb(i), entries->GetCmd (i) );
+                sOld.AddOrReplaceVerb( entries->GetVerb(i), entries->GetCmd(i) );

             }
             }

+

             //sOld should also contain the icon
             if ( !m_aIcons[index].empty() )
             //sOld should also contain the icon
             if ( !m_aIcons[index].empty() )

-                sOld.AddOrReplaceVerb ( wxT("icon-filename"), m_aIcons[index] );
+                sOld.AddOrReplaceVerb( wxT("icon-filename"), m_aIcons[index] );

 
             for (i=0; i < sOld.GetCount(); i++)
             {
 
             for (i=0; i < sOld.GetCount(); i++)
             {

-                sTmp = sOld.GetVerbCmd(i);
+                sTmp = sOld.GetVerbCmd( i );

                 sTmp.Replace( wxT("%s"), wxT("%f") );
                 sTmp = wxT("\t") + sTmp;
                 sTmp.Replace( wxT("%s"), wxT("%f") );
                 sTmp = wxT("\t") + sTmp;

-                nIndex ++;
-                outfile.InsertLine ( sTmp, nIndex );
+                nIndex++;
+                outfile.InsertLine( sTmp, nIndex );

             }
         }
     }
             }
         }
     }

-    bool bTmp = outfile.Write ();
+
+    bool bTmp = outfile.Write();

     return bTmp;
 }
 
     return bTmp;
 }
 

-

 bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index)
 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
 
 bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index)
 {
     wxString gnomedir;
     wxGetHomeDir( &gnomedir );
 

-    wxMimeTextFile outfile ( gnomedir + wxT("/.gnome/mime-info/user.mime"));
+    wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.mime") );

     // if this fails probably Gnome is not installed ??
     // create it anyway as a private mime store
     // if this fails probably Gnome is not installed ??
     // create it anyway as a private mime store

-    if (! outfile.Open () )
+    if (! outfile.Open() )

     {
     {

-        if (delete_index) return false;
-        if (!CheckGnomeDirsExist() ) return false;
-        outfile.Create ();
+        if (delete_index)
+            return false;
+        if (!CheckGnomeDirsExist() )
+            return false;
+
+        outfile.Create();

     }
     }

+

     wxString strType = m_aTypes[index];
     int nIndex = outfile.pIndexOf(strType);
     if ( nIndex == wxNOT_FOUND )
     {
     wxString strType = m_aTypes[index];
     int nIndex = outfile.pIndexOf(strType);
     if ( nIndex == wxNOT_FOUND )
     {

-        outfile.AddLine ( strType );
-        outfile.AddLine ( wxT("\text:") + m_aExtensions.Item(index) );
+        outfile.AddLine( strType );
+        outfile.AddLine( wxT("\text:") + m_aExtensions.Item(index) );

     }
     else
     {
         if (delete_index)
         {
             outfile.CommentLine(nIndex);
     }
     else
     {
         if (delete_index)
         {
             outfile.CommentLine(nIndex);

-            outfile.CommentLine(nIndex+1);
+            outfile.CommentLine(nIndex + 1);

         }
         else
         }
         else

-        {// check for next line being the right one to replace ??
-            wxString sOld = outfile.GetLine(nIndex+1);
-            if (sOld.Contains( wxT("\text: ")))
+        {
+            // check for next line being the right one to replace ??
+            wxString sOld = outfile.GetLine(nIndex + 1);
+            if (sOld.Contains( wxT("\text: ") ))

             {
             {

-                outfile.GetLine(nIndex+1) = wxT("\text: ") + m_aExtensions.Item(index);
+                outfile.GetLine(nIndex + 1) = wxT("\text: ") + m_aExtensions.Item(index);

             }
             else
             {
             }
             else
             {


@@ -518,21 +533,22 @@ bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index)
             }
         }
     }
             }
         }
     }

-    bool bTmp = outfile.Write ();
+
+    bool bTmp = outfile.Write();

     return bTmp;
 }
 
     return bTmp;
 }
 

-

 void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                                                       const wxArrayString& dirs)
 {
     wxTextFile textfile(filename);
 #if defined(__WXGTK20__) && wxUSE_UNICODE
 void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                                                       const wxArrayString& dirs)
 {
     wxTextFile textfile(filename);
 #if defined(__WXGTK20__) && wxUSE_UNICODE

-    if ( !textfile.Open( wxConvUTF8) )
+    if ( !textfile.Open(wxConvUTF8) )

 #else
     if ( !textfile.Open() )
 #endif
         return;
 #else
     if ( !textfile.Open() )
 #endif
         return;

+

     wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s  ---"),
             filename.c_str());
 
     wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s  ---"),
             filename.c_str());
 


@@ -547,26 +563,26 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
     const wxChar *pc;
     size_t nLineCount = textfile.GetLineCount();
     size_t nLine = 0;
     const wxChar *pc;
     size_t nLineCount = textfile.GetLineCount();
     size_t nLine = 0;

-    while ( nLine < nLineCount)
+    while ( nLine < nLineCount )

     {
         pc = textfile[nLine].c_str();
     {
         pc = textfile[nLine].c_str();

-        if ( *pc != _T('#') )
+        if ( *pc != wxT('#') )

         {
 
             wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"),
         {
 
             wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"),

-                    filename.c_str(),pc);
+                    filename.c_str(), pc);

 
             wxString sTmp(pc);
             if (sTmp.Contains(wxT("=")) )
             {
 
             wxString sTmp(pc);
             if (sTmp.Contains(wxT("=")) )
             {

-                // GNOME 1:

                 if (sTmp.Contains( wxT("icon-filename=") ) )
                 {
                 if (sTmp.Contains( wxT("icon-filename=") ) )
                 {

+                    // GNOME 1:

                     curIconFile = sTmp.AfterFirst(wxT('='));
                 }
                     curIconFile = sTmp.AfterFirst(wxT('='));
                 }

-                // GNOME 2:

                 else if (sTmp.Contains( wxT("icon_filename=") ) )
                 {
                 else if (sTmp.Contains( wxT("icon_filename=") ) )
                 {

+                    // GNOME 2:

                     curIconFile = sTmp.AfterFirst(wxT('='));
 
                     if (!wxFileExists(curIconFile))
                     curIconFile = sTmp.AfterFirst(wxT('='));
 
                     if (!wxFileExists(curIconFile))


@@ -600,9 +616,9 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                     sTmp = sTmp.AfterLast(wxT(']'));
                     sTmp = sTmp.AfterLast(wxT('\t'));
                     sTmp.Trim(false).Trim();
                     sTmp = sTmp.AfterLast(wxT(']'));
                     sTmp = sTmp.AfterLast(wxT('\t'));
                     sTmp.Trim(false).Trim();

-                    if (0 == sTmp.Replace ( wxT("%f"), wxT("%s") )) sTmp = sTmp + wxT(" %s");
+                    if (0 == sTmp.Replace( wxT("%f"), wxT("%s") ))
+                        sTmp = sTmp + wxT(" %s");

                     entry->Add(sTmp);
                     entry->Add(sTmp);

-

                 }
 
             } // emd of has an equals sign
                 }
 
             } // emd of has an equals sign


@@ -615,25 +631,25 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                     // overwrite any existing data
                     if (! curMimeType.empty())
                     {
                     // overwrite any existing data
                     if (! curMimeType.empty())
                     {

-                        AddToMimeData ( curMimeType, curIconFile, entry, strExtensions, strDesc);
+                        AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc );

 
                         // now get ready for next bit
                         entry = new wxMimeTypeCommands;
                     }
 
                         // now get ready for next bit
                         entry = new wxMimeTypeCommands;
                     }

+

                     curMimeType = sTmp.BeforeFirst(wxT(':'));
                 }
             }
         } // end of not a comment
                     curMimeType = sTmp.BeforeFirst(wxT(':'));
                 }
             }
         } // end of not a comment

+

         // ignore blank lines
         // ignore blank lines

-        nLine ++;
+        nLine++;

     } // end of while, save any data
 
     if (! curMimeType.empty())
     } // end of while, save any data
 
     if (! curMimeType.empty())

-        AddToMimeData ( curMimeType, curIconFile, entry, strExtensions, strDesc);
+        AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc);

 }
 
 }
 

-
-

 void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename)
 {
     wxTextFile textfile(filename);
 void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename)
 {
     wxTextFile textfile(filename);


@@ -649,7 +665,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file
 
     const wxChar *pc;
     size_t nLineCount = textfile.GetLineCount();
 
     const wxChar *pc;
     size_t nLineCount = textfile.GetLineCount();

-    for ( size_t nLine = 0;; nLine++ )
+    for ( size_t nLine = 0; /* nothing */; nLine++ )

     {
         if ( nLine < nLineCount )
         {
     {
         if ( nLine < nLineCount )
         {


@@ -680,7 +696,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file
 
             if ( !pc )
             {
 
             if ( !pc )
             {

-                // the end - this can only happen if nLine == nLineCount
+                // the end: this can only happen if nLine == nLineCount

                 break;
             }
 
                 break;
             }
 


@@ -728,7 +744,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
                       const wxString& dirbase, const wxArrayString& dirs)
 {
     wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase),
                       const wxString& dirbase, const wxArrayString& dirs)
 {
     wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase),

-                  _T("base directory shouldn't end with a slash") );
+                  wxT("base directory shouldn't end with a slash") );

 
     wxString dirname = dirbase;
     dirname << wxT("/mime-info");
 
     wxString dirname = dirbase;
     dirname << wxT("/mime-info");


@@ -745,7 +761,8 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
 
     wxString filename;
     bool cont;
 
     wxString filename;
     bool cont;

-    cont = dir.GetFirst(&filename, _T("*.mime"), wxDIR_FILES);
+
+    cont = dir.GetFirst(&filename, wxT("*.mime"), wxDIR_FILES);

     while ( cont )
     {
         LoadGnomeMimeTypesFromMimeFile(dirname + filename);
     while ( cont )
     {
         LoadGnomeMimeTypesFromMimeFile(dirname + filename);


@@ -753,7 +770,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
         cont = dir.GetNext(&filename);
     }
 
         cont = dir.GetNext(&filename);
     }
 

-    cont = dir.GetFirst(&filename, _T("*.keys"), wxDIR_FILES);
+    cont = dir.GetFirst(&filename, wxT("*.keys"), wxDIR_FILES);

     while ( cont )
     {
         LoadGnomeDataFromKeyFile(dirname + filename, dirs);
     while ( cont )
     {
         LoadGnomeDataFromKeyFile(dirname + filename, dirs);


@@ -761,7 +778,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
         cont = dir.GetNext(&filename);
     }
 
         cont = dir.GetNext(&filename);
     }
 

-    // Hack alert: We scan all icons and deduce the
+    // FIXME: Hack alert: We scan all icons and deduce the

     //             mime-type from the file name.
     dirname = dirbase;
     dirname << wxT("/pixmaps/document-icons");
     //             mime-type from the file name.
     dirname = dirbase;
     dirname << wxT("/pixmaps/document-icons");


@@ -772,7 +789,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
 
     if ( !wxDir::Exists(dirname) )
     {
 
     if ( !wxDir::Exists(dirname) )
     {

-        // Jst test for default GPE dir also
+        // Just test for default GPE dir also

         dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons");
 
         if ( !wxDir::Exists(dirname) )
         dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons");
 
         if ( !wxDir::Exists(dirname) )


@@ -786,7 +803,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
     {
         wxString mimeType = filename;
         mimeType.Remove( 0, 6 ); // remove "gnome-"
     {
         wxString mimeType = filename;
         mimeType.Remove( 0, 6 ); // remove "gnome-"

-        mimeType.Remove( mimeType.Len()-4, 4 ); // remove ".png"
+        mimeType.Remove( mimeType.Len() - 4, 4 ); // remove ".png"

         int pos = mimeType.Find( wxT("-") );
         if (pos != wxNOT_FOUND)
         {
         int pos = mimeType.Find( wxT("-") );
         if (pos != wxNOT_FOUND)
         {


@@ -794,7 +811,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir(
             wxString iconFile = dirname;
             iconFile << wxT("/");
             iconFile << filename;
             wxString iconFile = dirname;
             iconFile << wxT("/");
             iconFile << filename;

-            AddToMimeData ( mimeType, iconFile, NULL, strExtensions, strDesc, true );
+            AddToMimeData( mimeType, iconFile, NULL, strExtensions, strDesc, true );

         }
 
         cont = dir2.GetNext(&filename);
         }
 
         cont = dir2.GetNext(&filename);


@@ -805,7 +822,7 @@ void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
 {
     wxArrayString dirs;
 
 {
     wxArrayString dirs;
 

-    wxString gnomedir = wxGetenv( wxT("GNOMEDIR") );;
+    wxString gnomedir = wxGetenv( wxT("GNOMEDIR") );

     if (!gnomedir.empty())
     {
         gnomedir << wxT("/share");
     if (!gnomedir.empty())
     {
         gnomedir << wxT("/share");


@@ -819,7 +836,8 @@ void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
     gnomedir << wxT("/.gnome");
     dirs.Add( gnomedir );
 
     gnomedir << wxT("/.gnome");
     dirs.Add( gnomedir );
 

-    if (!sExtraDir.empty()) dirs.Add( sExtraDir );
+    if (!sExtraDir.empty())
+        dirs.Add( sExtraDir );

 
     size_t nDirs = dirs.GetCount();
     for ( size_t nDir = 0; nDir < nDirs; nDir++ )
 
     size_t nDirs = dirs.GetCount();
     for ( size_t nDir = 0; nDir < nDirs; nDir++ )


@@ -846,19 +864,17 @@ void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
 // kde writing; see http://webcvs.kde.org/cgi-bin/cvsweb.cgi/~checkout~/kdelibs/kio/DESKTOP_ENTRY_STANDARD
 // for now write to .kdelnk but should eventually do .desktop instead (in preference??)
 
 // kde writing; see http://webcvs.kde.org/cgi-bin/cvsweb.cgi/~checkout~/kdelibs/kio/DESKTOP_ENTRY_STANDARD
 // for now write to .kdelnk but should eventually do .desktop instead (in preference??)
 

-bool wxMimeTypesManagerImpl::CheckKDEDirsExist ( const wxString &sOK, const wxString &sTest )
+bool wxMimeTypesManagerImpl::CheckKDEDirsExist( const wxString &sOK, const wxString &sTest )

 {
     if (sTest.empty())
     {
 {
     if (sTest.empty())
     {

-        if (wxDir::Exists(sOK))
-            return true;
-        else
-            return false;
+        return wxDir::Exists(sOK);

     }
     else
     {
         wxString sStart = sOK + wxT("/") + sTest.BeforeFirst(wxT('/'));
     }
     else
     {
         wxString sStart = sOK + wxT("/") + sTest.BeforeFirst(wxT('/'));

-        if (!wxDir::Exists(sStart))  wxMkdir(sStart);
+        if (!wxDir::Exists(sStart))
+            wxMkdir(sStart);

         wxString sEnd = sTest.AfterFirst(wxT('/'));
         return CheckKDEDirsExist(sStart, sEnd);
     }
         wxString sEnd = sTest.AfterFirst(wxT('/'));
         return CheckKDEDirsExist(sStart, sEnd);
     }


@@ -870,29 +886,31 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index)
     wxString sHome = wxGetHomeDir();
     wxString sTmp = wxT(".kde/share/mimelnk/");
     wxString sMime = m_aTypes[index];
     wxString sHome = wxGetHomeDir();
     wxString sTmp = wxT(".kde/share/mimelnk/");
     wxString sMime = m_aTypes[index];

-    CheckKDEDirsExist (sHome, sTmp + sMime.BeforeFirst(wxT('/')) );
+    CheckKDEDirsExist(sHome, sTmp + sMime.BeforeFirst(wxT('/')) );

     sTmp = sHome + wxT('/') + sTmp + sMime + wxT(".kdelnk");
 
     bool bTemp;
     sTmp = sHome + wxT('/') + sTmp + sMime + wxT(".kdelnk");
 
     bool bTemp;

-    bool bMimeExists = mimeoutfile.Open (sTmp);
+    bool bMimeExists = mimeoutfile.Open(sTmp);

     if (!bMimeExists)
     {
     if (!bMimeExists)
     {

-        bTemp = mimeoutfile.Create (sTmp);
+        bTemp = mimeoutfile.Create(sTmp);

         // some unknown error eg out of disk space
         // some unknown error eg out of disk space

-        if (!bTemp) return false;
+        if (!bTemp)
+            return false;

     }
 
     sTmp = wxT(".kde/share/applnk/");
     }
 
     sTmp = wxT(".kde/share/applnk/");

-    CheckKDEDirsExist (sHome, sTmp + sMime.AfterFirst(wxT('/')) );
+    CheckKDEDirsExist(sHome, sTmp + sMime.AfterFirst(wxT('/')) );

     sTmp = sHome + wxT('/') + sTmp + sMime.AfterFirst(wxT('/')) + wxT(".kdelnk");
 
     bool bAppExists;
     sTmp = sHome + wxT('/') + sTmp + sMime.AfterFirst(wxT('/')) + wxT(".kdelnk");
 
     bool bAppExists;

-    bAppExists = appoutfile.Open (sTmp);
+    bAppExists = appoutfile.Open(sTmp);

     if (!bAppExists)
     {
     if (!bAppExists)
     {

-        bTemp = appoutfile.Create (sTmp);
+        bTemp = appoutfile.Create(sTmp);

         // some unknown error eg out of disk space
         // some unknown error eg out of disk space

-        if (!bTemp) return false;
+        if (!bTemp)
+            return false;

     }
 
     // fixed data; write if new file
     }
 
     // fixed data; write if new file


@@ -927,13 +945,15 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index)
     // we can either give the full path, or the shortfilename if its in
     // one of the directories we search
     mimeoutfile.CommentLine(wxT("Icon=") );
     // we can either give the full path, or the shortfilename if its in
     // one of the directories we search
     mimeoutfile.CommentLine(wxT("Icon=") );

-    if (!delete_index) mimeoutfile.AddLine(wxT("Icon=") + sTmp );
-    appoutfile.CommentLine(wxT("Icon=")  );
-    if (!delete_index) appoutfile.AddLine(wxT("Icon=") + sTmp );
+    if (!delete_index)
+        mimeoutfile.AddLine(wxT("Icon=") + sTmp );
+    appoutfile.CommentLine(wxT("Icon=") );
+    if (!delete_index)
+        appoutfile.AddLine(wxT("Icon=") + sTmp );

 
     sTmp = wxT(" ") + m_aExtensions[index];
 
 
     sTmp = wxT(" ") + m_aExtensions[index];
 

-    wxStringTokenizer tokenizer(sTmp, _T(" "));
+    wxStringTokenizer tokenizer(sTmp, wxT(" "));

     sTmp = wxT("Patterns=");
     mimeoutfile.CommentLine(sTmp);
     while ( tokenizer.HasMoreTokens() )
     sTmp = wxT("Patterns=");
     mimeoutfile.CommentLine(sTmp);
     while ( tokenizer.HasMoreTokens() )


@@ -942,30 +962,36 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index)
         wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";");
         sTmp = sTmp + e;
     }
         wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";");
         sTmp = sTmp + e;
     }

-    if (!delete_index) mimeoutfile.AddLine(sTmp);
+
+    if (!delete_index)
+        mimeoutfile.AddLine(sTmp);

 
     wxMimeTypeCommands * entries = m_aEntries[index];
     // if we don't find open just have an empty string ... FIX this
 
     wxMimeTypeCommands * entries = m_aEntries[index];
     // if we don't find open just have an empty string ... FIX this

-    sTmp = entries->GetCommandForVerb(_T("open"));
+    sTmp = entries->GetCommandForVerb(wxT("open"));

     sTmp.Replace( wxT("%s"), wxT("%f") );
 
     mimeoutfile.CommentLine(wxT("DefaultApp=") );
     sTmp.Replace( wxT("%s"), wxT("%f") );
 
     mimeoutfile.CommentLine(wxT("DefaultApp=") );

-    if (!delete_index) mimeoutfile.AddLine(wxT("DefaultApp=") + sTmp);
+    if (!delete_index)
+        mimeoutfile.AddLine(wxT("DefaultApp=") + sTmp);

 
     sTmp.Replace( wxT("%f"), wxT("") );
     appoutfile.CommentLine(wxT("Exec="));
 
     sTmp.Replace( wxT("%f"), wxT("") );
     appoutfile.CommentLine(wxT("Exec="));

-    if (!delete_index) appoutfile.AddLine(wxT("Exec=") + sTmp);
+    if (!delete_index)
+        appoutfile.AddLine(wxT("Exec=") + sTmp);

 
     if (entries->GetCount() > 1)
     {
         //other actions as well as open
 
     if (entries->GetCount() > 1)
     {
         //other actions as well as open

-

     }
     }

+

     bTemp = false;
     bTemp = false;

-    if (mimeoutfile.Write ()) bTemp = true;
-    mimeoutfile.Close ();
-    if (appoutfile.Write ()) bTemp = true;
-    appoutfile.Close ();
+    if (mimeoutfile.Write())
+        bTemp = true;
+    mimeoutfile.Close();
+    if (appoutfile.Write())
+        bTemp = true;
+    appoutfile.Close();

 
     return bTemp;
 }
 
     return bTemp;
 }


@@ -976,10 +1002,11 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
                                                const wxArrayString& icondirs)
 {
     wxMimeTextFile file;
                                                const wxArrayString& icondirs)
 {
     wxMimeTextFile file;

-    if ( !file.Open(dirbase + filename) ) return;
+    if ( !file.Open(dirbase + filename) )
+        return;

 
     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
 
     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),

-                           (dirbase+filename).c_str());
+                           (dirbase + filename).c_str());

 
     wxMimeTypeCommands * entry = new wxMimeTypeCommands;
     wxArrayString sExts;
 
     wxMimeTypeCommands * entry = new wxMimeTypeCommands;
     wxArrayString sExts;


@@ -992,68 +1019,74 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
         // file (it always has .kdelnk extension)
         mimetype << subdir << wxT('/') << filename.BeforeLast( wxT('.') );
     }
         // file (it always has .kdelnk extension)
         mimetype << subdir << wxT('/') << filename.BeforeLast( wxT('.') );
     }

-    else mimetype = file.GetCmd (nIndex);
+    else
+        mimetype = file.GetCmd(nIndex);

 
     // first find the description string: it is the value in either "Comment="
     // line or "Comment[<locale_name>]=" one
     nIndex = wxNOT_FOUND;
 
     wxString comment;
 
     // first find the description string: it is the value in either "Comment="
     // line or "Comment[<locale_name>]=" one
     nIndex = wxNOT_FOUND;
 
     wxString comment;

+

 #if wxUSE_INTL
     wxLocale *locale = wxGetLocale();
     if ( locale )
     {
         // try "Comment[locale name]" first
 #if wxUSE_INTL
     wxLocale *locale = wxGetLocale();
     if ( locale )
     {
         // try "Comment[locale name]" first

-        comment << _T("Comment[") + locale->GetName() + _T("]=");
+        comment << wxT("Comment[") + locale->GetName() + wxT("]=");

         nIndex = file.pIndexOf(comment);
     }
         nIndex = file.pIndexOf(comment);
     }

-#endif // wxUSE_INTL
+#endif

 
     if ( nIndex == wxNOT_FOUND )
     {
 
     if ( nIndex == wxNOT_FOUND )
     {

-        comment = _T("Comment=");
+        comment = wxT("Comment=");

         nIndex = file.pIndexOf(comment);
     }
 
         nIndex = file.pIndexOf(comment);
     }
 

-    if ( nIndex != wxNOT_FOUND ) mime_desc = file.GetCmd(nIndex);
+    if ( nIndex != wxNOT_FOUND )
+        mime_desc = file.GetCmd(nIndex);

     //else: no description
 
     // next find the extensions
     wxString mime_extension;
 
     //else: no description
 
     // next find the extensions
     wxString mime_extension;
 

-    nIndex = file.pIndexOf(_T("Patterns="));
+    nIndex = file.pIndexOf(wxT("Patterns="));

     if ( nIndex != wxNOT_FOUND )
     {
     if ( nIndex != wxNOT_FOUND )
     {

-        wxString exts = file.GetCmd (nIndex);
+        wxString exts = file.GetCmd(nIndex);

 
 

-        wxStringTokenizer tokenizer(exts, _T(";"));
+        wxStringTokenizer tokenizer(exts, wxT(";"));

         while ( tokenizer.HasMoreTokens() )
         {
             wxString e = tokenizer.GetNextToken();
         while ( tokenizer.HasMoreTokens() )
         {
             wxString e = tokenizer.GetNextToken();

-            if ( e.Left(2) != _T("*.") )
-                continue; // don't support too difficult patterns
+
+            // don't support too difficult patterns
+            if ( e.Left(2) != wxT("*.") )
+                continue;

 
             if ( !mime_extension.empty() )
             {
                 // separate from the previous ext
 
             if ( !mime_extension.empty() )
             {
                 // separate from the previous ext

-                mime_extension << _T(' ');
+                mime_extension << wxT(' ');

             }
 
             mime_extension << e.Mid(2);
         }
     }
             }
 
             mime_extension << e.Mid(2);
         }
     }

+

     sExts.Add(mime_extension);
 
     // ok, now we can take care of icon:
 
     sExts.Add(mime_extension);
 
     // ok, now we can take care of icon:
 

-    nIndex = file.pIndexOf(_T("Icon="));
+    nIndex = file.pIndexOf(wxT("Icon="));

     if ( nIndex != wxNOT_FOUND )
     {
         strIcon = file.GetCmd(nIndex);
     if ( nIndex != wxNOT_FOUND )
     {
         strIcon = file.GetCmd(nIndex);

-        wxLogTrace(TRACE_MIME, wxT("  icon %s"), strIcon.c_str());
-        //it could be the real path, but more often a short name

 
 

+        wxLogTrace(TRACE_MIME, wxT("  icon %s"), strIcon.c_str());

 
 

+        // it could be the real path, but more often a short name

         if (!wxFileExists(strIcon))
         {
             // icon is just the short name
         if (!wxFileExists(strIcon))
         {
             // icon is just the short name


@@ -1077,6 +1110,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
             }
         }
     }
             }
         }
     }

+

     // now look for lines which know about the application
     // exec= or DefaultApp=
 
     // now look for lines which know about the application
     // exec= or DefaultApp=
 


@@ -1090,14 +1124,14 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
 
     if ( nIndex != wxNOT_FOUND )
     {
 
     if ( nIndex != wxNOT_FOUND )
     {

-        wxString sTmp = file.GetCmd(nIndex);

         // we expect %f; others including  %F and %U and %u are possible
         // we expect %f; others including  %F and %U and %u are possible

-        if (0 == sTmp.Replace ( wxT("%f"), wxT("%s") ))
+        wxString sTmp = file.GetCmd(nIndex);
+        if (0 == sTmp.Replace( wxT("%f"), wxT("%s") ))

             sTmp = sTmp + wxT(" %s");
             sTmp = sTmp + wxT(" %s");

-        entry->AddOrReplaceVerb (wxString(wxT("open")), sTmp );
+        entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp );

     }
 
     }
 

-    AddToMimeData (mimetype, strIcon, entry, sExts, mime_desc);
+    AddToMimeData(mimetype, strIcon, entry, sExts, mime_desc);

 }
 
 void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase,
 }
 
 void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase,


@@ -1113,18 +1147,19 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeType(const wxString& dirbase,
     wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s  ---"),
                            dirname.c_str());
 
     wxLogTrace(TRACE_MIME, wxT("--- Loading from KDE directory %s  ---"),
                            dirname.c_str());
 

-    dirname += _T('/');
+    dirname += wxT('/');

 
     wxString filename;
 
     wxString filename;

-    bool cont = dir.GetFirst(&filename, _T("*.kdelnk"), wxDIR_FILES);
+    bool cont = dir.GetFirst(&filename, wxT("*.kdelnk"), wxDIR_FILES);

     while ( cont )
     {
         LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);
 
         cont = dir.GetNext(&filename);
     }
     while ( cont )
     {
         LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);
 
         cont = dir.GetNext(&filename);
     }

+

     // new standard for Gnome and KDE
     // new standard for Gnome and KDE

-    cont = dir.GetFirst(&filename, _T("*.desktop"), wxDIR_FILES);
+    cont = dir.GetFirst(&filename, wxT("*.desktop"), wxDIR_FILES);

     while ( cont )
     {
         LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);
     while ( cont )
     {
         LoadKDELinksForMimeSubtype(dirname, subdir, filename, icondirs);


@@ -1137,10 +1172,10 @@ void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirbase,
                                             const wxArrayString& icondirs)
 {
     wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase),
                                             const wxArrayString& icondirs)
 {
     wxASSERT_MSG( !dirbase.empty() && !wxEndsWithPathSeparator(dirbase),

-                  _T("base directory shouldn't end with a slash") );
+                  wxT("base directory shouldn't end with a slash") );

 
     wxString dirname = dirbase;
 
     wxString dirname = dirbase;

-    dirname << _T("/mimelnk");
+    dirname << wxT("/mimelnk");

 
     if ( !wxDir::Exists(dirname) )
         return;
 
     if ( !wxDir::Exists(dirname) )
         return;


@@ -1150,7 +1185,7 @@ void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirbase,
         return;
 
     // we will concatenate it with dir name to get the full path below
         return;
 
     // we will concatenate it with dir name to get the full path below

-    dirname += _T('/');
+    dirname += wxT('/');

 
     wxString subdir;
     bool cont = dir.GetFirst(&subdir, wxEmptyString, wxDIR_DIRS);
 
     wxString subdir;
     bool cont = dir.GetFirst(&subdir, wxEmptyString, wxDIR_DIRS);


@@ -1196,7 +1231,7 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
         if (configFile.FileExists() && config.Open(configFile.GetFullPath()))
         {
             // $(KDEDIR)/share/config -> $(KDEDIR)/share
         if (configFile.FileExists() && config.Open(configFile.GetFullPath()))
         {
             // $(KDEDIR)/share/config -> $(KDEDIR)/share

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
+            configFile.RemoveDir( configFile.GetDirCount() - 1 );

             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );
 
             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );
 


@@ -1208,14 +1243,17 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
                 if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/))
                     break;
             }
                 if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/))
                     break;
             }

+

             configFile.AppendDir(theme);
         }
         else
         {
             // $(KDEDIR)/share/config -> $(KDEDIR)/share
             configFile.AppendDir(theme);
         }
         else
         {
             // $(KDEDIR)/share/config -> $(KDEDIR)/share

-            configFile.RemoveDir( configFile.GetDirCount()-1 );
+            configFile.RemoveDir( configFile.GetDirCount() - 1 );
+

             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );
             // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons
             configFile.AppendDir( wxT("icons") );

+

             // $(KDEDIR)/share/icons -> $(KDEDIR)/share/icons/default.kde
             configFile.AppendDir( wxT("default.kde") );
         }
             // $(KDEDIR)/share/icons -> $(KDEDIR)/share/icons/default.kde
             configFile.AppendDir( wxT("default.kde") );
         }


@@ -1226,7 +1264,7 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
 
         // Just try a few likely icons theme names
 
 
         // Just try a few likely icons theme names
 

-        int pos = configFile.GetDirCount()-3;
+        int pos = configFile.GetDirCount() - 3;

 
         if (!wxDir::Exists(configFile.GetPath()))
         {
 
         if (!wxDir::Exists(configFile.GetPath()))
         {


@@ -1268,14 +1306,15 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
     else
     {
         // try to guess KDEDIR
     else
     {
         // try to guess KDEDIR

-        dirs.Add(_T("/usr/share"));
-        dirs.Add(_T("/opt/kde/share"));
-        icondirs.Add(_T("/usr/share/icons/"));
-        icondirs.Add(_T("/usr/X11R6/share/icons/")); // Debian/Corel linux
-        icondirs.Add(_T("/opt/kde/share/icons/"));
+        dirs.Add(wxT("/usr/share"));
+        dirs.Add(wxT("/opt/kde/share"));
+        icondirs.Add(wxT("/usr/share/icons/"));
+        icondirs.Add(wxT("/usr/X11R6/share/icons/")); // Debian/Corel linux
+        icondirs.Add(wxT("/opt/kde/share/icons/"));

     }
 
     }
 

-    if (!sExtraDir.empty()) dirs.Add (sExtraDir);
+    if (!sExtraDir.empty())
+        dirs.Add(sExtraDir);

     icondirs.Add(sExtraDir + wxT("/icons"));
 
     size_t nDirs = dirs.GetCount();
     icondirs.Add(sExtraDir + wxT("/icons"));
 
     size_t nDirs = dirs.GetCount();


@@ -1295,24 +1334,24 @@ wxString wxFileTypeImpl::GetExpandedCommand(const wxString & verb, const wxFileT
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.empty() )
     {
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.empty() )
     {

-            sTmp = m_manager->GetCommand ( verb, m_index[i] );
-            i ++;
+        sTmp = m_manager->GetCommand( verb, m_index[i] );
+        i++;

     }
 
     return wxFileType::ExpandCommand(sTmp, params);
 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
     }
 
     return wxFileType::ExpandCommand(sTmp, params);
 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const

-

 {
     wxString sTmp;
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.empty() )
     {
         sTmp = m_manager->m_aIcons[m_index[i]];
 {
     wxString sTmp;
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.empty() )
     {
         sTmp = m_manager->m_aIcons[m_index[i]];

-        i ++;
+        i++;

     }
     }

-    if ( sTmp.empty () )
+
+    if ( sTmp.empty() )

         return false;
 
     if ( iconLoc )
         return false;
 
     if ( iconLoc )


@@ -1323,60 +1362,55 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
     return true;
 }
 
     return true;
 }
 

-
-bool
-wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
+bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const

 {
     mimeTypes.Clear();
     for (size_t i = 0; i < m_index.GetCount(); i++)
         mimeTypes.Add(m_manager->m_aTypes[m_index[i]]);
 {
     mimeTypes.Clear();
     for (size_t i = 0; i < m_index.GetCount(); i++)
         mimeTypes.Add(m_manager->m_aTypes[m_index[i]]);

+

     return true;
 }
 
     return true;
 }
 

-

 size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                   wxArrayString *commands,
                                   const wxFileType::MessageParameters& params) const
 {
 size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                   wxArrayString *commands,
                                   const wxFileType::MessageParameters& params) const
 {

-

     wxString vrb, cmd, sTmp;
     size_t count = 0;
     wxMimeTypeCommands * sPairs;
 
     // verbs and commands have been cleared already in mimecmn.cpp...
     // if we find no entries in the exact match, try the inexact match
     wxString vrb, cmd, sTmp;
     size_t count = 0;
     wxMimeTypeCommands * sPairs;
 
     // verbs and commands have been cleared already in mimecmn.cpp...
     // if we find no entries in the exact match, try the inexact match

-    for (size_t n = 0; ((count ==0) && (n < m_index.GetCount())); n++)
+    for (size_t n = 0; ((count == 0) && (n < m_index.GetCount())); n++)

     {
         // list of verb = command pairs for this mimetype
         sPairs = m_manager->m_aEntries [m_index[n]];
         size_t i;
     {
         // list of verb = command pairs for this mimetype
         sPairs = m_manager->m_aEntries [m_index[n]];
         size_t i;

-        for ( i = 0; i < sPairs->GetCount (); i++ )
+        for ( i = 0; i < sPairs->GetCount(); i++ )
+        {
+            vrb = sPairs->GetVerb(i);
+            // some gnome entries have "." inside
+            vrb = vrb.AfterLast(wxT('.'));
+            cmd = sPairs->GetCmd(i);
+            if (! cmd.empty() )

             {
             {

-                vrb = sPairs->GetVerb(i);
-                // some gnome entries have . inside
-                vrb = vrb.AfterLast(wxT('.'));
-                cmd = sPairs->GetCmd (i);
-                if (! cmd.empty() )
-                     {
-                     cmd = wxFileType::ExpandCommand(cmd, params);
-                     count ++;
-                     if ( vrb.IsSameAs (wxT("open")))
-                         {
-                         verbs->Insert(vrb,0u);
-                         commands ->Insert(cmd,0u);
-                         }
-                     else
-                         {
-                         verbs->Add (vrb);
-                         commands->Add (cmd);
-                         }
-                     }
-
+                 cmd = wxFileType::ExpandCommand(cmd, params);
+                 count++;
+                 if ( vrb.IsSameAs(wxT("open")))
+                 {
+                     verbs->Insert(vrb, 0u);
+                     commands ->Insert(cmd, 0u);
+                 }
+                 else
+                 {
+                     verbs->Add(vrb);
+                     commands->Add(cmd);
+                 }
+             }

         }
         }

-

     }
     }

-    return count;

 
 

+    return count;

 }
 
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 }
 
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)


@@ -1384,28 +1418,34 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
     wxString strExtensions = m_manager->GetExtension(m_index[0]);
     extensions.Empty();
 
     wxString strExtensions = m_manager->GetExtension(m_index[0]);
     extensions.Empty();
 

-    // one extension in the space or comma delimitid list
+    // one extension in the space or comma-delimited list

     wxString strExt;
     wxString strExt;

-    for ( const wxChar *p = strExtensions;; p++ ) {
-        if ( *p == wxT(' ') || *p == wxT(',') || *p == wxT('\0') ) {
-            if ( !strExt.empty() ) {
+    for ( const wxChar *p = strExtensions; /* nothing */; p++ )
+    {
+        if ( *p == wxT(' ') || *p == wxT(',') || *p == wxT('\0') )
+        {
+            if ( !strExt.empty() )
+            {

                 extensions.Add(strExt);
                 strExt.Empty();
             }
                 extensions.Add(strExt);
                 strExt.Empty();
             }

-            //else: repeated spaces (shouldn't happen, but it's not that
-            //      important if it does happen)
+            //else: repeated spaces
+            // (shouldn't happen, but it's not that important if it does happen)

 
             if ( *p == wxT('\0') )
                 break;
         }
 
             if ( *p == wxT('\0') )
                 break;
         }

-        else if ( *p == wxT('.') ) {
+        else if ( *p == wxT('.') )
+        {

             // remove the dot from extension (but only if it's the first char)
             // remove the dot from extension (but only if it's the first char)

-            if ( !strExt.empty() ) {
+            if ( !strExt.empty() )
+            {

                 strExt += wxT('.');
             }
             //else: no, don't append it
         }
                 strExt += wxT('.');
             }
             //else: no, don't append it
         }

-        else {
+        else
+        {

             strExt += *p;
         }
     }
             strExt += *p;
         }
     }


@@ -1413,62 +1453,68 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
     return true;
 }
 
     return true;
 }
 

-// set an arbitrary command,
+// set an arbitrary command:

 // could adjust the code to ask confirmation if it already exists and
 // overwriteprompt is true, but this is currently ignored as *Associate* has
 // no overwrite prompt
 // could adjust the code to ask confirmation if it already exists and
 // overwriteprompt is true, but this is currently ignored as *Associate* has
 // no overwrite prompt

-bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt /*= true*/)
+bool
+wxFileTypeImpl::SetCommand(const wxString& cmd,
+                           const wxString& verb,
+                           bool WXUNUSED(overwriteprompt))

 {
     wxArrayString strExtensions;
     wxString strDesc, strIcon;
 
 {
     wxArrayString strExtensions;
     wxString strDesc, strIcon;
 

-    wxMimeTypeCommands *entry = new wxMimeTypeCommands ();
+    wxMimeTypeCommands *entry = new wxMimeTypeCommands();

     entry->Add(verb + wxT("=")  + cmd + wxT(" %s "));
 
     wxArrayString strTypes;
     entry->Add(verb + wxT("=")  + cmd + wxT(" %s "));
 
     wxArrayString strTypes;

-    GetMimeTypes (strTypes);
-    if (strTypes.GetCount() < 1) return false;
+    GetMimeTypes(strTypes);
+    if (strTypes.GetCount() < 1)
+        return false;

 
     size_t i;
 
     size_t i;

-    bool Ok = true;
+    bool ok = true;

     for (i = 0; i < strTypes.GetCount(); i++)
     {
     for (i = 0; i < strTypes.GetCount(); i++)
     {

-        if (!m_manager->DoAssociation (strTypes[i], strIcon, entry, strExtensions, strDesc))
-            Ok = false;
+        if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc))
+            ok = false;

     }
 
     }
 

-    return Ok;
+    return ok;

 }
 
 // ignore index on the grouds that we only have one icon in a Unix file
 }
 
 // ignore index on the grouds that we only have one icon in a Unix file

-bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon /*= wxEmptyString*/, int /*index = 0*/)
+bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index))

 {
 {

-    if (strIcon.empty()) return false;
+    if (strIcon.empty())
+        return false;
+

     wxArrayString strExtensions;
     wxString strDesc;
 
     wxArrayString strExtensions;
     wxString strDesc;
 

-    wxMimeTypeCommands *entry = new wxMimeTypeCommands ();
+    wxMimeTypeCommands *entry = new wxMimeTypeCommands();

 
     wxArrayString strTypes;
 
     wxArrayString strTypes;

-    GetMimeTypes (strTypes);
-    if (strTypes.GetCount() < 1) return false;
+    GetMimeTypes(strTypes);
+    if (strTypes.GetCount() < 1)
+        return false;

 
     size_t i;
 
     size_t i;

-    bool Ok = true;
+    bool ok = true;

     for (i = 0; i < strTypes.GetCount(); i++)
     {
     for (i = 0; i < strTypes.GetCount(); i++)
     {

-        if (!m_manager->DoAssociation (strTypes[i], strIcon, entry, strExtensions, strDesc))
-            Ok = false;
+        if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc))
+            ok = false;

     }
 
     }
 

-    return Ok;
+    return ok;

 }
 
 // ----------------------------------------------------------------------------
 // wxMimeTypesManagerImpl (Unix)
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxMimeTypesManagerImpl (Unix)
 // ----------------------------------------------------------------------------
 

-

 wxMimeTypesManagerImpl::wxMimeTypesManagerImpl()
 {
     m_initialized = false;
 wxMimeTypesManagerImpl::wxMimeTypesManagerImpl()
 {
     m_initialized = false;


@@ -1482,16 +1528,18 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
         // set the flag first to prevent recursion
         m_initialized = true;
 
         // set the flag first to prevent recursion
         m_initialized = true;
 

-#if 0
+#if 1
+    Initialize();
+#else

     wxString wm = wxGetenv( wxT("WINDOWMANAGER") );
 
     if (wm.Find( wxT("kde") ) != wxNOT_FOUND)
     wxString wm = wxGetenv( wxT("WINDOWMANAGER") );
 
     if (wm.Find( wxT("kde") ) != wxNOT_FOUND)

-        Initialize( wxMAILCAP_KDE|wxMAILCAP_STANDARD );
+        Initialize( wxMAILCAP_KDE | wxMAILCAP_STANDARD );

     else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND)
     else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND)

-        Initialize( wxMAILCAP_GNOME|wxMAILCAP_STANDARD );
+        Initialize( wxMAILCAP_GNOME | wxMAILCAP_STANDARD );

     else
     else

+        Initialize();

 #endif
 #endif

-            Initialize();

     }
 }
 
     }
 }
 


@@ -1518,10 +1566,10 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
 // clear data so you can read another group of WM files
 void wxMimeTypesManagerImpl::ClearData()
 {
 // clear data so you can read another group of WM files
 void wxMimeTypesManagerImpl::ClearData()
 {

-    m_aTypes.Clear ();
-    m_aIcons.Clear ();
-    m_aExtensions.Clear ();
-    m_aDescriptions.Clear ();
+    m_aTypes.Clear();
+    m_aIcons.Clear();
+    m_aExtensions.Clear();
+    m_aDescriptions.Clear();

 
     WX_CLEAR_ARRAY(m_aEntries);
     m_aEntries.Empty();
 
     WX_CLEAR_ARRAY(m_aEntries);
     m_aEntries.Empty();


@@ -1534,8 +1582,7 @@ wxMimeTypesManagerImpl::~wxMimeTypesManagerImpl()
     ClearData();
 }
 
     ClearData();
 }
 

-
-void wxMimeTypesManagerImpl::GetMimeInfo (const wxString& sExtraDir)
+void wxMimeTypesManagerImpl::GetMimeInfo(const wxString& sExtraDir)

 {
     // read this for netscape or Metamail formats
 
 {
     // read this for netscape or Metamail formats
 


@@ -1553,31 +1600,33 @@ void wxMimeTypesManagerImpl::GetMimeInfo (const wxString& sExtraDir)
     wxString strHome = wxGetenv(wxT("HOME"));
 
     wxArrayString dirs;
     wxString strHome = wxGetenv(wxT("HOME"));
 
     wxArrayString dirs;

-    dirs.Add ( strHome + wxT("/.") );
-    dirs.Add ( wxT("/etc/") );
-    dirs.Add ( wxT("/usr/etc/") );
-    dirs.Add ( wxT("/usr/local/etc/") );
-    dirs.Add ( wxT("/etc/mail/") );
-    dirs.Add ( wxT("/usr/public/lib/") );
-    if (!sExtraDir.empty()) dirs.Add ( sExtraDir + wxT("/") );
+    dirs.Add( strHome + wxT("/.") );
+    dirs.Add( wxT("/etc/") );
+    dirs.Add( wxT("/usr/etc/") );
+    dirs.Add( wxT("/usr/local/etc/") );
+    dirs.Add( wxT("/etc/mail/") );
+    dirs.Add( wxT("/usr/public/lib/") );
+    if (!sExtraDir.empty())
+        dirs.Add( sExtraDir + wxT("/") );

 
     size_t nDirs = dirs.GetCount();
     for ( size_t nDir = 0; nDir < nDirs; nDir++ )
     {
         wxString file = dirs[nDir] + wxT("mailcap");
 
     size_t nDirs = dirs.GetCount();
     for ( size_t nDir = 0; nDir < nDirs; nDir++ )
     {
         wxString file = dirs[nDir] + wxT("mailcap");

-        if ( wxFile::Exists(file) ) {
+        if ( wxFile::Exists(file) )
+        {

             ReadMailcap(file);
         }
 
         file = dirs[nDir] + wxT("mime.types");
             ReadMailcap(file);
         }
 
         file = dirs[nDir] + wxT("mime.types");

-        if ( wxFile::Exists(file) ) {
+        if ( wxFile::Exists(file) )
+        {

             ReadMimeTypes(file);
         }
     }
             ReadMimeTypes(file);
         }
     }

-

 }
 
 }
 

-bool wxMimeTypesManagerImpl::WriteToMimeTypes (int index, bool delete_index)
+bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index)

 {
     // check we have the right manager
     if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD) )
 {
     // check we have the right manager
     if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD) )


@@ -1592,46 +1641,52 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes (int index, bool delete_index)
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {

-        bTemp =  file.Open(strUserMailcap);
+        bTemp = file.Open(strUserMailcap);

     }
     else
     {
     }
     else
     {

-        if (delete_index) return false;
+        if (delete_index)
+            return false;
+

         bTemp = file.Create(strUserMailcap);
     }
         bTemp = file.Create(strUserMailcap);
     }

+

     if (bTemp)
     {
         int nIndex;
         // test for netscape's header and return false if its found
     if (bTemp)
     {
         int nIndex;
         // test for netscape's header and return false if its found

-        nIndex = file.pIndexOf (wxT("#--Netscape"));
+        nIndex = file.pIndexOf(wxT("#--Netscape"));

         if (nIndex != wxNOT_FOUND)
         {
             wxASSERT_MSG(false,wxT("Error in .mime.types \nTrying to mix Netscape and Metamail formats\nFile not modiifed"));
             return false;
         }
         if (nIndex != wxNOT_FOUND)
         {
             wxASSERT_MSG(false,wxT("Error in .mime.types \nTrying to mix Netscape and Metamail formats\nFile not modiifed"));
             return false;
         }

+

         // write it in alternative format
         // get rid of unwanted entries
         wxString strType = m_aTypes[index];
         // write it in alternative format
         // get rid of unwanted entries
         wxString strType = m_aTypes[index];

-        nIndex = file.pIndexOf (strType);
+        nIndex = file.pIndexOf(strType);
+

         // get rid of all the unwanted entries...
         // get rid of all the unwanted entries...

-        if (nIndex != wxNOT_FOUND) file.CommentLine (nIndex);
+        if (nIndex != wxNOT_FOUND)
+            file.CommentLine(nIndex);

 
         if (!delete_index)
         {
             // add the new entries in
 
         if (!delete_index)
         {
             // add the new entries in

-            wxString sTmp = strType.Append (wxT(' '), 40-strType.Len() );
+            wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() );

             sTmp = sTmp + m_aExtensions[index];
             sTmp = sTmp + m_aExtensions[index];

-            file.AddLine (sTmp);
+            file.AddLine(sTmp);

         }
 
         }
 

-
-        bTemp = file.Write ();
-        file.Close ();
+        bTemp = file.Write();
+        file.Close();

     }
     }

+

     return bTemp;
 }
 
     return bTemp;
 }
 

-bool wxMimeTypesManagerImpl::WriteToNSMimeTypes (int index, bool delete_index)
+bool wxMimeTypesManagerImpl::WriteToNSMimeTypes(int index, bool delete_index)

 {
     //check we have the right managers
     if (! ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) )
 {
     //check we have the right managers
     if (! ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) )


@@ -1646,37 +1701,41 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes (int index, bool delete_index)
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {

-        bTemp =  file.Open(strUserMailcap);
+        bTemp = file.Open(strUserMailcap);

     }
     else
     {
     }
     else
     {

-        if (delete_index) return false;
+        if (delete_index)
+            return false;
+

         bTemp = file.Create(strUserMailcap);
     }
         bTemp = file.Create(strUserMailcap);
     }

+

     if (bTemp)
     {
     if (bTemp)
     {

-

         // write it in the format that Netscape uses
         int nIndex;
         // test for netscape's header and insert if required...
         // this is a comment so use true
         // write it in the format that Netscape uses
         int nIndex;
         // test for netscape's header and insert if required...
         // this is a comment so use true

-        nIndex = file.pIndexOf (wxT("#--Netscape"), true);
+        nIndex = file.pIndexOf(wxT("#--Netscape"), true);

         if (nIndex == wxNOT_FOUND)
         {
             // either empty file or metamail format
             // at present we can't cope with mixed formats, so exit to preseve
             // metamail entreies
         if (nIndex == wxNOT_FOUND)
         {
             // either empty file or metamail format
             // at present we can't cope with mixed formats, so exit to preseve
             // metamail entreies

-            if (file.GetLineCount () > 0)
+            if (file.GetLineCount() > 0)

             {
                 wxASSERT_MSG(false, wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap"));
                 return false;
             }
             {
                 wxASSERT_MSG(false, wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap"));
                 return false;
             }

-            file.InsertLine (wxT( "#--Netscape Communications Corporation MIME Information" ), 0);
+
+            file.InsertLine(wxT( "#--Netscape Communications Corporation MIME Information" ), 0);

             nIndex = 0;
         }
 
         wxString strType = wxT("type=") + m_aTypes[index];
             nIndex = 0;
         }
 
         wxString strType = wxT("type=") + m_aTypes[index];

-        nIndex = file.pIndexOf (strType);
+        nIndex = file.pIndexOf(strType);
+

         // get rid of all the unwanted entries...
         if (nIndex != wxNOT_FOUND)
         {
         // get rid of all the unwanted entries...
         if (nIndex != wxNOT_FOUND)
         {


@@ -1685,47 +1744,55 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes (int index, bool delete_index)
             {
                 file.CommentLine(nIndex);
                 sOld = file[nIndex];
             {
                 file.CommentLine(nIndex);
                 sOld = file[nIndex];

+

                 wxLogTrace(TRACE_MIME, wxT("--- Deleting from mime.types line '%d %s' ---"), nIndex, sOld.c_str());
                 wxLogTrace(TRACE_MIME, wxT("--- Deleting from mime.types line '%d %s' ---"), nIndex, sOld.c_str());

-                nIndex ++;
+
+                nIndex++;

             }
             }

-            if (nIndex < (int) file.GetLineCount()) file.CommentLine (nIndex);
+
+            if (nIndex < (int) file.GetLineCount())
+                file.CommentLine(nIndex);

         }
         }

-        else nIndex = (int) file.GetLineCount();
+        else
+            nIndex = (int) file.GetLineCount();

 
         wxString sTmp = strType + wxT(" \\");
 
         wxString sTmp = strType + wxT(" \\");

-        if (!delete_index) file.InsertLine (sTmp, nIndex);
+        if (!delete_index)
+            file.InsertLine(sTmp, nIndex);
+

         if ( ! m_aDescriptions.Item(index).empty() )
         {
         if ( ! m_aDescriptions.Item(index).empty() )
         {

-            sTmp =     wxT("desc=\"") + m_aDescriptions[index]+ wxT("\" \\"); //.trim ??
+            sTmp = wxT("desc=\"") + m_aDescriptions[index]+ wxT("\" \\"); //.trim ??

             if (!delete_index)
             {
             if (!delete_index)
             {

-                nIndex ++;
-                file.InsertLine (sTmp, nIndex);
+                nIndex++;
+                file.InsertLine(sTmp, nIndex);

             }
         }
             }
         }

-        wxString sExts =  m_aExtensions.Item(index);
-        sTmp =     wxT("exts=\"") + sExts.Trim(false).Trim() + wxT("\"");
+
+        wxString sExts = m_aExtensions.Item(index);
+        sTmp = wxT("exts=\"") + sExts.Trim(false).Trim() + wxT("\"");

         if (!delete_index)
         {
         if (!delete_index)
         {

-            nIndex ++;
-            file.InsertLine (sTmp, nIndex);
+            nIndex++;
+            file.InsertLine(sTmp, nIndex);

         }
 
         }
 

-        bTemp = file.Write ();
-        file.Close ();
+        bTemp = file.Write();
+        file.Close();

     }
     }

+

     return bTemp;
 }
 
     return bTemp;
 }
 

-
-bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
+bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)

 {
     //check we have the right managers
     if ( !( ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) ||
             ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) )
         return false;
 
 {
     //check we have the right managers
     if ( !( ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) ||
             ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) )
         return false;
 

-    bool bTemp;
+    bool bTemp = false;

     wxString strHome = wxGetenv(wxT("HOME"));
 
     // and now the users mailcap
     wxString strHome = wxGetenv(wxT("HOME"));
 
     // and now the users mailcap


@@ -1734,24 +1801,28 @@ bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {
     wxMimeTextFile file;
     if ( wxFile::Exists(strUserMailcap) )
     {

-        bTemp =  file.Open(strUserMailcap);
+        bTemp = file.Open(strUserMailcap);

     }
     else
     {
     }
     else
     {

-        if (delete_index) return false;
+        if (delete_index)
+            return false;
+

         bTemp = file.Create(strUserMailcap);
     }
         bTemp = file.Create(strUserMailcap);
     }

+

     if (bTemp)
     {
         // now got a file we can write to ....
         wxMimeTypeCommands * entries = m_aEntries[index];
         size_t iOpen;
     if (bTemp)
     {
         // now got a file we can write to ....
         wxMimeTypeCommands * entries = m_aEntries[index];
         size_t iOpen;

-        wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
+        wxString sCmd = entries->GetCommandForVerb(wxT("open"), &iOpen);

         wxString sTmp;
 
         sTmp = m_aTypes[index];
         wxString sOld;
         int nIndex = file.pIndexOf(sTmp);
         wxString sTmp;
 
         sTmp = m_aTypes[index];
         wxString sOld;
         int nIndex = file.pIndexOf(sTmp);

+

         // get rid of all the unwanted entries...
         if (nIndex == wxNOT_FOUND)
         {
         // get rid of all the unwanted entries...
         if (nIndex == wxNOT_FOUND)
         {


@@ -1765,31 +1836,35 @@ bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
             while ( (sOld.Contains(wxT("\\"))) && (nIndex < (int) file.GetLineCount()) )
             {
                 file.CommentLine(nIndex);
             while ( (sOld.Contains(wxT("\\"))) && (nIndex < (int) file.GetLineCount()) )
             {
                 file.CommentLine(nIndex);

-                if (nIndex < (int) file.GetLineCount()) sOld = sOld + file[nIndex];
+                if (nIndex < (int) file.GetLineCount())
+                    sOld = sOld + file[nIndex];

             }
             }

-            if (nIndex < (int) file.GetLineCount()) file.CommentLine (nIndex);
+
+            if (nIndex < (int)
+                file.GetLineCount()) file.CommentLine(nIndex);

         }
 
         sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s ");
 
         // write it in the format that Netscape uses (default)
         }
 
         sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s ");
 
         // write it in the format that Netscape uses (default)

-        if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD  ) )
+        if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) )

         {
         {

-            if (! delete_index) file.InsertLine (sTmp, nIndex);
-            nIndex ++;
+            if (! delete_index)
+                file.InsertLine(sTmp, nIndex);
+            nIndex++;

         }
         }

-
-        // write extended format

         else
         {
         else
         {

-            // todo FIX this code;
+            // write extended format
+
+            // TODO - FIX this code:

             // ii) lost entries
             // sOld holds all the entries, but our data store only has some
             // eg test= is not stored
 
             // so far we have written the mimetype and command out
             // ii) lost entries
             // sOld holds all the entries, but our data store only has some
             // eg test= is not stored
 
             // so far we have written the mimetype and command out

-            wxStringTokenizer sT (sOld, wxT(";\\"));
-            if (sT.CountTokens () > 2)
+            wxStringTokenizer sT(sOld, wxT(";\\"));
+            if (sT.CountTokens() > 2)

             {
                 // first one mimetype; second one command, rest unknown...
                 wxString s;
             {
                 // first one mimetype; second one command, rest unknown...
                 wxString s;


@@ -1801,104 +1876,109 @@ bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
                 while ( ! s.empty() )
                 {
                     bool bKnownToken = false;
                 while ( ! s.empty() )
                 {
                     bool bKnownToken = false;

-                    if (s.Contains(wxT("description="))) bKnownToken = true;
-                    if (s.Contains(wxT("x11-bitmap="))) bKnownToken = true;
+                    if (s.Contains(wxT("description=")))
+                        bKnownToken = true;
+                    if (s.Contains(wxT("x11-bitmap=")))
+                        bKnownToken = true;
+

                     size_t i;
                     for (i=0; i < entries->GetCount(); i++)
                     {
                     size_t i;
                     for (i=0; i < entries->GetCount(); i++)
                     {

-                        if (s.Contains(entries->GetVerb(i))) bKnownToken = true;
+                        if (s.Contains(entries->GetVerb(i)))
+                            bKnownToken = true;

                     }
                     }

+

                     if (!bKnownToken)
                     {
                         sTmp = sTmp + wxT("; \\");
                     if (!bKnownToken)
                     {
                         sTmp = sTmp + wxT("; \\");

-                        file.InsertLine (sTmp, nIndex);
+                        file.InsertLine(sTmp, nIndex);

                         sTmp = s;
                     }
                         sTmp = s;
                     }

-                    s = sT.GetNextToken ();
-                }

 
 

+                    s = sT.GetNextToken();
+                }

             }
 
             if (! m_aDescriptions[index].empty() )
             {
                 sTmp = sTmp + wxT("; \\");
             }
 
             if (! m_aDescriptions[index].empty() )
             {
                 sTmp = sTmp + wxT("; \\");

-                file.InsertLine (sTmp, nIndex);
-                nIndex ++;
+                file.InsertLine(sTmp, nIndex);
+                nIndex++;

                 sTmp = wxT("       description=\"") + m_aDescriptions[index] + wxT("\"");
             }
 
             if (! m_aIcons[index].empty() )
             {
                 sTmp = sTmp + wxT("; \\");
                 sTmp = wxT("       description=\"") + m_aDescriptions[index] + wxT("\"");
             }
 
             if (! m_aIcons[index].empty() )
             {
                 sTmp = sTmp + wxT("; \\");

-                file.InsertLine (sTmp, nIndex);
-                nIndex ++;
+                file.InsertLine(sTmp, nIndex);
+                nIndex++;

                 sTmp = wxT("       x11-bitmap=\"") + m_aIcons[index] + wxT("\"");
             }
                 sTmp = wxT("       x11-bitmap=\"") + m_aIcons[index] + wxT("\"");
             }

-            if ( entries->GetCount() > 1 )

 
 

+            if ( entries->GetCount() > 1 )

             {
                 size_t i;
                 for (i=0; i < entries->GetCount(); i++)
                     if ( i != iOpen )
                     {
                         sTmp = sTmp + wxT("; \\");
             {
                 size_t i;
                 for (i=0; i < entries->GetCount(); i++)
                     if ( i != iOpen )
                     {
                         sTmp = sTmp + wxT("; \\");

-                        file.InsertLine (sTmp, nIndex);
-                        nIndex ++;
+                        file.InsertLine(sTmp, nIndex);
+                        nIndex++;

                         sTmp = wxT("       ") + entries->GetVerbCmd(i);
                     }
             }
 
                         sTmp = wxT("       ") + entries->GetVerbCmd(i);
                     }
             }
 

-            file.InsertLine (sTmp, nIndex);
-            nIndex ++;
-
+            file.InsertLine(sTmp, nIndex);
+            nIndex++;

         }
         }

-        bTemp = file.Write ();
-        file.Close ();
+
+        bTemp = file.Write();
+        file.Close();

     }
     }

+

     return bTemp;
 }
 
     return bTemp;
 }
 

-wxFileType *
-wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
+wxFileType * wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)

 {
     InitIfNeeded();
 
 {
     InitIfNeeded();
 

-    wxString strType = ftInfo.GetMimeType ();
-    wxString strDesc = ftInfo.GetDescription ();
-    wxString strIcon = ftInfo.GetIconFile ();
+    wxString strType = ftInfo.GetMimeType();
+    wxString strDesc = ftInfo.GetDescription();
+    wxString strIcon = ftInfo.GetIconFile();

 
 

-    wxMimeTypeCommands *entry = new wxMimeTypeCommands ();
+    wxMimeTypeCommands *entry = new wxMimeTypeCommands();

 
     if ( ! ftInfo.GetOpenCommand().empty())
 
     if ( ! ftInfo.GetOpenCommand().empty())

-        entry->Add(wxT("open=")  + ftInfo.GetOpenCommand  () + wxT(" %s "));
-    if ( ! ftInfo.GetPrintCommand  ().empty())
-        entry->Add(wxT("print=") + ftInfo.GetPrintCommand () + wxT(" %s "));
+        entry->Add(wxT("open=")  + ftInfo.GetOpenCommand() + wxT(" %s "));
+    if ( ! ftInfo.GetPrintCommand().empty())
+        entry->Add(wxT("print=") + ftInfo.GetPrintCommand() + wxT(" %s "));

 
     // now find where these extensions are in the data store and remove them
 
     // now find where these extensions are in the data store and remove them

-    wxArrayString sA_Exts = ftInfo.GetExtensions ();
+    wxArrayString sA_Exts = ftInfo.GetExtensions();

     wxString sExt, sExtStore;
     size_t i, nIndex;
     for (i=0; i < sA_Exts.GetCount(); i++)
     wxString sExt, sExtStore;
     size_t i, nIndex;
     for (i=0; i < sA_Exts.GetCount(); i++)

-        {
+    {

         sExt = sA_Exts.Item(i);
         sExt = sA_Exts.Item(i);

-        //clean up to just a space before and after
+
+        // clean up to just a space before and after

         sExt.Trim().Trim(false);
         sExt = wxT(' ') + sExt + wxT(' ');
         sExt.Trim().Trim(false);
         sExt = wxT(' ') + sExt + wxT(' ');

-        for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex ++)
-            {
+        for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex++)
+        {

             sExtStore = m_aExtensions.Item(nIndex);
             sExtStore = m_aExtensions.Item(nIndex);

-            if (sExtStore.Replace(sExt, wxT(" ") ) > 0) m_aExtensions.Item(nIndex) = sExtStore;
-    }
-
+            if (sExtStore.Replace(sExt, wxT(" ") ) > 0)
+                m_aExtensions.Item(nIndex) = sExtStore;
+        }

     }
 
     }
 

-    if ( !DoAssociation (strType, strIcon, entry, sA_Exts, strDesc) )
+    if ( !DoAssociation(strType, strIcon, entry, sA_Exts, strDesc) )

         return NULL;
 
     return GetFileTypeFromMimeType(strType);
 }
 
         return NULL;
 
     return GetFileTypeFromMimeType(strType);
 }
 

-

 bool wxMimeTypesManagerImpl::DoAssociation(const wxString& strType,
                                            const wxString& strIcon,
                                            wxMimeTypeCommands *entry,
 bool wxMimeTypesManagerImpl::DoAssociation(const wxString& strType,
                                            const wxString& strIcon,
                                            wxMimeTypeCommands *entry,


@@ -1910,7 +1990,7 @@ bool wxMimeTypesManagerImpl::DoAssociation(const wxString& strType,
     if ( nIndex == wxNOT_FOUND )
         return false;
 
     if ( nIndex == wxNOT_FOUND )
         return false;
 

-    return WriteMimeInfo (nIndex, false);
+    return WriteMimeInfo(nIndex, false);

 }
 
 bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime )
 }
 
 bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime )


@@ -1920,28 +2000,31 @@ bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime )
     if ( m_mailcapStylesInited & wxMAILCAP_STANDARD )
     {
         // write in metamail  format;
     if ( m_mailcapStylesInited & wxMAILCAP_STANDARD )
     {
         // write in metamail  format;

-        if (WriteToMimeTypes (nIndex, delete_mime) )
-            if ( WriteToMailCap   (nIndex, delete_mime) )
+        if (WriteToMimeTypes(nIndex, delete_mime) )
+            if ( WriteToMailCap(nIndex, delete_mime) )

                 ok = false;
     }
                 ok = false;
     }

+

     if ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE )
     {
         // write in netsacpe format;
     if ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE )
     {
         // write in netsacpe format;

-        if (WriteToNSMimeTypes (nIndex, delete_mime) )
-            if ( WriteToMailCap   (nIndex, delete_mime) )
+        if (WriteToNSMimeTypes(nIndex, delete_mime) )
+            if ( WriteToMailCap(nIndex, delete_mime) )

                 ok = false;
     }
                 ok = false;
     }

+

     if (m_mailcapStylesInited & wxMAILCAP_GNOME)
     {
         // write in Gnome format;
     if (m_mailcapStylesInited & wxMAILCAP_GNOME)
     {
         // write in Gnome format;

-        if (WriteGnomeMimeFile (nIndex, delete_mime) )
-            if (WriteGnomeKeyFile   (nIndex, delete_mime) )
+        if (WriteGnomeMimeFile(nIndex, delete_mime) )
+            if (WriteGnomeKeyFile(nIndex, delete_mime) )

                 ok = false;
     }
                 ok = false;
     }

+

     if (m_mailcapStylesInited & wxMAILCAP_KDE)
     {
         // write in KDE format;
     if (m_mailcapStylesInited & wxMAILCAP_KDE)
     {
         // write in KDE format;

-        if (WriteKDEMimeFile (nIndex, delete_mime) )
+        if (WriteKDEMimeFile(nIndex, delete_mime) )

             ok = false;
     }
 
             ok = false;
     }
 


@@ -2000,13 +2083,13 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType,
                 m_aDescriptions[nIndex] = strDesc;
 
             // if new icon and no existing icon
                 m_aDescriptions[nIndex] = strDesc;
 
             // if new icon and no existing icon

-            if ( m_aIcons[nIndex].empty () )
+            if ( m_aIcons[nIndex].empty() )

                 m_aIcons[nIndex] = strIcon;
 
             // add any new entries...
             if ( entry )
             {
                 m_aIcons[nIndex] = strIcon;
 
             // add any new entries...
             if ( entry )
             {

-                wxMimeTypeCommands *entryOld  =  m_aEntries[nIndex];
+                wxMimeTypeCommands *entryOld = m_aEntries[nIndex];

 
                 size_t count = entry->GetCount();
                 for ( size_t i = 0; i < count; i++ )
 
                 size_t count = entry->GetCount();
                 for ( size_t i = 0; i < count; i++ )


@@ -2032,7 +2115,7 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType,
     size_t count = strExtensions.GetCount();
     for ( size_t i = 0; i < count; i++ )
     {
     size_t count = strExtensions.GetCount();
     for ( size_t i = 0; i < count; i++ )
     {

-        wxString ext = strExtensions[i] + _T(' ');
+        wxString ext = strExtensions[i] + wxT(' ');

 
         if ( exts.Find(ext) == wxNOT_FOUND )
         {
 
         if ( exts.Find(ext) == wxNOT_FOUND )
         {


@@ -2049,9 +2132,7 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType,
     return nIndex;
 }
 
     return nIndex;
 }
 

-
-wxFileType *
-wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
+wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)

 {
     if (ext.empty() )
         return NULL;
 {
     if (ext.empty() )
         return NULL;


@@ -2061,7 +2142,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     size_t count = m_aExtensions.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = m_aExtensions.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        wxStringTokenizer tk(m_aExtensions[n], _T(' '));
+        wxStringTokenizer tk(m_aExtensions[n], wxT(' '));

 
         while ( tk.HasMoreTokens() )
         {
 
         while ( tk.HasMoreTokens() )
         {


@@ -2080,8 +2161,7 @@ wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ext)
     return NULL;
 }
 
     return NULL;
 }
 

-wxFileType *
-wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
+wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)

 {
     InitIfNeeded();
 
 {
     InitIfNeeded();
 


@@ -2106,28 +2186,32 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType)
     wxString strCategory = mimetype.BeforeFirst(wxT('/'));
 
     size_t nCount = m_aTypes.Count();
     wxString strCategory = mimetype.BeforeFirst(wxT('/'));
 
     size_t nCount = m_aTypes.Count();

-    for ( size_t n = 0; n < nCount; n++ ) {
+    for ( size_t n = 0; n < nCount; n++ )
+    {

         if ( (m_aTypes[n].BeforeFirst(wxT('/')) == strCategory ) &&
         if ( (m_aTypes[n].BeforeFirst(wxT('/')) == strCategory ) &&

-                m_aTypes[n].AfterFirst(wxT('/')) == wxT("*") ) {
+                m_aTypes[n].AfterFirst(wxT('/')) == wxT("*") )
+        {

             index = n;
             break;
         }
             index = n;
             break;
         }

-

     }
 
     if ( index != wxNOT_FOUND )
     {
     }
 
     if ( index != wxNOT_FOUND )
     {

-        fileType = new wxFileType;
+       // don't throw away fileType that was already found
+        if (!fileType)
+            fileType = new wxFileType;

         fileType->m_impl->Init(this, index);
     }
         fileType->m_impl->Init(this, index);
     }

+

     return fileType;
 }
 
     return fileType;
 }
 

-

 wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex) const
 {
     wxString command, testcmd, sV, sTmp;
     sV = verb + wxT("=");
 wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex) const
 {
     wxString command, testcmd, sV, sTmp;
     sV = verb + wxT("=");

+

     // list of verb = command pairs for this mimetype
     wxMimeTypeCommands * sPairs = m_aEntries [nIndex];
 
     // list of verb = command pairs for this mimetype
     wxMimeTypeCommands * sPairs = m_aEntries [nIndex];
 


@@ -2138,6 +2222,7 @@ wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex
         if ( sTmp.Contains(sV) )
             command = sTmp.AfterFirst(wxT('='));
     }
         if ( sTmp.Contains(sV) )
             command = sTmp.AfterFirst(wxT('='));
     }

+

     return command;
 }
 
     return command;
 }
 


@@ -2148,10 +2233,11 @@ void wxMimeTypesManagerImpl::AddFallback(const wxFileTypeInfo& filetype)
     wxString extensions;
     const wxArrayString& exts = filetype.GetExtensions();
     size_t nExts = exts.GetCount();
     wxString extensions;
     const wxArrayString& exts = filetype.GetExtensions();
     size_t nExts = exts.GetCount();

-    for ( size_t nExt = 0; nExt < nExts; nExt++ ) {
-        if ( nExt > 0 ) {
+    for ( size_t nExt = 0; nExt < nExts; nExt++ )
+    {
+        if ( nExt > 0 )

             extensions += wxT(' ');
             extensions += wxT(' ');

-        }
+

         extensions += exts[nExt];
     }
 
         extensions += exts[nExt];
     }
 


@@ -2181,11 +2267,11 @@ void wxMimeTypesManagerImpl::AddMimeTypeInfo(const wxString& strMimeType,
 
     while (!sTmp.empty())
     {
 
     while (!sTmp.empty())
     {

-        sExts.Add (sTmp.AfterLast(wxT(' ')));
+        sExts.Add(sTmp.AfterLast(wxT(' ')));

         sTmp = sTmp.BeforeLast(wxT(' '));
     }
 
         sTmp = sTmp.BeforeLast(wxT(' '));
     }
 

-    AddToMimeData (strMimeType, strIcon, NULL, sExts, strDesc, true);
+    AddToMimeData(strMimeType, strIcon, NULL, sExts, strDesc, true);

 }
 
 void wxMimeTypesManagerImpl::AddMailcapInfo(const wxString& strType,
 }
 
 void wxMimeTypesManagerImpl::AddMailcapInfo(const wxString& strType,


@@ -2204,8 +2290,7 @@ void wxMimeTypesManagerImpl::AddMailcapInfo(const wxString& strType,
     wxString strIcon;
     wxArrayString strExtensions;
 
     wxString strIcon;
     wxArrayString strExtensions;
 

-    AddToMimeData (strType, strIcon, entry, strExtensions, strDesc, true);
-
+    AddToMimeData(strType, strIcon, entry, strExtensions, strDesc, true);

 }
 
 bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
 }
 
 bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)


@@ -2215,7 +2300,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
 
     wxTextFile file(strFileName);
 #if defined(__WXGTK20__) && wxUSE_UNICODE
 
     wxTextFile file(strFileName);
 #if defined(__WXGTK20__) && wxUSE_UNICODE

-    if ( !file.Open( wxConvUTF8) )
+    if ( !file.Open(wxConvUTF8) )

 #else
     if ( !file.Open() )
 #endif
 #else
     if ( !file.Open() )
 #endif


@@ -2228,11 +2313,13 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
     const wxChar *pc = NULL;
     for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
     {
     const wxChar *pc = NULL;
     for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
     {

-        if ( pc == NULL ) {
+        if ( pc == NULL )
+        {

             // now we're at the start of the line
             pc = file[nLine].c_str();
         }
             // now we're at the start of the line
             pc = file[nLine].c_str();
         }

-        else {
+        else
+        {

             // we didn't finish with the previous line yet
             nLine--;
         }
             // we didn't finish with the previous line yet
             nLine--;
         }


@@ -2242,7 +2329,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
             pc++;
 
         // comment or blank line?
             pc++;
 
         // comment or blank line?

-        if ( *pc == wxT('#') || !*pc ) {
+        if ( *pc == wxT('#') || !*pc )
+        {

             // skip the whole line
             pc = NULL;
             continue;
             // skip the whole line
             pc = NULL;
             continue;


@@ -2250,12 +2338,14 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
 
         // detect file format
         const wxChar *pEqualSign = wxStrchr(pc, wxT('='));
 
         // detect file format
         const wxChar *pEqualSign = wxStrchr(pc, wxT('='));

-        if ( pEqualSign == NULL ) {
+        if ( pEqualSign == NULL )
+        {

             // brief format
             // ------------
 
             // first field is mime type
             // brief format
             // ------------
 
             // first field is mime type

-            for ( strMimeType.Empty(); !wxIsspace(*pc) && *pc != wxT('\0'); pc++ ) {
+            for ( strMimeType.Empty(); !wxIsspace(*pc) && *pc != wxT('\0'); pc++ )
+            {

                 strMimeType += *pc;
             }
 
                 strMimeType += *pc;
             }
 


@@ -2269,7 +2359,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
             // no description...
             strDesc.Empty();
         }
             // no description...
             strDesc.Empty();
         }

-        else {
+        else
+        {

             // expanded format
             // ---------------
 
             // expanded format
             // ---------------
 


@@ -2281,15 +2372,18 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
               ;
 
             const wxChar *pEnd;
               ;
 
             const wxChar *pEnd;

-            if ( *pc == wxT('"') ) {
+            if ( *pc == wxT('"') )
+            {

                 // the string is quoted and ends at the matching quote
                 pEnd = wxStrchr(++pc, wxT('"'));
                 // the string is quoted and ends at the matching quote
                 pEnd = wxStrchr(++pc, wxT('"'));

-                if ( pEnd == NULL ) {
-                    wxLogWarning(_("Mime.types file %s, line %d: unterminated quoted string."),
+                if ( pEnd == NULL )
+                {
+                    wxLogWarning(wxT("Mime.types file %s, line %d: unterminated quoted string."),

                                  strFileName.c_str(), nLine + 1);
                 }
             }
                                  strFileName.c_str(), nLine + 1);
                 }
             }

-            else {
+            else
+            {

                 // unquoted string ends at the first space or at the end of
                 // line
                 for ( pEnd = pc; *pEnd && !wxIsspace(*pEnd); pEnd++ )
                 // unquoted string ends at the first space or at the end of
                 // line
                 for ( pEnd = pc; *pEnd && !wxIsspace(*pEnd); pEnd++ )


@@ -2300,7 +2394,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
             wxString strRHS(pc, pEnd - pc);
 
             // check what follows this entry
             wxString strRHS(pc, pEnd - pc);
 
             // check what follows this entry

-            if ( *pEnd == wxT('"') ) {
+            if ( *pEnd == wxT('"') )
+            {

                 // skip this quote
                 pEnd++;
             }
                 // skip this quote
                 pEnd++;
             }


@@ -2310,38 +2405,43 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
 
             // if there is something left, it may be either a '\\' to continue
             // the line or the next field of the same entry
 
             // if there is something left, it may be either a '\\' to continue
             // the line or the next field of the same entry

-            bool entryEnded = *pc == wxT('\0'),
-                 nextFieldOnSameLine = false;
-            if ( !entryEnded ) {
+            bool entryEnded = *pc == wxT('\0');
+            bool nextFieldOnSameLine = false;
+            if ( !entryEnded )
+            {

                 nextFieldOnSameLine = ((*pc != wxT('\\')) || (pc[1] != wxT('\0')));
             }
 
             // now see what we got
                 nextFieldOnSameLine = ((*pc != wxT('\\')) || (pc[1] != wxT('\0')));
             }
 
             // now see what we got

-            if ( strLHS == wxT("type") ) {
+            if ( strLHS == wxT("type") )
+            {

                 strMimeType = strRHS;
             }
                 strMimeType = strRHS;
             }

-            else if ( strLHS.StartsWith(wxT("desc")) ) {
+            else if ( strLHS.StartsWith(wxT("desc")) )
+            {

                 strDesc = strRHS;
             }
                 strDesc = strRHS;
             }

-            else if ( strLHS == wxT("exts") ) {
+            else if ( strLHS == wxT("exts") )
+            {

                 strExtensions = strRHS;
             }
                 strExtensions = strRHS;
             }

-            else if ( strLHS == _T("icon") )
+            else if ( strLHS == wxT("icon") )

             {
                 // this one is simply ignored: it usually refers to Netscape
                 // built in icons which are useless for us anyhow
             }
             {
                 // this one is simply ignored: it usually refers to Netscape
                 // built in icons which are useless for us anyhow
             }

-            else if ( !strLHS.StartsWith(_T("x-")) )
+            else if ( !strLHS.StartsWith(wxT("x-")) )

             {
                 // we suppose that all fields starting with "X-" are
                 // unregistered extensions according to the standard practice,
                 // but it may be worth telling the user about other junk in
                 // his mime.types file
             {
                 // we suppose that all fields starting with "X-" are
                 // unregistered extensions according to the standard practice,
                 // but it may be worth telling the user about other junk in
                 // his mime.types file

-                wxLogWarning(_("Unknown field in file %s, line %d: '%s'."),
+                wxLogWarning(wxT("Unknown field in file %s, line %d: '%s'."),

                              strFileName.c_str(), nLine + 1, strLHS.c_str());
             }
 
                              strFileName.c_str(), nLine + 1, strLHS.c_str());
             }
 

-            if ( !entryEnded ) {
+            if ( !entryEnded )
+            {

                 if ( !nextFieldOnSameLine )
                     pc = NULL;
                 //else: don't reset it
                 if ( !nextFieldOnSameLine )
                     pc = NULL;
                 //else: don't reset it


@@ -2439,7 +2539,6 @@ wxMimeTypesManagerImpl::ProcessOtherMailcapField(MailcapLineData& data,
                 wxLogTrace(TRACE_MIME_TEST,
                            wxT("Test '%s' for mime type '%s' succeeded."),
                            rhs.c_str(), data.type.c_str());
                 wxLogTrace(TRACE_MIME_TEST,
                            wxT("Test '%s' for mime type '%s' succeeded."),
                            rhs.c_str(), data.type.c_str());

-

             }
             else
             {
             }
             else
             {


@@ -2498,7 +2597,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
 
     wxTextFile file(strFileName);
 #if defined(__WXGTK20__) && wxUSE_UNICODE
 
     wxTextFile file(strFileName);
 #if defined(__WXGTK20__) && wxUSE_UNICODE

-    if ( !file.Open( wxConvUTF8) )
+    if ( !file.Open(wxConvUTF8) )

 #else
     if ( !file.Open() )
 #endif
 #else
     if ( !file.Open() )
 #endif


@@ -2540,7 +2639,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
             Field_Type,
             Field_OpenCmd,
             Field_Other
             Field_Type,
             Field_OpenCmd,
             Field_Other

-        } currentToken = Field_Type;
+        }
+        currentToken = Field_Type;

 
         // the flags and field values on the current line
         MailcapLineData data;
 
         // the flags and field values on the current line
         MailcapLineData data;


@@ -2598,7 +2698,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
                             {
                                 // I don't think that this is a valid mailcap
                                 // entry, but try to interpret it somehow
                             {
                                 // I don't think that this is a valid mailcap
                                 // entry, but try to interpret it somehow

-                                data.type = _T('*');
+                                data.type = wxT('*');

                             }
 
                             if ( data.type.Find(wxT('/')) == wxNOT_FOUND )
                             }
 
                             if ( data.type.Find(wxT('/')) == wxNOT_FOUND )


@@ -2664,14 +2764,13 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // check that we really read something reasonable
         if ( currentToken < Field_Other )
         {
         // check that we really read something reasonable
         if ( currentToken < Field_Other )
         {

-            wxLogWarning(_("Mailcap file %s, line %d: incomplete entry ignored."),
+            wxLogWarning(wxT("Mailcap file %s, line %d: incomplete entry ignored."),

                          strFileName.c_str(), nLine + 1);
 
             continue;
         }
 
                          strFileName.c_str(), nLine + 1);
 
             continue;
         }
 

-        // if the test command failed, it's as if the entry were not there at
-        // all
+        // if the test command failed, it's as if the entry were not there at all

         if ( data.testfailed )
         {
             continue;
         if ( data.testfailed )
         {
             continue;


@@ -2687,19 +2786,19 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // is a bad idea (FIXME)
         if ( data.copiousoutput )
         {
         // is a bad idea (FIXME)
         if ( data.copiousoutput )
         {

-            const wxChar *p = wxGetenv(_T("PAGER"));
-            data.cmdOpen << _T(" | ") << (p ? p : _T("more"));
+            const wxChar *p = wxGetenv(wxT("PAGER"));
+            data.cmdOpen << wxT(" | ") << (p ? p : wxT("more"));

         }
 
         if ( data.needsterminal )
         {
         }
 
         if ( data.needsterminal )
         {

-            data.cmdOpen = wxString::Format(_T("xterm -e sh -c '%s'"),
+            data.cmdOpen = wxString::Format(wxT("xterm -e sh -c '%s'"),

                                             data.cmdOpen.c_str());
         }
 
         if ( !data.cmdOpen.empty() )
         {
                                             data.cmdOpen.c_str());
         }
 
         if ( !data.cmdOpen.empty() )
         {

-            data.verbs.Insert(_T("open"), 0);
+            data.verbs.Insert(wxT("open"), 0);

             data.commands.Insert(data.cmdOpen, 0);
         }
 
             data.commands.Insert(data.cmdOpen, 0);
         }
 


@@ -2723,9 +2822,9 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
                             aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;
         }
 
                             aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;
         }
 

-        wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),
+        wxLogTrace(TRACE_MIME, wxT("mailcap %s: %s [%s]"),

                    data.type.c_str(), data.cmdOpen.c_str(),
                    data.type.c_str(), data.cmdOpen.c_str(),

-                   overwrite ? _T("replace") : _T("add"));
+                   overwrite ? wxT("replace") : wxT("add"));

 
         int n = AddToMimeData
                 (
 
         int n = AddToMimeData
                 (


@@ -2758,7 +2857,7 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
     {
         // don't return template types from here (i.e. anything containg '*')
         type = m_aTypes[n];
     {
         // don't return template types from here (i.e. anything containg '*')
         type = m_aTypes[n];

-        if ( type.Find(_T('*')) == wxNOT_FOUND )
+        if ( type.Find(wxT('*')) == wxNOT_FOUND )

         {
             mimetypes.Add(type);
         }
         {
             mimetypes.Add(type);
         }


@@ -2774,14 +2873,14 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {
     wxArrayString sMimeTypes;
 bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {
     wxArrayString sMimeTypes;

-    ft->GetMimeTypes (sMimeTypes);
+    ft->GetMimeTypes(sMimeTypes);

 
     wxString sMime;
     size_t i;
     for (i = 0; i < sMimeTypes.GetCount(); i ++)
     {
         sMime = sMimeTypes.Item(i);
 
     wxString sMime;
     size_t i;
     for (i = 0; i < sMimeTypes.GetCount(); i ++)
     {
         sMime = sMimeTypes.Item(i);

-        int nIndex = m_aTypes.Index (sMime);
+        int nIndex = m_aTypes.Index(sMime);

         if ( nIndex == wxNOT_FOUND)
         {
             // error if we get here ??
         if ( nIndex == wxNOT_FOUND)
         {
             // error if we get here ??


@@ -2789,7 +2888,7 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
         }
         else
         {
         }
         else
         {

-            WriteMimeInfo(nIndex, true );
+            WriteMimeInfo(nIndex, true);

             m_aTypes.RemoveAt(nIndex);
             m_aEntries.RemoveAt(nIndex);
             m_aExtensions.RemoveAt(nIndex);
             m_aTypes.RemoveAt(nIndex);
             m_aEntries.RemoveAt(nIndex);
             m_aExtensions.RemoveAt(nIndex);


@@ -2814,12 +2913,12 @@ static bool IsKnownUnimportantField(const wxString& fieldAll)
 {
     static const wxChar *knownFields[] =
     {
 {
     static const wxChar *knownFields[] =
     {

-        _T("x-mozilla-flags"),
-        _T("nametemplate"),
-        _T("textualnewlines"),
+        wxT("x-mozilla-flags"),
+        wxT("nametemplate"),
+        wxT("textualnewlines"),

     };
 
     };
 

-    wxString field = fieldAll.BeforeFirst(_T('='));
+    wxString field = fieldAll.BeforeFirst(wxT('='));

     for ( size_t n = 0; n < WXSIZEOF(knownFields); n++ )
     {
         if ( field.CmpNoCase(knownFields[n]) == 0 )
     for ( size_t n = 0; n < WXSIZEOF(knownFields); n++ )
     {
         if ( field.CmpNoCase(knownFields[n]) == 0 )