/////////////////////////////////////////////////////////////////////////////
-// Name: radiobox.cpp
-// Purpose: wxRadioBox
+// Name: src/msw/radiobox.cpp
+// Purpose: wxRadioBox implementation
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "radiobox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#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
-
-#ifndef __GNUWIN32__
- #include <commctrl.h>
-#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_SPECIFY_ROWS)
+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,
// global vars
// ---------------------------------------------------------------------------
-// the pointer to standard radio button wnd proc
-static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
-
-#endif // __WIN32__
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// wxRadioBox
-// ---------------------------------------------------------------------------
-
-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)
+namespace
{
- if ( cmd == BN_CLICKED )
- {
- int selectedButton = -1;
- for ( int i = 0; i < m_noItems; i++ )
- {
- if ( id == wxGetWindowId(m_radioButtons[i]) )
- {
- selectedButton = i;
-
- break;
- }
- }
+// the pointer to standard radio button wnd proc
+WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
- wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") );
+// 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);
- if ( selectedButton != m_selectedButton )
- {
- m_selectedButton = selectedButton;
+RadioBoxFromButton gs_boxFromButton;
- SendNotificationEvent();
- }
- //else: don't generate events when the selection doesn't change
+} // anonymous namespace
- return TRUE;
- }
- else
- return FALSE;
-}
+// ===========================================================================
+// implementation
+// ===========================================================================
-#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)
+/* static */
+wxRadioBox* wxRadioBox::GetFromRadioButtonHWND(WXHWND hwnd)
{
- 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;
+ const RadioBoxFromButton::const_iterator it = gs_boxFromButton.find(hwnd);
+ return it == gs_boxFromButton.end() ? NULL : it->second;
}
-#endif // WXWIN_COMPATIBILITY
+// ---------------------------------------------------------------------------
+// wxRadioBox creation
+// ---------------------------------------------------------------------------
// 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_dummyHwnd = NULL;
m_radioWidth = NULL;
m_radioHeight = NULL;
}
const wxValidator& val,
const wxString& name)
{
- // initialize members
- m_selectedButton = -1;
- m_noItems = 0;
+ // common initialization
+ if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
+ return false;
- m_majorDim = majorDim == 0 ? n : majorDim;
- m_noRowsOrCols = majorDim;
+ // 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;
- // common initialization
- if ( !CreateControl(parent, id, pos, size, style, val, name) )
- return FALSE;
-
- // create the static box
- if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP,
- pos, size, title, 0) )
- return FALSE;
-
- // and now create the buttons
- m_noItems = n;
-#if RADIOBTN_PARENT_IS_RADIOBOX
- HWND hwndParent = GetHwnd();
+#if wxUSE_VALIDATORS
+ SetValidator(val);
#else
- HWND hwndParent = GetHwndOf(parent);
-#endif
+ 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);
- // Some radio boxes test consecutive id.
- (void)NewControlId();
- m_radioButtons = new WXHWND[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();
+ wxWindowIDRef subid = NewControlId();
- HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
- choices[i],
+ HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
+ choices[i].wx_str(),
styleBtn,
0, 0, 0, 0, // will be set in SetSize()
- hwndParent,
- (HMENU)newId,
+ GetHwndOf(parent),
+ (HMENU)wxUIntToPtr(subid.GetValue()),
wxGetInstance(),
NULL);
if ( !hwndBtn )
{
- wxLogLastError("CreateWindow(radio btn)");
+ wxLogLastError(wxT("CreateWindow(radio btn)"));
- return FALSE;
+ return false;
}
- m_radioButtons[i] = (WXHWND)hwndBtn;
+ // Keep track of the subwindow
+ m_radioButtons->Set(i, hwndBtn, subid);
SubclassRadioButton((WXHWND)hwndBtn);
- if ( hfont )
- {
- ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
- }
-
- m_subControls.Add(newId);
+ // Also, make it a subcontrol of this control
+ m_subControls.Add(subid);
}
// 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);
-
- SetSelection(0);
+ m_dummyId = NewControlId();
- SetSize(pos.x, pos.y, size.x, size.y);
+ 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);
- return TRUE;
-}
-wxRadioBox::~wxRadioBox()
-{
- m_isBeingDeleted = TRUE;
+ m_radioButtons->SetFont(GetFont());
- 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;
+#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);
-wxString wxRadioBox::GetLabel(int item) const
-{
- wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );
+ // Now that we have items determine what is the best size and set it.
+ SetInitialSize(size);
- return wxGetWindowText(m_radioButtons[item]);
+ return true;
}
-void wxRadioBox::SetLabel(int item, const wxString& label)
+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)
{
- 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());
+ wxCArrayString chs(choices);
+ return Create(parent, id, title, pos, size, chs.GetCount(),
+ chs.GetStrings(), majorDim, style, val, name);
}
-void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
+wxRadioBox::~wxRadioBox()
{
- /*
- m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
- m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
- */
- wxFAIL_MSG(wxT("not implemented"));
-}
+ SendDestroyEvent();
-int wxRadioBox::FindString(const wxString& s) const
-{
- for (int i = 0; i < m_noItems; i++)
+ // 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++ )
{
- if ( s == wxGetWindowText(m_radioButtons[i]) )
- return i;
- }
-
- return wxNOT_FOUND;
-}
+ HWND hwnd = m_radioButtons->Get(item);
-void wxRadioBox::SetSelection(int N)
-{
- wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") );
+ wxSetWindowProc(hwnd, reinterpret_cast<WNDPROC>(s_wndprocRadioBtn));
+ gs_boxFromButton.erase(hwnd);
+ }
- // 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);
+ delete m_radioButtons;
- ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
- ::SetFocus((HWND)m_radioButtons[N]);
+ if ( m_dummyHwnd )
+ DestroyWindow((HWND)m_dummyHwnd);
- m_selectedButton = N;
+ delete[] m_radioWidth;
+ delete[] m_radioHeight;
}
-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
-{
- return m_selectedButton;
-}
-
-// Find string for position
-wxString wxRadioBox::GetString(int N) const
-{
- return wxGetWindowText(m_radioButtons[N]);
-}
-
-// Restored old code.
-void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+// 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 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
+ HWND hwndBtn = (HWND)hWndBtn;
- int current_width, cyf;
+ if ( !s_wndprocRadioBtn )
+ s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
- int cx1,cy1;
- wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
+ wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
- // 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;
+ gs_boxFromButton[hwndBtn] = this;
+}
- int i;
- for (i = 0 ; i < m_noItems; i++)
- {
- 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];
- }
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
- if (maxWidth<eachWidth)
- maxWidth = eachWidth;
- if (maxHeight<eachHeight)
- maxHeight = eachHeight;
- }
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)
+{
+ const int id = (signed short)id_;
- if (m_hWnd)
+ if ( cmd == BN_CLICKED )
{
- int totWidth;
- int totHeight;
+ if (id == GetId())
+ return true;
- int nbHor = GetNumHor(),
- nbVer = GetNumVer();
+ int selectedButton = wxNOT_FOUND;
- // 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);
-
- int extraHeight = cy1;
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; i++ )
+ {
+ const HWND hwndBtn = (*m_radioButtons)[i];
+ if ( id == wxGetWindowId(hwndBtn) )
+ {
+ // we can get BN_CLICKED for a button which just became focused
+ // but it may not be checked, in which case we shouldn't
+ // generate a radiobox selection changed event for it
+ if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+ selectedButton = i;
-#if defined(CTL3D) && !CTL3D
- // Requires a bigger group box in plain Windows
- extraHeight *= 3;
- extraHeight /= 2;
-#endif
+ break;
+ }
+ }
- // only change our width/height if asked for
- if ( width == -1 )
+ if ( selectedButton == wxNOT_FOUND )
{
- if ( sizeFlags & wxSIZE_AUTO_WIDTH )
- width = totWidth + cx1;
- else
- width = widthOld;
+ // just ignore it - due to a hack with WM_NCHITTEST handling in our
+ // wnd proc, we can receive dummy click messages when we click near
+ // the radiobox edge (this is ugly but Julian wouldn't let me get
+ // rid of this...)
+ return false;
}
- if ( height == -1 )
+ if ( selectedButton != m_selectedButton )
{
- if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
- height = totHeight + extraHeight;
- else
- height = heightOld;
- }
+ m_selectedButton = selectedButton;
- ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+ SendNotificationEvent();
+ }
+ //else: don't generate events when the selection doesn't change
- x_offset += cx1;
- y_offset += cy1;
+ return true;
}
+ else
+ return false;
+}
-#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 startX = x_offset;
- int startY = y_offset;
+void wxRadioBox::Command(wxCommandEvent & event)
+{
+ SetSelection (event.GetInt());
+ SetFocus();
+ ProcessCommand(event);
+}
- for ( i = 0 ; i < m_noItems; i++)
- {
- // Bidimensional radio adjustment
- if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
- {
- if (m_windowStyle & wxRA_VERTICAL)
- {
- y_offset = startY;
- x_offset += maxWidth + cx1;
- }
- else
- {
- x_offset = startX;
- y_offset += maxHeight;
- if (m_radioWidth[0]>0)
- 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];
- }
+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);
+}
- // 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);
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------
- if (m_windowStyle & wxRA_SPECIFY_ROWS)
- {
- y_offset += maxHeight;
- if (m_radioWidth[0]>0)
- y_offset += cy1/2;
- }
- else
- x_offset += maxWidth + cx1;
- }
+unsigned int wxRadioBox::GetCount() const
+{
+ return m_radioButtons ? m_radioButtons->GetCount() : 0u;
}
-void wxRadioBox::GetSize(int *width, int *height) const
+void wxRadioBox::SetString(unsigned int item, const wxString& label)
{
- RECT rect;
- rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+ wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
- if (m_hWnd)
- wxFindMaxSize(m_hWnd, &rect);
+ m_radioWidth[item] =
+ m_radioHeight[item] = wxDefaultCoord;
- int i;
- for (i = 0; i < m_noItems; i++)
- wxFindMaxSize(m_radioButtons[i], &rect);
+ ::SetWindowText((*m_radioButtons)[item], label.c_str());
- *width = rect.right - rect.left;
- *height = rect.bottom - rect.top;
+ InvalidateBestSize();
}
-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(unsigned 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(unsigned 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);
+ BOOL ret = MSWEnableHWND((*m_radioButtons)[item], enable);
+
+ return (ret == 0) != enable;
}
-// Enable all controls
-bool wxRadioBox::Enable(bool enable)
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
{
- if ( !wxControl::Enable(enable) )
- return FALSE;
-
- for (int i = 0; i < m_noItems; i++)
- ::EnableWindow((HWND) m_radioButtons[i], enable);
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemEnabled()") );
- return TRUE;
+ return ::IsWindowEnabled((*m_radioButtons)[item]) != 0;
}
// Show a specific button
-void wxRadioBox::Show(int item, bool show)
+bool wxRadioBox::Show(unsigned 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);
+
+ bool changed = (ret != 0) != show;
+ if ( changed )
+ {
+ InvalidateBestSize();
+ }
+
+ return changed;
}
-// For single selection items only
-wxString wxRadioBox::GetStringSelection() const
+bool wxRadioBox::IsItemShown(unsigned int item) const
{
- wxString result;
- int sel = GetSelection();
- if (sel > -1)
- result = GetString(sel);
+ wxCHECK_MSG( IsValid(item), false,
+ wxT("invalid item in wxRadioBox::IsItemShown()") );
+
+ // don't use IsWindowVisible() here because it would return false if the
+ // radiobox itself is hidden while we want to only return false if this
+ // button specifically is hidden
+ return (::GetWindowLong((*m_radioButtons)[item],
+ GWL_STYLE) & WS_VISIBLE) != 0;
+}
- return result;
+#if wxUSE_TOOLTIPS
+
+bool wxRadioBox::HasToolTips() const
+{
+ return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips();
}
-bool wxRadioBox::SetStringSelection(const wxString& s)
+void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
{
- int sel = FindString (s);
- if (sel > -1)
- {
- SetSelection (sel);
- return TRUE;
- }
- else
- return FALSE;
+ // we have already checked for the item to be valid in wxRadioBoxBase
+ const HWND hwndRbtn = (*m_radioButtons)[item];
+ if ( tooltip != NULL )
+ tooltip->Add(hwndRbtn);
+ else // unset the tooltip
+ wxToolTip::Remove(hwndRbtn, 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...
}
-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
+#endif // wxUSE_TOOLTIPS
+
+bool wxRadioBox::Reparent(wxWindowBase *newParent)
{
- int i;
- for (i = 0; i < Number(); i++)
+ if ( !wxStaticBox::Reparent(newParent) )
{
- if (GetRadioButtons()[i] == hWnd)
- return TRUE;
+ return false;
}
- return FALSE;
+ 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;
}
-void wxRadioBox::Command(wxCommandEvent & event)
-{
- SetSelection (event.m_commandInt);
- ProcessCommand (event);
-}
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
-void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
+// ----------------------------------------------------------------------------
+// size calculations
+// ----------------------------------------------------------------------------
+
+wxSize wxRadioBox::GetMaxButtonSize() const
{
-#ifdef __WIN32__
- HWND hwndBtn = (HWND)hWndBtn;
+ // calculate the max button size
+ int widthMax = 0,
+ heightMax = 0;
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0 ; i < count; i++ )
+ {
+ int width, height;
+ if ( m_radioWidth[i] < 0 )
+ {
+ GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height);
- if ( !s_wndprocRadioBtn )
- s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+ // 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];
+ }
- // No GWL_USERDATA in Win16, so omit this subclassing.
- ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
- ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-#endif // __WIN32__
+ if ( widthMax < width )
+ widthMax = width;
+ if ( heightMax < height )
+ heightMax = height;
+ }
+
+ return wxSize(widthMax, heightMax);
}
-void wxRadioBox::SendNotificationEvent()
+wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
{
- wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
- event.SetInt( m_selectedButton );
- event.SetString( GetString(m_selectedButton) );
- event.SetEventObject( this );
- ProcessCommand(event);
+ // the radiobox should be big enough for its buttons
+ int cx1, cy1;
+ wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+ int extraHeight = cy1;
+
+ int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight;
+ int width = GetColumnCount() * (sizeBtn.x + cx1) + cx1;
+
+ // Add extra space under the label, if it exists.
+ if (!wxControl::GetLabel().empty())
+ height += cy1/2;
+
+ // and also wide enough for its label
+ int widthLabel;
+ GetTextExtent(GetLabelText(), &widthLabel, NULL);
+ widthLabel += RADIO_SIZE; // FIXME this is bogus too
+ if ( widthLabel > width )
+ width = widthLabel;
+
+ return wxSize(width, height);
}
-bool wxRadioBox::SetFont(const wxFont& font)
+wxSize wxRadioBox::DoGetBestSize() const
{
- if ( !wxControl::SetFont(font) )
+ if ( !m_radioButtons )
{
- // nothing to do
- return FALSE;
+ // if we're not fully initialized yet, we can't meaningfully compute
+ // our best size, we'll do it later
+ return wxSize(1, 1);
}
- // also set the font of our radio buttons
- WXHFONT hfont = wxFont(font).GetResourceHandle();
- for ( int n = 0; n < m_noItems; n++ )
+ wxSize best = GetTotalButtonSize(GetMaxButtonSize());
+ CacheBestSize(best);
+ return best;
+}
+
+void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+ if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
+ (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
{
- ::SendMessage((HWND)m_radioButtons[n], WM_SETFONT, (WPARAM)hfont, 0L);
+ // 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());
+
+ // only change our width/height if asked for
+ if ( width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH) )
+ width = totSize.x;
+
+ if ( height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT) )
+ height = totSize.y;
}
- return TRUE;
+ wxStaticBox::DoSetSize(x, y, width, height);
}
-long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
{
- switch ( nMsg )
+ wxStaticBox::DoMoveWindow(x, y, width, height);
+
+ wxSize maxSize = GetMaxButtonSize();
+ int maxWidth = maxSize.x,
+ maxHeight = maxSize.y;
+
+ // 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.
+
+ // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in
+ // 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
+ // GetMajorDim() is the number of rows.
+
+ int cx1, cy1;
+ wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+ 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;
+
+ const unsigned int count = GetCount();
+ for (unsigned int i = 0; i < count; i++)
{
- case WM_CTLCOLORSTATIC:
- // set the colour of the radio buttons to be the same as ours
+ // 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
+ unsigned int n = i + 1;
+ isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);
+ }
+ else // wxRA_SPECIFY_ROWS
+ {
+ // item is the last in the row if it is in the last columns
+ isLastInTheRow = i >= (count/GetMajorDim())*GetMajorDim();
+ }
+
+ // is this the start of new row/column?
+ if ( i && (i % GetMajorDim() == 0) )
+ {
+ if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+ {
+ // start of new column
+ y_offset = startY;
+ x_offset += maxWidth + cx1;
+ }
+ else // start of new row
{
- HDC hdc = (HDC)wParam;
+ x_offset = startX;
+ y_offset += maxHeight;
+ if (m_radioWidth[0]>0)
+ y_offset += cy1/2;
+ }
+ }
- const wxColour& colBack = GetBackgroundColour();
- ::SetBkColor(hdc, wxColourToRGB(colBack));
- ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+ 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;
+ }
- wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+ // 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);
- return (WXHBRUSH)brush->GetResourceHandle();
- }
+ // 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;
+ }
+ }
+}
- // 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 wxRadioBox::GetItemFromPoint(const wxPoint& pt) const
+{
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; i++ )
+ {
+ RECT rect = wxGetWindowRect((*m_radioButtons)[i]);
- ScreenToClient(&xPos, &yPos);
+ if ( rect.left <= pt.x && pt.x < rect.right &&
+ rect.top <= pt.y && pt.y < rect.bottom )
+ {
+ return i;
+ }
+ }
- // 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;
- }
- // fall through
+ return wxNOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+// radio box drawing
+// ----------------------------------------------------------------------------
+
+#ifndef __WXWINCE__
- default:
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
+{
+ RECT rc;
+ ::GetWindowRect(GetHwnd(), &rc);
+ HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
+
+ const unsigned int count = GetCount();
+ for ( unsigned int i = 0; i < count; ++i )
+ {
+ // don't clip out hidden children
+ if ( !IsItemShown(i) )
+ continue;
+
+ ::GetWindowRect((*m_radioButtons)[i], &rc);
+ AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+ ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
}
+
+ return (WXHRGN)hrgn;
}
+#endif // __WXWINCE__
+
// ---------------------------------------------------------------------------
// 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
- )
- {
- wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);
- wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+ wxRadioBox * const radiobox = wxRadioBox::GetFromRadioButtonHWND(hwnd);
+ wxCHECK_MSG( radiobox, 0, wxT("Should have the associated radio box") );
-#if wxUSE_TOOLTIPS && !defined(__GNUWIN32__)
- if ( msg == WM_NOTIFY )
- {
- NMHDR* hdr = (NMHDR *)lParam;
- if ( (int)hdr->code == TTN_NEEDTEXT )
+ switch ( message )
+ {
+ 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
{
- wxToolTip *tt = radiobox->GetToolTip();
- if ( tt )
- {
- TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
- ttt->lpszText = (wxChar *)tt->GetTip().c_str();
+ long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd,
+ message, wParam, lParam);
- processed = TRUE;
- }
+ return lDlgCode | DLGC_WANTARROWS;
}
- }
- else // msg == WM_KEYDOWN
-#endif // wxUSE_TOOLTIPS
- {
- processed = TRUE;
-
- int sel = radiobox->GetSelection();
- switch ( wParam )
+ case WM_KEYDOWN:
{
- case VK_UP:
- sel--;
- break;
+ bool processed = true;
- case VK_LEFT:
- sel -= radiobox->GetNumVer();
- break;
+ wxDirection dir;
+ switch ( wParam )
+ {
+ case VK_UP:
+ dir = wxUP;
+ break;
+
+ case VK_LEFT:
+ dir = wxLEFT;
+ break;
+
+ case VK_DOWN:
+ dir = wxDOWN;
+ break;
- case VK_DOWN:
- sel++;
- break;
+ case VK_RIGHT:
+ dir = wxRIGHT;
+ break;
- case VK_RIGHT:
- sel += radiobox->GetNumVer();
- break;
+ default:
+ processed = false;
- case VK_TAB:
+ // 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 )
{
- wxNavigationKeyEvent event;
- event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
- event.SetWindowChange(FALSE);
- event.SetEventObject(radiobox);
+ radiobox->SetSelection(selNew);
+ radiobox->SetFocus();
- if ( radiobox->GetEventHandler()->ProcessEvent(event) )
- return 0;
+ // emulate the button click
+ radiobox->SendNotificationEvent();
+
+ return 0;
}
- // fall through
+ }
+ }
+ break;
- default:
- processed = FALSE;
+ case WM_SETFOCUS:
+ case WM_KILLFOCUS:
+ {
+ // 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);
+ 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
projects / wxWidgets.git / blobdiff