Unnecessary const_ prefix removed (blindly).

[wxWidgets.git] / utils / emulator / src / emulator.cpp

diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 4e44d87096aa3a0b124e4284e5ee7f83631f5793..6854942fdc9352b5555fc9614ad1a44f759dbcd2 100644 (file)
--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@@ -108,7 +108,9 @@ wxEmulatorApp::wxEmulatorApp()
 // 'Main program' equivalent: the program execution "starts" here
 bool wxEmulatorApp::OnInit()
 {
+#if wxUSE_LOG
     wxLog::SetTimestamp(NULL);
+#endif // wxUSE_LOG
     wxInitAllImageHandlers();
 
     wxString currentDir = wxGetCwd();
@@ -555,9 +557,9 @@ wxString wxColourToHexString(const wxColour& col)
 // Convert 6-digit hex string to a colour
 wxColour wxHexStringToColour(const wxString& hex)
 {
-    unsigned int r = wxHexToDec(hex.Mid(0, 2));
-    unsigned int g = wxHexToDec(hex.Mid(2, 2));
-    unsigned int b = wxHexToDec(hex.Mid(4, 2));
+    unsigned char r = (unsigned char)wxHexToDec(hex.Mid(0, 2));
+    unsigned char g = (unsigned char)wxHexToDec(hex.Mid(2, 2));
+    unsigned char b = (unsigned char)wxHexToDec(hex.Mid(4, 2));
 
     return wxColour(r, g, b);
 }