added the static function GetLabelText() to wxStaticText which was mentioned in the...

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 1fecf3f8db8bc70284e590cf8193592847e5150c..68ad272a3c62648b4284ca4512f7212c0fcdf9de 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -6,27 +6,27 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-//-------------------------------------------------------------------------------------
-//         headers
-//-------------------------------------------------------------------------------------
-

 #include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 
 #include "wx/wxprec.h"
 
 #if wxUSE_RADIOBOX
 

-#include "wx/arrstr.h"

 #include "wx/radiobox.h"
 #include "wx/radiobox.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()
 
 


@@ -36,10 +36,10 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
     {
         wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
         int i = GetSelection() ;
     {
         wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
         int i = GetSelection() ;

-        event.SetInt( i );
-        event.SetString( GetString( i ) );
+        event.SetInt(i);
+        event.SetString(GetString(i));

         event.SetEventObject( this );
         event.SetEventObject( this );

-        ProcessCommand( event );
+        ProcessCommand(event);

     }
 }
 
     }
 }
 


@@ -101,13 +101,13 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     int i;
 
 
     int i;
 

-    m_noItems = n;
+    m_noItems = (unsigned int)n;

     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     SetMajorDim( majorDim == 0 ? n : majorDim, style );
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     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 )


@@ -128,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 );


@@ -148,14 +148,13 @@ bool wxRadioBox::Create( wxWindow *parent,
 //
 bool wxRadioBox::Enable(bool enable)
 {
 //
 bool wxRadioBox::Enable(bool enable)
 {

-    int i;

     wxRadioButton *current;
 
     if (!wxControl::Enable( enable ))
         return false;
 
     current = m_radioButtonCycle;
     wxRadioButton *current;
 
     if (!wxControl::Enable( enable ))
         return false;
 
     current = m_radioButtonCycle;

-    for (i = 0; i < m_noItems; i++)
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         current->Enable( enable );
         current = current->NextInCycle();
     {
         current->Enable( enable );
         current = current->NextInCycle();


@@ -166,16 +165,13 @@ bool wxRadioBox::Enable(bool enable)
 
 // Enables or disables an given button
 //
 
 // Enables or disables an given button
 //

-bool wxRadioBox::Enable(int item, bool enable)
+bool wxRadioBox::Enable(unsigned int item, bool enable)

 {
 {

-    int i;
-    wxRadioButton *current;
-

     if (!IsValid( item ))
         return false;
 
     if (!IsValid( item ))
         return false;
 

-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;

     while (i != item)
     {
         i++;
     while (i != item)
     {
         i++;


@@ -194,15 +190,14 @@ wxString wxRadioBox::GetLabel() const
 
 // Returns the label for the given button
 //
 
 // Returns the label for the given button
 //

-wxString wxRadioBox::GetString(int item) const
+wxString wxRadioBox::GetString(unsigned int item) const

 {
 {

-    int i;

     wxRadioButton *current;
 
     if (!IsValid( item ))
         return wxEmptyString;
 
     wxRadioButton *current;
 
     if (!IsValid( item ))
         return wxEmptyString;
 

-    i = 0;
+    unsigned int i = 0;

     current = m_radioButtonCycle;
     while (i != item)
     {
     current = m_radioButtonCycle;
     while (i != item)
     {


@@ -240,16 +235,13 @@ void wxRadioBox::SetLabel(const wxString& label)
 
 // Sets the label of a given button
 //
 
 // Sets the label of a given button
 //

-void wxRadioBox::SetString(int item,const wxString& label)
+void wxRadioBox::SetString(unsigned int item,const wxString& label)

 {
 {

-    int i;
-    wxRadioButton *current;
-

     if (!IsValid( item ))
         return;
 
     if (!IsValid( item ))
         return;
 

-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;

     while (i != item)
     {
         i++;
     while (i != item)
     {
         i++;


@@ -285,11 +277,10 @@ void wxRadioBox::SetSelection(int item)
 //
 bool wxRadioBox::Show(bool show)
 {
 //
 bool wxRadioBox::Show(bool show)
 {

-    int i;

     wxRadioButton *current;
 
     current = m_radioButtonCycle;
     wxRadioButton *current;
 
     current = m_radioButtonCycle;

-    for (i=0; i<m_noItems; i++)
+    for (unsigned int i=0; i<m_noItems; i++)

     {
         current->Show( show );
         current = current->NextInCycle();
     {
         current->Show( show );
         current = current->NextInCycle();


@@ -302,16 +293,13 @@ bool wxRadioBox::Show(bool show)
 
 // Shows or hides the given button
 //
 
 // Shows or hides the given button
 //

-bool wxRadioBox::Show(int item, bool show)
+bool wxRadioBox::Show(unsigned int item, bool show)

 {
 {

-    int i;
-    wxRadioButton *current;
-

     if (!IsValid( item ))
         return false;
 
     if (!IsValid( item ))
         return false;
 

-    i = 0;
-    current = m_radioButtonCycle;
+    unsigned int i = 0;
+    wxRadioButton *current = m_radioButtonCycle;

     while (i != item)
     {
         i++;
     while (i != item)
     {
         i++;


@@ -333,14 +321,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();
     }
 


@@ -389,9 +374,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     maxWidth = -1;
     maxHeight = -1;
 
     maxWidth = -1;
     maxHeight = -1;

-    for (i = 0 ; i < m_noItems; i++)
+    for (unsigned int i = 0 ; i < m_noItems; i++)

     {
     {

-        GetTextExtent( GetString( i ), &eachWidth[i], &eachHeight[i] );
+        GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );

         eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
         eachHeight[i] = (int)((3 * eachHeight[i]) / 2);
 
         eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
         eachHeight[i] = (int)((3 * eachHeight[i]) / 2);
 


@@ -435,7 +420,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     y_offset = y_start;
 
     current = m_radioButtonCycle;
     y_offset = y_start;
 
     current = m_radioButtonCycle;

-    for ( i = 0 ; i < m_noItems; i++)
+    for (i = 0 ; i < (int)m_noItems; i++)

     {
         // not to do for the zero button!
         if ((i > 0) && ((i % GetMajorDim()) == 0))
     {
         // not to do for the zero button!
         if ((i > 0) && ((i % GetMajorDim()) == 0))


@@ -479,9 +464,9 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
     maxWidth = -1;
     maxHeight = -1;
 

-    for (int i = 0 ; i < m_noItems; i++)
+    for (unsigned int i = 0 ; i < m_noItems; i++)

     {
     {

-        GetTextExtent( GetString( i ), &eachWidth, &eachHeight, NULL, NULL, &font );
+        GetTextExtent(GetString(i), &eachWidth, &eachHeight, NULL, NULL, &font );

         eachWidth  = (int)(eachWidth + RADIO_SIZE);
         eachHeight = (int)((3 * eachHeight) / 2);
         if (maxWidth < eachWidth)
         eachWidth  = (int)(eachWidth + RADIO_SIZE);
         eachHeight = (int)((3 * eachHeight) / 2);
         if (maxWidth < eachWidth)


@@ -506,4 +491,4 @@ wxSize wxRadioBox::DoGetBestSize() const
     return wxSize( totWidth, totHeight );
 }
 
     return wxSize( totWidth, totHeight );
 }
 

-#endif
+#endif // wxUSE_RADIOBOX