X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..67193066b2d16ca36529216f70d093690d7e1123:/src/mac/classic/radiobox.cpp diff --git a/src/mac/classic/radiobox.cpp b/src/mac/classic/radiobox.cpp index 103d68ca44..e29ce47f4c 100644 --- a/src/mac/classic/radiobox.cpp +++ b/src/mac/classic/radiobox.cpp @@ -1,40 +1,39 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp +// Name: src/mac/classic/radiobox.cpp // Purpose: wxRadioBox // Author: Stefan Csomor // Modified by: JS Lair (99/11/15) first implementation // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "radioboxbase.h" -#pragma implementation "radiobox.h" -#endif - //------------------------------------------------------------------------------------- // headers //------------------------------------------------------------------------------------- -#include "wx/defs.h" -#include "wx/arrstr.h" +#include "wx/wxprec.h" + +#if wxUSE_RADIOBOX #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" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif //------------------------------------------------------------------------------------- // ¥ 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 ) @@ -44,7 +43,7 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer ) wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); int i = GetSelection() ; event.SetInt( i ); - event.SetString( GetString( i ) ); + event.SetString(GetString(i)); event.SetEventObject( this ); ProcessCommand(event); } @@ -54,13 +53,12 @@ wxRadioBox::wxRadioBox() { m_noItems = 0; m_noRowsOrCols = 0; - m_majorDim = 0 ; 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 @@ -75,10 +73,10 @@ wxRadioBox::wxRadioBox() wxRadioBox::~wxRadioBox() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; wxRadioButton *next,*current; - + current=m_radioButtonCycle->NextInCycle(); next=current->NextInCycle(); while (current!=m_radioButtonCycle) { @@ -86,7 +84,7 @@ wxRadioBox::~wxRadioBox() current=next; next=current->NextInCycle(); } - delete current; + delete current; } //------------------------------------------------------------------------------------- @@ -116,25 +114,21 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, return false; int i; - - m_noItems = n; + + m_noItems = (unsigned int)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 ; - + 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 ) ; - + for (i = 0; i < n; i++) { wxRadioButton *radBtn = new wxRadioButton @@ -150,11 +144,11 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, m_radioButtonCycle = radBtn ; // m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle); } - + SetSelection(0); MacPostControlCreate() ; - - return TRUE; + + return true; } @@ -165,14 +159,12 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, bool wxRadioBox::Enable(bool enable) { - int i; - wxRadioButton *current; - if (!wxControl::Enable(enable)) return false; - - current = m_radioButtonCycle; - for (i = 0; i < m_noItems; i++) { + + wxRadioButton *current = m_radioButtonCycle; + for (unsigned int i = 0; i < m_noItems; i++) + { current->Enable(enable); current = current->NextInCycle(); } @@ -180,25 +172,23 @@ bool wxRadioBox::Enable(bool enable) } //------------------------------------------------------------------------------------- -// ¥ Enable(int, bool) +// ¥ Enable(unsigned int, bool) //------------------------------------------------------------------------------------- // Enables or disables an given button -void wxRadioBox::Enable(int item, bool enable) +bool wxRadioBox::Enable(unsigned int item, bool enable) { - int i; - wxRadioButton *current; - - if ((item < 0) || (item >= m_noItems)) - return; - - i = 0; - current = m_radioButtonCycle; - while (i != item) { + if (!IsValid(item)) + return false; + + unsigned int i = 0; + wxRadioButton *current = m_radioButtonCycle; + while (i != item) + { i++; current = current->NextInCycle(); } - current->Enable(enable); + return current->Enable(enable); } //------------------------------------------------------------------------------------- @@ -216,15 +206,14 @@ wxString wxRadioBox::GetLabel() const //------------------------------------------------------------------------------------- // 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 ((item < 0) || (item >= m_noItems)) + + if (!IsValid(item)) return wxEmptyString; - - i = 0; + + unsigned int i = 0; current = m_radioButtonCycle; while (i != item) { i++; @@ -242,14 +231,14 @@ int wxRadioBox::GetSelection() const { int i; wxRadioButton *current; - + i=0; current=m_radioButtonCycle; while (!current->GetValue()) { i++; current=current->NextInCycle(); } - + return i; } @@ -276,16 +265,15 @@ void wxRadioBox::SetLabel(const wxString& label) //------------------------------------------------------------------------------------- // 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 ((item < 0) || (item >= m_noItems)) + if (!IsValid(item)) return; - i=0; - current=m_radioButtonCycle; - while (i!=item) { + + unsigned int i=0; + wxRadioButton *current=m_radioButtonCycle; + while (i!=item) + { i++; current=current->NextInCycle(); } @@ -295,15 +283,15 @@ void wxRadioBox::SetString(int item,const wxString& label) //------------------------------------------------------------------------------------- // ¥ 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; - - if ((item < 0) || (item >= m_noItems)) + + if (!IsValid(item)) return; i=0; current=m_radioButtonCycle; @@ -312,23 +300,23 @@ void wxRadioBox::SetSelection(int item) current=current->NextInCycle(); } current->SetValue(true); - + } //------------------------------------------------------------------------------------- // ¥ Show(bool) //------------------------------------------------------------------------------------- -// Shows or hides the entire radiobox +// Shows or hides the entire radiobox bool wxRadioBox::Show(bool show) { - int i; wxRadioButton *current; - + wxControl::Show(show); - + current=m_radioButtonCycle; - for (i=0;iShow(show); current=current->NextInCycle(); } @@ -336,24 +324,22 @@ bool wxRadioBox::Show(bool show) } //------------------------------------------------------------------------------------- -// ¥ Show(int, bool) +// ¥ Show(unsigned int, bool) //------------------------------------------------------------------------------------- -// Shows or hides the given button +// Shows or hides the given button -void wxRadioBox::Show(int item, bool show) +bool wxRadioBox::Show(unsigned int item, bool show) { - int i; - wxRadioButton *current; - - if ((item < 0) || (item >= m_noItems)) - return; - i=0; - current=m_radioButtonCycle; + if (!IsValid(item)) + return false; + + unsigned int i = 0; + wxRadioButton *current=m_radioButtonCycle; while (i!=item) { i++; current=current->NextInCycle(); } - current->Show(show); + return current->Show(show); } //------------------------------------------------------------------------------------- @@ -376,7 +362,7 @@ void wxRadioBox::SetFocus() { int i; wxRadioButton *current; - + i=0; current=m_radioButtonCycle; while (!current->GetValue()) { @@ -396,35 +382,35 @@ void wxRadioBox::SetFocus() void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - int i; + unsigned int i; wxRadioButton *current; - + // define the position - + 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); - if ((x == -1) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if ((x == wxDefaultCoord) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) x_offset = x_current; - if ((y == -1)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if ((y == wxDefaultCoord)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) y_offset = y_current; - + // define size - + int charWidth,charHeight; int maxWidth,maxHeight; int eachWidth[128],eachHeight[128]; int totWidth,totHeight; - + SetFont(GetParent()->GetFont()); GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight); charWidth/=52; - + maxWidth=-1; maxHeight=-1; for (i = 0 ; i < m_noItems; i++) @@ -434,49 +420,49 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) eachHeight[i] = (int)((3*eachHeight[i])/2); if (maxWidth= 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; - - current=m_radioButtonCycle; + + 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) { @@ -489,10 +475,10 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) y_offset += maxHeight ; /*+ charHeight/2;*/ } } - + 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 @@ -506,16 +492,16 @@ wxSize wxRadioBox::DoGetBestSize() const int maxWidth, maxHeight; int eachWidth, eachHeight; int totWidth, totHeight; - + wxFont font = GetParent()->GetFont(); GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight, NULL, NULL, &font); charWidth /= 52; - + 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); eachWidth = (int)(eachWidth + RADIO_SIZE) ; @@ -523,58 +509,22 @@ wxSize wxRadioBox::DoGetBestSize() const if (maxWidth < eachWidth) maxWidth = eachWidth; if (maxHeight < eachHeight) maxHeight = eachHeight; } - + 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 - GetTextExtent(GetTitle(), &eachWidth, NULL); + GetTextExtent(GetLabel(), &eachWidth, NULL); eachWidth = (int)(eachWidth + RADIO_SIZE) + 3 * charWidth ; - if (totWidth < eachWidth) + if (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); } - - - - +#endif // wxUSE_RADIOBOX