Merged the changes from revision range 582:588 into reorganized sources. These changes accidentally were not included in files copied during directory structure reorganization.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@594 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/OptionsDialog.cxx b/win/vncviewer/OptionsDialog.cxx
index 2e43b38..5bb21fd 100644
--- a/win/vncviewer/OptionsDialog.cxx
+++ b/win/vncviewer/OptionsDialog.cxx
@@ -163,6 +163,15 @@
setItemChecked(IDC_ACCEPT_BELL, dlg->options.acceptBell);
setItemChecked(IDC_AUTO_RECONNECT, dlg->options.autoReconnect);
setItemChecked(IDC_SHOW_TOOLBAR, dlg->options.showToolbar);
+ char scale_values[8][20] = {
+ "25","50","75","90","100","125","150","Auto"
+ };
+ HWND hScaleCombo = GetDlgItem(handle, IDC_COMBO_SCALE);
+ for (int i = 0; i <= 7; i++) {
+ SendMessage(hScaleCombo, CB_INSERTSTRING,
+ (WPARAM)i, (LPARAM)(int FAR*)scale_values[i]);
+ }
+ SetDlgItemText(handle, IDC_COMBO_SCALE, "100");
}
virtual bool onOk() {
dlg->options.shared = isItemChecked(IDC_CONN_SHARED);