zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'string-literals' of https://github.com/Edward850/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-02-26 11:59:07 +01:00
commit bcfa8da4a3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/win32/i_crash.cpp
View file

@ -1967,8 +1967,8 @@ static INT_PTR CALLBACK OverviewDlgProc (HWND hDlg, UINT message, WPARAM wParam,
SendMessage (edit, EM_AUTOURLDETECT, TRUE, 0); SendMessage (edit, EM_AUTOURLDETECT, TRUE, 0);
SendMessage (edit, WM_SETTEXT, 0, (LPARAM)"Please tell us about this problem.\n" SendMessage (edit, WM_SETTEXT, 0, (LPARAM)"Please tell us about this problem.\n"
"The information will NOT be sent to Microsoft.\n\n" "The information will NOT be sent to Microsoft.\n\n"
"An error report has been created that you can submit to help improve "GAMENAME". " "An error report has been created that you can submit to help improve " GAMENAME ". "
"You can either save it to disk and make a report in the bugs forum at "FORUM_URL", " "You can either save it to disk and make a report in the bugs forum at " FORUM_URL ", "
"or you can send it directly without letting other people know about it."); "or you can send it directly without letting other people know about it.");
SendMessage (edit, EM_SETSEL, 0, 81); SendMessage (edit, EM_SETSEL, 0, 81);
SendMessage (edit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFormat); SendMessage (edit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&charFormat);

2
src/win32/i_input.cpp
View file

@ -164,7 +164,7 @@ CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CUSTOM_CVAR(Bool, norawinput, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL) CUSTOM_CVAR(Bool, norawinput, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
{ {
Printf("This won't take effect until "GAMENAME" is restarted.\n"); Printf("This won't take effect until " GAMENAME " is restarted.\n");
} }
extern int chatmodeon; extern int chatmodeon;

4
src/win32/i_main.cpp
View file

@ -713,7 +713,7 @@ void ShowErrorPane(const char *text)
if (text != NULL) if (text != NULL)
{ {
char caption[100]; char caption[100];
mysnprintf(caption, countof(caption), "Fatal Error - "GAMESIG" %s "X64" (%s)", GetVersionString(), GetGitTime()); mysnprintf(caption, countof(caption), "Fatal Error - " GAMESIG " %s " X64 " (%s)", GetVersionString(), GetGitTime());
SetWindowText (Window, caption); SetWindowText (Window, caption);
ErrorIcon = CreateWindowEx (WS_EX_NOPARENTNOTIFY, "STATIC", NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SS_OWNERDRAW, 0, 0, 0, 0, Window, NULL, g_hInst, NULL); ErrorIcon = CreateWindowEx (WS_EX_NOPARENTNOTIFY, "STATIC", NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SS_OWNERDRAW, 0, 0, 0, 0, Window, NULL, g_hInst, NULL);
if (ErrorIcon != NULL) if (ErrorIcon != NULL)
@ -946,7 +946,7 @@ void DoMain (HINSTANCE hInstance)
/* create window */ /* create window */
char caption[100]; char caption[100];
mysnprintf(caption, countof(caption), ""GAMESIG" %s "X64" (%s)", GetVersionString(), GetGitTime()); mysnprintf(caption, countof(caption), "" GAMESIG " %s " X64 " (%s)", GetVersionString(), GetGitTime());
Window = CreateWindowEx( Window = CreateWindowEx(
WS_EX_APPWINDOW, WS_EX_APPWINDOW,
(LPCTSTR)WinClassName, (LPCTSTR)WinClassName,