Michael Fieldings patch 598106 applied in part

[wxWidgets.git] / src / x11 / dcclient.cpp

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 200762065f47fd222611edb9c9f24b4699418d69..81bbf7a9227f96929009846bfb6cb2f4faf4e9f1 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -2044,15 +2044,16 @@ wxClientDC::wxClientDC( wxWindow *window )
 {
     wxCHECK_RET( window, _T("NULL window in wxClientDC::wxClientDC") );
     
-    m_window = (WXWindow*) window->GetClientWindow();
+    m_window = (WXWindow*) window->GetClientAreaWindow();
     
-#if wxUSE_TWO_WINDOWS
-#else
+    // Adjust the client area when the wxWindow is not using 2 X windows.
+    if (m_window == (WXWindow*) window->GetMainWindow())
+    {
         wxPoint ptOrigin = window->GetClientAreaOrigin();
         SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
         wxSize size = window->GetClientSize();
         SetClippingRegion(wxPoint(0, 0), size);
-#endif
+    }
 }
 
 void wxClientDC::DoGetSize(int *width, int *height) const