Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp
index 103d68ca440e684148637c4b011267d31b503bfc..39bd6b2855fce0886b661da0ceb4e038012d9a0e 100644 (file)
--- a/src/mac/classic/radiobox.cpp
+++ b/src/mac/classic/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.cpp
+// Name:        src/mac/classic/radiobox.cpp

 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation


@@ -9,11 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "radioboxbase.h"
-#pragma implementation "radiobox.h"
-#endif
-

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


@@ -25,16 +20,14 @@
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"
 
 #include "wx/radiobut.h"
 #include "wx/mac/uma.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

-#endif

 
 //-------------------------------------------------------------------------------------
 //         ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------
 // Default constructor
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
 
 //-------------------------------------------------------------------------------------
 //         ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------
 // Default constructor
 BEGIN_EVENT_TABLE(wxRadioBox, wxControl)

-EVT_RADIOBUTTON( -1 , wxRadioBox::OnRadioButton )
+EVT_RADIOBUTTON( wxID_ANY , wxRadioBox::OnRadioButton )

 END_EVENT_TABLE()
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 END_EVENT_TABLE()
 
 void wxRadioBox::OnRadioButton( wxCommandEvent &outer )


@@ -54,13 +47,12 @@ wxRadioBox::wxRadioBox()
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;
 {
     m_noItems = 0;
     m_noRowsOrCols = 0;

-    m_majorDim = 0 ;

     m_radioButtonCycle = NULL;
 }
 
 //-------------------------------------------------------------------------------------
     m_radioButtonCycle = NULL;
 }
 
 //-------------------------------------------------------------------------------------

-//         ¥ wxRadioBox(wxWindow*, wxWindowID, const wxString&, const wxPoint&, 
-//                        const wxSize&, int, const wxString[], int, long, 
+//         ¥ wxRadioBox(wxWindow*, wxWindowID, const wxString&, const wxPoint&,
+//                        const wxSize&, int, const wxString[], int, long,

 //                        const wxValidator&, const wxString&)
 //-------------------------------------------------------------------------------------
 // Contructor, creating and showing a radiobox
 //                        const wxValidator&, const wxString&)
 //-------------------------------------------------------------------------------------
 // Contructor, creating and showing a radiobox


@@ -75,10 +67,10 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     wxRadioButton *next,*current;
 
     wxRadioButton *next,*current;

-    
+

     current=m_radioButtonCycle->NextInCycle();
     next=current->NextInCycle();
     while (current!=m_radioButtonCycle) {
     current=m_radioButtonCycle->NextInCycle();
     next=current->NextInCycle();
     while (current!=m_radioButtonCycle) {


@@ -86,7 +78,7 @@ wxRadioBox::~wxRadioBox()
         current=next;
         next=current->NextInCycle();
     }
         current=next;
         next=current->NextInCycle();
     }

-    delete current;    
+    delete current;

 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------


@@ -116,25 +108,21 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         return false;
 
     int i;
         return false;
 
     int i;

-    
+

     m_noItems = n;
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
     m_noItems = n;
     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 ;

-    
+

     MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;
     MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;

-    
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,

         kControlGroupBoxTextTitleProc , (long) this ) ;
         kControlGroupBoxTextTitleProc , (long) this ) ;

-    
+

     for (i = 0; i < n; i++)
     {
         wxRadioButton *radBtn = new wxRadioButton
     for (i = 0; i < n; i++)
     {
         wxRadioButton *radBtn = new wxRadioButton


@@ -150,11 +138,11 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
             m_radioButtonCycle = radBtn ;
         //        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);
     }
             m_radioButtonCycle = radBtn ;
         //        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);
     }

-    
+

     SetSelection(0);
     MacPostControlCreate() ;
     SetSelection(0);
     MacPostControlCreate() ;

-    
-    return TRUE;
+
+    return true;

 }
 
 
 }
 
 


@@ -167,10 +155,10 @@ bool wxRadioBox::Enable(bool enable)
 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
+

     if (!wxControl::Enable(enable))
         return false;
     if (!wxControl::Enable(enable))
         return false;

-    
+

     current = m_radioButtonCycle;
     for (i = 0; i < m_noItems; i++) {
         current->Enable(enable);
     current = m_radioButtonCycle;
     for (i = 0; i < m_noItems; i++) {
         current->Enable(enable);


@@ -184,21 +172,21 @@ bool wxRadioBox::Enable(bool enable)
 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 
 //-------------------------------------------------------------------------------------
 // Enables or disables an given button
 

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

 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
-    if ((item < 0) || (item >= m_noItems))
-        return;
-    
+
+    if (!IsValid(item))
+        return false;
+

     i = 0;
     current = m_radioButtonCycle;
     while (i != item) {
         i++;
         current = current->NextInCycle();
     }
     i = 0;
     current = m_radioButtonCycle;
     while (i != item) {
         i++;
         current = current->NextInCycle();
     }

-    current->Enable(enable);
+    return current->Enable(enable);

 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------


@@ -220,10 +208,10 @@ wxString wxRadioBox::GetString(int item) const
 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
-    if ((item < 0) || (item >= m_noItems))
+
+    if (!IsValid(item))

         return wxEmptyString;
         return wxEmptyString;

-    
+

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


@@ -242,14 +230,14 @@ int wxRadioBox::GetSelection() const
 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
+

     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {
         i++;
         current=current->NextInCycle();
     }
     i=0;
     current=m_radioButtonCycle;
     while (!current->GetValue()) {
         i++;
         current=current->NextInCycle();
     }

-    
+

     return i;
 }
 
     return i;
 }
 


