actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate C++11 branch into 5_1-new

Browse Source
This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenTextEntry.h
+13 -13
View File
@@ -42,32 +42,32 @@ public:
RString sQuestion,
RString sInitialAnswer,
int iMaxInputLength,
bool(*Validate)(const RString &sAnswer,RString &sErrorOut) = NULL,
void(*OnOK)(const RString &sAnswer) = NULL,
void(*OnCancel)() = NULL,
bool(*Validate)(const RString &sAnswer,RString &sErrorOut) = nullptr,
void(*OnOK)(const RString &sAnswer) = nullptr,
void(*OnCancel)() = nullptr,
bool bPassword = false,
bool (*ValidateAppend)(const RString &sAnswerBeforeChar, RString &sAppend) = NULL,
RString (*FormatAnswerForDisplay)(const RString &sAnswer) = NULL
bool (*ValidateAppend)(const RString &sAnswerBeforeChar, RString &sAppend) = nullptr,
RString (*FormatAnswerForDisplay)(const RString &sAnswer) = nullptr
);
static void TextEntry(
ScreenMessage smSendOnPop,
RString sQuestion,
RString sInitialAnswer,
int iMaxInputLength,
bool(*Validate)(const RString &sAnswer,RString &sErrorOut) = NULL,
void(*OnOK)(const RString &sAnswer) = NULL,
void(*OnCancel)() = NULL,
bool(*Validate)(const RString &sAnswer,RString &sErrorOut) = nullptr,
void(*OnOK)(const RString &sAnswer) = nullptr,
void(*OnCancel)() = nullptr,
bool bPassword = false,
bool (*ValidateAppend)(const RString &sAnswerBeforeChar, RString &sAppend) = NULL,
RString (*FormatAnswerForDisplay)(const RString &sAnswer) = NULL
bool (*ValidateAppend)(const RString &sAnswerBeforeChar, RString &sAppend) = nullptr,
RString (*FormatAnswerForDisplay)(const RString &sAnswer) = nullptr
);
static void Password(
ScreenMessage smSendOnPop,
const RString &sQuestion,
void(*OnOK)(const RString &sPassword) = NULL,
void(*OnCancel)() = NULL )
void(*OnOK)(const RString &sPassword) = nullptr,
void(*OnCancel)() = nullptr )
{
TextEntry( smSendOnPop, sQuestion, "", 255, NULL, OnOK, OnCancel, true );
TextEntry( smSendOnPop, sQuestion, "", 255, nullptr, OnOK, OnCancel, true );
}
struct TextEntrySettings {