winecfg: Remove color depth. It's source of problems for number of users.

Vitaliy Margolen wine-patch at kievinfo.com
Mon Jan 30 20:47:24 CST 2006 

ChangeLog:
winecfg: Remove color depth. It's source of problems for number of users.
If depth set to anything other then screen Wine will fail to run any GUI
application.

 programs/winecfg/Bg.rc       |    3 --
 programs/winecfg/Cs.rc       |    3 --
 programs/winecfg/De.rc       |    3 --
 programs/winecfg/En.rc       |   33 ++++++++++++--------------
 programs/winecfg/Es.rc       |    3 --
 programs/winecfg/Fi.rc       |    3 --
 programs/winecfg/Fr.rc       |    3 --
 programs/winecfg/It.rc       |    3 --
 programs/winecfg/Ja.rc       |    3 --
 programs/winecfg/Ko.rc       |    3 --
 programs/winecfg/Nl.rc       |    3 --
 programs/winecfg/No.rc       |    3 --
 programs/winecfg/Pt.rc       |    3 --
 programs/winecfg/Ru.rc       |   32 ++++++++++++-------------
 programs/winecfg/resource.h  |    1 -
 programs/winecfg/x11drvdlg.c |   54 +++---------------------------------------
 16 files changed, 34 insertions(+), 122 deletions(-)
-------------- next part --------------
5ec7b35d82253e82f4f0bfaeb0182412c70cca6d
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index 2e2f153..50844b7 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -63,9 +63,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Äúëáî÷èíà íà öâåòîâåòå: ",IDC_STATIC,8,10,100,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,110,8,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Íàñòðîéêà íà ïðîçîðöèòå ",IDC_STATIC,8,25,244,110
 
     CONTROL	    "Ðàçðåøè íà DirectX ïðèëîæåíèÿòà äà çàêëþ÷âàò ìèøêàòà",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index 6f4f845..a4707fb 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Barevná hloubka obrazovky: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     CONTROL	    "Povolit aplikacím DirectX dr¾et ukazatel my¹i ve svém oknì ?",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
     CONTROL	    "Povolit double buffering plochy",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8
     
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index ba643cf..44d65fa 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Bildschirmfarbtiefe: ",IDC_STATIC,8,10,70,30
-    COMBOBOX        IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Fenstereinstellungen ",IDC_STATIC,8,25,244,180
 
     CONTROL         "Erlaube DirectX Anwendungen, dass die Maus ihr Fenster nicht verlassen kann.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 5ad12f4..d972973 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -81,7 +81,7 @@ BEGIN
     EDITTEXT        IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
     EDITTEXT        IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
 
-    GROUPBOX        " Direct3D ",IDC_STATIC,8,189,244,50
+    GROUPBOX        " Direct3D ",IDC_STATIC,8,189,244,55
 
     LTEXT	    "Vertex Shader Support: ",IDC_STATIC,15,199,80,30
     COMBOBOX	    IDC_D3D_VSHADER_MODE,100,197,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -214,32 +214,29 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Screen colour depth: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        " Window settings ",IDC_STATIC,8,4,244,110
 
-    CONTROL	    "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
-    CONTROL	    "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8
-    CONTROL	    "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,230,8
+    CONTROL	    "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8
+    CONTROL	    "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8
+    CONTROL	    "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8
     
-    GROUPBOX        " Window settings ",IDC_STATIC,8,25,244,110
-
     /* FIXME: the wording of this explanation could be a lot better */
     LTEXT           "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.",
-                    IDC_STATIC,15,73,228,28
-    LTEXT           "Desktop size:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED
-    LTEXT           "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED
+                    IDC_STATIC,15,52,228,28
+    LTEXT           "Desktop size:",IDC_DESKTOP_SIZE,15,94,44,8,WS_DISABLED
+    LTEXT           "X",IDC_DESKTOP_BY,108,94,8,8,WS_DISABLED
     CONTROL         "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,79,230,10
 		    
-    EDITTEXT        IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
-    EDITTEXT        IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_DESKTOP_WIDTH,64,94,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_DESKTOP_HEIGHT,117,94,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
 
