diff options
| author | Constantin Kaplinsky <const@tightvnc.com> | 2006-05-17 04:17:25 +0000 |
|---|---|---|
| committer | Constantin Kaplinsky <const@tightvnc.com> | 2006-05-17 04:17:25 +0000 |
| commit | f403883adc81d59d4d8a79e02c581ad7d87a65f9 (patch) | |
| tree | 20f3f6cd33500dd0c47c9d58a5aafb0878b43ae6 /vncviewer/DesktopWindow.cxx | |
| parent | 1ecf40f2658c6a87a982b450c18c47ab19c51163 (diff) | |
| download | tigervnc-f403883adc81d59d4d8a79e02c581ad7d87a65f9.tar.gz tigervnc-f403883adc81d59d4d8a79e02c581ad7d87a65f9.zip | |
Fixed a bug with setting window size which has been introduced while merging. Also, there are minor code cleanups - getHandle() and getFrameHandle() methods are not used in the DesktopWindow class any more; now we use corresponding member variables directly, just like in VNC 4.1.1.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@554 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer/DesktopWindow.cxx')
| -rw-r--r-- | vncviewer/DesktopWindow.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx index 311a5865..f536e0c7 100644 --- a/vncviewer/DesktopWindow.cxx +++ b/vncviewer/DesktopWindow.cxx @@ -195,13 +195,13 @@ DesktopWindow::DesktopWindow(Callback* cb) vlog.debug("created window \"%s\" (%x)", name, handle); // Create the toolbar - tb.create(getHandle()); + tb.create(handle); vlog.debug("created toolbar window \"%s\" (%x)", "ViewerToolBar", tb.getHandle()); // Create the frame window frameHandle = CreateWindowEx(WS_EX_CLIENTEDGE, (const TCHAR*)frameClass.classAtom, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, getHandle(), 0, frameClass.instance, this); + CW_USEDEFAULT, CW_USEDEFAULT, handle, 0, frameClass.instance, this); if (!frameHandle) { throw rdr::SystemException("unable to create rfb frame window instance", GetLastError()); } @@ -397,7 +397,7 @@ DesktopWindow::processMessage(UINT msg, WPARAM wParam, LPARAM lParam) { if (current_style & WS_HSCROLL) reqd_size.br.y += GetSystemMetrics(SM_CXHSCROLL); - SetRect(&r, reqd_size.tl.x, reqd_size.br.x, reqd_size.tl.y, reqd_size.br.y); + SetRect(&r, reqd_size.tl.x, reqd_size.tl.y, reqd_size.br.x, reqd_size.br.y); if (tb.isVisible()) r.bottom += tb.getHeight(); AdjustWindowRect(&r, GetWindowLong(handle, GWL_STYLE), FALSE); @@ -428,12 +428,12 @@ DesktopWindow::processMessage(UINT msg, WPARAM wParam, LPARAM lParam) { RECT r; // Resize child windows - GetClientRect(getHandle(), &r); + GetClientRect(handle, &r); if (tb.isVisible()) { - MoveWindow(getFrameHandle(), 0, tb.getHeight(), + MoveWindow(frameHandle, 0, tb.getHeight(), r.right, r.bottom - tb.getHeight(), TRUE); } else { - MoveWindow(getFrameHandle(), 0, 0, r.right, r.bottom, TRUE); + MoveWindow(frameHandle, 0, 0, r.right, r.bottom, TRUE); } tb.autoSize(); |