Removing console specific defines [4/4]

[Eric Pouech]

See 1/4 for the details.
A+
-- 
Eric Pouech
-------------- next part --------------
Name:          wc_edmo_dlg
ChangeLog:     - Added the GUI part for setting the edition mode flavor
License:       X11
GenDate:       2003/01/06 21:47:42 UTC
ModifiedFiles: programs/wineconsole/dialog.c programs/wineconsole/wineconsole_De.rc programs/wineconsole/wineconsole_En.rc programs/wineconsole/wineconsole_Fr.rc programs/wineconsole/wineconsole_Hu.rc programs/wineconsole/wineconsole_res.rc
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/wineconsole/dialog.c,v
retrieving revision 1.12
diff -u -u -r1.12 dialog.c
--- programs/wineconsole/dialog.c	4 Sep 2002 18:41:52 -0000	1.12
+++ programs/wineconsole/dialog.c	6 Jan 2003 21:28:46 -0000
@@ -598,6 +598,19 @@
 	SetDlgItemInt(hDlg, IDC_CNF_WIN_HEIGHT, di->config.win_height, FALSE);
         SendDlgItemMessage(hDlg, IDC_CNF_CLOSE_EXIT, BM_SETCHECK,
                            (di->config.exit_on_die) ? BST_CHECKED : BST_UNCHECKED, 0L);
+        {
+            static WCHAR        s1[] = {'W','i','n','3','2',0};
+            static WCHAR        s2[] = {'E','m','a','c','s',0};
+
+            SendDlgItemMessage(hDlg, IDC_CNF_EDITION_MODE, CB_ADDSTRING,
+                               0, (LPARAM)s1);
+            SendDlgItemMessage(hDlg, IDC_CNF_EDITION_MODE, CB_ADDSTRING,
+                               0, (LPARAM)s2);
+            SendDlgItemMessage(hDlg, IDC_CNF_EDITION_MODE, CB_SETCURSEL,
+                               di->config.edition_mode, 0);
+            WINE_FIXME("edmo=%d\n", di->config.edition_mode);
+    	}
+
 	break;
     case WM_COMMAND:
 	di = (struct dialog_info*)GetWindowLong(hDlg, DWL_USER);
@@ -634,7 +647,8 @@
                 di->config.win_height = y;
             }
             di->config.exit_on_die = IsDlgButtonChecked(hDlg, IDC_CNF_CLOSE_EXIT) ? 1 : 0;
-
+            di->config.edition_mode = SendDlgItemMessage(hDlg, IDC_CNF_EDITION_MODE, CB_GETCURSEL,
+                                                         0, 0);
             SetWindowLong(hDlg, DWL_MSGRESULT, PSNRET_NOERROR);
 	    return TRUE;
 	default:
Index: programs/wineconsole/wineconsole_De.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/wineconsole/wineconsole_De.rc,v
retrieving revision 1.3
diff -u -u -r1.3 wineconsole_De.rc
--- programs/wineconsole/wineconsole_De.rc	25 Oct 2002 03:49:43 -0000	1.3
+++ programs/wineconsole/wineconsole_De.rc	6 Jan 2003 21:33:28 -0000
@@ -99,6 +99,9 @@
 
 	GROUPBOX "End of program", -1, 115, 11, 80, 42, BS_GROUPBOX
 	AUTOCHECKBOX "&Close console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP
+	
+	GROUPBOX "Edition", -1, 115, 55, 80, 42
+	COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
 }
 
 IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 140, 60
Index: programs/wineconsole/wineconsole_En.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/wineconsole/wineconsole_En.rc,v
retrieving revision 1.9
diff -u -u -r1.9 wineconsole_En.rc
--- programs/wineconsole/wineconsole_En.rc	25 Oct 2002 03:49:43 -0000	1.9
+++ programs/wineconsole/wineconsole_En.rc	6 Jan 2003 21:33:38 -0000
@@ -99,6 +99,9 @@
 
 	GROUPBOX "End of program", -1, 115, 11, 80, 42, BS_GROUPBOX
 	AUTOCHECKBOX "&Close console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP
+
+	GROUPBOX "Edition", -1, 115, 55, 80, 42
+	COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
 }
 
 IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 140, 60
Index: programs/wineconsole/wineconsole_Fr.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/wineconsole/wineconsole_Fr.rc,v
retrieving revision 1.7
diff -u -u -r1.7 wineconsole_Fr.rc
--- programs/wineconsole/wineconsole_Fr.rc	4 Sep 2002 18:41:52 -0000	1.7
+++ programs/wineconsole/wineconsole_Fr.rc	6 Jan 2003 21:33:51 -0000
@@ -99,6 +99,9 @@
 
 	GROUPBOX "Fin du programme", -1, 115, 11, 80, 42, BS_GROUPBOX
 	AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP
+
+	GROUPBOX "Edition", -1, 115, 55, 80, 42
+	COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
 }
 
 IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 200, 60
Index: programs/wineconsole/wineconsole_Hu.rc
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/programs/wineconsole/wineconsole_Hu.rc,v
retrieving revision 1.1
diff -u -u -r1.1 wineconsole_Hu.rc
--- programs/wineconsole/wineconsole_Hu.rc	4 Nov 2002 22:45:23 -0000	1.1
+++ programs/wineconsole/wineconsole_Hu.rc	6 Jan 2003 21:33:14 -0000
@@ -100,6 +100,9 @@
 
 	GROUPBOX "Program vége", -1, 115, 11, 80, 42, BS_GROUPBOX
 	AUTOCHECKBOX "&Konsol bezárása", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP
+
+	GROUPBOX "Edition", -1, 115, 55, 80, 42
+	COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP
 }
 
 IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 140, 60