X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f11220943f14b4bb5190db0dfd0054304f5015c..7848088476db284a94f19eeb24411b45d676ac46:/src/msw/radiobox.cpp?ds=sidebyside diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index dc5008a687..29943e25c8 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -1,15 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "radiobox.h" #endif @@ -20,296 +28,347 @@ #pragma hdrstop #endif +#if wxUSE_RADIOBOX + #ifndef WX_PRECOMP - #include - #include "wx/setup.h" #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" -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) -#endif +#if wxUSE_TOOLTIPS + #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__) + #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() -bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id) -{ - if (param == BN_CLICKED) - { -#ifdef __WIN32__ - int i; - for (i = 0; i < m_noItems; i++) - if (id == GetWindowLong((HWND) m_radioButtons[i], GWL_ID)) - m_selectedButton = i; #else - int i; - for (i = 0; i < m_noItems; i++) - if (id == GetWindowWord((HWND) m_radioButtons[i], GWW_ID)) - m_selectedButton = i; +IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) #endif - wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); - event.SetInt( m_selectedButton ); - event.SetEventObject( this ); - ProcessCommand(event); - return TRUE; - } - else return FALSE; -} +/* + selection + content + label + dimension + item +*/ + +// 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 + +// --------------------------------------------------------------------------- +// private functions +// --------------------------------------------------------------------------- + +// wnd proc for radio buttons +#ifdef __WIN32__ +LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam); -#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; -} +// --------------------------------------------------------------------------- +// global vars +// --------------------------------------------------------------------------- -#endif +// the pointer to standard radio button wnd proc +static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL; -// Radio box item -wxRadioBox::wxRadioBox(void) -{ - m_selectedButton = -1; - m_noItems = 0; - m_noRowsOrCols = 0; - m_radioButtons = NULL; - m_majorDim = 0 ; - m_radioWidth = NULL ; - m_radioHeight = NULL ; -} +#endif // __WIN32__ -bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - int majorDim, long style, - const wxValidator& val, const wxString& name) -{ - m_selectedButton = -1; - m_noItems = n; +// =========================================================================== +// implementation +// =========================================================================== - SetName(name); - SetValidator(val); +// --------------------------------------------------------------------------- +// wxRadioBox +// --------------------------------------------------------------------------- - parent->AddChild(this); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; +int wxRadioBox::GetCount() const +{ + return m_noItems; +} - m_windowStyle = (long&)style; +int wxRadioBox::GetColumnCount() const +{ + return GetNumHor(); +} - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; +int wxRadioBox::GetRowCount() const +{ + return GetNumVer(); +} - if (id == -1) - m_windowId = NewControlId(); +// returns the number of rows +int wxRadioBox::GetNumVer() const +{ + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) + { + return m_majorDim; + } else - m_windowId = id; - - m_noRowsOrCols = majorDim; - if (majorDim==0) - m_majorDim = n ; - else // Seemed to make sense to put this 'else' here... (RD) - m_majorDim = majorDim ; - - long msStyle = GROUP_FLAGS; - - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D) ; - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - /* - if ( want3D || wxStyleHasBorder(m_windowStyle) ) - msStyle |= WS_BORDER; - */ - - - HWND the_handle = (HWND) parent->GetHWND() ; - - m_hWnd = (WXHWND)::CreateWindowEx - ( - (DWORD)exStyle, - GROUP_CLASS, - title, - msStyle, - 0, 0, 0, 0, - the_handle, - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); - -#if wxUSE_CTL3D - if (want3D) { - Ctl3dSubclassCtl((HWND)m_hWnd); - m_useCtl3D = TRUE; + return (m_noItems + m_majorDim - 1)/m_majorDim; } -#endif - - SetFont(parent->GetFont()); +} - SubclassWin((WXHWND)m_hWnd); +// returns the number of columns +int wxRadioBox::GetNumHor() const +{ + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) + { + return (m_noItems + m_majorDim - 1)/m_majorDim; + } + else + { + return m_majorDim; + } +} - // Some radio boxes test consecutive id. - (void)NewControlId() ; - m_radioButtons = new WXHWND[n]; - m_radioWidth = new int[n] ; - m_radioHeight = new int[n] ; - int i; - for (i = 0; i < n; i++) +bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id) +{ + if ( cmd == BN_CLICKED ) { - m_radioWidth[i] = m_radioHeight[i] = -1 ; - long groupStyle = 0; - if (i == 0 && style==0) - groupStyle = WS_GROUP; - long newId = NewControlId(); - long msStyle = groupStyle | RADIO_FLAGS; + if (id == GetId()) + return TRUE; - m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, choices[i], - msStyle,0,0,0,0, - the_handle, (HMENU)newId, wxGetInstance(), NULL); -#if wxUSE_CTL3D - if (want3D) + int selectedButton = -1; + + for ( int i = 0; i < m_noItems; i++ ) { - Ctl3dSubclassCtl((HWND) m_hWnd); - m_useCtl3D = TRUE; + if ( id == wxGetWindowId(m_radioButtons[i]) ) + { + selectedButton = i; + + break; + } } -#endif - if (GetFont().Ok()) + + if ( selectedButton == -1 ) { - SendMessage((HWND)m_radioButtons[i],WM_SETFONT, - (WPARAM)GetFont().GetResourceHandle(),0L); + // 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_subControls.Append((wxObject *)newId); - } - // Create a dummy radio control to end the group. - (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL); - - SetSelection(0); + if ( selectedButton != m_selectedButton ) + { + m_selectedButton = selectedButton; - SetSize(x, y, width, height); + SendNotificationEvent(); + } + //else: don't generate events when the selection doesn't change - return TRUE; + return TRUE; + } + else + return FALSE; } -#if 0 -bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - int n, const wxBitmap *choices[], - int majorDim, long style, - const wxValidator& val, const wxString& name) +// Radio box item +wxRadioBox::wxRadioBox() { m_selectedButton = -1; + m_noItems = 0; m_noRowsOrCols = 0; - m_noItems = n; - - SetName(name); - SetValidator(val); + m_radioButtons = NULL; + m_majorDim = 0; + m_radioWidth = NULL; + m_radioHeight = NULL; +} - parent->AddChild(this); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; +bool wxRadioBox::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + int n, + const wxString choices[], + int majorDim, + long style, + const wxValidator& val, + const wxString& name) +{ + // initialize members + m_selectedButton = -1; + m_noItems = 0; - m_windowStyle = (long&)style; + m_majorDim = majorDim == 0 ? n : majorDim; + m_noRowsOrCols = majorDim; - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + // common initialization + if ( !CreateControl(parent, id, pos, size, style, val, name) ) + return FALSE; - if (id == -1) - m_windowId = NewControlId(); - else - m_windowId = id; + // 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(); +#else + HWND hwndParent = GetHwndOf(parent); +#endif - m_noRowsOrCols = majorDim; - if (majorDim==0) - m_majorDim = n ; - m_majorDim = majorDim ; - HWND the_handle ; + // Some radio boxes test consecutive id. + (void)NewControlId(); + m_radioButtons = new WXHWND[n]; + m_radioWidth = new int[n]; + m_radioHeight = new int[n]; - long msStyle = GROUP_FLAGS; + WXHFONT hfont = 0; + wxFont& font = GetFont(); + if ( font.Ok() ) + { + hfont = font.GetResourceHandle(); + } - bool want3D; - WXDWORD exStyle = Determine3DEffects(0, &want3D) ; - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - if ( want3D || wxStyleHasBorder(m_windowStyle) ) - msStyle |= WS_BORDER; + for ( int i = 0; i < n; i++ ) + { + m_radioWidth[i] = + m_radioHeight[i] = -1; + long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE; + if ( i == 0 && style == 0 ) + styleBtn |= WS_GROUP; - m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title), - msStyle, - 0,0,0,0, - (HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ; + long newId = NewControlId(); - the_handle = (HWND) parent->GetHWND(); + HWND hwndBtn = ::CreateWindow(_T("BUTTON"), + choices[i], + styleBtn, + 0, 0, 0, 0, // will be set in SetSize() + hwndParent, + (HMENU)newId, + wxGetInstance(), + NULL); -#if wxUSE_CTL3D - if (want3D) - { - Ctl3dSubclassCtl((HWND) m_hWnd); - m_useCtl3D = TRUE; - } -#endif + if ( !hwndBtn ) + { + wxLogLastError(wxT("CreateWindow(radio btn)")); - SetFont(parent->GetFont()); + return FALSE; + } - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND)m_hWnd); + m_radioButtons[i] = (WXHWND)hwndBtn; - (void)NewControlId() ; - m_radioButtons = new WXHWND[n]; - m_radioWidth = new int[n] ; - m_radioHeight = new int[n] ; + SubclassRadioButton((WXHWND)hwndBtn); - int i; - for (i = 0; i < n; i++) - { - long groupStyle = 0; - if (i == 0 && style==0) - groupStyle = WS_GROUP; - long newId = NewControlId(); - m_radioWidth[i] = ((wxBitmap *)choices[i])->GetWidth(); - m_radioHeight[i] = ((wxBitmap *)choices[i])->GetHeight(); - char tmp[32] ; - sprintf(tmp,"Toggle%d",i) ; - long msStyle = groupStyle | RADIO_FLAGS; - m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, tmp, - msStyle,0,0,0,0, - the_handle, (HMENU)newId, wxhInstance, NULL); -#if wxUSE_CTL3D - if (want3D) + if ( hfont ) { - Ctl3dSubclassCtl((HWND) m_hWnd); - m_useCtl3D = TRUE; + ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L); } -#endif - m_subControls.Append((wxObject *)newId); + + m_subControls.Add(newId); } + // Create a dummy radio control to end the group. - (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL); + (void)::CreateWindow(_T("BUTTON"), + wxEmptyString, + WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD, + 0, 0, 0, 0, hwndParent, + (HMENU)NewControlId(), wxGetInstance(), NULL); SetSelection(0); - SetSize(x, y, width, height); + SetSize(pos.x, pos.y, size.x, size.y); return TRUE; } -#endif -wxRadioBox::~wxRadioBox(void) +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; @@ -317,241 +376,277 @@ wxRadioBox::~wxRadioBox(void) { int i; for (i = 0; i < m_noItems; i++) - DestroyWindow((HWND) m_radioButtons[i]); + ::DestroyWindow((HWND)m_radioButtons[i]); delete[] m_radioButtons; } + if (m_radioWidth) - delete[] m_radioWidth ; + delete[] m_radioWidth; if (m_radioHeight) - delete[] m_radioHeight ; - if (m_hWnd) - ::DestroyWindow((HWND) m_hWnd) ; - m_hWnd = 0 ; + delete[] m_radioHeight; } -wxString wxRadioBox::GetLabel(int item) const +void wxRadioBox::SetString(int item, const wxString& label) { - GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300); - return wxString(wxBuffer); + wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") ); + + m_radioWidth[item] = m_radioHeight[item] = -1; + SetWindowText((HWND)m_radioButtons[item], label.c_str()); } -void wxRadioBox::SetLabel(int item, const wxString& label) +void wxRadioBox::SetSelection(int N) { - m_radioWidth[item] = m_radioHeight[item] = -1 ; - SetWindowText((HWND)m_radioButtons[item], (const char *)label); + wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") ); + + // 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); + + ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L); + + m_selectedButton = N; } -void wxRadioBox::SetLabel(int item, wxBitmap *bitmap) +// Get single selection, for single choice list items +int wxRadioBox::GetSelection() const { - /* - m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ; - m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN ; - */ + return m_selectedButton; } -int wxRadioBox::FindString(const wxString& s) const +// Find string for position +wxString wxRadioBox::GetString(int item) const { - int i; - for (i = 0; i < m_noItems; i++) - { - GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000); - if (s == wxBuffer) - return i; - } - return -1; + wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString, + wxT("invalid radiobox index") ); + + return wxGetWindowText(m_radioButtons[item]); } -void wxRadioBox::SetSelection(int N) +// ---------------------------------------------------------------------------- +// size calculations +// ---------------------------------------------------------------------------- + +wxSize wxRadioBox::GetMaxButtonSize() const { - if ((N < 0) || (N >= m_noItems)) - return; + // calculate the max button size + int widthMax = 0, + heightMax = 0; + for ( int i = 0 ; i < m_noItems; i++ ) + { + int width, height; + if ( m_radioWidth[i] < 0 ) + { + GetTextExtent(wxGetWindowText(m_radioButtons[i]), &width, &height); - // 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); + // 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]; + } - SendMessage((HWND) m_radioButtons[N], BM_SETCHECK, 1, 0L); - m_selectedButton = N; + if ( widthMax < width ) + widthMax = width; + if ( heightMax < height ) + heightMax = height; + } + + return wxSize(widthMax, heightMax); } -// Get single selection, for single choice list items -int wxRadioBox::GetSelection(void) const +wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const { - return m_selectedButton; + // the radiobox should be big enough for its buttons + int cx1, cy1; + wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont()); + + int extraHeight = cy1; + + /* We'll assume the adjustments below are OK for Win 3.1 too +#if defined(CTL3D) && !CTL3D + // Requires a bigger group box in plain Windows + extraHeight *= 3; + extraHeight /= 2; +#endif + */ + + 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().IsEmpty()) + 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; + + return wxSize(width, height); } -// Find string for position -wxString wxRadioBox::GetString(int N) const +wxSize wxRadioBox::DoGetBestSize() const { - GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000); - return wxString(wxBuffer); + return GetTotalButtonSize(GetMaxButtonSize()); } -void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags) +// Restored old code. +void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { 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)) + if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) xx = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) yy = currentY; - AdjustForParentClientOrigin(xx, yy, sizeFlags); - - wxString textRadioButton; - +#if RADIOBTN_PARENT_IS_RADIOBOX + int y_offset = 0; + int x_offset = 0; +#else int y_offset = yy; int x_offset = xx; - int current_width, cyf; - - int cx1,cy1; - wxGetCharSize(m_hWnd, &cx1, &cy1, & this->GetFont()); +#endif - // number of radio boxes in both directions - int nbHor, nbVer; - if (m_windowStyle & wxRA_VERTICAL) - { - nbVer = m_majorDim ; - nbHor = (m_noItems+m_majorDim-1)/m_majorDim ; - } - else - { - nbHor = m_majorDim ; - nbVer = (m_noItems+m_majorDim-1)/m_majorDim ; - } + 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 = width, - maxHeight = height; + // 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; - // if we're given the width or height explicitly do not recalculate it, but - // use what we have - bool calcWidth = maxWidth == -1, - calcHeight = maxHeight == -1; + wxSize totSize = GetTotalButtonSize(maxSize); + int totWidth = totSize.x, + totHeight = totSize.y; - if ( calcWidth || calcHeight ) + // only change our width/height if asked for + if ( width == -1 ) { - // init vars to avoid compiler warnings, even if we don't use them - int eachWidth = 0, - eachHeight = 0; - - for ( int i = 0 ; i < m_noItems; i++ ) - { - if ( m_radioWidth[i] < 0 ) - { - // It's a labelled toggle - textRadioButton = wxGetWindowText(m_radioButtons[i]); - GetTextExtent(textRadioButton, ¤t_width, &cyf, - NULL,NULL, & this->GetFont()); - - if ( calcWidth ) - eachWidth = (int)(current_width + RADIO_SIZE); - if ( calcHeight ) - eachHeight = (int)((3*cyf)/2); - } - else - { - if ( calcWidth ) - eachWidth = m_radioWidth[i] ; - if ( calcHeight ) - eachHeight = m_radioHeight[i] ; - } - - if ( calcWidth && maxWidth < eachWidth ) - maxWidth = eachWidth; - if ( calcHeight && maxHeight < eachHeight ) - maxHeight = eachHeight; - } + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + width = totWidth; + else + width = widthOld; } - else + + if ( height == -1 ) { - maxHeight = height/nbVer; - maxWidth = width/nbHor; + if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) + height = totHeight; + else + height = heightOld; } - if (m_hWnd) - { - int totWidth ; - int totHeight; + ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE); - // this formula works, but I don't know why. - // Please, be sure what you do if you modify it!! - if (m_radioWidth[0]<0) - totHeight = (nbVer * maxHeight) + cy1/2 ; - else - totHeight = nbVer * (maxHeight+cy1/2) ; - totWidth = nbHor * (maxWidth+cx1) ; + // 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. -#if (!wxUSE_CTL3D) - // Requires a bigger group box in plain Windows - MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ; -#else - MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ; -#endif - x_offset += cx1; - y_offset += cy1; - } + // 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. -#if (!wxUSE_CTL3D) - y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label - // JACS 2/12/93. CTL3D draws group label quite high. -#endif - int startX = x_offset ; - int startY = y_offset ; + x_offset += cx1; + y_offset += cy1; - for ( int i = 0 ; i < m_noItems; i++) + // Add extra space under the label, if it exists. + if (!wxControl::GetLabel().IsEmpty()) + y_offset += cy1/2; + + int startX = x_offset; + int startY = y_offset; + + for ( int i = 0; i < m_noItems; i++ ) { - // Bidimensional radio adjustment - if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0? + // 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 == m_noItems); + } + else // wxRA_SPECIFY_ROWS + { + // item is the last in the row if it is in the last columns + isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim; + } + + // is this the start of new row/column? + if ( i && (i % m_majorDim == 0) ) { - if (m_windowStyle & wxRA_VERTICAL) + if ( m_windowStyle & wxRA_SPECIFY_ROWS ) { + // start of new column y_offset = startY; - x_offset += maxWidth + cx1 ; + x_offset += maxWidth + cx1; } - else + else // start of new row { - x_offset = startX ; - y_offset += maxHeight ; + x_offset = startX; + y_offset += maxHeight; if (m_radioWidth[0]>0) - y_offset += cy1/2 ; + y_offset += cy1/2; } } - int eachWidth ; - int eachHeight ; - if (m_radioWidth[i]<0) + + int widthBtn; + if ( isLastInTheRow ) { - // It's a labeled item - textRadioButton = wxGetWindowText(m_radioButtons[i]); - GetTextExtent(textRadioButton, ¤t_width, &cyf, - NULL,NULL, & this->GetFont()); - - // 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; } - MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE); - if (m_windowStyle & wxRA_VERTICAL) + // 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, 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 ; + y_offset += cy1/2; } else - x_offset += maxWidth + cx1; + { + // to the right of this one + x_offset += widthBtn + cx1; + } } } @@ -574,8 +669,7 @@ void wxRadioBox::GetSize(int *width, int *height) const void wxRadioBox::GetPosition(int *x, int *y) const { wxWindow *parent = GetParent(); - RECT rect; - rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; + RECT rect = { -1, -1, -1, -1 }; int i; for (i = 0; i < m_noItems; i++) @@ -584,8 +678,8 @@ void wxRadioBox::GetPosition(int *x, int *y) const 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 + // 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; @@ -593,9 +687,9 @@ void wxRadioBox::GetPosition(int *x, int *y) const { ::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). + + // 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()); @@ -607,163 +701,390 @@ void wxRadioBox::GetPosition(int *x, int *y) const *y = point.y; } -wxString wxRadioBox::GetLabel(void) const +void wxRadioBox::SetFocus() { - if (m_hWnd) + if (m_noItems > 0) { - GetWindowText((HWND) m_hWnd, wxBuffer, 300); - return wxString(wxBuffer); + ::SetFocus((HWND)m_radioButtons[m_selectedButton == -1 + ? 0 + : m_selectedButton]); } - else return wxString(""); -} -void wxRadioBox::SetLabel(const wxString& label) -{ - if (m_hWnd) - SetWindowText((HWND) m_hWnd, label); } -void wxRadioBox::SetFocus(void) +bool wxRadioBox::Show(bool show) { - if (m_noItems > 0) + if ( !wxControl::Show(show) ) + return FALSE; + + int nCmdShow = show ? SW_SHOW : SW_HIDE; + for ( int i = 0; i < m_noItems; i++ ) { - if (m_selectedButton == -1) - ::SetFocus((HWND) m_radioButtons[0]); - else - ::SetFocus((HWND) m_radioButtons[m_selectedButton]); + ::ShowWindow((HWND)m_radioButtons[i], nCmdShow); } -} - -bool wxRadioBox::Show(bool show) -{ - int cshow; - if (show) - cshow = SW_SHOW; - else - cshow = SW_HIDE; - if (m_hWnd) - ShowWindow((HWND) m_hWnd, cshow); - int i; - for (i = 0; i < m_noItems; i++) - ShowWindow((HWND) m_radioButtons[i], cshow); return TRUE; } // Enable a specific button void wxRadioBox::Enable(int item, bool enable) { - if (item<0) - wxWindow::Enable(enable) ; - else if (item < m_noItems) - ::EnableWindow((HWND) m_radioButtons[item], enable); + wxCHECK_RET( item >= 0 && item < m_noItems, + wxT("invalid item in wxRadioBox::Enable()") ); + + ::EnableWindow((HWND) m_radioButtons[item], enable); } // Enable all controls -void wxRadioBox::Enable(bool enable) +bool wxRadioBox::Enable(bool enable) { - wxControl::Enable(enable); + if ( !wxControl::Enable(enable) ) + return FALSE; - int i; - for (i = 0; i < m_noItems; i++) + 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) { - if (item<0) - wxRadioBox::Show(show) ; - else if (item < m_noItems) - { - int cshow; - if (show) - cshow = SW_SHOW; - else - cshow = SW_HIDE; - ShowWindow((HWND) m_radioButtons[item], cshow); - } + wxCHECK_RET( item >= 0 && item < m_noItems, + wxT("invalid item in wxRadioBox::Show()") ); + + ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE); } -WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +bool wxRadioBox::ContainsHWND(WXHWND hWnd) const { -#if wxUSE_CTL3D - if ( m_useCtl3D ) + size_t count = GetCount(); + for ( size_t i = 0; i < count; i++ ) { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; + if ( GetRadioButtons()[i] == hWnd ) + return TRUE; } -#endif - if (GetParent()->GetTransparentBackground()) - SetBkMode((HDC) pDC, TRANSPARENT); - else - SetBkMode((HDC) pDC, OPAQUE); + return FALSE; +} - ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); - ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue())); +void wxRadioBox::Command(wxCommandEvent & event) +{ + SetSelection (event.m_commandInt); + SetFocus(); + ProcessCommand (event); +} + +// 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; - wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); + if ( !s_wndprocRadioBtn ) + s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn); - // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush - // has a zero usage count. - // backgroundBrush->RealizeResource(); - return (WXHBRUSH) backgroundBrush->GetResourceHandle(); + wxSetWindowProc(hwndBtn, wxRadioBtnWndProc); + wxSetWindowUserData(hwndBtn, this); } -// For single selection items only -wxString wxRadioBox::GetStringSelection (void) const +void wxRadioBox::SendNotificationEvent() { - int sel = GetSelection (); - if (sel > -1) - return this->GetString (sel); - else - return wxString(""); + wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId); + event.SetInt( m_selectedButton ); + event.SetString( GetString(m_selectedButton) ); + event.SetEventObject( this ); + ProcessCommand(event); } -bool wxRadioBox::SetStringSelection (const wxString& s) +bool wxRadioBox::SetFont(const wxFont& font) { - int sel = FindString (s); - if (sel > -1) + if ( !wxControl::SetFont(font) ) { - SetSelection (sel); - return TRUE; - } - else + // nothing to do return FALSE; + } + + // also set the font of our radio buttons + WXHFONT hfont = wxFont(font).GetResourceHandle(); + for ( int n = 0; n < m_noItems; n++ ) + { + HWND hwndBtn = (HWND)m_radioButtons[n]; + ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L); + + // otherwise the buttons are not redrawn correctly + ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */); + } + + return TRUE; } -bool wxRadioBox::ContainsHWND(WXHWND hWnd) const +// ---------------------------------------------------------------------------- +// our window proc +// ---------------------------------------------------------------------------- + +WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - int i; - for (i = 0; i < Number(); i++) - if (GetRadioButtons()[i] == hWnd) - return TRUE; - return FALSE; + 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 (WXLRESULT)brush->GetResourceHandle(); + } +#endif // Win32 + + // VZ: this code breaks radiobox redrawing under Windows XP, don't use + // it. If you need to get messages from the static controls, + // create them as a child of another (non static) window +#if 0 + // 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; +#endif // 0 + } + + return wxControl::MSWWindowProc(nMsg, wParam, lParam); } -void wxRadioBox::Command (wxCommandEvent & event) +WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), +#if wxUSE_CTL3D + WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam +#else + WXUINT WXUNUSED(message), + WXWPARAM WXUNUSED(wParam), + WXLPARAM WXUNUSED(lParam) +#endif + ) { - SetSelection (event.m_commandInt); - ProcessCommand (event); +#if wxUSE_CTL3D + if ( m_useCtl3D ) + { + HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); + return (WXHBRUSH) hbrush; + } +#endif // wxUSE_CTL3D + + HDC hdc = (HDC)pDC; + wxColour colBack = GetBackgroundColour(); + + if (!IsEnabled()) + colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + + ::SetBkColor(hdc, wxColourToRGB(colBack)); + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + + return (WXHBRUSH)brush->GetResourceHandle(); } -long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) + +// --------------------------------------------------------------------------- +// window proc for radio buttons +// --------------------------------------------------------------------------- + +#ifdef __WIN32__ + +LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) { - if (nMsg == WM_NCHITTEST) + switch ( message ) { - int xPos = LOWORD(lParam); // horizontal position of cursor - int yPos = HIWORD(lParam); // vertical position of cursor + 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); + + return lDlgCode | DLGC_WANTARROWS; + } - ScreenToClient(&xPos, &yPos); +#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 - // 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; + case WM_KEYDOWN: + { + 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_RIGHT: + dir = wxRIGHT; + break; + + default: + processed = FALSE; + + // just to suppress the compiler warning + dir = wxALL; + } + + if ( processed ) + { + 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(); + + return 0; + } + } + } + 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; + +#ifdef __WIN32__ + case WM_HELP: + { + wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd); + + wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") ); + + bool processed = TRUE; + + // HELPINFO doesn't seem to be supported on WinCE. +#ifndef __WXWINCE__ + HELPINFO* info = (HELPINFO*) lParam; + // Don't yet process menu help events, just windows + if (info->iContextType == HELPINFO_WINDOW) +#endif + { + wxWindow* subjectOfHelp = radiobox; + bool eventProcessed = FALSE; + while (subjectOfHelp && !eventProcessed) + { + wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), +#ifdef __WXWINCE__ + wxPoint(0, 0) +#else + wxPoint(info->MousePos.x, info->MousePos.y) +#endif + ) ; // info->iCtrlId); + helpEvent.SetEventObject(radiobox); + eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); + + // Go up the window hierarchy until the event is handled (or not) + subjectOfHelp = subjectOfHelp->GetParent(); + } + processed = eventProcessed; + } +#ifndef __WXWINCE__ + else if (info->iContextType == HELPINFO_MENUITEM) + { + wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ; + helpEvent.SetEventObject(radiobox); + processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent); + } + else + processed = FALSE; +#endif + if (processed) + return 0; + + break; + } +#endif // __WIN32__ } - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam); } +#endif // __WIN32__ + +#endif // wxUSE_RADIOBOX