ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3580 from Tilka/fix_warnings 

Fix warnings
This commit is contained in:
Ryan Houdek 2016-01-28 19:12:22 -05:00
parent e1f21602fd bf643c98aa
commit 88c232aa1b
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -131,7 +131,7 @@ void CFrame::ToggleLogConfigWindow(bool bShow)
if (bShow)
{
if (!m_LogConfigWindow)
m_LogConfigWindow = new LogConfigWindow(this, m_LogWindow, IDM_LOG_CONFIG_WINDOW);
m_LogConfigWindow = new LogConfigWindow(this, IDM_LOG_CONFIG_WINDOW);
const int nbIndex = IDM_LOG_CONFIG_WINDOW - IDM_LOG_WINDOW;
DoAddPage(m_LogConfigWindow,

4
Source/Core/DolphinWX/LogConfigWindow.cpp
View File

@ -20,9 +20,9 @@
#include "DolphinWX/LogWindow.h"
#include "DolphinWX/WxUtils.h"
LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id)
LogConfigWindow::LogConfigWindow(wxWindow* parent, wxWindowID id)
: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration"))
, m_LogWindow(log_window), enableAll(true)
, enableAll(true)
{
SetMinSize(wxSize(100, 100));
m_LogManager = LogManager::GetInstance();

4
Source/Core/DolphinWX/LogConfigWindow.h
View File

@ -7,7 +7,6 @@
#include <wx/panel.h>
class LogManager;
class CLogWindow;
class wxCheckBox;
class wxCheckListBox;
class wxRadioBox;
@ -15,7 +14,7 @@ class wxRadioBox;
class LogConfigWindow : public wxPanel
{
public:
LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id = wxID_ANY);
LogConfigWindow(wxWindow* parent, wxWindowID id = wxID_ANY);
~LogConfigWindow();
void SaveSettings();
@ -23,7 +22,6 @@ public:
private:
LogManager *m_LogManager;
CLogWindow *m_LogWindow;
bool m_writeFile, m_writeConsole, m_writeWindow;
bool enableAll;

2
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -35,7 +35,7 @@ static AVFormatContext* s_format_context = nullptr;
static AVStream* s_stream = nullptr;
static AVFrame* s_src_frame = nullptr;
static AVFrame* s_scaled_frame = nullptr;
AVPixelFormat s_pix_fmt = AV_PIX_FMT_BGR24;
static AVPixelFormat s_pix_fmt = AV_PIX_FMT_BGR24;
static uint8_t* s_yuv_buffer = nullptr;
static SwsContext* s_sws_context = nullptr;
static int s_width;