-    GROUPBOX        " Direct3D ",IDC_STATIC,8,140,244,120
+    GROUPBOX        " Direct3D ",IDC_STATIC,8,119,244,120
 
-    LTEXT	    "Vertex Shader Support: ",IDC_STATIC,15,150,80,30
-    COMBOBOX	    IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT	    "Vertex Shader Support: ",IDC_STATIC,15,129,80,30
+    COMBOBOX	    IDC_D3D_VSHADER_MODE,100,127,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
-    CONTROL         "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10
+    CONTROL         "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,144,230,10
 END
 
 IDD_APPEARANCE DIALOG DISCARDABLE  0, 0, 260, 250
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index c91a426..28d2324 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT          "Profundidad de color: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        "Configuración de ventanas",IDC_STATIC,8,25,244,180
 
     CONTROL        "Permitir a los programas DirectX retener el ratón en sus ventanas",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 8526b2e..2f16e77 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Näytön värisyvyys: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Ikkunan asetukset ",IDC_STATIC,8,25,244,110
 
     CONTROL	    "&Salli DirectX -sovellusten estää kursorin poistuminen ikkunasta",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 33e3142..9367176 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Qualité couleur: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Paramètres des fenêtres ",IDC_STATIC,8,25,244,110
 
     CONTROL	    "Permettre aux applications DirectX d'empêcher la souris de quitter leur fenêtre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc
index 28ae44a..0b60509 100644
--- a/programs/winecfg/It.rc
+++ b/programs/winecfg/It.rc
@@ -56,9 +56,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Profondità dei colori: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     CONTROL	    "DirectX può impedira al mouse di lasciare la loro finestra?",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
     CONTROL	    "Abilita il doppio buffering del desktop",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8
     
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 4c8060b..fe656d5 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -62,9 +62,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 9, "MS UI Gothic"
 BEGIN
-    LTEXT	    "‰æ–ʂ̉𑜓x: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " ƒEƒBƒ“ƒhƒEÝ’è ",IDC_STATIC,8,25,244,110
 
     CONTROL	    "DirectX ƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ªƒ}ƒEƒX‚ðŠm•Û‚·‚é‚Ì‚ð‹–‰Â‚·‚é",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 01bc003..9b937ee 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -63,9 +63,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "È­¸é ÇØ»óµµ: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " â ¼³Á¤ ",IDC_STATIC,8,25,244,180
 
     CONTROL	    "DirectX Ç®±×¸²ÀÌ ±×µéÀÇ Ã¢¿¡¼­ ¸¶¿ì½º°¡ ¹þ¾î³ª¸é Á¤ÁöÇϵµ·Ï Çã¿ë",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index fd29e29..a38413b 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -61,9 +61,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Kleurdiepte: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Windowsinstellingen ",IDC_STATIC,8,25,244,120
 
     CONTROL	    "Een DirectX programma kan de muis in een window vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index 91b0f75..978ff58 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -60,9 +60,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Fargedybde: ",IDC_STATIC,8,10,70,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     GROUPBOX        " Vinduinnstillinger ",IDC_STATIC,8,25,244,180
 
     CONTROL	    "Tillat DirectX-programmer å hindre musen fra å forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 8b8cf4e..7449d1c 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -63,9 +63,6 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Profundidade de cores: ",IDC_STATIC,8,10,80,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,85,8,165,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-
     CONTROL	    "Programas DirectX podem impedir que o mouse deixe a janela?",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8
     CONTROL	    "Permitir buffer duplo do desktop",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8
     
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 9bfe923..6144ab0 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -63,31 +63,29 @@ IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 2
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT	    "Ãëóáèíà öâåòà ýêðàíà: ",IDC_STATIC,8,10,120,30
-    COMBOBOX	    IDC_SCREEN_DEPTH,90,8,160,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        " Íàñòðîéêè îêíà ",IDC_STATIC,8,4,244,180
 
-    GROUPBOX        " Íàñòðîéêè îêíà ",IDC_STATIC,8,25,244,110
+    CONTROL	    "Ðàçðåøèòü ïðèëîæåíèþ DirectX óäåðæèâàòü ìûøü â ñâî¸ì îêíå",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8
+    CONTROL	    "Âêëþ÷èòü äâîéíóþ áóôåðèçàöèþ ðàáî÷åãî ñòîëà",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8
+    CONTROL	    "Ðàçðåøèòü ìåíåäæåðó îêîí óïðàâëÿòü îêíàìè",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8
 
-    CONTROL	    "Ðàçðåøèòü ïðèëîæåíèþ DirectX óäåðæèâàòü ìûøü â ñâî¸ì îêíå",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,235,8
-    CONTROL	    "Âêëþ÷èòü äâîéíóþ áóôåðèçàöèþ ðàáî÷åãî ñòîëà",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8
-    
     /* FIXME: the wording of this explanation could be a lot better */
     LTEXT           "Åñëè âêëþ÷èòü ýìóëÿöèþ ðàáî÷åãî ñòîëà, òî âñå îêíà áóäóò îòîáðàæàòüñÿ â îäíîì 'âèðòóàëüíîì ýêðàíå', èíà÷å îêíà ðàçìåùàþòñÿ êàê îáû÷íûå, íà ñòàíäàðòíîì ðàáî÷åì ñòîëå.",
-                    IDC_STATIC,15,73,228,28
-    LTEXT           "Ðàçìåð ðàáî÷åãî ñòîëà:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED
-    LTEXT           "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED
+                    IDC_STATIC,15,125,228,28
+    LTEXT           "Ðàçìåð ðàáî÷åãî ñòîëà:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED
+    LTEXT           "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED
     CONTROL         "Ýìóëèðîâàòü âèðòóàëüíûé ðàáî÷èé ñòîë",IDC_ENABLE_DESKTOP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10
-		    
-    EDITTEXT        IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
-    EDITTEXT        IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+                    BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10
+
+    EDITTEXT        IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+    EDITTEXT        IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
 
-    GROUPBOX        " Direct3D ",IDC_STATIC,8,140,244,120
+    GROUPBOX        " Direct3D ",IDC_STATIC,8,189,244,55
 
-    LTEXT	    "Ïîääåðæêà Vertex Shader: ",IDC_STATIC,15,150,120,30
-    COMBOBOX	    IDC_D3D_VSHADER_MODE,120,148,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT	    "Ïîääåðæêà Vertex Shader: ",IDC_STATIC,15,199,120,30
+    COMBOBOX	    IDC_D3D_VSHADER_MODE,120,197,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
-    CONTROL         "Âêëþ÷èòü Pixel Shader (åñëè ïîääåðæèâàåòñÿ îáîðóäîâàíèåì)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10
+    CONTROL         "Âêëþ÷èòü Pixel Shader (åñëè ïîääåðæèâàåòñÿ îáîðóäîâàíèåì)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10
 END
 
 IDD_DLLCFG DIALOG DISCARDABLE  0, 0, 260, 250
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index df7f0b9..e7554c3 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -120,7 +120,6 @@
 
 /* graphics */
 #define IDC_ENABLE_MANAGED              1100
-#define IDC_SCREEN_DEPTH                1101
 #define IDC_DX_MOUSE_GRAB               1102
 #define IDC_USE_TAKE_FOCUS              1103
 #define IDC_DOUBLE_BUFFER               1104
diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c
index 73fe40c..4b35b25 100644
--- a/programs/winecfg/x11drvdlg.c
+++ b/programs/winecfg/x11drvdlg.c
@@ -100,23 +100,6 @@ static void update_gui_for_desktop_mode(
     updating_ui = FALSE;
 }
 
