In MSWUniv wxWindow and wxWindowMSW are different classes so we can't access some of protected members (catched only by Borland). Therefore some of the flags related to background needs reading API.

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

include/wx/univ/window.h

@@ -150,7 +150,6 @@ public:
 
     // return true if we should use the colours/fonts returned by the
     // corresponding GetXXX() methods instead of the default ones
-    bool UseBgCol() const { return m_hasBgCol; }
     bool UseFgCol() const { return m_hasFgCol; }
     bool UseFont() const { return m_hasFont; }
 

include/wx/window.h

@@ -424,11 +424,11 @@ public:
 
         // Override these methods for windows that have a virtual size
         // independent of their client size.  eg. the virtual area of a
-        // wxScrolledWindow. 
+        // wxScrolledWindow.
 
     virtual void DoSetVirtualSize( int x, int y );
     virtual wxSize DoGetVirtualSize() const;
-    
+
         // Return the largest of ClientSize and BestSize (as determined
         // by a sizer, interior children, or other means)
 
@@ -759,6 +759,14 @@ public:
             m_inheritBgCol = false;
     }
     wxColour GetBackgroundColour() const;
+    bool InheritsBackgroundColour() const
+    {
+        return m_inheritBgCol;
+    }
+    bool UseBgCol() const
+    {
+        return m_hasBgCol;
+    }
 
     // if the window shouldn't inherit its colour from the parent, override
     // this function to return true

src/msw/window.cpp

@@ -4041,7 +4041,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
         // windows for which a custom colour had been explicitly set with
         // SetOwnBackgroundColour() and so shouldn't affect its children
         if ( win->ProvidesBackground() ||
-                (win->m_hasBgCol && !win->m_inheritBgCol) )
+                (win->UseBgCol() && !win->InheritsBackgroundColour()) )
             break;
     }