Fix remaining incorrect dialog definitions using DS_SHELLFONT as an extended style.

svn path=/trunk/; revision=27708

diff --git a/reactos/base/applications/games/solitaire/lang/bg-BG.rc b/reactos/base/applications/games/solitaire/lang/bg-BG.rc
index c1f1ec7..3087a52 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/bg-BG.rc
+++ b/reactos/base/applications/games/solitaire/lang/bg-BG.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Íàñòðîéêè"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Êàðòè", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Èçòåãëè &åäíà", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc
index 2989c98..616c57b 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/de-DE.rc
+++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Optionen"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Karten", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc
index 92f61f0..62c58bc 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/en-US.rc
+++ b/reactos/base/applications/games/solitaire/lang/en-US.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc
index 05cdd39..0a65033 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/es-ES.rc
+++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
index 0d41c62..5edb886 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc
+++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cartes", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/id-ID.rc b/reactos/base/applications/games/solitaire/lang/id-ID.rc
index 2aa203b..408544f 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/id-ID.rc
+++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc
@@ -14,10 +14,9 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc
index e80baf2..539f735 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/it-IT.rc
+++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc
@@ -14,10 +14,9 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Carte", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/nb-NO.rc b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
index 30f1cdf..46a1b26 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/nb-NO.rc
+++ b/reactos/base/applications/games/solitaire/lang/nb-NO.rc
@@ -14,10 +14,9 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
index 9f8fec1..8951135 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc
+++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc
@@ -12,10 +12,9 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Opcje"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Karty", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/ru-RU.rc b/reactos/base/applications/games/solitaire/lang/ru-RU.rc
index 98472a4..90a1b33 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/ru-RU.rc
+++ b/reactos/base/applications/games/solitaire/lang/ru-RU.rc
@@ -8,10 +8,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 /* Äèàëîãè */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Íàñòðîéêè"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Êàðòû", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Ïî &îäíîé", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/sk-SK.rc b/reactos/base/applications/games/solitaire/lang/sk-SK.rc
index a12a0dd..910fc03 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/sk-SK.rc
+++ b/reactos/base/applications/games/solitaire/lang/sk-SK.rc
@@ -15,10 +15,9 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Mo\9enosti"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Karty", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "\8daha\9d &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc
index 497f510..eb26f8b 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/th-TH.rc
+++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc
@@ -14,10 +14,9 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
index 51a2c02..fcac22a 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc
+++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc
@@ -13,10 +13,9 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Ïàðàìåòðè"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Êàðòè", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
index 8ac0e32..6c53808 100644 (file)
--- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc
+++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc
@@ -14,10 +14,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 /* Dialogs */
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Options"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX        "Cards", -1, 7, 7, 65, 40
     AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP

diff --git a/reactos/dll/cpl/mmsys/lang/uk-UA.rc b/reactos/dll/cpl/mmsys/lang/uk-UA.rc
index 2d7a74c..6ba8cf1 100644 (file)
--- a/reactos/dll/cpl/mmsys/lang/uk-UA.rc
+++ b/reactos/dll/cpl/mmsys/lang/uk-UA.rc
@@ -12,7 +12,6 @@ IDD_HARDWARE DIALOGEX 0, 0, 246, 228
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Óñòàòêóâàííÿ"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 BEGIN
 END
 

diff --git a/reactos/dll/cpl/timedate/lang/uk-UA.rc b/reactos/dll/cpl/timedate/lang/uk-UA.rc
index e099311..81f7fb8 100644 (file)
--- a/reactos/dll/cpl/timedate/lang/uk-UA.rc
+++ b/reactos/dll/cpl/timedate/lang/uk-UA.rc
@@ -12,7 +12,6 @@ IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Äàòà é ÷àñ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
-EXSTYLE DS_SHELLFONT
 BEGIN
     GROUPBOX "&Äàòà", -1, 4, 2, 122, 125
     COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -36,7 +35,6 @@ IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "×àñîâèé ïîÿñ"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
-EXSTYLE DS_SHELLFONT
 BEGIN
     COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136,
              CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
@@ -49,7 +47,6 @@ IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "×àñ ²íòåðíåòó"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
-EXSTYLE DS_SHELLFONT
 BEGIN
     COMBOBOX        IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     AUTOCHECKBOX    "Àâòîìàòè÷íî ñèíõðîí³çóâàòè ç ñåðâåðîì ÷àñó â ²íòåðíåò³", IDC_AUTOSYNC,