compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index a081998ac9a4186b476fd4bb9b6cdfe5ec376907..2d8e1623780eb18101892a366b9eb048b60fc184 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -212,7 +212,7 @@ int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const
 {
     size_t n = IndexForInsert(lItem, fnCompare);
 
 {
     size_t n = IndexForInsert(lItem, fnCompare);
 

-    return n < m_nCount && m_pItems[n] == lItem ? n : wxNOT_FOUND;
+    return n < m_nCount && m_pItems[n] == lItem ? (int)n : wxNOT_FOUND;

 }
 
 // add item at the end
 }
 
 // add item at the end

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 0bef50921138187c638e13e6b7958958761be661..e625f22269310f93baf1f87cde385e81d52f5dfc 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -3567,6 +3567,8 @@ void wxListMainWindow::RecalculatePositions()
                        GetScrollPos(wxVERTICAL),
                        TRUE );
 
                        GetScrollPos(wxVERTICAL),
                        TRUE );
 

+        // FIXME: wxGTK::wxScrolledWindow doesn't have SetTargetRect()
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)

         // we must have an integer number of lines on screen and so we fit
         // the real control size to the line height
         wxRect rect;
         // we must have an integer number of lines on screen and so we fit
         // the real control size to the line height
         wxRect rect;


@@ -3575,6 +3577,7 @@ void wxListMainWindow::RecalculatePositions()
         rect.width = clientWidth;
         rect.height = ((clientHeight - LINE_SPACING) / lineHeight)*lineHeight;
         SetTargetRect(rect);
         rect.width = clientWidth;
         rect.height = ((clientHeight - LINE_SPACING) / lineHeight)*lineHeight;
         SetTargetRect(rect);

+#endif

     }
     else // !report
     {
     }
     else // !report
     {

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 2332dc12ac3d429811247d8fbd8eb6e11012e5cb..6693d5bd8887f1c012d43e8d8c60ee3ba6f9e90b 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -2531,11 +2531,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