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 5ea0c08e591c5951106e5a6a90a622e826f0ceae..81bbf7a9227f96929009846bfb6cb2f4faf4e9f1 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -313,13 +313,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
     m_owner->GetSize(width, height);
 }
 

-extern void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 

                           const wxColour & col, int style);
 
                           const wxColour & col, int style);
 

-void wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,

                              const wxColour& col, int style)
 {
                              const wxColour& col, int style)
 {

-    wxDoFloodFill(this, x, y, col, style);
+    return wxDoFloodFill(this, x, y, col, style);

 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const


@@ -2044,15 +2044,16 @@ wxClientDC::wxClientDC( wxWindow *window )
 {
     wxCHECK_RET( window, _T("NULL window in wxClientDC::wxClientDC") );
     
 {
     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);
         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
 }
 
 void wxClientDC::DoGetSize(int *width, int *height) const