Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 08:25:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update WordPad to recent Wine CVS. Fixes some strange behavior for me.

Browse source 
svn path=/trunk/; revision=32762
This commit is contained in:
Daniel Reimer 2008-03-24 16:43:34 +00:00
parent 29d152f93b
commit 5830d67c51
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
reactos/base/applications/wordpad/wordpad.c
View file

@ -350,7 +350,7 @@ static void update_font_list(void)
fmt.cbSize = sizeof(fmt);
SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName);
if (!SendMessageW(hFontListEdit, WM_GETTEXT, MAX_PATH, (LPARAM)fontName)) return;
if(lstrcmpW(fontName, fmt.szFaceName))
{
@ -1212,7 +1212,7 @@ static void number_with_units(LPWSTR buffer, int number)
MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN);
}
BOOL CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message)
{
@ -1263,7 +1263,7 @@ BOOL CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
return FALSE;
}
BOOL CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK newfile_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch(message)
{
@ -1844,7 +1844,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
{
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
int ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE), hWnd,
(DLGPROC)newfile_proc);
newfile_proc);
if(ret != ID_NEWFILE_ABORT)
{
@ -2160,7 +2160,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
case ID_DATETIME:
{
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE);
DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, (DLGPROC)datetime_proc);
DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_DATETIME), hWnd, datetime_proc);
break;
}
@ -2269,7 +2269,6 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR);
HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER);
int rebarHeight = 0;
int rebarRows = 2;
if (hwndStatusBar)
{
@ -2285,13 +2284,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam )
}
if (hwndReBar)
{
if(!is_bar_visible(BANDID_TOOLBAR))
rebarRows--;
if(!is_bar_visible(BANDID_FORMATBAR))
rebarRows--;
rebarHeight = rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0) : 0;
rebarHeight = SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0);
MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rebarHeight, TRUE);
}