From d2044a7a237f6d57c75893f7c7d3f5dc29b239d1 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Tue, 25 Jan 2011 11:14:11 +0000
Subject: [PATCH] Removed extra space character in "Use FPS For Limiting".
 Changed "Frame Stepping" to "Frame Advance". Some minor preprocessor cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6913 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/Thread.h             | 1 +
 Source/Core/DolphinWX/Src/ConfigMain.cpp    | 2 +-
 Source/Core/DolphinWX/Src/FrameTools.cpp    | 2 +-
 Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 3 ---
 Source/Core/DolphinWX/Src/NetPlay.h         | 2 --
 Source/Core/DolphinWX/Src/stdafx.h          | 1 +
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index 81284ce94d..5d4182f5e4 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -26,6 +26,7 @@
 #define USE_BEGINTHREADEX
 #endif
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #ifdef USE_BEGINTHREADEX
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index ef679516fc..ec7487525c 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -459,7 +459,7 @@ void CConfigMain::CreateGUIControls()
 	EnableCheats = new wxCheckBox(GeneralPage, ID_ENABLECHEATS, _("Enable Cheats"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	// Framelimit
 	Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit, 0, wxDefaultValidator);
-	UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Use FPS  For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
+	UseFPSForLimiting = new wxCheckBox(GeneralPage, ID_FRAMELIMIT_USEFPSFORLIMITING, _("Use FPS For Limiting"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Core Settings - Advanced
 	sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index acfd250b08..c33b364872 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -139,7 +139,7 @@ void CFrame::CreateMenu()
 	emulationMenu->Append(IDM_RECORDEXPORT, _("Export Recording..."));
 	emulationMenu->AppendSeparator();
 	
-	emulationMenu->Append(IDM_FRAMESTEP, _("&Frame Stepping"), wxEmptyString, wxITEM_CHECK);
+	emulationMenu->Append(IDM_FRAMESTEP, _("&Frame Advance"), wxEmptyString, wxITEM_CHECK);
 
 	wxMenu *skippingMenu = new wxMenu;
 	emulationMenu->AppendSubMenu(skippingMenu, _("Frame S&kipping"));
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
index 82d480afb7..c491424376 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
@@ -1,9 +1,6 @@
 
 #include "GeckoCodeDiag.h"
 
-#ifdef _WIN32
-#define _WINSOCK2API_
-#endif
 #include <SFML/Network/Http.hpp>
 
 #include <sstream>
diff --git a/Source/Core/DolphinWX/Src/NetPlay.h b/Source/Core/DolphinWX/Src/NetPlay.h
index 07a664e1b7..cdc6305c67 100644
--- a/Source/Core/DolphinWX/Src/NetPlay.h
+++ b/Source/Core/DolphinWX/Src/NetPlay.h
@@ -3,11 +3,9 @@
 
 #include "Common.h"
 #include "CommonTypes.h"
-//#define WIN32_LEAN_AND_MEAN
 #include "Thread.h"
 #include "Timer.h"
 
-#define _WINSOCK2API_
 #include <SFML/Network.hpp>
 
 #include "GCPadStatus.h"
diff --git a/Source/Core/DolphinWX/Src/stdafx.h b/Source/Core/DolphinWX/Src/stdafx.h
index b9c22663b0..032dc317f4 100644
--- a/Source/Core/DolphinWX/Src/stdafx.h
+++ b/Source/Core/DolphinWX/Src/stdafx.h
@@ -26,6 +26,7 @@
 #define _WIN32_IE       0x0500
 #define _RICHEDIT_VER   0x0100
 
+#define WIN32_LEAN_AND_MEAN
 #include <wx/wx.h> // wxWidgets
 
 #if defined _M_IX86