Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

This patch changes a pre-compile check to a run-time
check. The fix is that for windows that only using 1 X
window (like wxFrame) the client area needs to be
adjusted...

FL is one of the things that needs this patch to work ok
under wxX11.

Hans Van Leemputten

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 8693ee3f4c675aee97e5b3863c84c7fe0b7a1e05..81bbf7a9227f96929009846bfb6cb2f4faf4e9f1 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -2046,13 +2046,14 @@ wxClientDC::wxClientDC( wxWindow *window )
     
     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