Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc
Modified: trunk/reactos/lib/comdlg32/filedlg.c
Modified: trunk/reactos/lib/comdlg32/printdlg.c
--- trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-10-27 19:01:29 UTC (rev 18793)
+++ trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-10-27 19:03:58 UTC (rev 18794)
@@ -115,15 +115,35 @@
}
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 13, 54, 264, 147
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "PÝsmo"
FONT 8, "MS Shell Dlg"
{
- LTEXT "PÝsmo:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "PÝ&smo:", 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 "St&yl:",stc2 ,108,3,44,9
+ COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "&Velikost:",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 "Storno",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Pou×Ýt", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nßpovýda" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+ GROUPBOX "Efekty",grp1,6,72,84,34,WS_GROUP
+ CHECKBOX "P°eÜ&krtnutÝ", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&Podtr×enÝ", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+ LTEXT "&Barva:", 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 "Ukßzka",grp2,98,72,120,36,WS_GROUP
+ CTEXT "P°ÝliÜ ×luØouÞk² k¨? ·pýl ´ßbelskÚ k¾dy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Skr&ipt:",stc7 ,98,114,40,9
+ COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
--- trunk/reactos/lib/comdlg32/filedlg.c 2005-10-27 19:01:29 UTC (rev 18793)
+++ trunk/reactos/lib/comdlg32/filedlg.c 2005-10-27 19:03:58 UTC (rev 18794)
@@ -2500,7 +2500,7 @@
*/
static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) {
HKEY hKey;
- const static WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\',
+ static const WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\',
'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\',
'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\',
--- trunk/reactos/lib/comdlg32/printdlg.c 2005-10-27 19:01:29 UTC (rev 18793)
+++ trunk/reactos/lib/comdlg32/printdlg.c 2005-10-27 19:03:58 UTC (rev 18794)
@@ -1270,10 +1270,10 @@
static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
PRINT_PTRW* PrintStructures)
{
- const static WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
- const static WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
- const static WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 };
- const static WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 };
+ static const WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
+ static const WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 };
+ static const WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 };
+ static const WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 };
LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
DEVNAMES *pdn;
DEVMODEW *pdm;
@@ -2366,9 +2366,9 @@
}
static void
_c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) {
- const static WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 };
- const static WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 };
- const static WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 };
+ static const WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 };
+ static const WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 };
+ static const WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 };
lstrcpyW(strout, UNDEF);
if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
wsprintfW(strout,mm_fmt,(size*1.0)/100.0);
@@ -3182,7 +3182,7 @@
static INT_PTR CALLBACK
PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- const static WCHAR __WINE_PAGESETUPDLGDATA[] =
+ static const WCHAR __WINE_PAGESETUPDLGDATA[] =
{ '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E',
'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 };
PageSetupDataW *pda;