fixing a scope error introduced in 1.41

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

diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 672267db79ca67f19564d738c21c68d061615b21..869d0c9b4482702a28211f02e183c783bd38cc5e 100644 (file)
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -6,16 +6,18 @@
 // 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
 //-------------------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 
 //-------------------------------------------------------------------------------------
 //         headers
 //-------------------------------------------------------------------------------------
 

-#include "wx/defs.h"
-#include "wx/arrstr.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_RADIOBOX

 
 

+#include "wx/arrstr.h"

 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"
 #include "wx/radiobox.h"
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"


@@ -47,7 +49,6 @@ wxRadioBox::wxRadioBox()
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;

-    m_majorDim = 0 ;

     m_radioButtonCycle = NULL;
 }
 
     m_radioButtonCycle = NULL;
 }
 


@@ -110,14 +111,11 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     int i;
 
 
     int i;
 

-    m_noItems = n;
+    m_noItems = (size_t)n;

     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 

-    if (majorDim==0)
-        m_majorDim = n ;
-    else
-        m_majorDim = majorDim ;
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);

 
     Rect bounds ;
     Str255 title ;
 
     Rect bounds ;
     Str255 title ;


@@ -157,14 +155,13 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 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 (size_t i = 0; i < m_noItems; i++) {

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


@@ -314,13 +311,12 @@ void wxRadioBox::SetSelection(int item)
 
 bool wxRadioBox::Show(bool show)
 {
 
 bool wxRadioBox::Show(bool show)
 {

-    int i;

     wxRadioButton *current;
 
     wxControl::Show(show);
 
     current=m_radioButtonCycle;
     wxRadioButton *current;
 
     wxControl::Show(show);
 
     current=m_radioButtonCycle;

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

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


@@ -389,7 +385,7 @@ void wxRadioBox::SetFocus()
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    int i;
+    size_t i;

     wxRadioButton *current;
 
     // define the position
     wxRadioButton *current;
 
     // define the position


@@ -427,7 +423,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         eachHeight[i] = (int)((3*eachHeight[i])/2);
         if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
         eachHeight[i] = (int)((3*eachHeight[i])/2);
         if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];

-          }
+    }

 
     totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
 
     totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;


@@ -469,7 +465,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     current=m_radioButtonCycle;
     for ( i = 0 ; i < m_noItems; i++)
     {
     current=m_radioButtonCycle;
     for ( i = 0 ; i < m_noItems; i++)
     {

-        if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
+        if (i&&((i%GetMajorDim())==0)) // not to do for the zero button!

         {
             if (m_windowStyle & wxRA_VERTICAL)
             {
         {
             if (m_windowStyle & wxRA_VERTICAL)
             {


@@ -508,7 +504,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     maxWidth = -1;
     maxHeight = -1;
 
     maxWidth = -1;
     maxHeight = -1;
 

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

     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);
         eachWidth  = (int)(eachWidth + RADIO_SIZE) ;
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);
         eachWidth  = (int)(eachWidth + RADIO_SIZE) ;


@@ -533,36 +529,5 @@ wxSize wxRadioBox::DoGetBestSize() const
 
     return wxSize(totWidth, totHeight);
 }
 
     return wxSize(totWidth, totHeight);
 }

-//-------------------------------------------------------------------------------------
-//         ¥ GetNumVer
-//-------------------------------------------------------------------------------------
-// return the number of buttons in the vertical direction

 
 

-int wxRadioBox::GetRowCount() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return m_majorDim;
-    }
-    else
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-}
-
-//-------------------------------------------------------------------------------------
-//         ¥ GetNumHor
-//-------------------------------------------------------------------------------------
-// return the number of buttons in the horizontal direction
-
-int wxRadioBox::GetColumnCount() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-    else
-    {
-        return m_majorDim;
-    }
-}
+#endif // wxUSE_RADIOBOX