piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reformat all the things. Have fun with merge conflicts.

Browse Source
This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Source/Core/DolphinWX/LogWindow.h
View File

@ -25,47 +25,43 @@ class wxTextCtrl;
class CLogWindow : public wxPanel, LogListener
{
public:
CLogWindow(CFrame* parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const wxString& name = _("Log")
);
~CLogWindow();
CLogWindow(CFrame* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL,
const wxString& name = _("Log"));
~CLogWindow();
void SaveSettings();
void Log(LogTypes::LOG_LEVELS, const char *text) override;
void SaveSettings();
void Log(LogTypes::LOG_LEVELS, const char* text) override;
int x, y, winpos;
int x, y, winpos;
private:
CFrame* Parent;
wxFont DefaultFont, MonoSpaceFont;
std::vector<wxFont> LogFont;
wxTimer m_LogTimer;
LogManager* m_LogManager;
std::queue<std::pair<u8, wxString> > msgQueue;
bool m_writeFile, m_writeWindow, m_LogAccess;
CFrame* Parent;
wxFont DefaultFont, MonoSpaceFont;
std::vector<wxFont> LogFont;
wxTimer m_LogTimer;
LogManager* m_LogManager;
std::queue<std::pair<u8, wxString>> msgQueue;
bool m_writeFile, m_writeWindow, m_LogAccess;
// Controls
wxBoxSizer* sBottom;
wxTextCtrl* m_Log;
wxTextCtrl* m_cmdline;
wxChoice* m_FontChoice;
wxCheckBox* m_WrapLine;
wxButton* m_clear_log_btn;
// Controls
wxBoxSizer* sBottom;
wxTextCtrl* m_Log;
wxTextCtrl* m_cmdline;
wxChoice* m_FontChoice;
wxCheckBox* m_WrapLine;
wxButton* m_clear_log_btn;
std::mutex m_LogSection;
std::mutex m_LogSection;
wxTextCtrl* CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
void CreateGUIControls();
void PopulateBottom();
void UnPopulateBottom();
void OnClose(wxCloseEvent& event);
void OnFontChange(wxCommandEvent& event);
void OnWrapLineCheck(wxCommandEvent& event);
void OnClear(wxCommandEvent& event);
void OnLogTimer(wxTimerEvent& WXUNUSED(event));
void UpdateLog();
wxTextCtrl* CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
void CreateGUIControls();
void PopulateBottom();
void UnPopulateBottom();
void OnClose(wxCloseEvent& event);
void OnFontChange(wxCommandEvent& event);
void OnWrapLineCheck(wxCommandEvent& event);
void OnClear(wxCommandEvent& event);
void OnLogTimer(wxTimerEvent& WXUNUSED(event));
void UpdateLog();
};