ChangeLog:
Shachar Shemesh <winecode@sun.consumer.org.il>
Todo:
* Implement support for the scripts selection.
o Enum the scripts the font supports, and display the list
accordingly.
o Make the sample text use characters from the selected script
(today SOME resources included the local text, which is not
the correct behaviour).
o Implement the Unicode version of script selection properly.
Bugs:
* Non functional changes were only applied to the English resource.
I'm sorry, I'm sick (literally - I'm ill), and my sed skills are
not very good. I only performed the changes that were required in
order to keep the code functioning.
* The windows method is to pass stc5 not visible, and the commdlg
code created a BUTTON with the same ID at the same place. I'm not
sure why that is, probably so things will be visibily pleasing.
Our code, if passed not visible, will not display the sample text.
dlls/commdlg/cdlg_En.rc
* Changed all numeric resources in ChooseFont to labels for better
readability.
dlls/commdlg/cdlg_*.rc
* Changed control #1093 (sample text) to stc5 (1092) to convert to
Windows compatible numbers.
dlls/commdlg/fontdlg.c
* Changed all handling of stc6 (1093) to atc5 (1092) so that will be
compatible with Windows resource numbers.
* Added code to load the user's resources rather than our own if
CF_ENABLETEMPLATE is passed in "flags".
Index: dlls/commdlg/cdlg_Ca.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Ca.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_Ca.rc
--- dlls/commdlg/cdlg_Ca.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_Ca.rc 6 Nov 2002 20:29:08 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Exemple",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Da.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Da.rc,v
retrieving revision 1.7
diff -u -r1.7 cdlg_Da.rc
--- dlls/commdlg/cdlg_Da.rc 1 Jun 2002 02:55:49 -0000 1.7
+++ dlls/commdlg/cdlg_Da.rc 6 Nov 2002 20:30:33 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Eksempel",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_De.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_De.rc,v
retrieving revision 1.9
diff -u -r1.9 cdlg_De.rc
--- dlls/commdlg/cdlg_De.rc 1 Jun 2002 02:55:49 -0000 1.9
+++ dlls/commdlg/cdlg_De.rc 6 Nov 2002 20:30:48 -0000
@@ -166,7 +166,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Muster",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_En.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_En.rc,v
retrieving revision 1.22
diff -u -r1.22 cdlg_En.rc
--- dlls/commdlg/cdlg_En.rc 1 Jun 2002 02:55:49 -0000 1.22
+++ dlls/commdlg/cdlg_En.rc 6 Nov 2002 19:47:47 -0000
@@ -116,27 +116,27 @@
CAPTION "Font"
FONT 8, "Helv"
{
- LTEXT "&Font:",1088 ,6,3,40,9
+ LTEXT "&Font:",stc1 ,6,3,40,9
COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
- LTEXT "Font St&yle:",1089 ,108,3,44,9
+ LTEXT "Font St&yle:",stc2 ,108,3,44,9
COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
- LTEXT "&Size:",1090,179,3,30,9
+ LTEXT "&Size:",stc3,179,3,30,9
COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
PUSHBUTTON "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Apply", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Help" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
- GROUPBOX "Effects",1072,6,72,84,34,WS_GROUP
+ GROUPBOX "Effects",grp1,6,72,84,34,WS_GROUP
CHECKBOX "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
CHECKBOX "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX
- LTEXT "&Color:", 1091 ,6,110,30,9
+ LTEXT "&Color:", stc4 ,6,110,30,9
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Sample",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ GROUPBOX "Sample",grp2,98,72,160,49,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Es.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Es.rc,v
retrieving revision 1.5
diff -u -r1.5 cdlg_Es.rc
--- dlls/commdlg/cdlg_Es.rc 9 Mar 2002 23:29:34 -0000 1.5
+++ dlls/commdlg/cdlg_Es.rc 6 Nov 2002 20:31:27 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Ejemplo",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÑñ",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZzÑñ",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Fi.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Fi.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_Fi.rc
--- dlls/commdlg/cdlg_Fi.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_Fi.rc 6 Nov 2002 20:31:39 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Näyte",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Fr.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Fr.rc,v
retrieving revision 1.8
diff -u -r1.8 cdlg_Fr.rc
--- dlls/commdlg/cdlg_Fr.rc 23 Oct 2002 23:34:33 -0000 1.8
+++ dlls/commdlg/cdlg_Fr.rc 6 Nov 2002 20:31:48 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Exemple",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Hu.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Hu.rc,v
retrieving revision 1.5
diff -u -r1.5 cdlg_Hu.rc
--- dlls/commdlg/cdlg_Hu.rc 9 Mar 2002 23:29:34 -0000 1.5
+++ dlls/commdlg/cdlg_Hu.rc 6 Nov 2002 20:31:57 -0000
@@ -135,7 +135,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Minta",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÁáÕõÉé",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZzÁáÕõÉé",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_It.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_It.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_It.rc
--- dlls/commdlg/cdlg_It.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_It.rc 6 Nov 2002 20:32:05 -0000
@@ -135,7 +135,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Esempio",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
Index: dlls/commdlg/cdlg_Ja.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Ja.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_Ja.rc
--- dlls/commdlg/cdlg_Ja.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_Ja.rc 6 Nov 2002 20:32:17 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "ƒTƒ“ƒvƒ‹",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Nl.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Nl.rc,v
retrieving revision 1.7
diff -u -r1.7 cdlg_Nl.rc
--- dlls/commdlg/cdlg_Nl.rc 1 Jun 2002 02:55:49 -0000 1.7
+++ dlls/commdlg/cdlg_Nl.rc 6 Nov 2002 20:32:44 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Voorbeeld",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Pl.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Pl.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_Pl.rc
--- dlls/commdlg/cdlg_Pl.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_Pl.rc 6 Nov 2002 20:33:10 -0000
@@ -133,7 +133,7 @@
CONTROL "", 1139, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6,120,84,100
CONTROL "Przyk³ad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49
- CONTROL "AaBbYyZz\xB3", 1093, "STATIC", SS_NOPREFIX | WS_VISIBLE, 104,81,149,37
+ CONTROL "AaBbYyZz\xB3", stc5, "STATIC", SS_NOPREFIX | WS_VISIBLE, 104,81,149,37
END
/* PUSHBUTTON "&Replace", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
* PUSHBUTTON "Replace &All", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
Index: dlls/commdlg/cdlg_Pt.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Pt.rc,v
retrieving revision 1.7
diff -u -r1.7 cdlg_Pt.rc
--- dlls/commdlg/cdlg_Pt.rc 1 Jun 2002 02:55:49 -0000 1.7
+++ dlls/commdlg/cdlg_Pt.rc 6 Nov 2002 20:33:26 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Amostra",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Ru.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Ru.rc,v
retrieving revision 1.8
diff -u -r1.8 cdlg_Ru.rc
--- dlls/commdlg/cdlg_Ru.rc 1 Jun 2002 02:55:49 -0000 1.8
+++ dlls/commdlg/cdlg_Ru.rc 6 Nov 2002 20:33:33 -0000
@@ -136,7 +136,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Îáðàçåö",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Si.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Si.rc,v
retrieving revision 1.1
diff -u -r1.1 cdlg_Si.rc
--- dlls/commdlg/cdlg_Si.rc 28 Jun 2002 23:28:36 -0000 1.1
+++ dlls/commdlg/cdlg_Si.rc 6 Nov 2002 20:33:38 -0000
@@ -136,7 +136,7 @@
COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Vzorec",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Sk.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Sk.rc,v
retrieving revision 1.6
diff -u -r1.6 cdlg_Sk.rc
--- dlls/commdlg/cdlg_Sk.rc 1 Jun 2002 02:55:49 -0000 1.6
+++ dlls/commdlg/cdlg_Sk.rc 6 Nov 2002 20:33:45 -0000
@@ -138,7 +138,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Vzorka",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
Index: dlls/commdlg/cdlg_Sv.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Sv.rc,v
retrieving revision 1.7
diff -u -r1.7 cdlg_Sv.rc
--- dlls/commdlg/cdlg_Sv.rc 1 Jun 2002 02:55:49 -0000 1.7
+++ dlls/commdlg/cdlg_Sv.rc 6 Nov 2002 20:33:50 -0000
@@ -134,7 +134,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Test",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Wa.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Wa.rc,v
retrieving revision 1.7
diff -u -r1.7 cdlg_Wa.rc
--- dlls/commdlg/cdlg_Wa.rc 1 Jun 2002 02:55:49 -0000 1.7
+++ dlls/commdlg/cdlg_Wa.rc 6 Nov 2002 20:33:55 -0000
@@ -141,7 +141,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Egzimpe",1073,98,72,160,49,WS_GROUP
- CTEXT "AaBbYyZzÅåÇçÛû",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZzÅåÇçÛû",stc5,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/cdlg_Zh.rc
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/cdlg_Zh.rc,v
retrieving revision 1.4
diff -u -r1.4 cdlg_Zh.rc
--- dlls/commdlg/cdlg_Zh.rc 15 Aug 2002 21:57:36 -0000 1.4
+++ dlls/commdlg/cdlg_Zh.rc 6 Nov 2002 20:34:07 -0000
@@ -87,7 +87,7 @@
COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
GROUPBOX "¹ Àý",1073,128,72,160,49,WS_GROUP
- CTEXT "AaBbYyZz",1093,134,81,149,37,SS_NOPREFIX | WS_VISIBLE
+ CTEXT "AaBbYyZz",stc5,134,81,149,37,SS_NOPREFIX | WS_VISIBLE
}
Index: dlls/commdlg/fontdlg.c
===================================================================
RCS file: /home/sun/sources/cvs/wine/dlls/commdlg/fontdlg.c,v
retrieving revision 1.43
diff -u -r1.43 fontdlg.c
--- dlls/commdlg/fontdlg.c 1 Nov 2002 01:50:06 -0000 1.43
+++ dlls/commdlg/fontdlg.c 6 Nov 2002 20:11:12 -0000
@@ -262,14 +262,28 @@
{
LPCVOID template;
HRSRC hResInfo;
+ HINSTANCE hDlginst;
HGLOBAL hDlgTmpl;
- if (!(hResInfo = FindResourceA(COMMDLG_hInstance32, "CHOOSE_FONT", RT_DIALOGA)))
+ if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 )
{
- COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
- return FALSE;
+ hDlginst=lpChFont->hInstance;
+ if( !(hResInfo = FindResourceA(hDlginst, lpChFont->lpTemplateName,
+ RT_DIALOGA)))
+ {
+ COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+ return FALSE;
+ }
+ } else
+ {
+ hDlginst=COMMDLG_hInstance32;
+ if (!(hResInfo = FindResourceA(hDlginst, "CHOOSE_FONT", RT_DIALOGA)))
+ {
+ COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+ return FALSE;
+ }
}
- if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hResInfo )) ||
+ if (!(hDlgTmpl = LoadResource(hDlginst, hResInfo )) ||
!(template = LockResource( hDlgTmpl )))
{
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
@@ -720,7 +734,7 @@
hBitmapTT = LoadBitmapA(0, MAKEINTRESOURCEA(OBM_TRTYPE));
/* This font will be deleted by WM_COMMAND */
- SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,
+ SendDlgItemMessageA(hDlg,stc5,WM_SETFONT,
(WPARAM)CreateFontA(0, 0, 1, 1, 400, 0, 0, 0, 0, 0, 0, 0, 0, NULL),FALSE);
if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner))
@@ -959,7 +973,7 @@
LPCHOOSEFONTA lpcf)
{
if (lpcf->Flags & CF_EFFECTS)
- if (GetDlgCtrlID(HWND_32(LOWORD(lParam)))==stc6)
+ if (GetDlgCtrlID(HWND_32(LOWORD(lParam)))==stc5)
{
SetTextColor((HDC)wParam, lpcf->rgbColors);
return (LRESULT)GetStockObject(WHITE_BRUSH);
@@ -1065,9 +1079,9 @@
hFont=CreateFontIndirectA(lpxx);
if (hFont)
{
- HFONT oldFont=(HFONT)SendDlgItemMessageA(hDlg, stc6,
+ HFONT oldFont=(HFONT)SendDlgItemMessageA(hDlg, stc5,
WM_GETFONT, 0, 0);
- SendDlgItemMessageA(hDlg,stc6,WM_SETFONT,(WPARAM)hFont,TRUE);
+ SendDlgItemMessageA(hDlg,stc5,WM_SETFONT,(WPARAM)hFont,TRUE);
DeleteObject(oldFont);
}
}
@@ -1077,7 +1091,7 @@
if (i!=CB_ERR)
{
lpcf->rgbColors=textcolors[i];
- InvalidateRect( GetDlgItem(hDlg,stc6), NULL, 0 );
+ InvalidateRect( GetDlgItem(hDlg,stc5), NULL, 0 );
}
break;
@@ -1109,7 +1123,7 @@
static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- DeleteObject((HFONT)SendDlgItemMessageA(hwnd, stc6, WM_GETFONT, 0, 0));
+ DeleteObject((HFONT)SendDlgItemMessageA(hwnd, stc5, WM_GETFONT, 0, 0));
return TRUE;
}
