diff --git a/include/wx/timer.h b/include/wx/timer.h
index 30e48fca44..aee24ca764 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -158,8 +158,8 @@ public:
     // ctor starts the stop watch
     wxStopWatch()        { Start(); }
     void Start(long t = 0);
-    inline void Pause()  { m_pause = GetElapsedTime(); }
-    inline void Resume() { Start(m_pause); }
+    void Pause()  { m_pause = GetElapsedTime(); }
+    void Resume() { Start(m_pause); }
 
     // get elapsed time since the last Start() or Pause() in milliseconds
     long Time() const;
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index a26d420e68..f6b77360a9 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -113,7 +113,7 @@ void wxStopWatch::Start(long t)
     m_pause = 0;
 }
 
-inline long wxStopWatch::GetElapsedTime() const
+long wxStopWatch::GetElapsedTime() const
 {
     return (wxGetLocalTimeMillis() - m_t0).GetLo();
 }
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 5a6e892e78..60b582dcfb 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -688,12 +688,12 @@ void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
     item.m_mask = wxLIST_MASK_DATA;
 
     item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
-    while ( item.m_itemId != -1 ) 
+    while ( item.m_itemId != -1 )
     {
         GetItem( item );
         wxFileData *fd = (wxFileData*)item.m_data;
         delete fd;
-        item.m_data = (void*) NULL;
+        item.m_data = 0;
         SetItem( item );
         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
@@ -1171,7 +1171,7 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) 
+    while ( item.m_itemId != -1 )
     {
         m_list->GetItem( item );
         paths.Add( dir + item.m_text );
@@ -1194,7 +1194,7 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) 
+    while ( item.m_itemId != -1 )
     {
         m_list->GetItem( item );
         files.Add( item.m_text );