fix for richedit version 1 control bug with bad refresh after resize under Windows XP

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index a6df181a1a5f75d141b8895ffd11c2b34e7ed22f..253c31204d8fbd005032d9aa9c5467e4bfb4f3cc 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -816,25 +816,21 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
     return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 
     return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 

-WXHRGN wxRadioBox::MSWCalculateClippingRegion()
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()

 {
     RECT rc;
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
 
 {
     RECT rc;
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
 

-    size_t count = GetCount();
+    const size_t count = GetCount();

     for ( size_t i = 0; i < count; ++i )
     {
         ::GetWindowRect((*m_radioButtons)[i], &rc);
     for ( size_t i = 0; i < count; ++i )
     {
         ::GetWindowRect((*m_radioButtons)[i], &rc);

-        HRGN hrgnchild = ::CreateRectRgnIndirect(&rc);
+        AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));

         ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
         ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);

-        ::DeleteObject(hrgnchild);

     }
 
     }
 

-    ::GetWindowRect(GetHwnd(), &rc);
-    ::OffsetRgn(hrgn, -rc.left, -rc.top);
-
-    return hrgn;
+    return (WXHRGN)hrgn;

 }
 
 WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 }
 
 WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)