Sync to Wine-0_9:

Francois Gouget <fgouget@free.fr>
- Use "static const" rather than "const static" as gcc -W complains
  about the former.
Michal Suchanek <hramrach@gmail.com>
- Make Czech font selection dialog usable.

svn path=/trunk/; revision=18794

diff --git a/reactos/lib/comdlg32/cdlg_Cs.rc b/reactos/lib/comdlg32/cdlg_Cs.rc
index 30153af..7b8677b 100644 (file)
--- a/reactos/lib/comdlg32/cdlg_Cs.rc
+++ b/reactos/lib/comdlg32/cdlg_Cs.rc
@@ -115,15 +115,35 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-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\9eí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\9a&krtnutí", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX        "&Podtr\9eení", 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\9a \9elu\9douè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
 }
 
 

diff --git a/reactos/lib/comdlg32/filedlg.c b/reactos/lib/comdlg32/filedlg.c
index 95b856f..78fc1c6 100644 (file)
--- a/reactos/lib/comdlg32/filedlg.c
+++ b/reactos/lib/comdlg32/filedlg.c
@@ -2500,7 +2500,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
  */
 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','\\',

diff --git a/reactos/lib/comdlg32/printdlg.c b/reactos/lib/comdlg32/printdlg.c
index 7b7ed9d..964a78f 100644 (file)
--- a/reactos/lib/comdlg32/printdlg.c
+++ b/reactos/lib/comdlg32/printdlg.c
@@ -1270,10 +1270,10 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
 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 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) {
 }
 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 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 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;