X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9705fbe9042fd947be91ad3242b70df8c5274187..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/radiobox.cpp diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 09abc32319..b29e5eb3e2 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/radiobox.cpp +// Name: src/msw/radiobox.cpp // Purpose: wxRadioBox implementation // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "radiobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,25 +26,18 @@ #if wxUSE_RADIOBOX +#include "wx/radiobox.h" + #ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/brush.h" - #include "wx/radiobox.h" #include "wx/settings.h" #include "wx/log.h" #endif #include "wx/msw/subwin.h" -// This is switched off because in some situations, the radiobox -// buttons simply don't appear when deferred sizing is on. -// Instead, refreshing on WM_MOVE seems to at least cure the droppings. -#define USE_DEFERRED_SIZING 0 - #if wxUSE_TOOLTIPS - #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) - #include - #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS @@ -140,7 +129,6 @@ void wxRadioBox::Init() { m_selectedButton = wxNOT_FOUND; m_radioButtons = NULL; - m_majorDim = 0; m_radioWidth = NULL; m_radioHeight = NULL; } @@ -157,9 +145,6 @@ bool wxRadioBox::Create(wxWindow *parent, const wxValidator& val, const wxString& name) { - // initialize members - m_majorDim = majorDim == 0 ? n : majorDim; - // common initialization if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) return false; @@ -185,10 +170,10 @@ bool wxRadioBox::Create(wxWindow *parent, long newId = NewControlId(); HWND hwndBtn = ::CreateWindow(_T("BUTTON"), - choices[i], + choices[i].wx_str(), styleBtn, 0, 0, 0, 0, // will be set in SetSize() - GetHwnd(), + GetHwndOf(parent), (HMENU)newId, wxGetInstance(), NULL); @@ -211,7 +196,7 @@ bool wxRadioBox::Create(wxWindow *parent, (void)::CreateWindow(_T("BUTTON"), wxEmptyString, WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, - 0, 0, 0, 0, GetHwnd(), + 0, 0, 0, 0, GetHwndOf(parent), (HMENU)NewControlId(), wxGetInstance(), NULL); m_radioButtons->SetFont(GetFont()); @@ -221,11 +206,12 @@ bool wxRadioBox::Create(wxWindow *parent, SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE); #endif + SetMajorDim(majorDim == 0 ? n : majorDim, style); SetSelection(0); SetSize(pos.x, pos.y, size.x, size.y); // Now that we have items determine what is the best size and set it. - SetBestSize(size); + SetInitialSize(size); return true; } @@ -272,8 +258,10 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) // events generation // ---------------------------------------------------------------------------- -bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) +bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_) { + const int id = (signed short)id_; + if ( cmd == BN_CLICKED ) { if (id == GetId()) @@ -281,12 +269,17 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) int selectedButton = wxNOT_FOUND; - int count = GetCount(); - for ( int i = 0; i < count; i++ ) + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; i++ ) { - if ( id == wxGetWindowId((*m_radioButtons)[i]) ) + const HWND hwndBtn = (*m_radioButtons)[i]; + if ( id == wxGetWindowId(hwndBtn) ) { - selectedButton = i; + // we can get BN_CLICKED for a button which just became focused + // but it may not be checked, in which case we shouldn't + // generate a radiobox selection changed event for it + if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED ) + selectedButton = i; break; } @@ -326,7 +319,7 @@ void wxRadioBox::SendNotificationEvent() { wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); event.SetInt( m_selectedButton ); - event.SetString( GetString(m_selectedButton) ); + event.SetString(GetString(m_selectedButton)); event.SetEventObject( this ); ProcessCommand(event); } @@ -335,38 +328,12 @@ void wxRadioBox::SendNotificationEvent() // simple accessors // ---------------------------------------------------------------------------- -int wxRadioBox::GetCount() const +unsigned int wxRadioBox::GetCount() const { - return m_radioButtons->GetCount(); + return m_radioButtons ? m_radioButtons->GetCount() : 0u; } -// returns the number of rows -int wxRadioBox::GetNumVer() const -{ - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return m_majorDim; - } - else - { - return (GetCount() + m_majorDim - 1)/m_majorDim; - } -} - -// returns the number of columns -int wxRadioBox::GetNumHor() const -{ - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return (GetCount() + m_majorDim - 1)/m_majorDim; - } - else - { - return m_majorDim; - } -} - -void wxRadioBox::SetString(int item, const wxString& label) +void wxRadioBox::SetString(unsigned int item, const wxString& label) { wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") ); @@ -393,7 +360,7 @@ void wxRadioBox::SetSelection(int N) } // Find string for position -wxString wxRadioBox::GetString(int item) const +wxString wxRadioBox::GetString(unsigned int item) const { wxCHECK_MSG( IsValid(item), wxEmptyString, wxT("invalid radiobox index") ); @@ -412,30 +379,72 @@ void wxRadioBox::SetFocus() } // Enable a specific button -bool wxRadioBox::Enable(int item, bool enable) +bool wxRadioBox::Enable(unsigned int item, bool enable) { wxCHECK_MSG( IsValid(item), false, wxT("invalid item in wxRadioBox::Enable()") ); BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable); - return (ret == 0) == enable; + return (ret == 0) != enable; +} + +bool wxRadioBox::IsItemEnabled(unsigned int item) const +{ + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::IsItemEnabled()") ); + + return ::IsWindowEnabled((*m_radioButtons)[item]) != 0; } // Show a specific button -bool wxRadioBox::Show(int item, bool show) +bool wxRadioBox::Show(unsigned int item, bool show) { wxCHECK_MSG( IsValid(item), false, wxT("invalid item in wxRadioBox::Show()") ); BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE); - bool changed = (ret != 0) == show; - if( changed ) + bool changed = (ret != 0) != show; + if ( changed ) + { InvalidateBestSize(); + } + return changed; } +bool wxRadioBox::IsItemShown(unsigned int item) const +{ + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::IsItemShown()") ); + + // don't use IsWindowVisible() here because it would return false if the + // radiobox itself is hidden while we want to only return false if this + // button specifically is hidden + return (::GetWindowLong((*m_radioButtons)[item], + GWL_STYLE) & WS_VISIBLE) != 0; +} + +#if wxUSE_TOOLTIPS + +bool wxRadioBox::HasToolTips() const +{ + return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips(); +} + +void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip) +{ + // we have already checked for the item to be valid in wxRadioBoxBase + const HWND hwndRbtn = (*m_radioButtons)[item]; + if ( tooltip != NULL ) + tooltip->Add(hwndRbtn); + else // unset the tooltip + wxToolTip::Remove(hwndRbtn); +} + +#endif // wxUSE_TOOLTIPS + WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons) // ---------------------------------------------------------------------------- @@ -447,8 +456,8 @@ wxSize wxRadioBox::GetMaxButtonSize() const // calculate the max button size int widthMax = 0, heightMax = 0; - const int count = GetCount(); - for ( int i = 0 ; i < count; i++ ) + const unsigned int count = GetCount(); + for ( unsigned int i = 0 ; i < count; i++ ) { int width, height; if ( m_radioWidth[i] < 0 ) @@ -484,8 +493,8 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const int extraHeight = cy1; - int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight; - int width = GetNumHor() * (sizeBtn.x + cx1) + cx1; + int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight; + int width = GetColumnCount() * (sizeBtn.x + cx1) + cx1; // Add extra space under the label, if it exists. if (!wxControl::GetLabel().empty()) @@ -493,7 +502,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const // and also wide enough for its label int widthLabel; - GetTextExtent(GetTitle(), &widthLabel, NULL); + GetTextExtent(GetLabelText(), &widthLabel, NULL); widthLabel += RADIO_SIZE; // FIXME this is bogus too if ( widthLabel > width ) width = widthLabel; @@ -503,6 +512,13 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const wxSize wxRadioBox::DoGetBestSize() const { + if ( !m_radioButtons ) + { + // if we're not fully initialized yet, we can't meaningfully compute + // our best size, we'll do it later + return wxSize(1, 1); + } + wxSize best = GetTotalButtonSize(GetMaxButtonSize()); CacheBestSize(best); return best; @@ -524,8 +540,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) yy = currentY; - int y_offset = 0; - int x_offset = 0; + int y_offset = yy; + int x_offset = xx; int cx1, cy1; wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); @@ -557,17 +573,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) height = heightOld; } - // if our parent had prepared a defer window handle for us, use it (unless - // we are a top level window) - -#if USE_DEFERRED_SIZING - wxWindowMSW *parent = GetParent(); - HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL; -#else - HDWP hdwp = 0; -#endif - - wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height); + DoMoveWindow(xx, yy, width, height); // Now position all the buttons: the current button will be put at // wxPoint(x_offset, y_offset) and the new row/column will start at @@ -576,9 +582,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) // to the right border of radiobox and thus can be wider than this. // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in - // left to right order and m_majorDim is the number of columns while + // left to right order and GetMajorDim() is the number of columns while // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and - // m_majorDim is the number of rows. + // GetMajorDim() is the number of rows. x_offset += cx1; y_offset += cy1; @@ -590,8 +596,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) int startX = x_offset; int startY = y_offset; - const int count = GetCount(); - for ( int i = 0; i < count; i++ ) + const unsigned int count = GetCount(); + for (unsigned int i = 0; i < count; i++) { // the last button in the row may be wider than the other ones as the // radiobox may be wider than the sum of the button widths (as it @@ -601,17 +607,17 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { // item is the last in its row if it is a multiple of the number of // columns or if it is just the last item - int n = i + 1; - isLastInTheRow = ((n % m_majorDim) == 0) || (n == count); + unsigned int n = i + 1; + isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count); } else // wxRA_SPECIFY_ROWS { // item is the last in the row if it is in the last columns - isLastInTheRow = i >= (count/m_majorDim)*m_majorDim; + isLastInTheRow = i >= (count/GetMajorDim())*GetMajorDim(); } // is this the start of new row/column? - if ( i && (i % m_majorDim == 0) ) + if ( i && (i % GetMajorDim() == 0) ) { if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { @@ -646,9 +652,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) // the radiobox entirely and the radiobox tooltips are always shown // (otherwise they are not when the mouse pointer is in the radiobox // part not belonging to any radiobutton) - ::MoveWindow((*m_radioButtons)[i], - x_offset, y_offset, widthBtn, maxHeight, - TRUE); + DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight); // where do we put the next button? if ( m_windowStyle & wxRA_SPECIFY_ROWS ) @@ -664,14 +668,23 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) x_offset += widthBtn + cx1; } } +} -#if USE_DEFERRED_SIZING - if (parent) +int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const +{ + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; i++ ) { - // hdwp must be updated as it may have been changed - parent->m_hDWP = (WXHANDLE)hdwp; + RECT rect = wxGetWindowRect((*m_radioButtons)[i]); + + if ( rect.left <= pt.x && pt.x < rect.right && + rect.top <= pt.y && pt.y < rect.bottom ) + { + return i; + } } -#endif + + return wxNOT_FOUND; } // ---------------------------------------------------------------------------- @@ -686,9 +699,13 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren() ::GetWindowRect(GetHwnd(), &rc); HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); - const size_t count = GetCount(); - for ( size_t i = 0; i < count; ++i ) + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; ++i ) { + // don't clip out hidden children + if ( !IsItemShown(i) ) + continue; + ::GetWindowRect((*m_radioButtons)[i], &rc); AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc)); ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF); @@ -697,24 +714,6 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren() return (WXHRGN)hrgn; } -WXLRESULT -wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - // FIXME: Without this, the radiobox corrupts other controls as it moves - // in a dynamic layout. Refreshing causes flicker, but it's better than - // leaving droppings. Note that for some reason, wxStaticBox doesn't need - // this (perhaps because it has no real children?) - if ( nMsg == WM_MOVE ) - { - WXLRESULT res = wxControl::MSWWindowProc(nMsg, wParam, lParam); - wxRect rect = GetRect(); - GetParent()->Refresh(true, & rect); - return res; - } - - return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam); -} - #endif // __WXWINCE__ // --------------------------------------------------------------------------- @@ -739,32 +738,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, return lDlgCode | DLGC_WANTARROWS; } -#if wxUSE_TOOLTIPS - case WM_NOTIFY: - { - NMHDR* hdr = (NMHDR *)lParam; - if ( hdr->code == TTN_NEEDTEXT ) - { - wxRadioBox * - radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); - - wxCHECK_MSG( radiobox, 0, - wxT("radio button without radio box?") ); - - wxToolTip *tooltip = radiobox->GetToolTip(); - if ( tooltip ) - { - TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam; - ttt->lpszText = (wxChar *)tooltip->GetTip().c_str(); - } - - // processed - return 0; - } - } - break; -#endif // wxUSE_TOOLTIPS - case WM_KEYDOWN: { wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); @@ -889,4 +862,3 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, } #endif // wxUSE_RADIOBOX -