More build system polishing.. mostly. Some stuff ported over from

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 5f86b8f068ddcbae87e5fc6e474bbe08f2b1d4b1..1d16f85fce9af79868d4f7baef1df0382e08d34a 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -119,7 +119,6 @@ public:
 
     wxString GetVerb (size_t i)
     {
 
     wxString GetVerb (size_t i)
     {

-        if (i < 0) return wxEmptyString;

         if (i > GetCount() ) return wxEmptyString;
         wxString sTmp = Item(i).BeforeFirst(wxT('='));
         return sTmp;
         if (i > GetCount() ) return wxEmptyString;
         wxString sTmp = Item(i).BeforeFirst(wxT('='));
         return sTmp;


@@ -127,7 +126,6 @@ public:
 
     wxString GetCmd (size_t i)
     {
 
     wxString GetCmd (size_t i)
     {

-        if (i < 0) return wxEmptyString;

         if (i > GetCount() ) return wxEmptyString;
         wxString sTmp = Item(i).AfterFirst(wxT('='));
         return sTmp;
         if (i > GetCount() ) return wxEmptyString;
         wxString sTmp = Item(i).AfterFirst(wxT('='));
         return sTmp;


@@ -197,7 +195,6 @@ public:
 
     wxString GetVerb (size_t i)
     {
 
     wxString GetVerb (size_t i)
     {

-        if (i < 0) return wxEmptyString;

         if (i > GetLineCount() ) return wxEmptyString;
         wxString sTmp = GetLine(i).BeforeFirst(wxT('='));
         return sTmp;
         if (i > GetLineCount() ) return wxEmptyString;
         wxString sTmp = GetLine(i).BeforeFirst(wxT('='));
         return sTmp;


@@ -205,7 +202,6 @@ public:
 
     wxString GetCmd (size_t i)
     {
 
     wxString GetCmd (size_t i)
     {

-        if (i < 0) return wxEmptyString;

         if (i > GetLineCount() ) return wxEmptyString;
         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;
         if (i > GetLineCount() ) return wxEmptyString;
         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;


@@ -299,10 +295,13 @@ static bool IsKnownUnimportantField(const wxString& field);
 //  a) for "brief" format:
 //      <mime type>  <space separated list of extensions>
 //  b) for "expanded" format:
 //  a) for "brief" format:
 //      <mime type>  <space separated list of extensions>
 //  b) for "expanded" format:

-//      type=<mime type> \ 
-//      desc="<description>" \ 
+//      type=<mime type> BACKSLASH
+//      desc="<description>" BACKSLASH

 //      exts="<comma separated list of extensions>"
 //
 //      exts="<comma separated list of extensions>"
 //

+// (where BACKSLASH is a literal '\\' which we can't put here because cpp
+// misinterprets it)
+//

 // We try to autodetect the format of mime.types: if a non-comment line starts
 // with "type=" we assume the second format, otherwise the first one.
 
 // We try to autodetect the format of mime.types: if a non-comment line starts
 // with "type=" we assume the second format, otherwise the first one.
 


@@ -1110,17 +1109,19 @@ wxString wxFileTypeImpl::GetExpandedCommand(const wxString & verb, const wxFileT
     return wxFileType::ExpandCommand(sTmp, params);
 }
 
     return wxFileType::ExpandCommand(sTmp, params);
 }
 

-bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */,
-                 int *iconIndex /*= NULL*/) const
+bool wxFileTypeImpl::GetIcon(wxIcon *icon,
+                             wxString *iconFile /*= NULL */,
+                             int *iconIndex /*= NULL*/) const

 
 {
 
 {

+#if wxUSE_GUI

     wxString sTmp;
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.IsEmpty() )
     wxString sTmp;
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.IsEmpty() )

-        {
-            sTmp = m_manager->m_aIcons[m_index[i]];
-            i ++;
-        }
+    {
+        sTmp = m_manager->m_aIcons[m_index[i]];
+        i ++;
+    }

     if ( sTmp.IsEmpty () ) return FALSE;
 
     wxIcon icn;
     if ( sTmp.IsEmpty () ) return FALSE;
 
     wxIcon icn;


@@ -1131,14 +1132,16 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */,
         icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY);
 
     if ( icn.Ok() )
         icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY);
 
     if ( icn.Ok() )

-      {
-      *icon = icn;
-      if (iconFile) *iconFile = sTmp;
-      if (iconIndex) *iconIndex = 0;
-      return TRUE;
-      }
-        return FALSE;
+    {
+        *icon = icn;
+        if (iconFile) *iconFile = sTmp;
+        if (iconIndex) *iconIndex = 0;
+        return TRUE;

     }
     }

+#endif // wxUSE_GUI
+
+    return FALSE;
+}

 
 
 bool
 
 
 bool


@@ -2199,7 +2202,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // the flags and field values on the current line
         bool needsterminal = FALSE,
              copiousoutput = FALSE;
         // the flags and field values on the current line
         bool needsterminal = FALSE,
              copiousoutput = FALSE;

-        wxMimeArrayString *entry;
+        wxMimeArrayString *entry = NULL; // suppress compiler warning

 
         wxString strType,
                  strOpenCmd,
 
         wxString strType,
                  strOpenCmd,


@@ -2524,11 +2527,11 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
         else
         {
             WriteMimeInfo(nIndex, TRUE );
         else
         {
             WriteMimeInfo(nIndex, TRUE );

-            m_aTypes.Remove (nIndex);
-            m_aEntries.Remove (nIndex);
-            m_aExtensions.Remove (nIndex);
-            m_aDescriptions.Remove (nIndex);
-            m_aIcons.Remove (nIndex);
+            m_aTypes.RemoveAt(nIndex);
+            m_aEntries.RemoveAt(nIndex);
+            m_aExtensions.RemoveAt(nIndex);
+            m_aDescriptions.RemoveAt(nIndex);
+            m_aIcons.RemoveAt(nIndex);

         }
     }
     // check data integrity
         }
     }
     // check data integrity