Fixes for wxPopupTransientWindow for wxMSW. Includes Patch #1181190,

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d17556945e44784110602d6c71238052fb4d81f7..d0395958a37a0742d86c8f67261b0d3c50487011 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -332,7 +332,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
 }
 #endif // Win95
 
 }
 #endif // Win95
 

-WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
+WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)

 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )
 {
     HDC hdc = (HDC)pDC;
     if ( m_hasFgCol )


@@ -343,7 +343,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
     WXHBRUSH hbr = 0;
     if ( !colBg.Ok() )
     {
     WXHBRUSH hbr = 0;
     if ( !colBg.Ok() )
     {

-        hbr = MSWGetBgBrush(pDC);
+        hbr = MSWGetBgBrush(pDC, hWnd);

 
         // if the control doesn't have any bg colour, foreground colour will be
         // ignored as the return value would be 0 -- so forcefully give it a
 
         // if the control doesn't have any bg colour, foreground colour will be
         // ignored as the return value would be 0 -- so forcefully give it a


@@ -366,7 +366,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg)
     return hbr;
 }
 
     return hbr;
 }
 

-WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
+WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)

 {
     wxColour colBg;
 
 {
     wxColour colBg;
 


@@ -375,13 +375,14 @@ WXHBRUSH wxControl::MSWControlColor(WXHDC pDC)
     else // if the control is opaque it shouldn't use the parents background
         colBg = GetBackgroundColour();
 
     else // if the control is opaque it shouldn't use the parents background
         colBg = GetBackgroundColour();
 

-    return DoMSWControlColor(pDC, colBg);
+    return DoMSWControlColor(pDC, colBg, hWnd);

 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
 {
     return DoMSWControlColor(pDC,
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
 {
     return DoMSWControlColor(pDC,

-                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
+                             wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE),
+                             GetHWND());

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------