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

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

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

diff --git a/rfb_win32/ToolBar.h b/rfb_win32/ToolBar.h
index dd7373c3466703edd92eafb8c3da063e5047ecf4..feed1a02dc186a6bcd7e85f7a09097930a0685a0 100644 (file)
--- a/rfb_win32/ToolBar.h
+++ b/rfb_win32/ToolBar.h
@@ -101,6 +101,7 @@ namespace rfb {
       // 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 @@ namespace rfb {
       // 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;

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

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