diff options
author | george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2006-09-11 06:07:55 +0000 |
---|---|---|
committer | george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2006-09-11 06:07:55 +0000 |
commit | 03ad683b85236cd7d144a491ebb7efdde5224f41 (patch) | |
tree | f177e759588d2344f9da94fb8c481ea14c1eeefd /win | |
parent | 57160b0fc45ad4ee81a6bfa7ab668eba9071a357 (diff) | |
download | tigervnc-03ad683b85236cd7d144a491ebb7efdde5224f41.tar.gz tigervnc-03ad683b85236cd7d144a491ebb7efdde5224f41.zip |
Removed the unnecessary CConnOptions::scaling parameter.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@658 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win')
-rw-r--r-- | win/vncviewer/CConn.cxx | 1 | ||||
-rw-r--r-- | win/vncviewer/CConnOptions.cxx | 7 | ||||
-rw-r--r-- | win/vncviewer/CConnOptions.h | 1 | ||||
-rw-r--r-- | win/vncviewer/OptionsDialog.cxx | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx index 708fd66b..ccf80f36 100644 --- a/win/vncviewer/CConn.cxx +++ b/win/vncviewer/CConn.cxx @@ -195,7 +195,6 @@ CConn::sysCommand(WPARAM wParam, LPARAM lParam) { 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 bf2ba5a3..71c07f9d 100644 --- a/win/vncviewer/CConnOptions.cxx +++ b/win/vncviewer/CConnOptions.cxx @@ -153,9 +153,6 @@ autoReconnect(::autoReconnect), autoScaling(::autoScaling), scale(::scale) // Default to CustomCompressLevel=1 if CompressLevel is used. customCompressLevel = ::compressLevel.hasBeenSet(); } - - if (scale != 100) scaling = true; - else scaling = false; } @@ -301,9 +298,6 @@ void CConnOptions::readFromFile(const char* filename) { 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 @@ CConnOptions& CConnOptions::operator=(const CConnOptions& o) { 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 5f8f00d6..51ab78af 100644 --- a/win/vncviewer/CConnOptions.h +++ b/win/vncviewer/CConnOptions.h @@ -67,7 +67,6 @@ namespace rfb { 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 c4bf401e..08990f74 100644 --- a/win/vncviewer/OptionsDialog.cxx +++ b/win/vncviewer/OptionsDialog.cxx @@ -190,14 +190,11 @@ public: 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(); |