fixed bug due to missing break in GetColourFromGTKWidget() (part of patch 1160117)

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

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index ec34ceda00075d9e807344dfceb72253e2feefa3..bb6aa6eda12af41d954e51e2b39cacf99f81c21a 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -74,7 +74,7 @@ public:
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {
-                return TRUE;
+                return true;
             }
         }
 
@@ -112,7 +112,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
     Init();
 
-    (void)Create(parent, id, title, pos, size, chs.GetCount(), 
+    (void)Create(parent, id, title, pos, size, chs.GetCount(),
                  chs.GetStrings(), majorDim, style, val, name);
 }
 
@@ -129,7 +129,7 @@ bool wxRadioBox::Create(wxWindow *parent,
 {
     wxCArrayString chs(choices);
 
-    return Create(parent, id, title, pos, size, chs.GetCount(), 
+    return Create(parent, id, title, pos, size, chs.GetCount(),
                   chs.GetStrings(), majorDim, style, val, name);
 }
 
@@ -142,7 +142,7 @@ bool wxRadioBox::Create(wxWindow *parent,
                         const wxString *choices,
                         int majorDim,
                         long style,
-                        const wxValidator& val,
+                        const wxValidator& wxVALIDATOR_PARAM(val),
                         const wxString& name)
 {
     // for compatibility with the other ports which don't handle (yet?)
@@ -169,7 +169,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
+        return false;
 
 #if wxUSE_VALIDATORS
     SetValidator(val);
@@ -193,7 +193,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     // radiobox should already have selection so select at least one item
     SetSelection(0);
 
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
@@ -205,7 +205,7 @@ wxRadioBox::~wxRadioBox()
     size_t count = m_buttons.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
-        m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+        m_buttons[n]->PopEventHandler(true /* delete it */);
 
         delete m_buttons[n];
     }
@@ -246,7 +246,7 @@ void wxRadioBox::Append(int count, const wxString *choices)
     {
         // make the first button in the box the start of new group by giving it
         // wxRB_GROUP style
-        wxRadioButton *btn = new wxRadioButton(parent, -1, choices[n],
+        wxRadioButton *btn = new wxRadioButton(parent, wxID_ANY, choices[n],
                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);
@@ -273,7 +273,7 @@ void wxRadioBox::SetSelection(int n)
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group
-    btn->SetValue(TRUE);
+    btn->SetValue(true);
 }
 
 int wxRadioBox::GetSelection() const
@@ -309,7 +309,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
 
 wxString wxRadioBox::GetString(int n) const
 {
-    wxCHECK_MSG( IsValid(n), _T(""),
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();
@@ -322,18 +322,18 @@ void wxRadioBox::SetString(int n, const wxString& label)
     m_buttons[n]->SetLabel(label);
 }
 
-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(int n, bool enable)
 {
-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );
 
-    m_buttons[n]->Enable(enable);
+    return m_buttons[n]->Enable(enable);
 }
 
-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(int n, bool show)
 {
-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );
 
-    m_buttons[n]->Show(show);
+    return m_buttons[n]->Show(show);
 }
 
 // ----------------------------------------------------------------------------
@@ -343,7 +343,7 @@ void wxRadioBox::Show(int n, bool show)
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )
-        return FALSE;
+        return false;
 
     // also enable/disable the buttons
     size_t count = m_buttons.GetCount();
@@ -352,13 +352,13 @@ bool wxRadioBox::Enable(bool enable)
         Enable(n, enable);
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )
-        return FALSE;
+        return false;
 
     // also show/hide the buttons
     size_t count = m_buttons.GetCount();
@@ -367,7 +367,7 @@ bool wxRadioBox::Show(bool show)
         Show(n, show);
     }
 
-    return TRUE;
+    return true;
 }
 
 wxString wxRadioBox::GetLabel() const
@@ -517,7 +517,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         default:
-            return FALSE;
+            return false;
     }
 
     int selOld = GetSelection();
@@ -530,7 +530,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
         SendRadioEvent();
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_RADIOBOX