diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 08e7f08a49..3f986176d7 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -434,8 +434,8 @@ void CFrame::OnPlay(wxCommandEvent& WXUNUSED (event)) void CFrame::OnStop(wxCommandEvent& WXUNUSED (event)) { // Ask for confirmation in case the user accidently clicked Stop - int answer = wxMessageBox("Are you sure you want to stop the current emulation?", - "Confirm", wxYES_NO); + int answer = wxMessageBox(wxT("Are you sure you want to stop the current emulation?"), + wxT("Confirm"), wxYES_NO); if (answer == wxYES && Core::GetState() != Core::CORE_UNINITIALIZED) { diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 10535180ff..92f0296b07 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -299,7 +299,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event) freeblocks = BE16(memoryCard[slot]->bat.FreeBlocks); { wxString Foobar; - Foobar.Printf("Only %d blocks available", freeblocks); + Foobar.Printf(wxT("Only %d blocks available"), freeblocks); wxMessageBox(Foobar,wxT("Failure"),wxOK); } break; diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp index d77c2f35aa..f7fb85c3b0 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.cpp @@ -181,9 +181,10 @@ SetTitle(wxT("Sound Debugging")); m_settings->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); m_settings->SetMinSize(wxSize(m_settings->GetSize().GetWidth() - 40, m_settings->GetCount() * 15)); +#ifdef _WIN32 for (int i = 0; i < m_settings->GetCount(); ++i) m_settings->GetItem(i)->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); - +#endif m_checkSizer2->Add(m_settings, 0, 0, 0); // ------------------------ diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp index 7548066607..936b9b58a2 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp @@ -55,7 +55,7 @@ is closed */ // ------------- void startConsoleWin(int width, int height, char* fname) { -#if defined(DEBUG_HLE) defined(_WIN32) +#if defined(DEBUG_HLE) && defined(_WIN32) AllocConsole(); @@ -220,4 +220,4 @@ HWND GetConsoleHwnd(void) return(hwndFound); } -#endif // win32 \ No newline at end of file +#endif // win32