/////////////////////////////////////////////////////////////////////////////
-// Name: msw/radiobox.cpp
+// 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
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "radiobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_RADIOBOX
+#include "wx/radiobox.h"
+
#ifndef WX_PRECOMP
+ #include "wx/hashmap.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"
+#include "wx/msw/subwin.h"
#if wxUSE_TOOLTIPS
- #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
- #include <commctrl.h>
- #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_SPECIFY_ROWS)
+wxEND_FLAGS( wxRadioBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
+ wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , 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-<mnemonic of radiobox> 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-<mnemonic> 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,
// global vars
// ---------------------------------------------------------------------------
+namespace
+{
+
// the pointer to standard radio button wnd proc
-static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+
+// Hash allowing to find wxRadioBox containing the given radio button by its
+// HWND. This is used by (subclassed) radio button window proc to find the
+// radio box it belongs to.
+WX_DECLARE_HASH_MAP(HWND, wxRadioBox *,
+ wxPointerHash, wxPointerEqual,
+ RadioBoxFromButton);
-#endif // __WIN32__
+RadioBoxFromButton gs_boxFromButton;
+
+} // anonymous namespace
// ===========================================================================
// implementation
// ===========================================================================
+/* static */
+wxRadioBox* wxRadioBox::GetFromRadioButtonHWND(WXHWND hwnd)
+{
+ const RadioBoxFromButton::const_iterator it = gs_boxFromButton.find(hwnd);
+ return it == gs_boxFromButton.end() ? NULL : it->second;
+}
+
// ---------------------------------------------------------------------------
-// wxRadioBox
+// wxRadioBox creation
// ---------------------------------------------------------------------------
-int wxRadioBox::GetCount() const
+// Radio box item
+void wxRadioBox::Init()
{
- return m_noItems;
+ m_selectedButton = wxNOT_FOUND;
+ m_radioButtons = NULL;
+ m_dummyHwnd = NULL;
+ m_radioWidth = NULL;
+ m_radioHeight = NULL;
}
-int wxRadioBox::GetColumnCount() const
+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)
{
- return GetNumHor();
+ // common initialization
+ if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
+ return false;
+
+ // the code elsewhere in this file supposes that either wxRA_SPECIFY_COLS
+ // or wxRA_SPECIFY_ROWS is set, ensure that this is indeed the case
+ if ( !(style & (wxRA_SPECIFY_ROWS | wxRA_SPECIFY_COLS)) )
+ style |= wxRA_SPECIFY_COLS;
+
+#if wxUSE_VALIDATORS
+ SetValidator(val);
+#else
+ wxUnusedVar(val);
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
+
+ // We need an extra one to keep track of the 'dummy' item we
+ // create to end the radio group, so it will be destroyed and
+ // it's id will be released. But we want it separate from the
+ // other buttons since the wxSubwindows will operate on it as
+ // well and we just want to ignore it until destroying it.
+ // For instance, we don't want the bounding box of the radio
+ // buttons to include the dummy button
+ m_radioButtons = new wxSubwindows(n);
+
+ m_radioWidth = new int[n];
+ m_radioHeight = new int[n];
+
+ for ( int i = 0; i < n; i++ )
+ {
+ m_radioWidth[i] =
+ m_radioHeight[i] = wxDefaultCoord;
+ long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
+ if ( i == 0 )
+ styleBtn |= WS_GROUP;
+
+ wxWindowIDRef subid = NewControlId();
+
+ HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
+ choices[i].t_str(),
+ styleBtn,
+ 0, 0, 0, 0, // will be set in SetSize()
+ GetHwndOf(parent),
+ (HMENU)wxUIntToPtr(subid.GetValue()),
+ wxGetInstance(),
+ NULL);
+
+ if ( !hwndBtn )
+ {
+ wxLogLastError(wxT("CreateWindow(radio btn)"));
+
+ return false;
+ }
+
+ // Keep track of the subwindow
+ m_radioButtons->Set(i, hwndBtn, subid);
+
+ SubclassRadioButton((WXHWND)hwndBtn);
+
+ // Also, make it a subcontrol of this control
+ m_subControls.Add(subid);
+ }
+
+ // Create a dummy radio control to end the group.
+ m_dummyId = NewControlId();
+
+ m_dummyHwnd = (WXHWND)::CreateWindow(wxT("BUTTON"),
+ wxEmptyString,
+ WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
+ 0, 0, 0, 0, GetHwndOf(parent),
+ (HMENU)wxUIntToPtr(m_dummyId.GetValue()),
+ wxGetInstance(), NULL);
+
+
+ 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);
+
+ // Now that we have items determine what is the best size and set it.
+ SetInitialSize(size);
+
+ // And update all the buttons positions to match it.
+ const wxSize actualSize = GetSize();
+ PositionAllButtons(pos.x, pos.y, actualSize.x, actualSize.y);
+
+ // The base wxStaticBox class never accepts focus, but we do because giving
+ // focus to a wxRadioBox actually gives it to one of its buttons, which are
+ // not visible at wx level and hence are not taken into account by the
+ // logic in wxControlContainer code.
+ m_container.EnableSelfFocus();
+
+ return true;
}
-int wxRadioBox::GetRowCount() const
+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)
{
- return GetNumVer();
+ wxCArrayString chs(choices);
+ return Create(parent, id, title, pos, size, chs.GetCount(),
+ chs.GetStrings(), majorDim, style, val, name);
}
-// returns the number of rows
-int wxRadioBox::GetNumVer() const
+wxRadioBox::~wxRadioBox()
{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return m_majorDim;
- }
- else
+ SendDestroyEvent();
+
+ // Unsubclass all the radio buttons and remove their soon-to-be-invalid
+ // HWNDs from the global map. Notice that we need to unsubclass because
+ // otherwise we'd need the entries in gs_boxFromButton for the buttons
+ // being deleted to handle the messages generated during their destruction.
+ for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
{
- return (m_noItems + m_majorDim - 1)/m_majorDim;
+ HWND hwnd = m_radioButtons->Get(item);
+
+ wxSetWindowProc(hwnd, reinterpret_cast<WNDPROC>(s_wndprocRadioBtn));
+ gs_boxFromButton.erase(hwnd);
}
+
+ delete m_radioButtons;
+
+ if ( m_dummyHwnd )
+ DestroyWindow((HWND)m_dummyHwnd);
+
+ delete[] m_radioWidth;
+ delete[] m_radioHeight;
}
-// returns the number of columns
-int wxRadioBox::GetNumHor() const
+// 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)
{
- if ( m_windowStyle & wxRA_SPECIFY_ROWS )
- {
- return (m_noItems + m_majorDim - 1)/m_majorDim;
- }
- else
- {
- return m_majorDim;
- }
+ HWND hwndBtn = (HWND)hWndBtn;
+
+ if ( !s_wndprocRadioBtn )
+ s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
+
+ wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+
+ gs_boxFromButton[hwndBtn] = this;
}
-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)
{
+ const int id = (signed short)id_;
+
if ( cmd == BN_CLICKED )
{
if (id == GetId())
- return TRUE;
+ return true;
- int selectedButton = -1;
+ int selectedButton = wxNOT_FOUND;
- for ( int i = 0; i < m_noItems; i++ )
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; i++ )
{
- if ( id == wxGetWindowId(m_radioButtons[i]) )
+ const HWND hwndBtn = (*m_radioButtons)[i];
+ if ( id == wxGetWindowId(hwndBtn) )
{
- selectedButton = i;
+ // we can get BN_CLICKED for a button which just became focused
+ // but it may not be checked, in which case we shouldn't
+ // generate a radiobox selection changed event for it
+ if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+ selectedButton = i;
break;
}
}
- if ( selectedButton == -1 )
+ 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;
+ return false;
}
if ( selectedButton != m_selectedButton )
}
//else: don't generate events when the selection doesn't change
- return TRUE;
+ return true;
}
else
- return FALSE;
+ 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;
+void wxRadioBox::Command(wxCommandEvent & event)
+{
+ SetSelection (event.GetInt());
+ SetFocus();
+ ProcessCommand(event);
}
-#endif // WXWIN_COMPATIBILITY
-
-// Radio box item
-wxRadioBox::wxRadioBox()
+void wxRadioBox::SendNotificationEvent()
{
- m_selectedButton = -1;
- m_noItems = 0;
- m_noRowsOrCols = 0;
- m_radioButtons = NULL;
- m_majorDim = 0;
- m_radioWidth = NULL;
- m_radioHeight = NULL;
+ wxCommandEvent event(wxEVT_RADIOBOX, m_windowId);
+ event.SetInt( m_selectedButton );
+ event.SetString(GetString(m_selectedButton));
+ event.SetEventObject( this );
+ ProcessCommand(event);
}
-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)
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------
+
+unsigned int wxRadioBox::GetCount() const
{
- // initialize members
- m_selectedButton = -1;
- m_noItems = 0;
+ return m_radioButtons ? m_radioButtons->GetCount() : 0u;
+}
- m_majorDim = majorDim == 0 ? n : majorDim;
- m_noRowsOrCols = majorDim;
+void wxRadioBox::SetString(unsigned int item, const wxString& label)
+{
+ wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
- // 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();
-#else
- HWND hwndParent = GetHwndOf(parent);
-#endif
+ m_radioWidth[item] =
+ m_radioHeight[item] = wxDefaultCoord;
- // Some radio boxes test consecutive id.
- (void)NewControlId();
- m_radioButtons = new WXHWND[n];
- m_radioWidth = new int[n];
- m_radioHeight = new int[n];
+ ::SetWindowText((*m_radioButtons)[item], label.c_str());
- WXHFONT hfont = 0;
- wxFont& font = GetFont();
- if ( font.Ok() )
- {
- hfont = font.GetResourceHandle();
- }
+ InvalidateBestSize();
+}
- 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;
+void wxRadioBox::SetSelection(int N)
+{
+ wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );
- long newId = NewControlId();
+ // unselect the old button
+ if ( m_selectedButton != wxNOT_FOUND )
+ ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L);
- HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
- choices[i],
- styleBtn,
- 0, 0, 0, 0, // will be set in SetSize()
- hwndParent,
- (HMENU)newId,
- wxGetInstance(),
- NULL);
+ // and select the new one
+ ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L);
- if ( !hwndBtn )
- {
- wxLogLastError(wxT("CreateWindow(radio btn)"));
+ m_selectedButton = N;
+}
- return FALSE;
- }
+// Find string for position
+wxString wxRadioBox::GetString(unsigned int item) const
+{
+ wxCHECK_MSG( IsValid(item), wxEmptyString,
+ wxT("invalid radiobox index") );
- m_radioButtons[i] = (WXHWND)hwndBtn;
+ return wxGetWindowText((*m_radioButtons)[item]);
+}
- SubclassRadioButton((WXHWND)hwndBtn);
+void wxRadioBox::SetFocus()
+{
+ if ( GetCount() > 0 )
+ {
+ ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND
+ ? 0
+ : m_selectedButton]);
+ }
+}
- if ( hfont )
- {
- ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
- }
+bool wxRadioBox::CanBeFocused() const
+{
+ // If the control itself is hidden or disabled, no need to check anything
+ // else.
+ if ( !wxStaticBox::CanBeFocused() )
+ return false;
- m_subControls.Add(newId);
+ // Otherwise, check if we have any buttons that can be focused.
+ for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
+ {
+ if ( IsItemEnabled(item) && IsItemShown(item) )
+ return true;
}
- // Create a dummy radio control to end the group.
- (void)::CreateWindow(_T("BUTTON"),
- _T(""),
- WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
- 0, 0, 0, 0, hwndParent,
- (HMENU)NewControlId(), wxGetInstance(), NULL);
+ // We didn't find any items that can accept focus, so neither can we as a
+ // whole accept it.
+ return false;
+}
- SetSelection(0);
+// Enable a specific button
+bool wxRadioBox::Enable(unsigned int item, bool enable)
+{
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::Enable()") );
- SetSize(pos.x, pos.y, size.x, size.y);
+ BOOL ret = MSWEnableHWND((*m_radioButtons)[item], enable);
- return TRUE;
+ return (ret == 0) != enable;
}
-wxRadioBox::~wxRadioBox()
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
{
- 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;
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemEnabled()") );
+ return ::IsWindowEnabled((*m_radioButtons)[item]) != 0;
}
-void wxRadioBox::SetString(int item, const wxString& label)
+// Show a specific button
+bool wxRadioBox::Show(unsigned int item, bool show)
{
- wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::Show()") );
+
+ BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
+
+ bool changed = (ret != 0) != show;
+ if ( changed )
+ {
+ InvalidateBestSize();
+ }
- m_radioWidth[item] = m_radioHeight[item] = -1;
- SetWindowText((HWND)m_radioButtons[item], label.c_str());
+ return changed;
}
-void wxRadioBox::SetSelection(int N)
+bool wxRadioBox::IsItemShown(unsigned int item) const
{
- wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") );
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemShown()") );
- // 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);
+ // 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;
+}
- ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
- ::SetFocus((HWND)m_radioButtons[N]);
+#if wxUSE_TOOLTIPS
- m_selectedButton = N;
+bool wxRadioBox::HasToolTips() const
+{
+ return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips();
}
-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
+void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
{
- return m_selectedButton;
+ // we have already checked for the item to be valid in wxRadioBoxBase
+ const HWND hwndRbtn = (*m_radioButtons)[item];
+ if ( tooltip != NULL )
+ tooltip->AddOtherWindow(hwndRbtn);
+ else // unset the tooltip
+ wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
+ // the second parameter can be zero since it's ignored by Remove()
+ // as we pass a rect for which wxRect::IsEmpty()==true...
}
-// Find string for position
-wxString wxRadioBox::GetString(int item) const
+#endif // wxUSE_TOOLTIPS
+
+bool wxRadioBox::Reparent(wxWindowBase *newParent)
{
- wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
- wxT("invalid radiobox index") );
+ if ( !wxStaticBox::Reparent(newParent) )
+ {
+ return false;
+ }
- return wxGetWindowText(m_radioButtons[item]);
+ HWND hwndParent = GetHwndOf(GetParent());
+ for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
+ {
+ ::SetParent((*m_radioButtons)[item], hwndParent);
+ }
+#ifdef __WXWINCE__
+ // put static box under the buttons in the Z-order
+ SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#endif
+ return true;
}
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
+
// ----------------------------------------------------------------------------
// size calculations
// ----------------------------------------------------------------------------
// calculate the max button size
int widthMax = 0,
heightMax = 0;
- for ( int i = 0 ; i < m_noItems; i++ )
+ 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);
+ GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height);
// adjust the size to take into account the radio box itself
// FIXME this is totally bogus!
{
// the radiobox should be big enough for its buttons
int cx1, cy1;
- wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont());
+ wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
int extraHeight = cy1;
-#if defined(CTL3D) && !CTL3D
- // Requires a bigger group box in plain Windows
- extraHeight *= 3;
- extraHeight /= 2;
-#endif
+ int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight;
+ int width = GetColumnCount() * (sizeBtn.x + cx1) + cx1;
- 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);
+ GetTextExtent(GetLabelText(), &widthLabel, NULL);
widthLabel += RADIO_SIZE; // FIXME this is bogus too
if ( widthLabel > width )
width = widthLabel;
wxSize wxRadioBox::DoGetBestSize() const
{
- return GetTotalButtonSize(GetMaxButtonSize());
+ 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.
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);
+ if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
+ (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
+ {
+ // Attempt to have a look coherent with other platforms: We compute the
+ // biggest toggle dim, then we align all items according this value.
+ const wxSize totSize = GetTotalButtonSize(GetMaxButtonSize());
- int xx = x;
- int yy = y;
+ // only change our width/height if asked for
+ if ( width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH) )
+ width = totSize.x;
- if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- xx = currentX;
- if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- yy = currentY;
+ if ( height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT) )
+ height = totSize.y;
+ }
-#if RADIOBTN_PARENT_IS_RADIOBOX
- int y_offset = 0;
- int x_offset = 0;
-#else
- int y_offset = yy;
- int x_offset = xx;
-#endif
+ wxStaticBox::DoSetSize(x, y, width, height);
+}
- int cx1, cy1;
- wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
+void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
+{
+ wxStaticBox::DoMoveWindow(x, y, width, height);
- // Attempt to have a look coherent with other platforms: We compute the
- // biggest toggle dim, then we align all items according this value.
+ PositionAllButtons(x, y, width, height);
+}
+
+void
+wxRadioBox::PositionAllButtons(int x, int y, int width, int WXUNUSED(height))
+{
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 == -1 )
- {
- if ( sizeFlags & wxSIZE_AUTO_WIDTH )
- width = totWidth;
- else
- width = widthOld;
- }
-
- if ( height == -1 )
- {
- if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
- height = totHeight;
- else
- height = heightOld;
- }
-
- ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
-
// 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,
// to the right border of radiobox and thus can be wider than this.
// Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in
- // left to right order and m_majorDim is the number of columns while
+ // left to right order and GetMajorDim() is the number of columns while
// wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
- // m_majorDim is the number of rows.
+ // GetMajorDim() is the number of rows.
- x_offset += cx1;
- y_offset += cy1;
+ int cx1, cy1;
+ wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
-#if defined(CTL3D) && (!CTL3D)
- y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
- // JACS 2/12/93. CTL3D draws group label quite high.
-#endif
+ int x_offset = x + cx1;
+ int y_offset = y + cy1;
+
+ // Add extra space under the label, if it exists.
+ if (!wxControl::GetLabel().empty())
+ y_offset += cy1/2;
int startX = x_offset;
int startY = y_offset;
- for ( int i = 0; i < m_noItems; i++ )
+ const unsigned int count = GetCount();
+ for (unsigned int i = 0; i < count; i++)
{
// the last button in the row may be wider than the other ones as the
// radiobox may be wider than the sum of the button widths (as it
{
// 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);
+ unsigned int n = i + 1;
+ isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);
}
else // wxRA_SPECIFY_ROWS
{
// item is the last in the row if it is in the last columns
- isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim;
+ isLastInTheRow = i >= (count/GetMajorDim())*GetMajorDim();
}
// is this the start of new row/column?
- if ( i && (i % m_majorDim == 0) )
+ if ( i && (i % GetMajorDim() == 0) )
{
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
{
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, widthBtn, 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);
// where do we put the next button?
if ( m_windowStyle & wxRA_SPECIFY_ROWS )
}
}
-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]);
- }
-
-}
-
-bool wxRadioBox::Show(bool show)
-{
- if ( !wxControl::Show(show) )
- return FALSE;
-
- int nCmdShow = show ? SW_SHOW : SW_HIDE;
- for ( int i = 0; i < m_noItems; 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);
-}
-
-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
- size_t count = GetCount();
- for ( size_t i = 0; i < count; i++ )
- {
- if ( GetRadioButtons()[i] == hWnd )
- return TRUE;
- }
-
- return FALSE;
-}
-
-void wxRadioBox::Command(wxCommandEvent & event)
-{
- SetSelection (event.m_commandInt);
- 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)
+int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const
{
- // No GWL_USERDATA in Win16, so omit this subclassing.
-#ifdef __WIN32__
- HWND hwndBtn = (HWND)hWndBtn;
-
- if ( !s_wndprocRadioBtn )
- s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
-
- ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
- ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-#endif // __WIN32__
-}
-
-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);
-}
-
-bool wxRadioBox::SetFont(const wxFont& font)
-{
- if ( !wxControl::SetFont(font) )
- {
- // 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++ )
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; i++ )
{
- HWND hwndBtn = (HWND)m_radioButtons[n];
- ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
+ RECT rect = wxGetWindowRect((*m_radioButtons)[i]);
- // otherwise the buttons are not redrawn correctly
- ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);
+ if ( rect.left <= pt.x && pt.x < rect.right &&
+ rect.top <= pt.y && pt.y < rect.bottom )
+ {
+ return i;
+ }
}
- return TRUE;
+ return wxNOT_FOUND;
}
// ----------------------------------------------------------------------------
-// our window proc
+// radio box drawing
// ----------------------------------------------------------------------------
-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
-
- // 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);
+#ifndef __WXWINCE__
- // 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);
-}
-
-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
- )
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif // wxUSE_CTL3D
-
- HDC hdc = (HDC)pDC;
- if (GetParent()->GetTransparentBackground())
- SetBkMode(hdc, TRANSPARENT);
- else
- SetBkMode(hdc, OPAQUE);
+ RECT rc;
+ ::GetWindowRect(GetHwnd(), &rc);
+ HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
- wxColour colBack = GetBackgroundColour();
-
- if (!IsEnabled())
- colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
- ::SetBkColor(hdc, wxColourToRGB(colBack));
- ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; ++i )
+ {
+ // don't clip out hidden children
+ if ( !IsItemShown(i) )
+ continue;
- wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+ ::GetWindowRect((*m_radioButtons)[i], &rc);
+ AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+ ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+ }
- return (WXHBRUSH)brush->GetResourceHandle();
+ return (WXHRGN)hrgn;
}
+#endif // __WXWINCE__
// ---------------------------------------------------------------------------
// window proc for radio buttons
// ---------------------------------------------------------------------------
-#ifdef __WIN32__
-
LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
UINT message,
WPARAM wParam,
LPARAM lParam)
{
+
+ wxRadioBox * const radiobox = wxRadioBox::GetFromRadioButtonHWND(hwnd);
+ wxCHECK_MSG( radiobox, 0, wxT("Should have the associated radio box") );
+
switch ( message )
{
case WM_GETDLGCODE:
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;
- }
- }
- break;
-#endif // wxUSE_TOOLTIPS
-
case WM_KEYDOWN:
{
- wxRadioBox *radiobox = (wxRadioBox *)
- ::GetWindowLong(hwnd, GWL_USERDATA);
-
- wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
-
- bool processed = TRUE;
+ bool processed = true;
wxDirection dir;
switch ( wParam )
break;
default:
- processed = FALSE;
+ processed = false;
// just to suppress the compiler warning
dir = wxALL;
if ( selNew != selOld )
{
radiobox->SetSelection(selNew);
+ radiobox->SetFocus();
// emulate the button click
radiobox->SendNotificationEvent();
}
break;
-#ifdef __WIN32__
- case WM_HELP:
+ case WM_SETFOCUS:
+ case WM_KILLFOCUS:
{
- wxRadioBox *radiobox = (wxRadioBox *)
- ::GetWindowLong(hwnd, GWL_USERDATA);
+ // 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;
- wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+#ifndef __WXWINCE__
+ case WM_HELP:
+ {
+ bool processed = false;
- bool processed = TRUE;
+ wxEvtHandler * const handler = radiobox->GetEventHandler();
HELPINFO* info = (HELPINFO*) lParam;
- // Don't yet process menu help events, just windows
- if (info->iContextType == HELPINFO_WINDOW)
+ if ( info->iContextType == HELPINFO_WINDOW )
{
- wxWindow* subjectOfHelp = radiobox;
- bool eventProcessed = FALSE;
- while (subjectOfHelp && !eventProcessed)
+ for ( wxWindow* subjectOfHelp = radiobox;
+ subjectOfHelp;
+ subjectOfHelp = subjectOfHelp->GetParent() )
{
- wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), wxPoint(info->MousePos.x, info->MousePos.y) ) ; // info->iCtrlId);
+ wxHelpEvent helpEvent(wxEVT_HELP,
+ subjectOfHelp->GetId(),
+ wxPoint(info->MousePos.x,
+ info->MousePos.y));
helpEvent.SetEventObject(radiobox);
- eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
-
- // Go up the window hierarchy until the event is handled (or not)
- subjectOfHelp = subjectOfHelp->GetParent();
+ if ( handler->ProcessEvent(helpEvent) )
+ {
+ processed = true;
+ break;
+ }
}
- processed = eventProcessed;
}
else if (info->iContextType == HELPINFO_MENUITEM)
{
- wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
+ wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);
helpEvent.SetEventObject(radiobox);
- processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+ processed = handler->ProcessEvent(helpEvent);
}
- else processed = FALSE;
- if (processed)
+ if ( processed )
return 0;
-
- break;
}
-#endif // __WIN32__
+ break;
+#endif // !__WXWINCE__
}
return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
}
-#endif // __WIN32__
-
#endif // wxUSE_RADIOBOX
projects / wxWidgets.git / blobdiff