Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Win32: Simplify Change Nickname code and slightly change InputBox_GetString to take a const default value. We don't modify it.

Browse source
This commit is contained in:
The Dax 2013-08-23 06:26:08 -04:00
parent 09dc4ac09b
commit e97def9c66
6 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Host.h
View file

@ -67,7 +67,7 @@ public:
#ifdef _WIN32
// Implement this on your platform to grab text input from the user for whatever purpose.
virtual bool InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outlength) { return false; }
virtual bool InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outlength) { return false; }
#endif
// Used for headless.

11
UI/GameSettingsScreen.cpp
View file

@ -477,19 +477,10 @@ UI::EventReturn GameSettingsScreen::OnChangeNickname(UI::EventParams &e) {
char name[name_len];
memset(name, 0, sizeof(name));
size_t default_len = strlen(g_Config.sNickName.c_str());
char *defaultVal = new char[default_len];
memset(defaultVal, 0, sizeof(default_len));
strcat(defaultVal, g_Config.sNickName.c_str());
if (host->InputBoxGetString("Enter a new PSP nickname", defaultVal, name, name_len)) {
if (host->InputBoxGetString("Enter a new PSP nickname", g_Config.sNickName.c_str(), name, name_len)) {
g_Config.sNickName = name;
}
delete [] defaultVal;
defaultVal = NULL;
#endif
return UI::EVENT_DONE;
}

2
Windows/InputBox.cpp
View file

@ -59,7 +59,7 @@ bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defa
return false;
}
bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength)
bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, const TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength)
{
const char *defaultTitle = "Input value";
defaultSelected = true;

2
Windows/InputBox.h
View file

@ -4,5 +4,5 @@
#include "Common/CommonWindows.h"
bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, bool selected = true);
bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength);
bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, const TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength);
bool InputBox_GetHex(HINSTANCE hInst, HWND hParent, TCHAR *title, u32 defaultvalue, u32 &outvalue);

2
Windows/WindowsHost.cpp
View file

@ -287,7 +287,7 @@ void WindowsHost::UpdateConsolePosition()
}
}
bool WindowsHost::InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outLength)
bool WindowsHost::InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outLength)
{
return InputBox_GetString(MainWindow::GetHInstance(), MainWindow::GetHWND(), title, defaultValue, outValue, outLength);
}

2
Windows/WindowsHost.h
View file

@ -55,7 +55,7 @@ public:
void SaveSymbolMap();
void SetWindowTitle(const char *message);
bool InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outlength);
bool InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outlength);
std::shared_ptr<KeyboardDevice> keyboard;