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 708fd66bb2c4d48eab0c9ec1a86ac4adc02b7c66..ccf80f36251326ff859ef8298f33c55a6ffca1f5 100644 (file)
--- 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 bf2ba5a330b72c116251f4085717ca721cc34b9d..71c07f9dd874e95bfb0c20fd58eefdf601e156ad 100644 (file)
--- 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 5f8f00d6369d30e829a08438f914d2701e36d8ed..51ab78af5a1c972e692d4b2b7b59024819b63463 100644 (file)
--- 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 c4bf401eb9874cd7c00b731285fdbc1e847ec71f..08990f74cb417f67800549331edeba0dedd19440 100644 (file)
--- 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();