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

General: Reordered the CFrame definitions 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4146 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-09-01 20:09:15 +00:00
parent 2599659022
commit b059e405f2
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -310,11 +310,12 @@ CFrame::CFrame(wxFrame* parent,
bool _UseDebugger, bool _UseDebugger,
bool ShowLogWindow, bool ShowLogWindow,
long style) long style)
: wxFrame(parent, id, title, pos, size, style) : wxFrame(parent, id, title, pos, size, style)
, m_GameListCtrl(NULL), m_pStatusBar(NULL) , m_LogWindow(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL), m_ToolBarAui(NULL)
, m_LogWindow(NULL), m_Panel(NULL), m_ToolBar(NULL), m_ToolBarDebug(NULL) , m_pStatusBar(NULL), m_GameListCtrl(NULL), m_Panel(NULL)
, m_bEdit(false), m_bTabSplit(false), m_bFloatPane(false), bRenderToMain(true), HaveLeds(false), HaveSpeakers(false) , UseDebugger(_UseDebugger), m_bEdit(false), m_bTabSplit(false), m_bFloatPane(false), bRenderToMain(true)
, UseDebugger(_UseDebugger), m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) , HaveLeds(false), HaveSpeakers(false)
, m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0)
#if wxUSE_TIMER #if wxUSE_TIMER
, m_timer(this) , m_timer(this)
#endif #endif

12
Source/Core/DolphinWX/Src/Frame.h
View File

@ -66,8 +66,7 @@ class CFrame : public wxFrame
virtual ~CFrame(); virtual ~CFrame();
// These have to be public // These have to be public
wxStatusBar* m_pStatusBar;
CCodeWindow* g_pCodeWindow; CCodeWindow* g_pCodeWindow;
wxBitmap aNormalFile; wxBitmap aNormalFile;
void InitBitmaps(); void InitBitmaps();
@ -159,16 +158,17 @@ class CFrame : public wxFrame
private: private:
bool UseDebugger; wxStatusBar* m_pStatusBar;
bool m_bEdit;
bool m_bTabSplit;
bool m_bFloatPane;
wxBoxSizer* sizerPanel; wxBoxSizer* sizerPanel;
wxBoxSizer* sizerFrame; wxBoxSizer* sizerFrame;
CGameListCtrl* m_GameListCtrl; CGameListCtrl* m_GameListCtrl;
wxPanel* m_Panel; wxPanel* m_Panel;
wxToolBarToolBase* m_ToolPlay; wxToolBarToolBase* m_ToolPlay;
CLogWindow* m_LogWindow; CLogWindow* m_LogWindow;
bool UseDebugger;
bool m_bEdit;
bool m_bTabSplit;
bool m_bFloatPane;
char **drives; char **drives;