diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 1f6306ab53..d651e06da8 100644
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -396,7 +396,7 @@ void wxEmulatorContainer::OnEraseBackground(wxEraseEvent& event)
         dc = new wxClientDC(this);
     }
 
-    dc->SetBackground(wxBrush(wxGetApp().m_emulatorInfo.m_emulatorBackgroundColour, wxSOLID));
+    dc->SetBackground(wxBrush(wxGetApp().m_emulatorInfo.m_emulatorBackgroundColour));
     dc->Clear();
 
     if (!event.GetDC())
diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index 8ad412e589..583a33706b 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -119,15 +119,15 @@ bool hvApp::OnInit()
         }
         else if ( argStr.Find( wxT("--Style") )  >= 0 )
         {
-            long i;
+            long style;
             wxString numb = argStr.AfterLast(wxT('e'));
-            if ( !(numb.ToLong(&i) ) )
+            if ( !(numb.ToLong(&style) ) )
             {
                 wxLogError( wxT("Integer conversion failed for --Style") );
             }
             else
             {
-                istyle = i;
+                istyle = style;
             }
         }
         else
diff --git a/utils/screenshotgen/src/customcombo.cpp b/utils/screenshotgen/src/customcombo.cpp
index 6d133d02b0..4e1b35fce9 100644
--- a/utils/screenshotgen/src/customcombo.cpp
+++ b/utils/screenshotgen/src/customcombo.cpp
@@ -58,29 +58,29 @@ void PenStyleComboBox::OnDrawItem( wxDC& dc,
     r.Deflate(3);
     r.height -= 2;
 
-    int penStyle = wxSOLID;
+    wxPenStyle penStyle = wxPENSTYLE_SOLID;
 //    if ( item == 1 )
-//        penStyle = wxTRANSPARENT;
+//        penStyle = wxPENSTYLE_TRANSPARENT;
 //    else if ( item == 2 )
-//        penStyle = wxDOT;
+//        penStyle = wxPENSTYLE_DOT;
 //    else if ( item == 3 )
-//        penStyle = wxLONG_DASH;
+//        penStyle = wxPENSTYLE_LONG_DASH;
 //    else if ( item == 4 )
-//        penStyle = wxSHORT_DASH;
+//        penStyle = wxPENSTYLE_SHORT_DASH;
     if ( item == 0 )
-        penStyle = wxDOT_DASH;
+        penStyle = wxPENSTYLE_DOT_DASH;
     else if ( item == 1 )
-        penStyle = wxBDIAGONAL_HATCH;
+        penStyle = wxPENSTYLE_BDIAGONAL_HATCH;
     else if ( item == 2 )
-        penStyle = wxCROSSDIAG_HATCH;
+        penStyle = wxPENSTYLE_CROSSDIAG_HATCH;
 //    else if ( item == 8 )
-//        penStyle = wxFDIAGONAL_HATCH;
+//        penStyle = wxPENSTYLE_FDIAGONAL_HATCH;
 //    else if ( item == 9 )
-//        penStyle = wxCROSS_HATCH;
+//        penStyle = wxPENSTYLE_CROSS_HATCH;
 //    else if ( item == 10 )
-//        penStyle = wxHORIZONTAL_HATCH;
+//        penStyle = wxPENSTYLE_HORIZONTAL_HATCH;
 //    else if ( item == 11 )
-//        penStyle = wxVERTICAL_HATCH;
+//        penStyle = wxPENSTYLE_VERTICAL_HATCH;
 
     wxPen pen( dc.GetTextForeground(), 3, penStyle );