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

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
This commit is contained in:
Jordan Woyak 2011-01-25 11:14:11 +00:00
parent efa9e81ca0
commit d2044a7a23
6 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/Thread.h
View File

@ -26,6 +26,7 @@
#define USE_BEGINTHREADEX
#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#ifdef USE_BEGINTHREADEX

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -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"));

2
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -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"));

3
Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
View File

@ -1,9 +1,6 @@
#include "GeckoCodeDiag.h"
#ifdef _WIN32
#define _WINSOCK2API_
#endif
#include <SFML/Network/Http.hpp>
#include <sstream>

2
Source/Core/DolphinWX/Src/NetPlay.h
View File

@ -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"

1
Source/Core/DolphinWX/Src/stdafx.h
View File

@ -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