corrected bg colour inheritance once again: only immediate transparent children shoul...

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

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index fcbadbd5669fa64a490228304dc04d928e6fb029..a95f5b572fca057a705e56a0aa515705b3d9886d 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -34,6 +34,7 @@
     #include "wx/radiobox.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"
+    #include "wx/arrstr.h"
 #endif
 
 #include "wx/tooltip.h"
@@ -73,7 +74,7 @@ public:
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {
-                return TRUE;
+                return true;
             }
         }
 
@@ -101,6 +102,37 @@ void wxRadioBox::Init()
     m_majorDim = 0;
 }
 
+wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+                       const wxPoint& pos, const wxSize& size,
+                       const wxArrayString& choices,
+                       int majorDim, long style,
+                       const wxValidator& val, const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    Init();
+
+    (void)Create(parent, id, title, pos, size, chs.GetCount(), 
+                 chs.GetStrings(), majorDim, style, val, name);
+}
+
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, title, pos, size, chs.GetCount(), 
+                  chs.GetStrings(), majorDim, style, val, name);
+}
+
 bool wxRadioBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& title,
@@ -137,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);
@@ -153,10 +185,15 @@ bool wxRadioBox::Create(wxWindow *parent,
         SetClientSize(DoGetBestClientSize());
     }
 
+    // Need to move the radiobox in order to move the radio buttons
+    wxPoint actualPos = GetPosition();
+    wxSize actualSize = GetSize();
+    DoMoveWindow(actualPos.x, actualPos.y, actualSize.x, actualSize.y);
+
     // radiobox should already have selection so select at least one item
     SetSelection(0);
 
-    return TRUE;
+    return true;
 }
 
 wxRadioBox::~wxRadioBox()
@@ -168,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];
     }
@@ -209,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);
@@ -236,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
@@ -306,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();
@@ -315,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();
@@ -330,7 +367,7 @@ bool wxRadioBox::Show(bool show)
         Show(n, show);
     }
 
-    return TRUE;
+    return true;
 }
 
 wxString wxRadioBox::GetLabel() const
@@ -480,7 +517,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         default:
-            return FALSE;
+            return false;
     }
 
     int selOld = GetSelection();
@@ -493,7 +530,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
         SendRadioEvent();
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_RADIOBOX