Patch from OSAF that maintains radio button selection if Realize is recalled.

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index c1bac089c26ffc5f106b14be914d6722176ab8cd..253c31204d8fbd005032d9aa9c5467e4bfb4f3cc 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -165,9 +165,6 @@ bool wxRadioBox::Create(wxWindow *parent,
     wxUnusedVar(val);
 #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 
-    // and now create the buttons
-    HWND hwndParent = GetHwndOf(parent);
-
     m_radioButtons = new wxSubwindows(n);
     m_radioWidth = new int[n];
     m_radioHeight = new int[n];
@@ -177,7 +174,7 @@ bool wxRadioBox::Create(wxWindow *parent,
         m_radioWidth[i] =
         m_radioHeight[i] = wxDefaultCoord;
         long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
-        if ( i == 0 && style == 0 )
+        if ( i == 0 )
             styleBtn |= WS_GROUP;
 
         long newId = NewControlId();
@@ -186,7 +183,7 @@ bool wxRadioBox::Create(wxWindow *parent,
                                       choices[i],
                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
-                                      hwndParent,
+                                      GetHwnd(),
                                       (HMENU)newId,
                                       wxGetInstance(),
                                       NULL);
@@ -209,7 +206,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     (void)::CreateWindow(_T("BUTTON"),
                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
-                         0, 0, 0, 0, hwndParent,
+                         0, 0, 0, 0, GetHwnd(),
                          (HMENU)NewControlId(), wxGetInstance(), NULL);
 
     m_radioButtons->SetFont(GetFont());
@@ -366,7 +363,7 @@ int wxRadioBox::GetNumHor() const
 
 void wxRadioBox::SetString(int item, const wxString& label)
 {
-    wxCHECK_RET( item >= 0 && item < GetCount(), wxT("invalid radiobox index") );
+    wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
 
     m_radioWidth[item] =
     m_radioHeight[item] = wxDefaultCoord;
@@ -376,7 +373,7 @@ void wxRadioBox::SetString(int item, const wxString& label)
 
 void wxRadioBox::SetSelection(int N)
 {
-    wxCHECK_RET( (N >= 0) && (N < GetCount()), wxT("invalid radiobox index") );
+    wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );
 
     // unselect the old button
     if ( m_selectedButton != wxNOT_FOUND )
@@ -391,7 +388,7 @@ void wxRadioBox::SetSelection(int N)
 // Find string for position
 wxString wxRadioBox::GetString(int item) const
 {
-    wxCHECK_MSG( item >= 0 && item < GetCount(), wxEmptyString,
+    wxCHECK_MSG( IsValid(item), wxEmptyString,
                  wxT("invalid radiobox index") );
 
     return wxGetWindowText((*m_radioButtons)[item]);
@@ -410,20 +407,23 @@ void wxRadioBox::SetFocus()
 // Enable a specific button
 bool wxRadioBox::Enable(int item, bool enable)
 {
-    wxCHECK_MSG( item >= 0 && item < GetCount(), false,
+    wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Enable()") );
 
-    ::EnableWindow((*m_radioButtons)[item], enable);
-    return true;
+    BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
+
+    return (ret == 0) == enable;
 }
 
 // Show a specific button
-void wxRadioBox::Show(int item, bool show)
+bool wxRadioBox::Show(int item, bool show)
 {
-    wxCHECK_RET( item >= 0 && item < GetCount(),
+    wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Show()") );
 
-    ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
+    BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
+
+    return (ret != 0) == show;
 }
 
 WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
@@ -512,8 +512,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         yy = currentY;
 
-    int y_offset = yy;
-    int x_offset = xx;
+    int y_offset = 0;
+    int x_offset = 0;
 
     int cx1, cy1;
     wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
@@ -816,5 +816,51 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
     return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
+{
+    RECT rc;
+    ::GetWindowRect(GetHwnd(), &rc);
+    HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
+
+    const size_t count = GetCount();
+    for ( size_t i = 0; i < count; ++i )
+    {
+        ::GetWindowRect((*m_radioButtons)[i], &rc);
+        AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+        ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+    }
+
+    return (WXHRGN)hrgn;
+}
+
+WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+#ifndef __WXWINCE__
+    if ( nMsg == WM_PRINTCLIENT )
+    {
+        // first check to see if a parent window knows how to paint us better
+        for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+            if ( win->MSWPrintChild(this, wParam, lParam) )
+                return true;
+
+        // nope, so lets do it ourselves
+        RECT rc;
+        WXHBRUSH hbr = DoMSWControlColor((HDC)wParam, wxNullColour);
+        if ( !hbr )
+        {
+            wxBrush *brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+            hbr = (WXHBRUSH)brush->GetResourceHandle();
+        }
+
+        ::GetClientRect(GetHwnd(), &rc);
+        ::FillRect((HDC)wParam, &rc, (HBRUSH)hbr);
+
+        return true;
+    }
+#endif
+    // __WXWINCE__
+
+    return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam);
+}
 #endif // wxUSE_RADIOBOX