commit d27bba040cc9253d874fc5e65aa9df5657f45969
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Sat Nov 05 04:48:46 2005 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Sat Nov 05 04:48:46 2005 +0000
tree e3651b48418c80600d39d6552ceb4a4430621ea6
parent 6f61579ace1852b31259f86b56db2101f59e436d

Moved methods ViewerToolBar::show() and ViewerToolBar::hide into rfb_win32::ToolBar class.


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

rfb_win32/ToolBar.cxx

diff --git a/rfb_win32/ToolBar.cxx b/rfb_win32/ToolBar.cxx
index 963a5d1..4061bb3 100644
--- a/rfb_win32/ToolBar.cxx
+++ b/rfb_win32/ToolBar.cxx
@@ -201,3 +201,11 @@
   GetWindowRect(getHandle(), &r);
   return r.bottom - r.top;
 }
+
+void ToolBar::show() {
+  ShowWindow(getHandle(), SW_SHOW);
+}
+
+void ToolBar::hide() {
+  ShowWindow(getHandle(), SW_HIDE);
+}

rfb_win32/ToolBar.h

diff --git a/rfb_win32/ToolBar.h b/rfb_win32/ToolBar.h
index dd7373c..feed1a0 100644
--- a/rfb_win32/ToolBar.h
+++ b/rfb_win32/ToolBar.h
@@ -101,6 +101,7 @@
       // Button size must be largen the button bitmap.
       bool setButtonSize(int width, int height);
 
+      // -=- ToolBar operations
 
       // autoSize() resizes the toolbar window.
       void autoSize();
@@ -111,6 +112,12 @@
       // getHeight() returns the toolbar window height.
       int getHeight();
 
+      // show() displays the toolbar window.
+      void show();
+
+      // hide() hides the toolbar window.
+      void hide();
+
     protected:
       HWND hwndToolBar;
       HWND parentHwnd;

vncviewer/ViewerToolBar.cxx

diff --git a/vncviewer/ViewerToolBar.cxx b/vncviewer/ViewerToolBar.cxx
index 865de93..c0f8115 100644
--- a/vncviewer/ViewerToolBar.cxx
+++ b/vncviewer/ViewerToolBar.cxx
@@ -48,11 +48,3 @@
   // Resize the toolbar window
   autoSize();
 }
-
-void ViewerToolBar::show() {
-  ShowWindow(getHandle(), SW_SHOW);
-}
-
-void ViewerToolBar::hide() {
-  ShowWindow(getHandle(), SW_HIDE);
-}

vncviewer/ViewerToolBar.h

diff --git a/vncviewer/ViewerToolBar.h b/vncviewer/ViewerToolBar.h
index 8e829e7..3f5ccdf 100644
--- a/vncviewer/ViewerToolBar.h
+++ b/vncviewer/ViewerToolBar.h
@@ -30,7 +30,4 @@
   ~ViewerToolBar() {}
 
   void create(HWND parentHwnd);
-
-  void show();
-  void hide();
 };