diff --git a/win/vncviewer/DesktopWindow.h b/win/vncviewer/DesktopWindow.h
index 8e82083..e8f87bc 100644
--- a/win/vncviewer/DesktopWindow.h
+++ b/win/vncviewer/DesktopWindow.h
@@ -82,10 +82,7 @@
       PixelFormat getPF() const { return buffer->getPF(); }
       void setSize(int w, int h);
       void setColour(int i, int r, int g, int b) {buffer->setColour(i, r, g, b);}
-      void setAutoScaling(bool as) { 
-        autoScaling = as;
-        if (as) fitBufferToWindow();
-      }
+      void setAutoScaling(bool as);
       bool isAutoScaling() const { return autoScaling; }
       void setDesktopScale(int scale);
       int  getDesktopScale() const { return buffer->getScale(); }
@@ -102,6 +99,7 @@
       // - Set/get the toolbar's state
       void setShowToolbar(bool st);
       bool isToolbarEnabled() { return showToolbar; }
+      void refreshToolbarButtons();
 
       // - Set whether to disable special Windows keys & pass them straight to server
       void setDisableWinKeys(bool dwk);
