X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..dc993cbfc601b70a4ddb567cebb5c0780eb4775a:/src/msw/radiobox.cpp?ds=sidebyside diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 857106acb0..d34034c6b1 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobox.cpp -// Purpose: wxRadioBox +// Name: 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,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif @@ -28,42 +28,88 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBOX + #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 - + #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) + #include + #endif #include "wx/tooltip.h" #endif // wxUSE_TOOLTIPS -IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +// 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() -// VZ: the new behaviour is to create the radio buttons as children of the -// radiobox instead of creating them as children of the radiobox' parent. -// -// This seems more logical, more consistent with what other frameworks do -// and allows tooltips to work with radioboxes, so there should be no -// reason to revert to the backward compatible behaviour - but I still -// leave this possibility just in case. +#else +IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) +#endif -#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, @@ -76,94 +122,18 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, // the pointer to standard radio button wnd proc static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL; -#endif // __WIN32__ - // =========================================================================== // 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; @@ -183,48 +153,31 @@ bool wxRadioBox::Create(wxWindow *parent, const wxString& name) { // initialize members - m_selectedButton = -1; - m_noItems = 0; - - m_majorDim = majorDim == 0 ? n : majorDim; - m_noRowsOrCols = majorDim; + m_majorDim = majorDim == 0 ? n : majorDim; // common initialization - if ( !CreateControl(parent, id, pos, size, style, val, name) ) - return FALSE; + if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) ) + return false; - // create the static box - if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP, - pos, size, title, 0) ) - return FALSE; +#if wxUSE_VALIDATORS + SetValidator(val); +#else + wxUnusedVar(val); +#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS // and now create the buttons - m_noItems = n; -#if RADIOBTN_PARENT_IS_RADIOBOX - HWND hwndParent = GetHwnd(); -#else HWND hwndParent = GetHwndOf(parent); -#endif - // 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(); @@ -240,511 +193,457 @@ bool wxRadioBox::Create(wxWindow *parent, 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, (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 + 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. + SetBestSize(size); + + return true; } -wxRadioBox::~wxRadioBox() +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) { - m_isBeingDeleted = TRUE; - - if (m_radioButtons) - { - int i; - for (i = 0; i < m_noItems; i++) - ::DestroyWindow((HWND)m_radioButtons[i]); - delete[] m_radioButtons; - } - - if (m_radioWidth) - delete[] m_radioWidth; - if (m_radioHeight) - delete[] m_radioHeight; - + wxCArrayString chs(choices); + return Create(parent, id, title, pos, size, chs.GetCount(), + chs.GetStrings(), majorDim, style, val, name); } -wxString wxRadioBox::GetLabel(int item) const +wxRadioBox::~wxRadioBox() { - wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") ); + m_isBeingDeleted = true; - return wxGetWindowText(m_radioButtons[item]); + delete m_radioButtons; + delete[] m_radioWidth; + delete[] m_radioHeight; } -void wxRadioBox::SetLabel(int item, const wxString& label) +// 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) { - wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); + HWND hwndBtn = (HWND)hWndBtn; - m_radioWidth[item] = m_radioHeight[item] = -1; - SetWindowText((HWND)m_radioButtons[item], label.c_str()); -} + if ( !s_wndprocRadioBtn ) + s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn); -void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) -{ - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN; - */ - wxFAIL_MSG(wxT("not implemented")); + wxSetWindowProc(hwndBtn, wxRadioBtnWndProc); + wxSetWindowUserData(hwndBtn, this); } -int wxRadioBox::FindString(const wxString& s) const +// ---------------------------------------------------------------------------- +// events generation +// ---------------------------------------------------------------------------- + +bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) { - for (int i = 0; i < m_noItems; i++) + if ( cmd == BN_CLICKED ) { - if ( s == wxGetWindowText(m_radioButtons[i]) ) - return i; - } + if (id == GetId()) + return true; - return wxNOT_FOUND; -} + int selectedButton = wxNOT_FOUND; -void wxRadioBox::SetSelection(int N) -{ - wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); + int count = GetCount(); + for ( int i = 0; i < count; i++ ) + { + if ( id == wxGetWindowId((*m_radioButtons)[i]) ) + { + selectedButton = i; - // 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); + break; + } + } - ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); - ::SetFocus((HWND)m_radioButtons[N]); + 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; + } - m_selectedButton = N; -} + if ( selectedButton != m_selectedButton ) + { + m_selectedButton = selectedButton; -// Get single selection, for single choice list items -int wxRadioBox::GetSelection() const -{ - return m_selectedButton; + SendNotificationEvent(); + } + //else: don't generate events when the selection doesn't change + + return true; + } + else + return false; } -// Find string for position -wxString wxRadioBox::GetString(int N) const +void wxRadioBox::Command(wxCommandEvent & event) { - return wxGetWindowText(m_radioButtons[N]); + SetSelection (event.GetInt()); + SetFocus(); + ProcessCommand(event); } -// Restored old code. -void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void wxRadioBox::SendNotificationEvent() { - int currentX, currentY; - GetPosition(¤tX, ¤tY); - int widthOld, heightOld; - GetSize(&widthOld, &heightOld); - - int xx = x; - int yy = y; - - if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - xx = currentX; - if (y == -1 && !(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; + wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); + event.SetInt( m_selectedButton ); + event.SetString( GetString(m_selectedButton) ); + event.SetEventObject( this ); + ProcessCommand(event); +} - int cx1,cy1; - wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont()); +// ---------------------------------------------------------------------------- +// simple accessors +// ---------------------------------------------------------------------------- - // 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; +int wxRadioBox::GetCount() const +{ + return m_radioButtons->GetCount(); +} - int i; - for (i = 0 ; i < m_noItems; i++) +// returns the number of rows +int wxRadioBox::GetNumVer() const +{ + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { - 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); - } - else - { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; - } - - if (maxWidth0) - y_offset += cy1/2; - } - } - int eachWidth; - int eachHeight; - if (m_radioWidth[i]<0) - { - // 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); - } - else - { - eachWidth = m_radioWidth[i]; - eachHeight = m_radioHeight[i]; - } - - // 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); - - if (m_windowStyle & wxRA_SPECIFY_ROWS) - { - y_offset += maxHeight; - if (m_radioWidth[0]>0) - y_offset += cy1/2; - } - else - x_offset += maxWidth + cx1; + return (GetCount() + m_majorDim - 1)/m_majorDim; + } + else + { + return m_majorDim; } } -void wxRadioBox::GetSize(int *width, int *height) const +void wxRadioBox::SetString(int item, const wxString& label) { - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; - - if (m_hWnd) - wxFindMaxSize(m_hWnd, &rect); + wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") ); - int i; - for (i = 0; i < m_noItems; i++) - wxFindMaxSize(m_radioButtons[i], &rect); + m_radioWidth[item] = + m_radioHeight[item] = wxDefaultCoord; - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + ::SetWindowText((*m_radioButtons)[item], label.c_str()); } -void wxRadioBox::GetPosition(int *x, int *y) const +void wxRadioBox::SetSelection(int N) { - 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); - } + wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") ); - // 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; - } + // 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); - *x = point.x; - *y = point.y; + m_selectedButton = N; } -void wxRadioBox::SetFocus() +// Find string for position +wxString wxRadioBox::GetString(int item) const { - if (m_noItems > 0) - { - if (m_selectedButton == -1) - ::SetFocus((HWND) m_radioButtons[0]); - else - ::SetFocus((HWND) m_radioButtons[m_selectedButton]); - } + wxCHECK_MSG( IsValid(item), wxEmptyString, + wxT("invalid radiobox index") ); + return wxGetWindowText((*m_radioButtons)[item]); } -bool wxRadioBox::Show(bool show) +void wxRadioBox::SetFocus() { - if ( !wxControl::Show(show) ) - return FALSE; - - int nCmdShow = show ? SW_SHOW : SW_HIDE; - for ( int i = 0; i < m_noItems; i++ ) + if ( GetCount() > 0 ) { - ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); + ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND + ? 0 + : m_selectedButton]); } - - return TRUE; } // Enable a specific button -void wxRadioBox::Enable(int item, bool enable) +bool wxRadioBox::Enable(int item, bool enable) { - wxCHECK_RET( item >= 0 && item < m_noItems, + wxCHECK_MSG( IsValid(item), false, 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); + BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable); - return TRUE; + return (ret == 0) == enable; } // Show a specific button -void wxRadioBox::Show(int item, bool show) +bool wxRadioBox::Show(int item, bool show) { - wxCHECK_RET( item >= 0 && item < m_noItems, + wxCHECK_MSG( IsValid(item), false, wxT("invalid item in wxRadioBox::Show()") ); - ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE); + BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE); + + return (ret != 0) == show; } -// For single selection items only -wxString wxRadioBox::GetStringSelection() const -{ - wxString result; - int sel = GetSelection(); - if (sel > -1) - result = GetString(sel); +WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons) - return result; -} +// ---------------------------------------------------------------------------- +// size calculations +// ---------------------------------------------------------------------------- -bool wxRadioBox::SetStringSelection(const wxString& s) +wxSize wxRadioBox::GetMaxButtonSize() const { - int sel = FindString (s); - if (sel > -1) + // calculate the max button size + int widthMax = 0, + heightMax = 0; + const int count = GetCount(); + for ( int i = 0 ; i < count; i++ ) { - SetSelection (sel); - return TRUE; - } - else - return FALSE; -} + int width, height; + if ( m_radioWidth[i] < 0 ) + { + GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height); -bool wxRadioBox::ContainsHWND(WXHWND hWnd) const -{ - int i; - for (i = 0; i < Number(); i++) - { - if (GetRadioButtons()[i] == hWnd) - return TRUE; + // 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 FALSE; + return wxSize(widthMax, heightMax); } -void wxRadioBox::Command(wxCommandEvent & event) +wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const { - SetSelection (event.m_commandInt); - ProcessCommand (event); -} + // the radiobox should be big enough for its buttons + int cx1, cy1; + wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont()); -void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn) -{ -#ifdef __WIN32__ - HWND hwndBtn = (HWND)hWndBtn; + int extraHeight = cy1; - if ( !s_wndprocRadioBtn ) - s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); + int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight; + int width = GetNumHor() * (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(GetTitle(), &widthLabel, NULL); + widthLabel += RADIO_SIZE; // FIXME this is bogus too + if ( widthLabel > width ) + width = widthLabel; - // No GWL_USERDATA in Win16, so omit this subclassing. - ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); - ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); -#endif // __WIN32__ + return wxSize(width, height); } -void wxRadioBox::SendNotificationEvent() +wxSize wxRadioBox::DoGetBestSize() const { - wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); - event.SetInt( m_selectedButton ); - event.SetString( GetString(m_selectedButton) ); - event.SetEventObject( this ); - ProcessCommand(event); + return GetTotalButtonSize(GetMaxButtonSize()); } -bool wxRadioBox::SetFont(const wxFont& font) +// Restored old code. +void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - if ( !wxControl::SetFont(font) ) + int currentX, currentY; + GetPosition(¤tX, ¤tY); + int widthOld, heightOld; + GetSize(&widthOld, &heightOld); + + int xx = x; + int yy = y; + + if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + xx = currentX; + if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + yy = currentY; + + int y_offset = yy; + int x_offset = xx; + + 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. + wxSize maxSize = GetMaxButtonSize(); + int maxWidth = maxSize.x, + maxHeight = maxSize.y; + + wxSize totSize = GetTotalButtonSize(maxSize); + int totWidth = totSize.x, + totHeight = totSize.y; + + // only change our width/height if asked for + if ( width == wxDefaultCoord ) { - // nothing to do - return FALSE; + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + width = totWidth; + else + width = widthOld; } - // also set the font of our radio buttons - WXHFONT hfont = wxFont(font).GetResourceHandle(); - for ( int n = 0; n < m_noItems; n++ ) + if ( height == wxDefaultCoord ) { - ::SendMessage((HWND)m_radioButtons[n], WM_SETFONT, (WPARAM)hfont, 0L); + if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) + height = totHeight; + else + height = heightOld; } - return TRUE; -} + ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE); -long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - switch ( nMsg ) - { - case WM_CTLCOLORSTATIC: - // set the colour of the radio buttons to be the same as ours - { - HDC hdc = (HDC)wParam; + // 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 + // startX/startY. The size of all buttons will be the same wxSize(maxWidth, + // maxHeight) except for the buttons in the last column which should extend + // to the right border of radiobox and thus can be wider than this. - const wxColour& colBack = GetBackgroundColour(); - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + // 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 + // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and + // m_majorDim is the number of rows. - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + x_offset += cx1; + y_offset += cy1; - return (WXHBRUSH)brush->GetResourceHandle(); - } + // Add extra space under the label, if it exists. + if (!wxControl::GetLabel().empty()) + y_offset += cy1/2; - // 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 + int startX = x_offset; + int startY = y_offset; - ScreenToClient(&xPos, &yPos); + const int count = GetCount(); + for ( 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 + // happens, for example, when the radiobox label is very long) + bool isLastInTheRow; + if ( m_windowStyle & wxRA_SPECIFY_COLS ) + { + // 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); + } + 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; + } - // 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; + // is this the start of new row/column? + if ( i && (i % m_majorDim == 0) ) + { + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) + { + // start of new column + y_offset = startY; + x_offset += maxWidth + cx1; + } + else // start of new row + { + x_offset = startX; + y_offset += maxHeight; + if (m_radioWidth[0]>0) + y_offset += cy1/2; } - // fall through + } - default: - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + int widthBtn; + if ( isLastInTheRow ) + { + // make the button go to the end of radio box + widthBtn = startX + width - x_offset - 2*cx1; + if ( widthBtn < maxWidth ) + widthBtn = maxWidth; + } + else + { + // normal button, always of the same size + widthBtn = maxWidth; + } + + // 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((*m_radioButtons)[i], + x_offset, y_offset, widthBtn, maxHeight, + TRUE); + + // 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 + { + // to the right of this one + x_offset += widthBtn + cx1; + } } } @@ -752,99 +651,173 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // window proc for radio buttons // --------------------------------------------------------------------------- -#ifdef __WIN32__ - LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, - UINT msg, + UINT message, WPARAM wParam, LPARAM lParam) { - bool processed = FALSE; - if ( msg == WM_KEYDOWN -#if wxUSE_TOOLTIPS - || msg == WM_NOTIFY -#endif // wxUSE_TOOLTIPS - ) + switch ( message ) { - wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA); + case WM_GETDLGCODE: + // we must tell IsDialogMessage()/our kbd processing code that we + // want to process arrows ourselves because neither of them is + // smart enough to handle arrows properly for us + { + long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, + message, wParam, lParam); - wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + return lDlgCode | DLGC_WANTARROWS; + } -#if wxUSE_TOOLTIPS && !defined(__GNUWIN32__) - if ( msg == WM_NOTIFY ) - { - NMHDR* hdr = (NMHDR *)lParam; - if ( (int)hdr->code == TTN_NEEDTEXT ) +#if wxUSE_TOOLTIPS + case WM_NOTIFY: { - wxToolTip *tt = radiobox->GetToolTip(); - if ( tt ) + NMHDR* hdr = (NMHDR *)lParam; + if ( hdr->code == TTN_NEEDTEXT ) { - TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam; - ttt->lpszText = (wxChar *)tt->GetTip().c_str(); + 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 = TRUE; + // processed + return 0; } } - } - else // msg == WM_KEYDOWN + break; #endif // wxUSE_TOOLTIPS - { - processed = TRUE; - - int sel = radiobox->GetSelection(); - switch ( wParam ) + case WM_KEYDOWN: { - case VK_UP: - sel--; - break; + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = true; + + wxDirection dir; + switch ( wParam ) + { + case VK_UP: + dir = wxUP; + break; + + case VK_LEFT: + dir = wxLEFT; + break; + + case VK_DOWN: + dir = wxDOWN; + break; - case VK_LEFT: - sel -= radiobox->GetNumVer(); - break; + case VK_RIGHT: + dir = wxRIGHT; + break; - case VK_DOWN: - sel++; - break; + default: + processed = false; - case VK_RIGHT: - sel += radiobox->GetNumVer(); - break; + // just to suppress the compiler warning + dir = wxALL; + } - case VK_TAB: + if ( processed ) + { + int selOld = radiobox->GetSelection(); + int selNew = radiobox->GetNextItem + ( + selOld, + dir, + radiobox->GetWindowStyle() + ); + + if ( selNew != selOld ) { - wxNavigationKeyEvent event; - event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100)); - event.SetWindowChange(FALSE); - event.SetEventObject(radiobox); + radiobox->SetSelection(selNew); + radiobox->SetFocus(); + + // emulate the button click + radiobox->SendNotificationEvent(); - if ( radiobox->GetEventHandler()->ProcessEvent(event) ) - return 0; + return 0; } - // fall through + } + } + break; - default: - processed = FALSE; + 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; - if ( processed ) +#ifndef __WXWINCE__ + case WM_HELP: { - if ( sel >= 0 && sel < radiobox->Number() ) - { - radiobox->SetSelection(sel); + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = false; - // emulate the button click - radiobox->SendNotificationEvent(); + 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__ } - if ( processed ) - return 0; - - return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam); + return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); } -#endif // __WIN32__ +#endif // wxUSE_RADIOBOX