reintroducing non-composited functionality due to DataBrowser Bugs under 10.2

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index b4fd6df3af11733384bbf6e5480ec1eec0158ac0..f4a4178a0e142db2ee266babe278019e61ed35b2 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -315,7 +315,7 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
 
 void wxRadioBox::Command(wxCommandEvent & event)
 {
-    SetSelection (event.m_commandInt);
+    SetSelection (event.GetInt());
     SetFocus();
     ProcessCommand(event);
 }
@@ -366,7 +366,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 +376,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 +391,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]);
@@ -408,21 +408,25 @@ void wxRadioBox::SetFocus()
 }
 
 // Enable a specific button
-void wxRadioBox::Enable(int item, bool enable)
+bool wxRadioBox::Enable(int item, bool enable)
 {
-    wxCHECK_RET( item >= 0 && item < GetCount(),
+    wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Enable()") );
 
-    ::EnableWindow((*m_radioButtons)[item], enable);
+    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)
@@ -477,7 +481,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
     int width  = GetNumHor() * (sizeBtn.x + cx1) + cx1;
 
     // Add extra space under the label, if it exists.
-    if (!wxControl::GetLabel().IsEmpty())
+    if (!wxControl::GetLabel().empty())
         height += cy1/2;
 
     // and also wide enough for its label
@@ -561,7 +565,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     y_offset += cy1;
 
     // Add extra space under the label, if it exists.
-    if (!wxControl::GetLabel().IsEmpty())
+    if (!wxControl::GetLabel().empty())
         y_offset += cy1/2;
 
     int startX = x_offset;