pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index eaefe7429e679cc156d81725e2e02b8cd25cb92a..69ce082c1b620fe5dcbfdd41c6f64b8e074aceae 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -15,15 +15,18 @@
 
 #include "wx/radiobox.h"
 
 
 #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)
 #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()
 
 
 END_EVENT_TABLE()
 
 


@@ -104,7 +107,7 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     SetMajorDim( majorDim == 0 ? n : majorDim, style );
 
 
     SetMajorDim( majorDim == 0 ? n : majorDim, style );
 

-    m_label = label;
+    m_labelOrig = m_label = label;

 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
     if ( bounds.right <= bounds.left )
 
     Rect bounds = wxMacGetBoundsForControl( this, pos, size );
     if ( bounds.right <= bounds.left )


@@ -125,7 +128,7 @@ bool wxRadioBox::Create( wxWindow *parent,
         wxRadioButton *radBtn = new wxRadioButton(
             this,
             wxID_ANY,
         wxRadioButton *radBtn = new wxRadioButton(
             this,
             wxID_ANY,

-            wxStripMenuCodes(choices[i]),
+            GetLabelText(choices[i]),

             wxPoint( 5, 20 * i + 10 ),
             wxDefaultSize,
             i == 0 ? wxRB_GROUP : 0 );
             wxPoint( 5, 20 * i + 10 ),
             wxDefaultSize,
             i == 0 ? wxRB_GROUP : 0 );


@@ -178,6 +181,22 @@ bool wxRadioBox::Enable(unsigned int item, bool enable)
     return current->Enable( enable );
 }
 
     return current->Enable( enable );
 }
 

+bool wxRadioBox::IsItemEnabled(unsigned int item) const
+{
+    if (!IsValid( item ))
+        return false;
+
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {
+        i++;
+        current = current->NextInCycle();
+    }
+
+    return current->IsEnabled();
+}
+

 // Returns the radiobox label
 //
 wxString wxRadioBox::GetLabel() const
 // Returns the radiobox label
 //
 wxString wxRadioBox::GetLabel() const


@@ -306,6 +325,23 @@ bool wxRadioBox::Show(unsigned int item, bool show)
     return current->Show( show );
 }
 
     return current->Show( show );
 }
 

+bool wxRadioBox::IsItemShown(unsigned int item) const
+{
+    if (!IsValid( item ))
+        return false;
+
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;
+    while (i != item)
+    {
+        i++;
+        current = current->NextInCycle();
+    }
+
+    return current->IsShown();
+}
+
+

 // Simulates the effect of the user issuing a command to the item
 //
 void wxRadioBox::Command( wxCommandEvent& event )
 // Simulates the effect of the user issuing a command to the item
 //
 void wxRadioBox::Command( wxCommandEvent& event )


@@ -318,14 +354,11 @@ void wxRadioBox::Command( wxCommandEvent& event )
 //
 void wxRadioBox::SetFocus()
 {
 //
 void wxRadioBox::SetFocus()
 {

-    int i;

     wxRadioButton *current;
 
     wxRadioButton *current;
 

-    i = 0;

     current = m_radioButtonCycle;
     while (!current->GetValue())
     {
     current = m_radioButtonCycle;
     while (!current->GetValue())
     {

-        i++;

         current = current->NextInCycle();
     }
 
         current = current->NextInCycle();
     }