Removed the unnecessary CConnOptions::scaling parameter.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@658 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index 708fd66..ccf80f3 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -195,7 +195,6 @@
options.autoScaling = false;
window->setAutoScaling(false);
}
- options.scaling = false;
options.scale = 100;
window->setDesktopScale(100);
return true;
diff --git a/win/vncviewer/CConnOptions.cxx b/win/vncviewer/CConnOptions.cxx
index bf2ba5a..71c07f9 100644
--- a/win/vncviewer/CConnOptions.cxx
+++ b/win/vncviewer/CConnOptions.cxx
@@ -153,9 +153,6 @@
// Default to CustomCompressLevel=1 if CompressLevel is used.
customCompressLevel = ::compressLevel.hasBeenSet();
}
-
- if (scale != 100) scaling = true;
- else scaling = false;
}
@@ -301,9 +298,6 @@
if (autoSelect)
preferredEncoding = encodingZRLE;
- if (scale == 100) scaling = false;
- else scaling = true;
-
setConfigFileName(filename);
} catch (rdr::Exception&) {
if (f) fclose(f);
@@ -468,7 +462,6 @@
qualityLevel = o.qualityLevel;
autoScaling = o.autoScaling;
scale = o.scale;
- scaling = o.scaling;
return *this;
}
diff --git a/win/vncviewer/CConnOptions.h b/win/vncviewer/CConnOptions.h
index 5f8f00d..51ab78a 100644
--- a/win/vncviewer/CConnOptions.h
+++ b/win/vncviewer/CConnOptions.h
@@ -67,7 +67,6 @@
bool protocol3_3;
bool acceptBell;
bool autoScaling;
- bool scaling;
int scale;
CharArray userName;
void setUserName(const char* user);
diff --git a/win/vncviewer/OptionsDialog.cxx b/win/vncviewer/OptionsDialog.cxx
index c4bf401..08990f7 100644
--- a/win/vncviewer/OptionsDialog.cxx
+++ b/win/vncviewer/OptionsDialog.cxx
@@ -190,14 +190,11 @@
if (s > 0) {
dlg->options.scale = s;
dlg->options.autoScaling = false;
- if (s == 100) dlg->options.scaling = false;
- else dlg->options.scaling = true;
} else {
char scaleStr[20];
GetDlgItemText(handle, IDC_COMBO_SCALE, scaleStr, 20);
if (strcmp(scaleStr, "Auto") == 0) {
dlg->options.autoScaling = true;
- dlg->options.scaling = true;
}
}
((ViewerOptions*)propSheet)->setChanged();