diff options
author | marha <marha@users.sourceforge.net> | 2010-09-11 14:54:46 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-11 14:54:46 +0000 |
commit | 2e177afc46d61858e1339d5c1554f7e33af59cc5 (patch) | |
tree | 1dea3b15456248902467d6170d27c8d2b05aa6d9 | |
parent | 35b29c19707341bbfa32f7f6136ce09e59cb332c (diff) | |
download | vcxsrv-2e177afc46d61858e1339d5c1554f7e33af59cc5.tar.gz vcxsrv-2e177afc46d61858e1339d5c1554f7e33af59cc5.tar.bz2 vcxsrv-2e177afc46d61858e1339d5c1554f7e33af59cc5.zip |
Make sure xdmcp is not selected in multiwindow mode
-rw-r--r-- | xorg-server/hw/xwin/xlaunch/main.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/xlaunch/main.cc b/xorg-server/hw/xwin/xlaunch/main.cc index f56c0514e..26a132756 100644 --- a/xorg-server/hw/xwin/xlaunch/main.cc +++ b/xorg-server/hw/xwin/xlaunch/main.cc @@ -277,8 +277,18 @@ class CMyWizard : public CWizard { case IDD_CLIENTS: // Enable or disable XDMCP radiobutton and text - EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP), config.window != CConfig::MultiWindow); - EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_DESC), config.window != CConfig::MultiWindow); + if (config.window != CConfig::MultiWindow) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP), true); + EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_DESC), true); + } + else + { + if (IsDlgButtonChecked(hwndDlg, IDC_XDMCP)) + CheckRadioButton(hwndDlg, IDC_CLIENT_NONE, IDC_CLIENT, IDC_CLIENT_NONE); + EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP), false); + EnableWindow(GetDlgItem(hwndDlg, IDC_XDMCP_DESC), false); + } break; } return FALSE; |