mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 07:47:07 +00:00
A few cosmetic changes plus fixes for problems spotted by Dmitry
Timoshkov.
This commit is contained in:
parent
b0ef56c2b7
commit
83ad886aad
|
@ -34,7 +34,7 @@ static LRESULT WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wPara
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ShowLastError()
|
VOID ShowLastError()
|
||||||
{
|
{
|
||||||
DWORD error = GetLastError();
|
DWORD error = GetLastError();
|
||||||
if (error != NO_ERROR)
|
if (error != NO_ERROR)
|
||||||
|
@ -505,10 +505,7 @@ VOID DIALOG_FilePrinterSetup(VOID)
|
||||||
|
|
||||||
VOID DIALOG_FileExit(VOID)
|
VOID DIALOG_FileExit(VOID)
|
||||||
{
|
{
|
||||||
if (DoCloseFile())
|
PostMessage(Globals.hMainWnd, WM_CLOSE, 0, 0l);
|
||||||
{
|
|
||||||
PostQuitMessage(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID DIALOG_EditUndo(VOID)
|
VOID DIALOG_EditUndo(VOID)
|
||||||
|
|
|
@ -50,6 +50,7 @@ VOID DIALOG_PageSetup(VOID);
|
||||||
VOID DIALOG_TimeDate(VOID);
|
VOID DIALOG_TimeDate(VOID);
|
||||||
|
|
||||||
/* utility functions */
|
/* utility functions */
|
||||||
|
VOID ShowLastError();
|
||||||
BOOL FileExists(LPSTR szFilename);
|
BOOL FileExists(LPSTR szFilename);
|
||||||
BOOL DoCloseFile(void);
|
BOOL DoCloseFile(void);
|
||||||
void DoOpenFile(LPSTR szFileName);
|
void DoOpenFile(LPSTR szFileName);
|
||||||
|
|
|
@ -117,16 +117,20 @@ LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam,
|
||||||
{
|
{
|
||||||
RECT rc;
|
RECT rc;
|
||||||
GetClientRect(hWnd, &rc);
|
GetClientRect(hWnd, &rc);
|
||||||
LoadLibrary("RichEd32.dll");
|
if (LoadLibrary("RichEd32.dll"))
|
||||||
|
{
|
||||||
Globals.hEdit =
|
Globals.hEdit =
|
||||||
CreateWindow("RICHEDIT", "",
|
CreateWindow("RICHEDIT", "",
|
||||||
WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL |
|
WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL |
|
||||||
ES_AUTOVSCROLL | ES_MULTILINE,
|
ES_AUTOVSCROLL | ES_MULTILINE,
|
||||||
0, 0, rc.right, rc.bottom, hWnd,
|
0, 0, rc.right, rc.bottom, hWnd,
|
||||||
NULL, Globals.hInstance, NULL);
|
NULL, Globals.hInstance, NULL);
|
||||||
NOTEPAD_InitData();
|
NOTEPAD_InitData();
|
||||||
DIALOG_FileNew();
|
DIALOG_FileNew();
|
||||||
|
} else {
|
||||||
|
ShowLastError();
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -140,9 +144,8 @@ LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam,
|
||||||
|
|
||||||
case WM_CLOSE:
|
case WM_CLOSE:
|
||||||
if (DoCloseFile()) {
|
if (DoCloseFile()) {
|
||||||
PostQuitMessage(0);
|
DestroyWindow(hWnd);
|
||||||
}
|
}
|
||||||
DestroyWindow(hWnd);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_DESTROY:
|
case WM_DESTROY:
|
||||||
|
@ -150,13 +153,9 @@ LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
{
|
SetWindowPos(Globals.hEdit, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam),
|
||||||
RECT rc;
|
|
||||||
GetClientRect(hWnd, &rc);
|
|
||||||
SetWindowPos(Globals.hEdit, NULL, 0, 0, rc.right, rc.bottom,
|
|
||||||
SWP_NOOWNERZORDER | SWP_NOZORDER);
|
SWP_NOOWNERZORDER | SWP_NOZORDER);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case WM_DROPFILES:
|
case WM_DROPFILES:
|
||||||
{
|
{
|
||||||
|
@ -295,6 +294,11 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
|
||||||
CreateWindow(className, winName, WS_OVERLAPPEDWINDOW,
|
CreateWindow(className, winName, WS_OVERLAPPEDWINDOW,
|
||||||
CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
|
CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
|
||||||
NULL, NULL, Globals.hInstance, NULL);
|
NULL, NULL, Globals.hInstance, NULL);
|
||||||
|
if (!Globals.hMainWnd)
|
||||||
|
{
|
||||||
|
ShowLastError();
|
||||||
|
ExitProcess(1);
|
||||||
|
}
|
||||||
|
|
||||||
ShowWindow(Globals.hMainWnd, show);
|
ShowWindow(Globals.hMainWnd, show);
|
||||||
UpdateWindow(Globals.hMainWnd);
|
UpdateWindow(Globals.hMainWnd);
|
||||||
|
|
Loading…
Reference in a new issue