summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorStevoisiak <Stevoisiak@gmail.com>2015-02-15 14:43:31 -0500
committerStevoisiak <Stevoisiak@gmail.com>2015-02-25 10:48:21 -0500
commit93b16a4a2d5f3e6d467d1315c461aff12852b26c (patch)
tree0993e6ce422ae33a850466e8da285421a462e79f /Source/Core/DolphinWX/FrameTools.cpp
parentb8edd8aedc75ae4e2abd8c5558af94e98c7bebcb (diff)
Formatting/Whitespace Cleanup
Various fixes to formatting and whitespace
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index a54de8d651..5ae3e62076 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -189,7 +189,7 @@ wxMenuBar* CFrame::CreateMenu()
loadMenu->Append(IDM_UNDO_SAVE_STATE, GetMenuLabel(HK_UNDO_SAVE_STATE));
saveMenu->AppendSeparator();
- loadMenu->Append(IDM_LOAD_STATE_FILE, GetMenuLabel(HK_LOAD_STATE_FILE));
+ loadMenu->Append(IDM_LOAD_STATE_FILE, GetMenuLabel(HK_LOAD_STATE_FILE));
loadMenu->Append(IDM_LOAD_SELECTED_SLOT, GetMenuLabel(HK_LOAD_STATE_SLOT_SELECTED));
loadMenu->Append(IDM_UNDO_LOAD_STATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
loadMenu->AppendSeparator();
@@ -198,7 +198,7 @@ wxMenuBar* CFrame::CreateMenu()
{
loadMenu->Append(IDM_LOAD_SLOT_1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1));
saveMenu->Append(IDM_SAVE_SLOT_1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1));
- slotSelectMenu->Append(IDM_SELECT_SLOT_1 + i - 1, GetMenuLabel(HK_SELECT_STATE_SLOT_1 + i -1));
+ slotSelectMenu->Append(IDM_SELECT_SLOT_1 + i - 1, GetMenuLabel(HK_SELECT_STATE_SLOT_1 + i - 1));
}
loadMenu->AppendSeparator();
@@ -939,12 +939,12 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
{
DEVMODE dmScreenSettings;
- memset(&dmScreenSettings,0,sizeof(dmScreenSettings));
+ memset(&dmScreenSettings, 0, sizeof(dmScreenSettings));
dmScreenSettings.dmSize = sizeof(dmScreenSettings);
sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str(),
"%dx%d", &dmScreenSettings.dmPelsWidth, &dmScreenSettings.dmPelsHeight);
dmScreenSettings.dmBitsPerPel = 32;
- dmScreenSettings.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT;
+ dmScreenSettings.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT;
// Try To Set Selected Mode And Get Results. NOTE: CDS_FULLSCREEN Gets Rid Of Start Bar.
ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN);
@@ -1424,7 +1424,7 @@ void CFrame::ClearStatusBar()
void CFrame::StatusBarMessage(const char * Text, ...)
{
- const int MAX_BYTES = 1024*10;
+ const int MAX_BYTES = 1024 * 10;
char Str[MAX_BYTES];
va_list ArgPtr;
va_start(ArgPtr, Text);
@@ -1433,7 +1433,7 @@ void CFrame::StatusBarMessage(const char * Text, ...)
if (this->GetStatusBar()->IsEnabled())
{
- this->GetStatusBar()->SetStatusText(StrToWxStr(Str),0);
+ this->GetStatusBar()->SetStatusText(StrToWxStr(Str), 0);
}
}