make --static flag act on --cppflags too.

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 2332dc12ac3d429811247d8fbd8eb6e11012e5cb..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;


@@ -2531,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