Commit 5ae5da91 authored by Alexander Nicolaysen Sørnes's avatar Alexander Nicolaysen Sørnes Committed by Alexandre Julliard

wordpad: Add date/time toolbar button.

parent 4c6c9e59
...@@ -927,6 +927,7 @@ programs/winhelp/winhelp ...@@ -927,6 +927,7 @@ programs/winhelp/winhelp
programs/winver/winver programs/winver/winver
programs/wordpad/formatbar.bmp programs/wordpad/formatbar.bmp
programs/wordpad/rsrc.res programs/wordpad/rsrc.res
programs/wordpad/toolbar.bmp
programs/wordpad/wordpad programs/wordpad/wordpad
programs/wordpad/wordpad.ico programs/wordpad/wordpad.ico
programs/xcopy/rsrc.res programs/xcopy/rsrc.res
......
...@@ -16,6 +16,7 @@ RC_SRCS = rsrc.rc ...@@ -16,6 +16,7 @@ RC_SRCS = rsrc.rc
RC_BINSRC = rsrc.rc RC_BINSRC = rsrc.rc
RC_BINARIES = \ RC_BINARIES = \
formatbar.bmp \ formatbar.bmp \
toolbar.bmp \
wordpad.ico wordpad.ico
@MAKE_PROG_RULES@ @MAKE_PROG_RULES@
......
...@@ -72,9 +72,10 @@ ...@@ -72,9 +72,10 @@
#define IDD_DATETIME 2100 #define IDD_DATETIME 2100
#define IDB_FORMATBAR 100 #define IDB_TOOLBAR 100
#define IDB_FORMATBAR 101
#define IDI_WORDPAD 101 #define IDI_WORDPAD 102
#define STRING_ALL_FILES 1400 #define STRING_ALL_FILES 1400
#define STRING_TEXT_FILES_TXT 1401 #define STRING_TEXT_FILES_TXT 1401
......
...@@ -39,6 +39,27 @@ BEGIN ...@@ -39,6 +39,27 @@ BEGIN
"S", ID_FILE_SAVE, VIRTKEY, CONTROL "S", ID_FILE_SAVE, VIRTKEY, CONTROL
END END
/* BINRES toolbar.bmp */
IDB_TOOLBAR BITMAP "toolbar.bmp"
/* {
'42 4d f6 00 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00'
'00 00 80 00 00 00 12 0b 00 00 12 0b 00 00 00 00'
'00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
'00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
'00 00 80 80 80 00 c0 c0 c0 00 00 00 ff 00 00 ff'
'00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff'
'00 00 ff ff ff 00 88 88 88 88 88 33 33 88 88 88'
'88 88 83 33 33 38 88 88 88 88 33 33 33 33 88 88'
'88 88 33 30 00 03 8f ff ff ff 33 30 33 33 8f 0f'
'f0 0f 33 30 33 33 8f 0f 0f f0 f3 30 33 38 8f 0f'
'ff f0 f8 33 33 88 8f 0f f0 0f f8 88 88 88 8f 0f'
'ff f0 f8 88 88 88 8f 0f 0f f0 f8 88 88 88 8f 0f'
'f0 0f f8 88 88 88 8f ff ff ff f8 88 88 88 84 44'
'44 44 48 88 88 88 84 44 44 44 48 88 88 88 88 88'
'88 88 88 88 88 88'
} */
/* BINRES formatbar.bmp */ /* BINRES formatbar.bmp */
IDB_FORMATBAR BITMAP "formatbar.bmp" IDB_FORMATBAR BITMAP "formatbar.bmp"
/* { /* {
......
...@@ -511,7 +511,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) ...@@ -511,7 +511,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON,
IDC_TOOLBAR, IDC_TOOLBAR,
0, hInstance, 0, 1, hInstance, IDB_TOOLBAR,
NULL, 0, NULL, 0,
24, 24, 16, 16, sizeof(TBBUTTON)); 24, 24, 16, 16, sizeof(TBBUTTON));
...@@ -533,6 +533,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) ...@@ -533,6 +533,8 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
AddButton(hToolBarWnd, nStdBitmaps+STD_PASTE, ID_EDIT_PASTE); AddButton(hToolBarWnd, nStdBitmaps+STD_PASTE, ID_EDIT_PASTE);
AddButton(hToolBarWnd, nStdBitmaps+STD_UNDO, ID_EDIT_UNDO); AddButton(hToolBarWnd, nStdBitmaps+STD_UNDO, ID_EDIT_UNDO);
AddButton(hToolBarWnd, nStdBitmaps+STD_REDOW, ID_EDIT_REDO); AddButton(hToolBarWnd, nStdBitmaps+STD_REDOW, ID_EDIT_REDO);
AddSeparator(hToolBarWnd);
AddButton(hToolBarWnd, 0, ID_DATETIME);
SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0); SendMessageW(hToolBarWnd, TB_AUTOSIZE, 0, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment