Rename X11 Driver tab of winecfg to Graphics.

programs/winecfg/En.rc

@@ -53,7 +53,7 @@ BEGIN
     COMBOBOX        IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/Es.rc

@@ -49,7 +49,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/It.rc

@@ -52,7 +52,7 @@ BEGIN
     COMBOBOX        IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/Pt.rc

@@ -52,7 +52,7 @@ BEGIN
     COMBOBOX        IDC_DOSVER,108,208,138,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/Ru.rc

@@ -62,7 +62,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/Si.rc

@@ -49,7 +49,7 @@ FONT 8, "MS Sans Serif"
 BEGIN
 END
 
-IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250
+IDD_GRAPHCFG DIALOG DISCARDABLE  0, 0, 260, 250
 STYLE WS_CHILD | WS_DISABLED
 FONT 8, "MS Sans Serif"
 BEGIN

programs/winecfg/main.c

@@ -129,10 +129,10 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
     psp[pg].dwSize = sizeof (PROPSHEETPAGE);
     psp[pg].dwFlags = PSP_USETITLE;
     psp[pg].hInstance = hInstance;
-    psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_X11DRVCFG);
+    psp[pg].u.pszTemplate = MAKEINTRESOURCE (IDD_GRAPHCFG);
     psp[pg].u2.pszIcon = NULL;
-    psp[pg].pfnDlgProc = X11DrvDlgProc;
-    psp[pg].pszTitle = "X11 Driver";
+    psp[pg].pfnDlgProc = GraphDlgProc;
+    psp[pg].pszTitle = "Graphics";
     psp[pg].lParam = 0;
     pg++;
 

programs/winecfg/resource.h

@@ -31,7 +31,7 @@
 #define IDD_ABOUTCFG                    107
 #define IDD_APPCFG                      108
 #define IDD_AUDIOCFG                    109
-#define IDD_X11DRVCFG                   110
+#define IDD_GRAPHCFG                    110
 #define IDD_DLLCFG                      111
 #define IDD_DRIVECFG                    112
 #define IDD_SYSTEMCFG                   113
@@ -111,7 +111,7 @@
 #define IDC_BUTTON_SHOW_HIDE_ADVANCED   1076
 #define IDC_STATIC_TYPE                 1077
 
-/* x11drv */
+/* graphics */
 #define IDC_ENABLE_MANAGED              1100
 #define IDC_SCREEN_DEPTH                1101
 #define IDC_DX_MOUSE_GRAB               1102

programs/winecfg/winecfg.h

@@ -96,11 +96,11 @@ char *getConfigValue (const char *subkey, const char *valueName, const char *def
 HRESULT doesConfigValueExist (const char *subkey, const char *valueName);
 HRESULT removeConfigValue (const char *subkey, const char *valueName);
 
-/* X11DRV */
+/* Graphics */
 
-void initX11DrvDlg (HWND hDlg);
-void saveX11DrvDlgSettings (HWND hDlg);
-INT_PTR CALLBACK X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+void initGraphDlg (HWND hDlg);
+void saveGraphDlgSettings (HWND hDlg);
+INT_PTR CALLBACK GraphDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* Drive management */
 void initDriveDlg (HWND hDlg);

programs/winecfg/x11drvdlg.c

 /*
- * X11DRV configuration code
+ * Graphics configuration code
  *
  * Copyright 2003 Mark Westcott
  * Copyright 2003 Mike Hearn
@@ -35,7 +35,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 
 #define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */
-#define section (appSettings == EDITING_GLOBAL ? "x11drv" : (getSectionForApp("x11drv")))
+#define section (appSettings == EDITING_GLOBAL ? "graphics" : (getSectionForApp("graphics")))
 
 int updatingUI;
 
@@ -84,7 +84,7 @@ void updateGUIForDesktopMode(HWND dialog) {
 }
 
 /* pokes the win32 api to setup the dialog from the config struct */
-void initX11DrvDlg (HWND hDlg)
+void initGraphDlg (HWND hDlg)
 {
     static const char default_desktop[] = "640x480";
     char *buf;
@@ -213,7 +213,7 @@ void onDoubleBufferClicked(HWND hDlg) {
 }
 
 INT_PTR CALLBACK
-X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+GraphDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg) {
 	case WM_INITDIALOG:
@@ -258,7 +258,7 @@ X11DrvDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		    break;
 		}
 		case PSN_SETACTIVE: {
-		    initX11DrvDlg (hDlg);
+		    initGraphDlg (hDlg);
 		    break;
 		}
 	    }