diff options
| author | Mat M <mathew1800@gmail.com> | 2016-09-25 16:53:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-25 16:53:46 -0400 |
| commit | e7efbf7ae58b27266daa62e4ccae6b6ce2b48fa2 (patch) | |
| tree | 55ff67a7a76144406d84aa95142210e6978937fe /Source/Core/DolphinWX/Frame.cpp | |
| parent | a1486d48efecf7cb4b3f6daff4bdbb0b5c822a31 (diff) | |
| parent | 349b27199b178fd2fb73727617ac86109c53f7aa (diff) | |
Merge pull request #4246 from leoetlino/in-class-init
In-class initialise member variables
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 5b0b8e1049..01341b316c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -386,13 +386,8 @@ static BOOL WINAPI s_ctrl_handler(DWORD fdwCtrlType) CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, bool _UseDebugger, bool _BatchMode, bool ShowLogWindow, long style) - : CRenderFrame(parent, id, title, pos, size, style), g_pCodeWindow(nullptr), - g_NetPlaySetupDiag(nullptr), g_CheatsWindow(nullptr), m_SavedPerspectives(nullptr), - m_ToolBar(nullptr), m_GameListCtrl(nullptr), m_Panel(nullptr), m_RenderFrame(nullptr), - m_RenderParent(nullptr), m_LogWindow(nullptr), m_LogConfigWindow(nullptr), - m_FifoPlayerDlg(nullptr), UseDebugger(_UseDebugger), m_bBatchMode(_BatchMode), m_bEdit(false), - m_bTabSplit(false), m_bNoDocking(false), m_bGameLoading(false), m_bClosing(false), - m_confirmStop(false), m_menubar_shadow(nullptr) + : CRenderFrame(parent, id, title, pos, size, style), UseDebugger(_UseDebugger), + m_bBatchMode(_BatchMode) { for (int i = 0; i <= IDM_CODE_WINDOW - IDM_LOG_WINDOW; i++) bFloatWindow[i] = false; |