@@ -278,10 +266,10 @@ void wxRadioBox::SetLabel(const wxString& label)
 
 void wxRadioBox::SetString(int item,const wxString& label)
 {
 
 void wxRadioBox::SetString(int item,const wxString& label)
 {

-       int i;
+    int i;

     wxRadioButton *current;
     wxRadioButton *current;

-    
-    if ((item < 0) || (item >= m_noItems))
+
+    if (!IsValid(item))

         return;
     i=0;
     current=m_radioButtonCycle;
         return;
     i=0;
     current=m_radioButtonCycle;


@@ -295,15 +283,15 @@ void wxRadioBox::SetString(int item,const wxString& label)
 //-------------------------------------------------------------------------------------
 //         ¥ SetSelection
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ SetSelection
 //-------------------------------------------------------------------------------------

-// Sets a button by passing the desired position. This does not cause 
+// Sets a button by passing the desired position. This does not cause

 // wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
 
 void wxRadioBox::SetSelection(int item)
 {
     int i;
     wxRadioButton *current;
 // wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
 
 void wxRadioBox::SetSelection(int item)
 {
     int i;
     wxRadioButton *current;

-    
-    if ((item < 0) || (item >= m_noItems))
+
+    if (!IsValid(item))

         return;
     i=0;
     current=m_radioButtonCycle;
         return;
     i=0;
     current=m_radioButtonCycle;


@@ -312,23 +300,24 @@ void wxRadioBox::SetSelection(int item)
         current=current->NextInCycle();
     }
     current->SetValue(true);
         current=current->NextInCycle();
     }
     current->SetValue(true);

-    
+

 }
 
 //-------------------------------------------------------------------------------------
 //         ¥ Show(bool)
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------
 //         ¥ Show(bool)
 //-------------------------------------------------------------------------------------

-// Shows or hides the entire radiobox 
+// Shows or hides the entire radiobox

 
 bool wxRadioBox::Show(bool show)
 {
     int i;
     wxRadioButton *current;
 
 bool wxRadioBox::Show(bool show)
 {
     int i;
     wxRadioButton *current;

-    
+

     wxControl::Show(show);
     wxControl::Show(show);

-    
+

     current=m_radioButtonCycle;
     current=m_radioButtonCycle;

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

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


@@ -338,22 +327,22 @@ bool wxRadioBox::Show(bool show)
 //-------------------------------------------------------------------------------------
 //         ¥ Show(int, bool)
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ Show(int, bool)
 //-------------------------------------------------------------------------------------

-// Shows or hides the given button 
+// Shows or hides the given button

 
 

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

 {
 {

-       int i;
+    int i;

     wxRadioButton *current;
     wxRadioButton *current;

-    
-    if ((item < 0) || (item >= m_noItems))
-        return;
+
+    if (!IsValid(item))
+        return false;

     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {
         i++;
         current=current->NextInCycle();
     }
     i=0;
     current=m_radioButtonCycle;
     while (i!=item) {
         i++;
         current=current->NextInCycle();
     }

-    current->Show(show);
+    return current->Show(show);

 }
 
 //-------------------------------------------------------------------------------------
 }
 
 //-------------------------------------------------------------------------------------


@@ -376,7 +365,7 @@ void wxRadioBox::SetFocus()
 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
+

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


@@ -398,33 +387,33 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     int i;
     wxRadioButton *current;
 {
     int i;
     wxRadioButton *current;

-    
+

     // define the position
     // define the position

-    
+

     int x_current, y_current;
     int x_offset,y_offset;
     int widthOld, heightOld;
     GetSize(&widthOld, &heightOld);
     int x_current, y_current;
     int x_offset,y_offset;
     int widthOld, heightOld;
     GetSize(&widthOld, &heightOld);

-    
+

     x_offset = x;
     y_offset = y;
     GetPosition(&x_current, &y_current);
     x_offset = x;
     y_offset = y;
     GetPosition(&x_current, &y_current);

-    if ((x == -1) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if ((x == wxDefaultCoord) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         x_offset = x_current;
         x_offset = x_current;

-    if ((y == -1)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if ((y == wxDefaultCoord)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         y_offset = y_current;
         y_offset = y_current;

-    
+

     // define size
     // define size

-    
+

     int charWidth,charHeight;
     int maxWidth,maxHeight;
     int eachWidth[128],eachHeight[128];
     int totWidth,totHeight;
     int charWidth,charHeight;
     int maxWidth,maxHeight;
     int eachWidth[128],eachHeight[128];
     int totWidth,totHeight;

-    
+

     SetFont(GetParent()->GetFont());
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
     charWidth/=52;
     SetFont(GetParent()->GetFont());
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
     charWidth/=52;

-    
+

     maxWidth=-1;
     maxHeight=-1;
     for (i = 0 ; i < m_noItems; i++)
     maxWidth=-1;
     maxHeight=-1;
     for (i = 0 ; i < m_noItems; i++)


@@ -435,48 +424,48 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
           }
         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;

-    
+

     // only change our width/height if asked for
     // only change our width/height if asked for

-    if ( width == -1 )
+    if ( width == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
             width = totWidth ;
         else
             width = widthOld;
     }
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
             width = totWidth ;
         else
             width = widthOld;
     }

-    
-    if ( height == -1 )
+
+    if ( height == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
             height = totHeight ;
         else
             height = heightOld;
     }
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
             height = totHeight ;
         else
             height = heightOld;
     }

-    
+

     wxControl::DoSetSize(x_offset,y_offset,width,height,wxSIZE_AUTO);
     wxControl::DoSetSize(x_offset,y_offset,width,height,wxSIZE_AUTO);

-    
+

     // arrange radiobuttons
     // arrange radiobuttons

-    
+

     int x_start,y_start;
     int x_start,y_start;

-    
-    
+
+

     x_start = charWidth;
     y_start = 15 ;
     if ( UMAGetSystemVersion() >= 0x1030 )
     {
     x_start = charWidth;
     y_start = 15 ;
     if ( UMAGetSystemVersion() >= 0x1030 )
     {

-               //need to add a few more pixels for the top border on panther
-               y_start = y_start + 5; //how many exactly should this be to meet the HIG?
+        //need to add a few more pixels for the top border on panther
+        y_start = y_start + 5; //how many exactly should this be to meet the HIG?

     }
     x_offset = x_start;
     y_offset = y_start;
     }
     x_offset = x_start;
     y_offset = y_start;

-    
-    current=m_radioButtonCycle;  
+
+    current=m_radioButtonCycle;

     for ( i = 0 ; i < m_noItems; i++)
     {
     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)
             {


@@ -489,10 +478,10 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 y_offset += maxHeight ; /*+ charHeight/2;*/
             }
         }
                 y_offset += maxHeight ; /*+ charHeight/2;*/
             }
         }

-        
+

         current->SetSize(x_offset,y_offset,eachWidth[i],eachHeight[i]);
         current=current->NextInCycle();
         current->SetSize(x_offset,y_offset,eachWidth[i],eachHeight[i]);
         current=current->NextInCycle();

-        
+

         if (m_windowStyle & wxRA_SPECIFY_ROWS)
             y_offset += maxHeight ; /*+ charHeight/2;*/
         else
         if (m_windowStyle & wxRA_SPECIFY_ROWS)
             y_offset += maxHeight ; /*+ charHeight/2;*/
         else


@@ -506,15 +495,15 @@ wxSize wxRadioBox::DoGetBestSize() const
     int maxWidth, maxHeight;
     int eachWidth, eachHeight;
     int totWidth, totHeight;
     int maxWidth, maxHeight;
     int eachWidth, eachHeight;
     int totWidth, totHeight;

-    
+

     wxFont font = GetParent()->GetFont();
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
         &charWidth, &charHeight, NULL, NULL, &font);
     charWidth /= 52;
     wxFont font = GetParent()->GetFont();
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
         &charWidth, &charHeight, NULL, NULL, &font);
     charWidth /= 52;

