diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 06d44aac60..b6a080fc80 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -310,11 +310,12 @@ CFrame::CFrame(wxFrame* parent, bool _UseDebugger, bool ShowLogWindow, long style) - : wxFrame(parent, id, title, pos, size, style) - , m_GameListCtrl(NULL), m_pStatusBar(NULL) - , m_LogWindow(NULL), m_Panel(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL) - , m_bEdit(false), m_bTabSplit(false), m_bFloatPane(false), bRenderToMain(true), HaveLeds(false), HaveSpeakers(false) - , UseDebugger(_UseDebugger), m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) + : wxFrame(parent, id, title, pos, size, style) + , m_LogWindow(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL) + , m_pStatusBar(NULL), m_GameListCtrl(NULL), m_Panel(NULL) + , UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bFloatPane(false), bRenderToMain(true) + , HaveLeds(false), HaveSpeakers(false) + , m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) #if wxUSE_TIMER , m_timer(this) #endif diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index e3504e30b0..6b2447c469 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -66,8 +66,7 @@ class CFrame : public wxFrame virtual ~CFrame(); - // These have to be public - wxStatusBar* m_pStatusBar; + // These have to be public CCodeWindow* g_pCodeWindow; wxBitmap aNormalFile; void InitBitmaps(); @@ -159,16 +158,17 @@ class CFrame : public wxFrame private: - bool UseDebugger; - bool m_bEdit; - bool m_bTabSplit; - bool m_bFloatPane; + wxStatusBar* m_pStatusBar; wxBoxSizer* sizerPanel; wxBoxSizer* sizerFrame; CGameListCtrl* m_GameListCtrl; wxPanel* m_Panel; wxToolBarToolBase* m_ToolPlay; CLogWindow* m_LogWindow; + bool UseDebugger; + bool m_bEdit; + bool m_bTabSplit; + bool m_bFloatPane; char **drives;