Alexander Nicolaysen Sørnes : wordpad: Add text alignment buttons.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5c9edfd4be83c22521c3fda1a50aaa144cfda17e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5c9edfd4be83c22521c3fda1a5...

Author: Alexander Nicolaysen Sørnes 
Date:   Tue Feb 27 15:09:24 2007 +0100

wordpad: Add text alignment buttons.

---

programs/wordpad/rsrc.rc   |   85 +++++++++++++++++++++++++++----------------
 programs/wordpad/wordpad.c |   18 ++++++++-
 2 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc
index a4c57e5..b8e3f54 100644
--- a/programs/wordpad/rsrc.rc
+++ b/programs/wordpad/rsrc.rc
@@ -42,38 +42,59 @@ END
 /* BINRES toolbar.bmp */
 IDB_TOOLBAR BITMAP "toolbar.bmp"
 /* {
- '42 4D F6 01 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 30 00 00 00 10 00 00 00 01 00 04 00 00 00'
- '00 00 80 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 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'
- '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 80'
- '00 00 00 88 88 88 88 88 00 00 08 88 88 88 88 88'
- '80 00 00 08 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 80'
- '08 88 80 08 88 88 88 88 88 08 88 88 88 88 88 88'
- '08 88 88 80 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 80'
- '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88'
- '08 88 88 80 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 80'
- '08 88 80 08 88 88 88 88 88 80 88 88 88 88 88 88'
- '08 88 88 80 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 80'
- '08 88 80 08 88 88 88 88 88 88 08 88 88 88 88 88'
- '08 88 88 80 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 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'
+ '42 4d 3e 03 00 00 00 00 00 00 3e 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'
+
 } */

#include "De.rc"
diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 2c650e0..bd0aeae 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -292,13 +292,13 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)

hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON,
       IDC_TOOLBAR,
-      3, hInstance, IDB_TOOLBAR,
+      6, hInstance, IDB_TOOLBAR,
       NULL, 0,
       24, 24, 16, 16, sizeof(TBBUTTON));

ab.hInst = HINST_COMMCTRL;
     ab.nID = IDB_STD_SMALL_COLOR;
-    nStdBitmaps = SendMessage(hToolBarWnd, TB_ADDBITMAP, 3, (LPARAM)&ab);
+    nStdBitmaps = SendMessage(hToolBarWnd, TB_ADDBITMAP, 6, (LPARAM)&ab);
     AddButton(hToolBarWnd, nStdBitmaps+STD_FILENEW, ID_FILE_NEW);
     AddButton(hToolBarWnd, nStdBitmaps+STD_FILEOPEN, ID_FILE_OPEN);
     AddButton(hToolBarWnd, nStdBitmaps+STD_FILESAVE, ID_FILE_SAVE);
@@ -317,6 +317,10 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam)
     AddButton(hToolBarWnd, 0, ID_FORMAT_BOLD);
     AddButton(hToolBarWnd, 1, ID_FORMAT_ITALIC);
     AddButton(hToolBarWnd, 2, ID_FORMAT_UNDERLINE);
+    AddSeparator(hToolBarWnd);
+    AddButton(hToolBarWnd, 3, ID_ALIGN_LEFT);
+    AddButton(hToolBarWnd, 4, ID_ALIGN_CENTER);
+    AddButton(hToolBarWnd, 5, ID_ALIGN_RIGHT);

SendMessage(hToolBarWnd, TB_ADDSTRING, 0, (LPARAM)"Exit\0");
     SendMessage(hToolBarWnd, TB_AUTOSIZE, 0, 0);
@@ -361,10 +365,14 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam)
     HWND hwndToolBar = GetDlgItem(hwndReBar, IDC_TOOLBAR);
     int from, to;
     CHARFORMAT2W fmt;
+    PARAFORMAT2 pf;

ZeroMemory(&fmt, sizeof(fmt));
     fmt.cbSize = sizeof(fmt);

+    ZeroMemory(&pf, sizeof(pf));
+    pf.cbSize = sizeof(pf);
+
     SendMessage(hwndEditor, EM_GETCHARFORMAT, TRUE, (LPARAM)&fmt);

SendMessage(hwndEditor, EM_GETSEL, (WPARAM)&from, (LPARAM)&to);
@@ -380,6 +388,12 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam)
     SendMessage(hwndToolBar, TB_INDETERMINATE, ID_FORMAT_ITALIC, !(fmt.dwMask & CFM_ITALIC));
     SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_FORMAT_UNDERLINE, (fmt.dwMask & CFM_UNDERLINE) && (fmt.dwEffects & CFE_UNDERLINE));
     SendMessage(hwndToolBar, TB_INDETERMINATE, ID_FORMAT_UNDERLINE, !(fmt.dwMask & CFM_UNDERLINE));
+
+    SendMessage(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf);
+    SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_LEFT, (pf.wAlignment == PFA_LEFT));
+    SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_CENTER, (pf.wAlignment == PFA_CENTER));
+    SendMessage(hwndToolBar, TB_CHECKBUTTON, ID_ALIGN_RIGHT, (pf.wAlignment == PFA_RIGHT));
+
     return 0;
 }