Fixed uninstalled toolbars in native toolbar mode, with a method for

[wxWidgets.git] / src / mac / carbon / radiobox.cpp

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index eaefe7429e679cc156d81725e2e02b8cd25cb92a..da6e2588685f4c460fa39c2ef1d001b05555c308 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -15,15 +15,18 @@
 
 #include "wx/radiobox.h"
 
-#include "wx/arrstr.h"
-#include "wx/radiobut.h"
+#ifndef WX_PRECOMP
+    #include "wx/radiobut.h"
+    #include "wx/arrstr.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
-EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
+    EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )
 END_EVENT_TABLE()
 
 
@@ -125,7 +128,7 @@ bool wxRadioBox::Create( wxWindow *parent,
         wxRadioButton *radBtn = new wxRadioButton(
             this,
             wxID_ANY,
-            wxStripMenuCodes(choices[i]),
+            GetLabelText(choices[i]),
             wxPoint( 5, 20 * i + 10 ),
             wxDefaultSize,
             i == 0 ? wxRB_GROUP : 0 );
@@ -318,14 +321,11 @@ void wxRadioBox::Command( wxCommandEvent& event )
 //
 void wxRadioBox::SetFocus()
 {
-    int i;
     wxRadioButton *current;
 
-    i = 0;
     current = m_radioButtonCycle;
     while (!current->GetValue())
     {
-        i++;
         current = current->NextInCycle();
     }