diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 650e51165b..d1e3b30179 100644
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -159,7 +159,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
     
     wxMemoryOutputStream mems;
-    if (image.Ok() && image.SaveFile(mems, type))
+    if (image.Ok() && image.SaveFile(mems, (int)type))
         m_Hash -> Put(filename, new MemFSHashObj(mems));
     else
     {
diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 7daf6eb98b..9a2081bf94 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -1655,8 +1655,10 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
     }
 
     dc.SetBackgroundMode(wxTRANSPARENT);
-    dc.DrawText( item->GetText(), image_w + item->GetX(), (wxCoord)item->GetY()
-                 + ((total_h > text_h) ? (total_h - text_h)/2 : 0));
+    int extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0;
+    dc.DrawText( item->GetText(),
+                 (wxCoord)(image_w + item->GetX()),
+                 (wxCoord)(item->GetY() + extraH));
 
     // restore normal font
     dc.SetFont( m_normalFont );