X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5333ab8e8ef81e3ae71fef22b42542c51b122258..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/radiobox.cpp?ds=sidebyside diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index d442dbd4df..b29e5eb3e2 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp -// Purpose: wxRadioBox +// Name: src/msw/radiobox.cpp +// Purpose: wxRadioBox implementation // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "radiobox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,53 +24,86 @@ #pragma hdrstop #endif +#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/private.h" +#include "wx/msw/subwin.h" #if wxUSE_TOOLTIPS -// #ifndef __GNUWIN32__ - #include -// #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS +// TODO: wxCONSTRUCTOR +#if 0 // wxUSE_EXTENDED_RTTI +WX_DEFINE_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() + +#else IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +#endif -// there are two possible ways to create the radio buttons: either as children -// of the radiobox or as siblings of it - allow playing with both variants for -// now, eventually we will choose the best one for our purposes -// -// two main problems are the keyboard navigation inside the radiobox (arrows -// should switch between buttons, not pass focus to the next control) and the -// tooltips - a tooltip is associated with the radiobox itself, not the -// children... -// -// the problems with setting this to 1: -// a) Alt- isn't handled properly by IsDialogMessage() -// because it sets focus to the next control accepting it which is not a -// radio button but a radiobox sibling in this case - the only solution to -// this would be to handle Alt- ourselves -// b) the problems with setting radiobox colours under Win98/2K were reported -// but I couldn't reproduce it so I have no idea about what causes it -// -// the problems with setting this to 0: -// a) the tooltips are not shown for the radiobox - possible solution: make -// TTM_WINDOWFROMPOS handling code in msw/tooltip.cpp work (easier said than -// done because I don't know why it doesn't work) -#define RADIOBTN_PARENT_IS_RADIOBOX 0 +/* + selection + content + label + dimension + item +*/ // --------------------------------------------------------------------------- // private functions // --------------------------------------------------------------------------- // wnd proc for radio buttons -#ifdef __WIN32__ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, UINT message, WPARAM wParam, @@ -85,98 +114,21 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, // --------------------------------------------------------------------------- // the pointer to standard radio button wnd proc -static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL; - -#endif // __WIN32__ +static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL; // =========================================================================== // implementation // =========================================================================== // --------------------------------------------------------------------------- -// wxRadioBox +// wxRadioBox creation // --------------------------------------------------------------------------- -int wxRadioBox::GetNumVer() const -{ - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return m_majorDim; - } - else - { - return (m_noItems + m_majorDim - 1)/m_majorDim; - } -} - -int wxRadioBox::GetNumHor() const -{ - if ( m_windowStyle & wxRA_SPECIFY_ROWS ) - { - return (m_noItems + m_majorDim - 1)/m_majorDim; - } - else - { - return m_majorDim; - } -} - -bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) -{ - if ( cmd == BN_CLICKED ) - { - int selectedButton = -1; - - for ( int i = 0; i < m_noItems; i++ ) - { - if ( id == wxGetWindowId(m_radioButtons[i]) ) - { - selectedButton = i; - - break; - } - } - - wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") ); - - if ( selectedButton != m_selectedButton ) - { - m_selectedButton = selectedButton; - - SendNotificationEvent(); - } - //else: don't generate events when the selection doesn't change - - return TRUE; - } - else - return FALSE; -} - -#if WXWIN_COMPATIBILITY -wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title, - int x, int y, int width, int height, - int n, char **choices, - int majorDim, long style, const char *name) -{ - wxString *choices2 = new wxString[n]; - for ( int i = 0; i < n; i ++) choices2[i] = choices[i]; - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style, - wxDefaultValidator, name); - Callback(func); - delete choices2; -} - -#endif // WXWIN_COMPATIBILITY - // Radio box item -wxRadioBox::wxRadioBox() +void wxRadioBox::Init() { - m_selectedButton = -1; - m_noItems = 0; - m_noRowsOrCols = 0; + m_selectedButton = wxNOT_FOUND; m_radioButtons = NULL; - m_majorDim = 0; m_radioWidth = NULL; m_radioHeight = NULL; } @@ -193,173 +145,383 @@ bool wxRadioBox::Create(wxWindow *parent, const wxValidator& val, const wxString& name) { - // initialize members - m_selectedButton = -1; - m_noItems = 0; - - m_majorDim = majorDim == 0 ? n : majorDim; - m_noRowsOrCols = majorDim; - // common initialization - if ( !CreateControl(parent, id, pos, size, style, val, name) ) - return FALSE; - - // create the static box - if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP, - pos, size, title, 0) ) - return FALSE; - - // and now create the buttons - m_noItems = n; -#if RADIOBTN_PARENT_IS_RADIOBOX - HWND hwndParent = GetHwnd(); + if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) + return false; + +#if wxUSE_VALIDATORS + SetValidator(val); #else - HWND hwndParent = GetHwndOf(parent); -#endif + wxUnusedVar(val); +#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS - // Some radio boxes test consecutive id. - (void)NewControlId(); - m_radioButtons = new WXHWND[n]; + m_radioButtons = new wxSubwindows(n); m_radioWidth = new int[n]; m_radioHeight = new int[n]; - WXHFONT hfont = 0; - wxFont& font = GetFont(); - if ( font.Ok() ) - { - hfont = font.GetResourceHandle(); - } - for ( int i = 0; i < n; i++ ) { m_radioWidth[i] = - m_radioHeight[i] = -1; + m_radioHeight[i] = wxDefaultCoord; long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE; - if ( i == 0 && style == 0 ) + if ( i == 0 ) styleBtn |= WS_GROUP; long newId = NewControlId(); HWND hwndBtn = ::CreateWindow(_T("BUTTON"), - choices[i], + choices[i].wx_str(), styleBtn, 0, 0, 0, 0, // will be set in SetSize() - hwndParent, + GetHwndOf(parent), (HMENU)newId, wxGetInstance(), NULL); if ( !hwndBtn ) { - wxLogLastError("CreateWindow(radio btn)"); + wxLogLastError(wxT("CreateWindow(radio btn)")); - return FALSE; + return false; } - m_radioButtons[i] = (WXHWND)hwndBtn; + (*m_radioButtons)[i] = hwndBtn; SubclassRadioButton((WXHWND)hwndBtn); - if ( hfont ) - { - ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L); - } - m_subControls.Add(newId); } // Create a dummy radio control to end the group. (void)::CreateWindow(_T("BUTTON"), - _T(""), + wxEmptyString, WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, - 0, 0, 0, 0, hwndParent, + 0, 0, 0, 0, GetHwndOf(parent), (HMENU)NewControlId(), wxGetInstance(), NULL); - SetSelection(0); + m_radioButtons->SetFont(GetFont()); +#ifdef __WXWINCE__ + // Set the z-order correctly + 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); - return TRUE; + // Now that we have items determine what is the best size and set it. + SetInitialSize(size); + + return true; +} + +bool wxRadioBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + int majorDim, + long style, + const wxValidator& val, + const wxString& name) +{ + wxCArrayString chs(choices); + return Create(parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, val, name); } wxRadioBox::~wxRadioBox() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; + + delete m_radioButtons; + delete[] m_radioWidth; + delete[] m_radioHeight; +} - if (m_radioButtons) +// NB: if this code is changed, wxGetWindowForHWND() which relies on having the +// radiobox pointer in GWL_USERDATA for radio buttons must be updated too! +void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) +{ + HWND hwndBtn = (HWND)hWndBtn; + + if ( !s_wndprocRadioBtn ) + s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn); + + wxSetWindowProc(hwndBtn, wxRadioBtnWndProc); + wxSetWindowUserData(hwndBtn, this); +} + +// ---------------------------------------------------------------------------- +// events generation +// ---------------------------------------------------------------------------- + +bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_) +{ + const int id = (signed short)id_; + + if ( cmd == BN_CLICKED ) { - int i; - for (i = 0; i < m_noItems; i++) - ::DestroyWindow((HWND)m_radioButtons[i]); - delete[] m_radioButtons; + if (id == GetId()) + return true; + + int selectedButton = wxNOT_FOUND; + + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; i++ ) + { + const HWND hwndBtn = (*m_radioButtons)[i]; + if ( id == wxGetWindowId(hwndBtn) ) + { + // 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; + } + } + + if ( selectedButton == wxNOT_FOUND ) + { + // just ignore it - due to a hack with WM_NCHITTEST handling in our + // wnd proc, we can receive dummy click messages when we click near + // the radiobox edge (this is ugly but Julian wouldn't let me get + // rid of this...) + return false; + } + + if ( selectedButton != m_selectedButton ) + { + m_selectedButton = selectedButton; + + SendNotificationEvent(); + } + //else: don't generate events when the selection doesn't change + + return true; } + else + return false; +} - if (m_radioWidth) - delete[] m_radioWidth; - if (m_radioHeight) - delete[] m_radioHeight; +void wxRadioBox::Command(wxCommandEvent & event) +{ + SetSelection (event.GetInt()); + SetFocus(); + ProcessCommand(event); +} +void wxRadioBox::SendNotificationEvent() +{ + wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); + event.SetInt( m_selectedButton ); + event.SetString(GetString(m_selectedButton)); + event.SetEventObject( this ); + ProcessCommand(event); } -wxString wxRadioBox::GetLabel(int item) const +// ---------------------------------------------------------------------------- +// simple accessors +// ---------------------------------------------------------------------------- + +unsigned int wxRadioBox::GetCount() const +{ + return m_radioButtons ? m_radioButtons->GetCount() : 0u; +} + +void wxRadioBox::SetString(unsigned int item, const wxString& label) { - wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); + wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") ); + + m_radioWidth[item] = + m_radioHeight[item] = wxDefaultCoord; + + ::SetWindowText((*m_radioButtons)[item], label.c_str()); - return wxGetWindowText(m_radioButtons[item]); + InvalidateBestSize(); } -void wxRadioBox::SetLabel(int item, const wxString& label) +void wxRadioBox::SetSelection(int N) { - wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); + wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") ); + + // unselect the old button + if ( m_selectedButton != wxNOT_FOUND ) + ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L); + + // and select the new one + ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L); - m_radioWidth[item] = m_radioHeight[item] = -1; - SetWindowText((HWND)m_radioButtons[item], label.c_str()); + m_selectedButton = N; } -void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) +// Find string for position +wxString wxRadioBox::GetString(unsigned int item) const { - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; - */ - wxFAIL_MSG(wxT("not implemented")); + wxCHECK_MSG( IsValid(item), wxEmptyString, + wxT("invalid radiobox index") ); + + return wxGetWindowText((*m_radioButtons)[item]); } -int wxRadioBox::FindString(const wxString& s) const +void wxRadioBox::SetFocus() { - for (int i = 0; i < m_noItems; i++) + if ( GetCount() > 0 ) { - if ( s == wxGetWindowText(m_radioButtons[i]) ) - return i; + ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND + ? 0 + : m_selectedButton]); } +} - return wxNOT_FOUND; +// Enable a specific button +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; } -void wxRadioBox::SetSelection(int N) +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(unsigned int item, bool show) { - wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); + wxCHECK_MSG( IsValid(item), false, + wxT("invalid item in wxRadioBox::Show()") ); - // Following necessary for Win32s, because Win32s translate BM_SETCHECK - if (m_selectedButton >= 0 && m_selectedButton < m_noItems) - ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L); + BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE); - ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); - ::SetFocus((HWND)m_radioButtons[N]); + bool changed = (ret != 0) != show; + if ( changed ) + { + InvalidateBestSize(); + } - m_selectedButton = N; + return changed; } -// Get single selection, for single choice list items -int wxRadioBox::GetSelection() const +bool wxRadioBox::IsItemShown(unsigned int item) const { - return m_selectedButton; + 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; } -// Find string for position -wxString wxRadioBox::GetString(int N) const +#if wxUSE_TOOLTIPS + +bool wxRadioBox::HasToolTips() const { - return wxGetWindowText(m_radioButtons[N]); + 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) + +// ---------------------------------------------------------------------------- +// size calculations +// ---------------------------------------------------------------------------- + +wxSize wxRadioBox::GetMaxButtonSize() const +{ + // calculate the max button size + int widthMax = 0, + heightMax = 0; + const unsigned int count = GetCount(); + for ( unsigned int i = 0 ; i < count; i++ ) + { + int width, height; + if ( m_radioWidth[i] < 0 ) + { + GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height); + + // adjust the size to take into account the radio box itself + // FIXME this is totally bogus! + width += RADIO_SIZE; + height *= 3; + height /= 2; + } + else + { + width = m_radioWidth[i]; + height = m_radioHeight[i]; + } + + if ( widthMax < width ) + widthMax = width; + if ( heightMax < height ) + heightMax = height; + } + + return wxSize(widthMax, heightMax); +} + +wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const +{ + // the radiobox should be big enough for its buttons + int cx1, cy1; + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); + + int extraHeight = cy1; + + 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()) + height += cy1/2; + + // and also wide enough for its label + int widthLabel; + GetTextExtent(GetLabelText(), &widthLabel, NULL); + widthLabel += RADIO_SIZE; // FIXME this is bogus too + if ( widthLabel > width ) + width = widthLabel; + + return wxSize(width, height); +} + +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; } // Restored old code. @@ -373,119 +535,97 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) int xx = x; int yy = y; - if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) xx = currentX; - if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) yy = currentY; -#if RADIOBTN_PARENT_IS_RADIOBOX - int y_offset = 0; - int x_offset = 0; -#else int y_offset = yy; int x_offset = xx; -#endif - - int current_width, cyf; - int cx1,cy1; - wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont()); + int cx1, cy1; + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); // Attempt to have a look coherent with other platforms: We compute the // biggest toggle dim, then we align all items according this value. - int maxWidth = -1; - int maxHeight = -1; + wxSize maxSize = GetMaxButtonSize(); + int maxWidth = maxSize.x, + maxHeight = maxSize.y; - int i; - for (i = 0 ; i < m_noItems; i++) + wxSize totSize = GetTotalButtonSize(maxSize); + int totWidth = totSize.x, + totHeight = totSize.y; + + // only change our width/height if asked for + if ( width == wxDefaultCoord ) { - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) - { - // It's a labelled toggle - GetTextExtent(wxGetWindowText(m_radioButtons[i]), - ¤t_width, &cyf); - eachWidth = (int)(current_width + RADIO_SIZE); - eachHeight = (int)((3*cyf)/2); - } + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + width = totWidth; else - { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; - } - - if (maxWidth= (count/GetMajorDim())*GetMajorDim(); + } + + // is this the start of new row/column? + if ( i && (i % GetMajorDim() == 0) ) + { + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { + // start of new column y_offset = startY; x_offset += maxWidth + cx1; } - else + else // start of new row { x_offset = startX; y_offset += maxHeight; @@ -493,288 +633,93 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) y_offset += cy1/2; } } - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) + + int widthBtn; + if ( isLastInTheRow ) { - // It's a labeled item - GetTextExtent(wxGetWindowText(m_radioButtons[i]), - ¤t_width, &cyf); - - // How do we find out radio button bitmap size!! - // By adjusting them carefully, manually :-) - eachWidth = (int)(current_width + RADIO_SIZE); - eachHeight = (int)((3*cyf)/2); + // make the button go to the end of radio box + widthBtn = startX + width - x_offset - 2*cx1; + if ( widthBtn < maxWidth ) + widthBtn = maxWidth; } else { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; + // normal button, always of the same size + widthBtn = maxWidth; } - // VZ: make all buttons of the same, maximal size - like this they - // cover 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((HWND)m_radioButtons[i], - x_offset, y_offset, maxWidth, maxHeight, - TRUE); + // make all buttons of the same, maximal size - like this they cover + // 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) + DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight); - if (m_windowStyle & wxRA_SPECIFY_ROWS) + // where do we put the next button? + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { + // below this one y_offset += maxHeight; if (m_radioWidth[0]>0) y_offset += cy1/2; } else - x_offset += maxWidth + cx1; - } -} - -void wxRadioBox::GetSize(int *width, int *height) const -{ - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; - - if (m_hWnd) - wxFindMaxSize(m_hWnd, &rect); - - int i; - for (i = 0; i < m_noItems; i++) - wxFindMaxSize(m_radioButtons[i], &rect); - - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; -} - -void wxRadioBox::GetPosition(int *x, int *y) const -{ - wxWindow *parent = GetParent(); - RECT rect = { -1, -1, -1, -1 }; - - int i; - for (i = 0; i < m_noItems; i++) - wxFindMaxSize(m_radioButtons[i], &rect); - - if (m_hWnd) - wxFindMaxSize(m_hWnd, &rect); - - // Since we now have the absolute screen coords, if there's a parent we - // must subtract its top left corner - POINT point; - point.x = rect.left; - point.y = rect.top; - if (parent) - { - ::ScreenToClient((HWND) parent->GetHWND(), &point); - } - - // We may be faking the client origin. So a window that's really at (0, 30) - // may appear (to wxWin apps) to be at (0, 0). - if (GetParent()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - point.x -= pt.x; - point.y -= pt.y; - } - - *x = point.x; - *y = point.y; -} - -void wxRadioBox::SetFocus() -{ - if (m_noItems > 0) - { - if (m_selectedButton == -1) - ::SetFocus((HWND) m_radioButtons[0]); - else - ::SetFocus((HWND) m_radioButtons[m_selectedButton]); + { + // to the right of this one + x_offset += widthBtn + cx1; + } } - } -bool wxRadioBox::Show(bool show) +int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const { - if ( !wxControl::Show(show) ) - return FALSE; - - int nCmdShow = show ? SW_SHOW : SW_HIDE; - for ( int i = 0; i < m_noItems; i++ ) + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; i++ ) { - ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); - } - - return TRUE; -} - -// Enable a specific button -void wxRadioBox::Enable(int item, bool enable) -{ - wxCHECK_RET( item >= 0 && item < m_noItems, - wxT("invalid item in wxRadioBox::Enable()") ); - - ::EnableWindow((HWND) m_radioButtons[item], enable); -} - -// Enable all controls -bool wxRadioBox::Enable(bool enable) -{ - if ( !wxControl::Enable(enable) ) - return FALSE; - - for (int i = 0; i < m_noItems; i++) - ::EnableWindow((HWND) m_radioButtons[i], enable); - - return TRUE; -} - -// Show a specific button -void wxRadioBox::Show(int item, bool show) -{ - wxCHECK_RET( item >= 0 && item < m_noItems, - wxT("invalid item in wxRadioBox::Show()") ); - - ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE); -} - -// For single selection items only -wxString wxRadioBox::GetStringSelection() const -{ - wxString result; - int sel = GetSelection(); - if (sel > -1) - result = GetString(sel); - - return result; -} - -bool wxRadioBox::SetStringSelection(const wxString& s) -{ - int sel = FindString (s); - if (sel > -1) - { - SetSelection (sel); - return TRUE; - } - else - return FALSE; -} + RECT rect = wxGetWindowRect((*m_radioButtons)[i]); -bool wxRadioBox::ContainsHWND(WXHWND hWnd) const -{ - int i; - for (i = 0; i < Number(); i++) - { - if (GetRadioButtons()[i] == hWnd) - return TRUE; + if ( rect.left <= pt.x && pt.x < rect.right && + rect.top <= pt.y && pt.y < rect.bottom ) + { + return i; + } } - return FALSE; -} - -void wxRadioBox::Command(wxCommandEvent & event) -{ - SetSelection (event.m_commandInt); - ProcessCommand (event); + return wxNOT_FOUND; } -// NB: if this code is changed, wxGetWindowForHWND() which relies on having the -// radiobox pointer in GWL_USERDATA for radio buttons must be updated too! -void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) -{ - // No GWL_USERDATA in Win16, so omit this subclassing. -#ifdef __WIN32__ - HWND hwndBtn = (HWND)hWndBtn; - - if ( !s_wndprocRadioBtn ) - s_wndprocRadioBtn = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); +// ---------------------------------------------------------------------------- +// radio box drawing +// ---------------------------------------------------------------------------- - ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); - ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); -#endif // __WIN32__ -} +#ifndef __WXWINCE__ -void wxRadioBox::SendNotificationEvent() +WXHRGN wxRadioBox::MSWGetRegionWithoutChildren() { - wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); - event.SetInt( m_selectedButton ); - event.SetString( GetString(m_selectedButton) ); - event.SetEventObject( this ); - ProcessCommand(event); -} + RECT rc; + ::GetWindowRect(GetHwnd(), &rc); + HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1); -bool wxRadioBox::SetFont(const wxFont& font) -{ - if ( !wxControl::SetFont(font) ) + const unsigned int count = GetCount(); + for ( unsigned int i = 0; i < count; ++i ) { - // nothing to do - return FALSE; - } + // don't clip out hidden children + if ( !IsItemShown(i) ) + continue; - // also set the font of our radio buttons - WXHFONT hfont = wxFont(font).GetResourceHandle(); - for ( int n = 0; n < m_noItems; n++ ) - { - ::SendMessage((HWND)m_radioButtons[n], WM_SETFONT, (WPARAM)hfont, 0L); + ::GetWindowRect((*m_radioButtons)[i], &rc); + AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc)); + ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF); } - // this is needed because otherwise the buttons are not redrawn correctly - Refresh(); - - return TRUE; + return (WXHRGN)hrgn; } -// ---------------------------------------------------------------------------- -// our window proc -// ---------------------------------------------------------------------------- - -long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - switch ( nMsg ) - { -#ifdef __WIN32__ - case WM_CTLCOLORSTATIC: - // set the colour of the radio buttons to be the same as ours - { - HDC hdc = (HDC)wParam; - - const wxColour& colBack = GetBackgroundColour(); - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); - - return (WXHBRUSH)brush->GetResourceHandle(); - } -#endif // Win32 - - // This is required for the radiobox to be sensitive to mouse input, - // e.g. for Dialog Editor. - case WM_NCHITTEST: - { - int xPos = LOWORD(lParam); // horizontal position of cursor - int yPos = HIWORD(lParam); // vertical position of cursor - - ScreenToClient(&xPos, &yPos); - - // Make sure you can drag by the top of the groupbox, but let - // other (enclosed) controls get mouse events also - if (yPos < 10) - return (long)HTCLIENT; - } - break; - } - - return wxControl::MSWWindowProc(nMsg, wParam, lParam); -} +#endif // __WXWINCE__ // --------------------------------------------------------------------------- // window proc for radio buttons // --------------------------------------------------------------------------- -#ifdef __WIN32__ - LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, UINT message, WPARAM wParam, @@ -787,81 +732,60 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, // want to process arrows ourselves because neither of them is // smart enough to handle arrows properly for us { - long lDlgCode = ::CallWindowProc(s_wndprocRadioBtn, hwnd, + long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); - return lDlgCode | DLGC_WANTARROWS; - } - -#if wxUSE_TOOLTIPS - case WM_NOTIFY: - { - NMHDR* hdr = (NMHDR *)lParam; - if ( (int)hdr->code == TTN_NEEDTEXT ) - { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); - - 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; - } + return lDlgCode | DLGC_WANTARROWS; } - break; -#endif // wxUSE_TOOLTIPS case WM_KEYDOWN: { - wxRadioBox *radiobox = (wxRadioBox *) - ::GetWindowLong(hwnd, GWL_USERDATA); + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); - bool processed = TRUE; - - int selOld = radiobox->GetSelection(); - int selNew = selOld; + bool processed = true; + wxDirection dir; switch ( wParam ) { case VK_UP: - selNew--; + dir = wxUP; break; case VK_LEFT: - selNew -= radiobox->GetNumVer(); + dir = wxLEFT; break; case VK_DOWN: - selNew++; + dir = wxDOWN; break; case VK_RIGHT: - selNew += radiobox->GetNumVer(); + dir = wxRIGHT; break; default: - processed = FALSE; + processed = false; + + // just to suppress the compiler warning + dir = wxALL; } if ( processed ) { - // ensure that selNew is in range [0..num) - int num = radiobox->Number(); - selNew += num; - selNew %= num; + int selOld = radiobox->GetSelection(); + int selNew = radiobox->GetNextItem + ( + selOld, + dir, + radiobox->GetWindowStyle() + ); if ( selNew != selOld ) { radiobox->SetSelection(selNew); + radiobox->SetFocus(); // emulate the button click radiobox->SendNotificationEvent(); @@ -870,10 +794,71 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, } } } + break; + + case WM_SETFOCUS: + case WM_KILLFOCUS: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + // if we don't do this, no focus events are generated for the + // radiobox and, besides, we need to notify the parent about + // the focus change, otherwise the focus handling logic in + // wxControlContainer doesn't work + if ( message == WM_SETFOCUS ) + radiobox->HandleSetFocus((WXHWND)wParam); + else + radiobox->HandleKillFocus((WXHWND)wParam); + } + break; + +#ifndef __WXWINCE__ + case WM_HELP: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = false; + + wxEvtHandler * const handler = radiobox->GetEventHandler(); + + HELPINFO* info = (HELPINFO*) lParam; + if ( info->iContextType == HELPINFO_WINDOW ) + { + for ( wxWindow* subjectOfHelp = radiobox; + subjectOfHelp; + subjectOfHelp = subjectOfHelp->GetParent() ) + { + wxHelpEvent helpEvent(wxEVT_HELP, + subjectOfHelp->GetId(), + wxPoint(info->MousePos.x, + info->MousePos.y)); + helpEvent.SetEventObject(radiobox); + if ( handler->ProcessEvent(helpEvent) ) + { + processed = true; + break; + } + } + } + else if (info->iContextType == HELPINFO_MENUITEM) + { + wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId); + helpEvent.SetEventObject(radiobox); + processed = handler->ProcessEvent(helpEvent); + } + + if ( processed ) + return 0; + } + break; +#endif // !__WXWINCE__ } - return ::CallWindowProc(s_wndprocRadioBtn, hwnd, message, wParam, lParam); + return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); } -#endif // __WIN32__ - +#endif // wxUSE_RADIOBOX