-static void init_screen_depth(HWND dialog)
-{
-    char* buf;
-    buf = get_reg_key(config_key, keypath("X11 Driver"), "ScreenDepth", "24");
-    if (strcmp(buf, "8") == 0)
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, 0, 0);
-    else if (strcmp(buf, "16") == 0)
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, 1, 0);
-    else if (strcmp(buf, "24") == 0)
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, 2, 0);
-    else if (strcmp(buf, "32") == 0)
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, 3, 0);
-    else
-	WINE_ERR("Invalid screen depth read from registry (%s)\n", buf);
-    HeapFree(GetProcessHeap(), 0, buf);
-}
-
 static void init_dialog(HWND dialog)
 {
     unsigned int it;
@@ -126,12 +109,6 @@ static void init_dialog(HWND dialog)
 
     updating_ui = TRUE;
     
-    SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_RESETCONTENT, 0, 0);
-    SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_ADDSTRING, 0, (LPARAM) "8 bit");
-    SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_ADDSTRING, 0, (LPARAM) "16 bit");
-    SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_ADDSTRING, 0, (LPARAM) "24 bit");
-    SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_ADDSTRING, 0, (LPARAM) "32 bit"); /* is this valid? */
-
     SendDlgItemMessage(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0);
     SendDlgItemMessage(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0);
 
@@ -143,15 +120,10 @@ static void init_dialog(HWND dialog)
     HeapFree(GetProcessHeap(), 0, buf);
 
     buf = get_reg_key(config_key, keypath("X11 Driver"), "DesktopDoubleBuffered", "Y");
-    if (IS_OPTION_TRUE(*buf)) {
+    if (IS_OPTION_TRUE(*buf))
 	CheckDlgButton(dialog, IDC_DOUBLE_BUFFER, BST_CHECKED);
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, -1, 0);
-	disable(IDC_SCREEN_DEPTH);
-    } else {
+    else
 	CheckDlgButton(dialog, IDC_DOUBLE_BUFFER, BST_UNCHECKED);
-    	init_screen_depth(dialog);
-	enable(IDC_SCREEN_DEPTH);
-    }
     HeapFree(GetProcessHeap(), 0, buf);
 
     buf = get_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y");
@@ -238,18 +210,6 @@ static void on_enable_managed_clicked(HW
     }
 }
 
-static void on_screen_depth_changed(HWND dialog) {
-    char *newvalue = get_text(dialog, IDC_SCREEN_DEPTH);
-    char *spaceIndex = strchr(newvalue, ' ');
-    
-    WINE_TRACE("newvalue=%s\n", newvalue);
-    if (updating_ui) return;
-
-    *spaceIndex = '\0';
-    set_reg_key(config_key, keypath("X11 Driver"), "ScreenDepth", newvalue);
-    HeapFree(GetProcessHeap(), 0, newvalue);
-}
-
 static void on_dx_mouse_grab_clicked(HWND dialog) {
     if (IsDlgButtonChecked(dialog, IDC_DX_MOUSE_GRAB) == BST_CHECKED) 
         set_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "Y");
@@ -259,15 +219,10 @@ static void on_dx_mouse_grab_clicked(HWN
 
 
 static void on_double_buffer_clicked(HWND dialog) {
-    if (IsDlgButtonChecked(dialog, IDC_DOUBLE_BUFFER) == BST_CHECKED) {
+    if (IsDlgButtonChecked(dialog, IDC_DOUBLE_BUFFER) == BST_CHECKED)
         set_reg_key(config_key, keypath("X11 Driver"), "DesktopDoubleBuffered", "Y");
-	SendDlgItemMessage(dialog, IDC_SCREEN_DEPTH, CB_SETCURSEL, -1, 0);
-	disable(IDC_SCREEN_DEPTH);
-    } else {
+    else
         set_reg_key(config_key, keypath("X11 Driver"), "DesktopDoubleBuffered", "N");
-    	init_screen_depth(dialog);
-	enable(IDC_SCREEN_DEPTH);
-    }
 }
 
 static void on_d3d_vshader_mode_changed(HWND dialog) {
@@ -317,7 +272,6 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARA
 		case CBN_SELCHANGE: {
 		    SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0);
 		    switch (LOWORD(wParam)) {
-		    case IDC_SCREEN_DEPTH: on_screen_depth_changed(hDlg); break;
 		    case IDC_D3D_VSHADER_MODE: on_d3d_vshader_mode_changed(hDlg); break;
 		    }
 		    break;

More information about the wine-patches mailing list