From 1bcef5be76c4866b46054d0981f3049e9794b1e7 Mon Sep 17 00:00:00 2001 From: magumagu9 Date: Sun, 28 Jun 2009 20:38:01 +0000 Subject: [PATCH] Misc warning fixes. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3582 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp | 1 + Source/Core/DolphinWX/Src/ARCodeAddEdit.h | 1 - Source/Core/DolphinWX/Src/CheatsWindow.cpp | 2 +- Source/Core/DolphinWX/Src/Frame.cpp | 5 ++--- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp index 3c9c7c2e2f..cdba7267c1 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp @@ -39,6 +39,7 @@ CARCodeAddEdit::~CARCodeAddEdit() void CARCodeAddEdit::CreateGUIControls(int _selection) { + ActionReplay::ARCode tempEntries; wxString currentName = wxT("Insert name here.."); if (_selection == -1) diff --git a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h index eaef8ffa07..7e3b346906 100644 --- a/Source/Core/DolphinWX/Src/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/Src/ARCodeAddEdit.h @@ -54,7 +54,6 @@ class CARCodeAddEdit : public wxDialog void UpdateTextCtrl(ActionReplay::ARCode arCode); int selection; - ActionReplay::ARCode tempEntries; }; #endif // __PATCH_ADDEDIT_h__ diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp index 727e25e016..b0c681691a 100644 --- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp @@ -165,7 +165,7 @@ void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (e m_Label_Codename->SetLabel(wxT("Name: ") + wxString::FromAscii(code.name.c_str())); char text[CHAR_MAX]; char* numcodes = text; - sprintf(numcodes, "Number of Codes: %lu", code.ops.size()); + sprintf(numcodes, "Number of Codes: %lu", (unsigned long)code.ops.size()); m_Label_NumCodes->SetLabel(wxString::FromAscii(numcodes)); m_ListBox_CodesList->Clear(); for (size_t j = 0; j < code.ops.size(); j++) diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index b2e02baa70..ab24dc8465 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -315,10 +315,9 @@ CFrame::CFrame(bool showLogWindow, const wxSize& size, long style) : wxFrame(parent, id, title, pos, size, style) + , m_pStatusBar(NULL), bRenderToMain(true), HaveLeds(false) + , HaveSpeakers(false), m_Panel(NULL) , m_bLogWindow(showLogWindow || SConfig::GetInstance().m_InterfaceLogWindow) - , m_pStatusBar(NULL), bRenderToMain(true) - , HaveLeds(false), HaveSpeakers(false) - , m_Panel(NULL) , m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) #if wxUSE_TIMER , m_timer(this)