X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..b16de7461ac6d97b0b04a5ce4e73447925e93416:/src/mac/carbon/radiobox.cpp?ds=sidebyside diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp index 103d68ca44..685ce0a654 100644 --- a/src/mac/carbon/radiobox.cpp +++ b/src/mac/carbon/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp +// Name: src/mac/carbon/radiobox.cpp // Purpose: wxRadioBox // Author: Stefan Csomor // Modified by: JS Lair (99/11/15) first implementation @@ -9,32 +9,28 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "radioboxbase.h" -#pragma implementation "radiobox.h" -#endif - //------------------------------------------------------------------------------------- // headers //------------------------------------------------------------------------------------- -#include "wx/defs.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" -#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 ) @@ -54,13 +50,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 +70,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 +81,7 @@ wxRadioBox::~wxRadioBox() current=next; next=current->NextInCycle(); } - delete current; + delete current; } //------------------------------------------------------------------------------------- @@ -112,29 +107,32 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, int majorDim, long style, const wxValidator& val, const wxString& name) { + m_macIsUserPane = false ; + if ( !wxControl::Create(parent, id, pos, size, style, val, name) ) return false; int i; - + m_noItems = n; m_noRowsOrCols = majorDim; m_radioButtonCycle = NULL; - - if (majorDim==0) - m_majorDim = n ; - else - m_majorDim = majorDim ; - - - 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, - kControlGroupBoxTextTitleProc , (long) this ) ; - + + SetMajorDim(majorDim == 0 ? n : majorDim, style); + + m_label = label ; + + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + if( bounds.right <= bounds.left ) + bounds.right = bounds.left + 100 ; + if ( bounds.bottom <= bounds.top ) + bounds.bottom = bounds.top + 100 ; + + m_peer = new wxMacControl(this) ; + + verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , + true /*primary*/ , m_peer->GetControlRefAddr() ) ) ; + for (i = 0; i < n; i++) { wxRadioButton *radBtn = new wxRadioButton @@ -150,11 +148,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; + MacPostControlCreate(pos,size) ; + + return true; } @@ -167,10 +165,10 @@ 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++) { current->Enable(enable); @@ -184,21 +182,21 @@ bool wxRadioBox::Enable(bool enable) //------------------------------------------------------------------------------------- // Enables or disables an given button -void wxRadioBox::Enable(int item, bool enable) +bool wxRadioBox::Enable(int item, bool enable) { 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(); } - current->Enable(enable); + return current->Enable(enable); } //------------------------------------------------------------------------------------- @@ -220,10 +218,10 @@ wxString wxRadioBox::GetString(int item) const { int i; wxRadioButton *current; - - if ((item < 0) || (item >= m_noItems)) + + if (!IsValid(item)) return wxEmptyString; - + i = 0; current = m_radioButtonCycle; while (i != item) { @@ -242,14 +240,14 @@ int wxRadioBox::GetSelection() const { int i; wxRadioButton *current; - + i=0; current=m_radioButtonCycle; while (!current->GetValue()) { i++; current=current->NextInCycle(); } - + return i; } @@ -280,8 +278,8 @@ void wxRadioBox::SetString(int item,const wxString& label) { int i; wxRadioButton *current; - - if ((item < 0) || (item >= m_noItems)) + + if (!IsValid(item)) return; i=0; current=m_radioButtonCycle; @@ -295,15 +293,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 +310,24 @@ 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(); } @@ -338,22 +337,22 @@ bool wxRadioBox::Show(bool show) //------------------------------------------------------------------------------------- // ¥ 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; - - if ((item < 0) || (item >= m_noItems)) - return; + + if (!IsValid(item)) + return false; i=0; current=m_radioButtonCycle; while (i!=item) { i++; current=current->NextInCycle(); } - current->Show(show); + return current->Show(show); } //------------------------------------------------------------------------------------- @@ -376,7 +375,7 @@ void wxRadioBox::SetFocus() { int i; wxRadioButton *current; - + i=0; current=m_radioButtonCycle; while (!current->GetValue()) { @@ -398,33 +397,33 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { 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,51 +433,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? - } + + + x_start = 0; + y_start = 0 ; + 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) + if (m_windowStyle & wxRA_SPECIFY_ROWS) { x_offset += maxWidth + charWidth; y_offset = y_start; @@ -489,10 +486,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,75 +503,39 @@ wxSize wxRadioBox::DoGetBestSize() const int maxWidth, maxHeight; int eachWidth, eachHeight; int totWidth, totHeight; - - wxFont font = GetParent()->GetFont(); + + 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++) { - GetTextExtent(GetString(i), &eachWidth, &eachHeight); + GetTextExtent(GetString(i), &eachWidth, &eachHeight,NULL, NULL, &font); eachWidth = (int)(eachWidth + RADIO_SIZE) ; eachHeight = (int)((3 * eachHeight) / 2); 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? - } + + totHeight = GetRowCount() * (maxHeight ) ; + totWidth = GetColumnCount() * (maxWidth + charWidth) ; + + wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth , totHeight ) ) ; + totWidth = sz.x ; + totHeight = sz.y ; + // 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