-    
+

     maxWidth = -1;
     maxHeight = -1;
     maxWidth = -1;
     maxHeight = -1;

-    
+

     for (int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);
     for (int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth, &eachHeight);


@@ -523,58 +512,20 @@ wxSize wxRadioBox::DoGetBestSize() const
         if (maxWidth < eachWidth)     maxWidth = eachWidth;
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }
         if (maxWidth < eachWidth)     maxWidth = eachWidth;
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }

-    
+

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

-    
+

     if ( UMAGetSystemVersion() >= 0x1030 )
     {
         //need to add a few more pixels for the static boxborder on panther
         totHeight = totHeight + 10; //how many exactly should this be to meet the HIG?
     }
     // handle radio box title as well
     if ( UMAGetSystemVersion() >= 0x1030 )
     {
         //need to add a few more pixels for the static boxborder on panther
         totHeight = totHeight + 10; //how many exactly should this be to meet the HIG?
     }
     // handle radio box title as well

-    GetTextExtent(GetTitle(), &eachWidth, NULL);
+    GetTextExtent(GetLabel(), &eachWidth, NULL);

     eachWidth  = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ;
     eachWidth  = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ;

-    if (totWidth < eachWidth)     
+    if (totWidth < eachWidth)

         totWidth = eachWidth;
         totWidth = eachWidth;

-    
-    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;
-    }
+    return wxSize(totWidth, totHeight);

 }
 }

-
-
-
-
-