Removed the unnecessary button "Disconnect" from the

vncviewer toolbar.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@654 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index bf19bd8569ed1e24d78450ad8fe95f5c2384d1c9..4a5f32da7e7412764d876ac53c9c4eb20b146cbc 100644 (file)
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -239,9 +239,6 @@ CConn::sysCommand(WPARAM wParam, LPARAM lParam) {
     return true;
   case IDM_CONN_SAVE_AS:
     return true;
-  case ID_CLOSE:
-    // FIXME: Remove the corresponding toolbar button.
-    return true;
   };
   return false;
 }

diff --git a/win/vncviewer/ViewerToolBar.cxx b/win/vncviewer/ViewerToolBar.cxx
index adc6f07e96ba053a15836557adc7432cc2d1f6df..66a50c36b879924fd422928bac73365f73f79687 100644 (file)
--- a/win/vncviewer/ViewerToolBar.cxx
+++ b/win/vncviewer/ViewerToolBar.cxx
@@ -48,7 +48,6 @@ void ViewerToolBar::create(HWND parentHwnd) {
   addButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP);
   addButton(13, ID_NEW_CONNECTION);
   addButton(14, ID_CONN_SAVE_AS);
-  addButton(15, ID_CLOSE);
 
   // Resize the toolbar window
   autoSize();
@@ -97,9 +96,6 @@ LRESULT ViewerToolBar::processWM_NOTIFY(WPARAM wParam, LPARAM lParam) {
       case ID_CONN_SAVE_AS:
         TTStr->lpszText = "Save connection info as...";
         break;
-      case ID_CLOSE:
-        TTStr->lpszText = "Disconnect";
-        break;
       default:
         break;
       }