Correction for 'protected' compiler error

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index a9bb558858c03f079fa5e1b021c2acefc91e8c49..041217aa9eb2b3d48cfe2040ac42db60efead61e 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -138,6 +138,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_backgroundColour.CalcPixel( (WXColormap) cm ); 
+    m_hasBgCol = TRUE;
     
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm ); 
@@ -149,7 +150,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
         xdisplay, parentWindow,
         x, y, w, h, 0, 
         m_backgroundColour.GetPixel(),
-        m_foregroundColour.GetPixel() );
+        m_backgroundColour.GetPixel() );
         
     m_mainWidget = (WXWindow) window;
 
@@ -956,7 +957,7 @@ void wxWindowX11::X11SendPaintEvents()
 {
     m_clipPaintRegion = TRUE;
 
-    if (!m_clearRegion.IsEmpty())
+    //    if (!m_clearRegion.IsEmpty())
     {
         wxWindowDC dc( (wxWindow*)this );
         dc.SetClippingRegion( m_clearRegion );
@@ -1313,8 +1314,7 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 
 bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 {
-    if ( !wxWindowBase::SetBackgroundColour(col) )
-        return FALSE;
+    wxWindowBase::SetBackgroundColour(col);
 
     if (!GetMainWindow())
         return FALSE;