moved WM_PRINTCLIENT from wxRadioBox to wxStaticBox to allow using it as parent for...

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index b5cdc6eedab07162709edab585b412b5c5a85148..09abc323191c48ab4e5fede8800459c62514acb1 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -700,28 +700,11 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
 WXLRESULT
 wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    if ( nMsg == WM_PRINTCLIENT )
-    {
-        // we have to process WM_PRINTCLIENT ourselves as otherwise the radio
-        // buttons background would never be drawn unless we have a parent with
-        // non default background
-
-        // so check first if we have one
-        if ( !HandlePrintClient((WXHDC)wParam) )
-        {
-            // no, we don't, erase the background ourselves (don't use our own
-            // colour as with static box, see comments there)
-            wxBrush brush(GetParent()->GetBackgroundColour());
-            wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush));
-        }
-
-        return 0;
-    }
     // FIXME: Without this, the radiobox corrupts other controls as it moves
     // in a dynamic layout. Refreshing causes flicker, but it's better than
     // leaving droppings. Note that for some reason, wxStaticBox doesn't need
     // this (perhaps because it has no real children?)
-    else if (nMsg == WM_MOVE)
+    if ( nMsg == WM_MOVE )
     {
         WXLRESULT res = wxControl::MSWWindowProc(nMsg, wParam, lParam);
         wxRect rect = GetRect();

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 04d9874b6bb14112736fb1ad62d093d8b0b55fa9..65bb2447bfa6f4a85e846f8f9921ea79ffe1a09c 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -209,6 +209,24 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
         }
     }
 
+    if ( nMsg == WM_PRINTCLIENT )
+    {
+        // we have to process WM_PRINTCLIENT ourselves as otherwise child
+        // windows' background (eg buttons in radio box) would never be drawn
+        // unless we have a parent with non default background
+
+        // so check first if we have one
+        if ( !HandlePrintClient((WXHDC)wParam) )
+        {
+            // no, we don't, erase the background ourselves
+            // (don't use our own) - see PaintBackground for explanation
+            wxBrush brush(GetParent()->GetBackgroundColour());
+            wxFillRect(GetHwnd(), (HDC)wParam, GetHbrushOf(brush));
+        }
+
+        return 0;
+    }
+
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
@@ -275,7 +293,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
             // if the window isn't visible then it doesn't need clipped
             continue;
         }
-        
+
         LONG style = ::GetWindowLong(child, GWL_STYLE);
         wxString str(wxGetWindowClass(child));
         str.UpperCase();
@@ -287,7 +305,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
             // overlapping windows anyway.
             continue;
         }
-        
+
         ::GetWindowRect(child, &rc);
         if ( ::RectInRegion(hrgn, &rc) )
         {
@@ -297,7 +315,7 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
             {
                 style &= ~WS_CLIPSIBLINGS;
                 ::SetWindowLong(child, GWL_STYLE, style);
-                
+
                 // MSDN: "If you have changed certain window data using
                 // SetWindowLong, you must call SetWindowPos to have the
                 // changes take effect."