Module: wine Branch: master Commit: c7ca877b127456cae2c26537ddea8115ee89348f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca877b127456cae2c26537dd...
Author: Alexander Nicolaysen Sørnes alex@thehandofagony.com Date: Wed Jul 18 15:47:01 2007 +0200
wordpad: Fix formatbar for native comctl32/XP.
---
programs/wordpad/rsrc.rc | 106 +++++++++++++++++++++++--------------------- programs/wordpad/wordpad.c | 6 +-- 2 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 85d7434..89f1485 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -67,58 +67,62 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" /* BINRES formatbar.bmp */ IDB_FORMATBAR BITMAP "formatbar.bmp" /* { - '42 4d 3e 03 00 00 00 00 00 00 3e 00 00 00 28 00' + '42 4d 76 03 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 60 00 00 00 10 00 00 00 01 00 04 00 00 00' - '00 00 00 03 00 00 12 0b 00 00 12 0b 00 00 02 00' - '00 00 02 00 00 00 c0 c0 c0 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '11 11 11 11 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 11 11 11 11 11 10 00 00 11' - '11 11 11 11 11 00 00 00 01 11 11 11 11 00 00 01' - '11 11 11 00 00 00 00 00 11 11 10 00 00 00 00 00' - '01 11 11 10 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 10 00 00 00 00 00' - '01 11 11 10 00 00 00 11 11 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 10 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' - '11 11 11 11 00 00 00 00 00 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '11 11 11 00 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 10 00 00 00 11' - '11 11 11 11 11 00 00 00 00 00 01 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 01 00 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 11 11 00 00 00' - '11 11 11 11 00 00 00 01 11 11 11 11 11 00 00 01' - '10 00 01 10 00 00 00 00 00 00 10 00 00 00 00 00' - '10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01' - '11 11 11 00 00 00 00 00 00 11 11 10 00 00 00 00' - '10 00 00 01 00 00 00 11 11 11 11 00 00 00 00 00' - '01 11 11 10 00 00 00 00 00 11 11 11 11 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 11 11 11 11 11 11 00 00 11' - '11 11 11 11 11 00 00 11 11 11 11 11 11 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 03 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 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 00 00 00 00 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' + '00 00 00 00 08 88 88 00 00 00 00 00 00 88 88 88' + '80 00 00 00 00 88 88 80 00 00 00 88 88 88 88 88' + '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 08 88 88 88 88 88 80 00 00 08 88 88 88 00' + '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 08 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 88' + '88 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 08 88 88 88 00 00 00 00 00 00 88 88 88' + '88 88 80 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 80 88 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 08 88 80 08 88 88 88 88' + '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 00 00 88 88 88 00 00 00 00 88 88 88 80' + '00 00 00 00 00 88 88 80 08 88 80 08 88 88 88 88' + '88 88 08 88 88 88 88 88 08 88 88 80 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 80 00 00 00 88 88 88 88 88' + '88 00 00 08 88 88 88 88 08 88 88 80 88 88 88 00' + '00 00 00 88 88 88 88 88 80 00 00 08 88 88 88 88' + '88 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 00' + '00 00 00 00 00 88 88 00 00 00 00 00 00 88 88 00' + '00 00 00 00 00 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88 88 88 88 88 88 88 88 88 88 88' + '88 88 88 88 88 88' } */
/* BINRES wordpad.ico */ diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c91ad39..34aba59 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -656,11 +656,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
hFormatBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, - IDC_FORMATBAR, 6, hInstance, IDB_FORMATBAR, NULL, 0, 24, 24, 16, 16, sizeof(TBBUTTON)); - - ab.hInst = HINST_COMMCTRL; - ab.nID = IDB_STD_SMALL_COLOR; - nStdBitmaps = SendMessageW(hFormatBarWnd, TB_ADDBITMAP, 6, (LPARAM)&ab); + IDC_FORMATBAR, 6, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON));
AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC);