Vitaliy Margolen : winecfg: Remove some old dead code and associated language resources.
Module: wine Branch: master Commit: 8b7661bdd8acb890f178553f79ca62e393583792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7661bdd8acb890f178553f79... Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 19 19:23:18 2006 -0700 winecfg: Remove some old dead code and associated language resources. --- programs/winecfg/Cs.rc | 29 --------------------------- programs/winecfg/It.rc | 29 --------------------------- programs/winecfg/Pt.rc | 33 ------------------------------ programs/winecfg/driveui.c | 46 ------------------------------------------- programs/winecfg/resource.h | 2 - 5 files changed, 0 insertions(+), 139 deletions(-) diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 0218920..cb13bab 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -123,35 +123,6 @@ BEGIN LTEXT "Varov�n�: Vypad� to, �e disk C nen� definov�n. Klikn�te na 'P�idat...' a vytvo�te ho.", IDS_DRIVE_NO_C, 7,223,250,110 END -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Konfigurace disk�" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Ok",ID_BUTTON_OK,145,150,50,16 - LTEXT "P�smeno:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,108,78,13,ES_AUTOHSCROLL - LTEXT "Jmenovka:",IDC_STATIC_LABEL,33,111,29,12 - LTEXT "S�riov� ��slo:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Typ:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Cesta:",IDC_STATIC,5,8,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Proch�zet...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Pokro�il� zobrazen�",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Detekovat ze za��zen�:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,69,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,79,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Proch�zet...",IDC_BUTTON_BROWSE_DEVICE,148,79,40,13 - CONTROL "P�i�adit ru�n�:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,98,69,10 - GROUPBOX "Jmenovka a s�riov� ��slo",IDC_BOX_LABELSERIAL,6,58,189,85 -END - IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 4a587d7..befa3d4 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -118,35 +118,6 @@ BEGIN LTEXT "ATTENZIONE: Non � stato definito un driver C. Clicca su 'Aggiungi Driver' per aggiungerne uno.", IDS_DRIVE_NO_C, 7,223,250,110 END -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurazone dei Drive" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Ok",ID_BUTTON_OK,145,150,50,16 - LTEXT "Lettera:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,108,78,13,ES_AUTOHSCROLL - LTEXT "Etichetta:",IDC_STATIC_LABEL,33,111,29,12 - LTEXT "Seriale:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Tipo:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Percorso:",IDC_STATIC,5,8,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Sfoglia...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Mostra Avanzate",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Rileva automaticamente dal dispositivo:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,69,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,79,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Sfoglia...",IDC_BUTTON_BROWSE_DEVICE,148,79,40,13 - CONTROL "Assegna manualmente:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,98,69,10 - GROUPBOX "Etichetta e numero seriale",IDC_BOX_LABELSERIAL,6,58,189,85 -END - IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 0938fe9..5d7d25b 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -151,39 +151,6 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configura��o de unidade" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&OK",ID_BUTTON_OK,145,150,50,13 - LTEXT "Letra:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,114,78,13,ES_AUTOHSCROLL - LTEXT "R�tulo:",IDC_STATIC_LABEL,33,117,29,12 - LTEXT "S�rie:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Tipo:",IDC_STATIC,5,54,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Caminho:",IDC_STATIC,5,10,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Procurar...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Mostrar Avan�ado",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Autodetectar do dispositivo:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,79,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,89,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Procurar...",IDC_BUTTON_BROWSE_DEVICE,148,89,40,13 - CONTROL "Associar manualmente:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,104,69,10 - GROUPBOX "R�tulo e n�mero de s�rie",IDC_BOX_LABELSERIAL,6,68,189,79 - -END - - LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c4a400d..b412c78 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -168,48 +168,6 @@ static const struct drive_typemap type_p #define DRIVE_TYPE_DEFAULT 0 -static void fill_drive_droplist(long mask, char curletter, HWND dialog) -{ - int i; - int selection; - int count; - int next_letter; - char sName[4]; - - strcpy(sName, "A:"); - for (i = 0, count = 0, selection = -1, next_letter = -1; i <= 'Z'-'A'; ++i) - { - if (mask & DRIVE_MASK_BIT('A' + i)) - { - int index; - - sName[0] = 'A' + i; - index = SendDlgItemMessage(dialog, IDC_COMBO_LETTER, CB_ADDSTRING, 0, (LPARAM) sName); - - if (toupper(curletter) == 'A' + i) - { - selection = count; - } - - if (i >= 2 && next_letter == -1) - { - /* default drive is first one of C-Z */ - next_letter = count; - } - - count++; - } - } - - if (selection == -1) - { - selection = next_letter; - } - - SendDlgItemMessage(dialog, IDC_COMBO_LETTER, CB_SETCURSEL, selection, 0); -} - - static void enable_labelserial_box(HWND dialog, int mode) { WINE_TRACE("mode=%d\n", mode); @@ -444,9 +402,6 @@ static void update_controls(HWND dialog) WINE_TRACE("Updating sheet for drive %c\n", current_drive->letter); - /* Drive letters */ - fill_drive_droplist(drive_available_mask(current_drive->letter), current_drive->letter, dialog); - /* path */ path = current_drive->unixpath; WINE_TRACE("set path control text to '%s'\n", path); @@ -770,7 +725,6 @@ DriveDlgProc (HWND dialog, UINT msg, WPA if (HIWORD(wParam) != BN_CLICKED) break; item = SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETCURSEL, 0, 0); drive = (struct drive *) SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); - /*DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_DRIVE_EDIT), NULL, (DLGPROC) DriveEditDlgProc, (LPARAM) drive); */ break; case IDC_BUTTON_AUTODETECT: diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 4d4fdd1..f9d6450 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -50,7 +50,6 @@ #define IDD_GRAPHCFG 110 #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 -#define IDD_DRIVE_EDIT 114 #define IDD_DESKTOP_INTEGRATION 115 #define IDB_WINE_LOGO 200 #define IDC_TABABOUT 1001 @@ -114,7 +113,6 @@ #define IDC_EDIT_LABEL 1060 #define IDC_EDIT_PATH 1061 #define IDC_EDIT_SERIAL 1062 -#define IDC_COMBO_LETTER 1063 #define IDC_COMBO_TYPE 1065 #define IDC_EDIT_DEVICE 1066 #define IDC_BUTTON_BROWSE_PATH 1067
participants (1)
-
Alexandre Julliard