X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc26eeb36a7415bd73d3e442c79b7acc0aeed6eb..f2c8079119e5887329d1cba5677498d9f6443f62:/src/common/radiocmn.cpp diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp index d31889c4b3..538281a0ed 100644 --- a/src/common/radiocmn.cpp +++ b/src/common/radiocmn.cpp @@ -6,7 +6,7 @@ // Created: 03.06.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -38,13 +38,80 @@ #include "wx/cshelp.h" #endif +extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox"; + // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// XTI +// ---------------------------------------------------------------------------- + +// TODO: wxCONSTRUCTOR +#if 0 // wxUSE_EXTENDED_RTTI +wxDEFINE_FLAGS( wxRadioBoxStyle ) + +wxBEGIN_FLAGS( wxRadioBoxStyle ) +// new style border flags, we put them first to +// use them for streaming out +wxFLAGS_MEMBER(wxBORDER_SIMPLE) +wxFLAGS_MEMBER(wxBORDER_SUNKEN) +wxFLAGS_MEMBER(wxBORDER_DOUBLE) +wxFLAGS_MEMBER(wxBORDER_RAISED) +wxFLAGS_MEMBER(wxBORDER_STATIC) +wxFLAGS_MEMBER(wxBORDER_NONE) + +// old style border flags +wxFLAGS_MEMBER(wxSIMPLE_BORDER) +wxFLAGS_MEMBER(wxSUNKEN_BORDER) +wxFLAGS_MEMBER(wxDOUBLE_BORDER) +wxFLAGS_MEMBER(wxRAISED_BORDER) +wxFLAGS_MEMBER(wxSTATIC_BORDER) +wxFLAGS_MEMBER(wxBORDER) + +// standard window styles +wxFLAGS_MEMBER(wxTAB_TRAVERSAL) +wxFLAGS_MEMBER(wxCLIP_CHILDREN) +wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) +wxFLAGS_MEMBER(wxWANTS_CHARS) +wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) +wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) +wxFLAGS_MEMBER(wxVSCROLL) +wxFLAGS_MEMBER(wxHSCROLL) + +wxFLAGS_MEMBER(wxRA_SPECIFY_COLS) +wxFLAGS_MEMBER(wxRA_HORIZONTAL) +wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS) +wxFLAGS_MEMBER(wxRA_VERTICAL) + +wxEND_FLAGS( wxRadioBoxStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h") + +wxBEGIN_PROPERTIES_TABLE(wxRadioBox) +wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent ) +wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +/* + selection + content + label + dimension + item + */ + +#endif + + +// ---------------------------------------------------------------------------- +// wxRadioBoxBase +// ---------------------------------------------------------------------------- + void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style) { - wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") ); + wxCHECK_RET( majorDim != 0, wxT("major radiobox dimension can't be 0") ); m_majorDim = majorDim; @@ -64,96 +131,106 @@ void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style) int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const { + const int itemStart = item; + int count = GetCount(), numCols = GetColumnCount(), numRows = GetRowCount(); bool horz = (style & wxRA_SPECIFY_COLS) != 0; - switch ( dir ) + do { - case wxUP: - if ( horz ) - { - item -= numCols; - } - else // vertical layout - { - if ( !item-- ) - item = count - 1; - } - break; - - case wxLEFT: - if ( horz ) - { - if ( !item-- ) - item = count - 1; - } - else // vertical layout - { - item -= numRows; - } - break; - - case wxDOWN: - if ( horz ) - { - item += numCols; - } - else // vertical layout - { - if ( ++item == count ) - item = 0; - } - break; - - case wxRIGHT: - if ( horz ) - { - if ( ++item == count ) - item = 0; - } - else // vertical layout - { - item += numRows; - } - break; + switch ( dir ) + { + case wxUP: + if ( horz ) + { + item -= numCols; + } + else // vertical layout + { + if ( !item-- ) + item = count - 1; + } + break; + + case wxLEFT: + if ( horz ) + { + if ( !item-- ) + item = count - 1; + } + else // vertical layout + { + item -= numRows; + } + break; + + case wxDOWN: + if ( horz ) + { + item += numCols; + } + else // vertical layout + { + if ( ++item == count ) + item = 0; + } + break; + + case wxRIGHT: + if ( horz ) + { + if ( ++item == count ) + item = 0; + } + else // vertical layout + { + item += numRows; + } + break; + + default: + wxFAIL_MSG( wxT("unexpected wxDirection value") ); + return wxNOT_FOUND; + } - default: - wxFAIL_MSG( _T("unexpected wxDirection value") ); - return wxNOT_FOUND; - } + // ensure that the item is in range [0..count) + if ( item < 0 ) + { + // first map the item to the one in the same column but in the last + // row + item += count; + + // now there are 2 cases: either it is the first item of the last + // row in which case we need to wrap again and get to the last item + // or we can just go to the previous item + if ( item % (horz ? numCols : numRows) ) + item--; + else + item = count - 1; + } + else if ( item >= count ) + { + // same logic as above + item -= count; + + // ... except that we need to check if this is not the last item, + // not the first one + if ( (item + 1) % (horz ? numCols : numRows) ) + item++; + else + item = 0; + } - // ensure that the item is in range [0..count) - if ( item < 0 ) - { - // first map the item to the one in the same column but in the last row - item += count; - - // now there are 2 cases: either it is the first item of the last row - // in which case we need to wrap again and get to the last item or we - // can just go to the previous item - if ( item % (horz ? numCols : numRows) ) - item--; - else - item = count - 1; - } - else if ( item >= count ) - { - // same logic as above - item -= count; - - // ... except that we need to check if this is not the last item, not - // the first one - if ( (item + 1) % (horz ? numCols : numRows) ) - item++; - else - item = 0; + wxASSERT_MSG( item < count && item >= 0, + wxT("logic error in wxRadioBox::GetNextItem()") ); } - - wxASSERT_MSG( item < count && item >= 0, - _T("logic error in wxRadioBox::GetNextItem()") ); + // we shouldn't select the non-active items, continue looking for a + // visible and shown one unless we came back to the item we started from in + // which case bail out to avoid infinite loop + while ( !(IsItemShown(item) && IsItemEnabled(item)) && item != itemStart ); return item; } @@ -162,7 +239,7 @@ int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text) { - wxASSERT_MSG( item < GetCount(), _T("Invalid item index") ); + wxASSERT_MSG( item < GetCount(), wxT("Invalid item index") ); // extend the array to have entries for all our items on first use if ( !m_itemsTooltips ) @@ -179,8 +256,7 @@ void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text) if ( tooltip ) { // delete the tooltip - delete tooltip; - tooltip = NULL; + wxDELETE(tooltip); } else // nothing to do { @@ -237,7 +313,7 @@ wxRadioBoxBase::~wxRadioBoxBase() // set helptext for a particular item void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText) { - wxCHECK_RET( n < GetCount(), _T("Invalid item index") ); + wxCHECK_RET( n < GetCount(), wxT("Invalid item index") ); if ( m_itemsHelpTexts.empty() ) { @@ -251,7 +327,7 @@ void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText) // retrieve helptext for a particular item wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const { - wxCHECK_MSG( n < GetCount(), wxEmptyString, _T("Invalid item index") ); + wxCHECK_MSG( n < GetCount(), wxEmptyString, wxT("Invalid item index") ); return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n]; } @@ -261,13 +337,30 @@ wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived, const wxPoint& pt, wxHelpEvent::Origin origin) const { - const int item = origin == wxHelpEvent::Origin_HelpButton - ? GetItemFromPoint(pt) - : GetSelection(); + int item; + switch ( origin ) + { + case wxHelpEvent::Origin_HelpButton: + item = GetItemFromPoint(pt); + break; + + case wxHelpEvent::Origin_Keyboard: + item = GetSelection(); + break; + + default: + wxFAIL_MSG( "unknown help even origin" ); + // fall through + + case wxHelpEvent::Origin_Unknown: + // this value is used when we're called from GetHelpText() for the + // radio box itself, so don't return item-specific text in this case + item = wxNOT_FOUND; + } if ( item != wxNOT_FOUND ) { - wxString text = GetItemHelpText(wx_static_cast(unsigned int, item)); + wxString text = GetItemHelpText(static_cast(item)); if( !text.empty() ) return text; } @@ -277,18 +370,4 @@ wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived, #endif // wxUSE_HELP -#if WXWIN_COMPATIBILITY_2_4 - -// these functions are deprecated and don't do anything -int wxRadioBoxBase::GetNumberOfRowsOrCols() const -{ - return 1; -} - -void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n)) -{ -} - -#endif // WXWIN_COMPATIBILITY_2_4 - #endif // wxUSE_RADIOBOX