#endif
#ifndef WX_PRECOMP
- #include <stdio.h>
- #include "wx/setup.h"
#include "wx/bitmap.h"
#include "wx/brush.h"
#include "wx/radiobox.h"
+ #include "wx/log.h"
#endif
#include "wx/msw/private.h"
-#if !USE_SHARED_LIBRARY
+#if wxUSE_TOOLTIPS
+ #include <commctrl.h>
+
+ #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
+
+// 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.
+#define RADIOBTN_PARENT_IS_RADIOBOX 1
// ---------------------------------------------------------------------------
// private functions
}
}
- wxASSERT_MSG( selectedButton != -1, "click from alien button?" );
+ wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") );
if ( selectedButton != m_selectedButton )
{
m_radioHeight = NULL;
}
-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)
+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 = n;
-
- SetName(name);
- SetValidator(val);
-
- parent->AddChild(this);
- m_backgroundColour = parent->GetBackgroundColour();
- m_foregroundColour = parent->GetForegroundColour();
-
- m_windowStyle = (long&)style;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (id == -1)
- m_windowId = NewControlId();
- else
- m_windowId = id;
+ m_noItems = 0;
- if ( majorDim == 0 )
- m_majorDim = n;
- else
- m_majorDim = majorDim;
+ m_majorDim = majorDim == 0 ? n : majorDim;
m_noRowsOrCols = majorDim;
- long msStyle = GROUP_FLAGS;
-
- bool want3D;
- WXDWORD exStyle = Determine3DEffects(0, &want3D);
-
- HWND hwndParent = (HWND)parent->GetHWND();
-
- m_hWnd = (WXHWND)::CreateWindowEx
- (
- (DWORD)exStyle,
- GROUP_CLASS,
- title,
- msStyle,
- 0, 0, 0, 0,
- hwndParent,
- (HMENU)m_windowId,
- wxGetInstance(),
- NULL
- );
-
-#if wxUSE_CTL3D
- if (want3D)
- {
- Ctl3dSubclassCtl((HWND)m_hWnd);
- m_useCtl3D = TRUE;
- }
-#endif // wxUSE_CTL3D
+ // common initialization
+ if ( !CreateControl(parent, id, pos, size, style, val, name) )
+ return FALSE;
- SetFont(parent->GetFont());
+ // create the static box
+ if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, title, 0) )
+ return FALSE;
- SubclassWin(m_hWnd);
+ // and now create the buttons
+ m_noItems = n;
+#if RADIOBTN_PARENT_IS_RADIOBOX
+ HWND hwndParent = GetHwnd();
+#else
+ HWND hwndParent = GetHwndOf(parent);
+#endif
// Some radio boxes test consecutive id.
(void)NewControlId();
m_radioButtons = new WXHWND[n];
m_radioWidth = new int[n];
m_radioHeight = new int[n];
- int i;
- for (i = 0; i < n; i++)
+
+ WXHFONT hfont = 0;
+ wxFont& font = GetFont();
+ if ( font.Ok() )
{
- m_radioWidth[i] = m_radioHeight[i] = -1;
- long groupStyle = 0;
+ hfont = font.GetResourceHandle();
+ }
+
+ for ( int i = 0; i < n; i++ )
+ {
+ m_radioWidth[i] =
+ m_radioHeight[i] = -1;
+ long styleBtn = BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE;
if ( i == 0 && style == 0 )
- groupStyle = WS_GROUP;
+ styleBtn |= WS_GROUP;
+
long newId = NewControlId();
- long msStyle = groupStyle | RADIO_FLAGS;
- HWND hwndBtn = CreateWindowEx(exStyle, RADIO_CLASS,
- choices[i], msStyle,
- 0,0,0,0,
+ HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
+ choices[i],
+ styleBtn,
+ 0, 0, 0, 0, // will be set in SetSize()
hwndParent,
- (HMENU)newId, wxGetInstance(),
+ (HMENU)newId,
+ wxGetInstance(),
NULL);
+ if ( !hwndBtn )
+ {
+ wxLogLastError("CreateWindow(radio btn)");
+
+ return FALSE;
+ }
+
m_radioButtons[i] = (WXHWND)hwndBtn;
SubclassRadioButton((WXHWND)hwndBtn);
- wxFont& font = GetFont();
- if ( font.Ok() )
+ if ( hfont )
{
- SendMessage(hwndBtn, WM_SETFONT,
- (WPARAM)font.GetResourceHandle(), 0L);
+ ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
}
- m_subControls.Append((wxObject *)(WXWORD)newId);
+ m_subControls.Add(newId);
}
// Create a dummy radio control to end the group.
- (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP | RADIO_FLAGS,
+ (void)::CreateWindow(_T("BUTTON"),
+ _T(""),
+ 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;
}
wxString wxRadioBox::GetLabel(int item) const
{
- wxCHECK_MSG( item >= 0 && item < m_noItems, "", "invalid radiobox index" );
+ wxCHECK_MSG( item >= 0 && item < m_noItems, wxT(""), wxT("invalid radiobox index") );
return wxGetWindowText(m_radioButtons[item]);
}
void wxRadioBox::SetLabel(int item, const wxString& label)
{
- wxCHECK_RET( item >= 0 && item < m_noItems, "invalid radiobox index" );
+ 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());
m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
*/
- wxFAIL_MSG("not implemented");
+ wxFAIL_MSG(wxT("not implemented"));
}
int wxRadioBox::FindString(const wxString& s) const
void wxRadioBox::SetSelection(int N)
{
- wxCHECK_RET( (N >= 0) && (N < m_noItems), "invalid radiobox index" );
+ 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)
// Restored old code.
void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- 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;
-
- char buf[400];
-
- int y_offset = yy;
- int x_offset = xx;
- int current_width, cyf;
-
- int cx1,cy1;
- wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
- // Attempt to have a look coherent with other platforms:
- // We compute the biggest toggle dim, then we align all
- // items according this value.
- int maxWidth = -1;
- int maxHeight = -1;
-
- int i;
- for (i = 0 ; i < m_noItems; i++)
- {
- int eachWidth;
- int eachHeight;
- if (m_radioWidth[i]<0)
- {
- // It's a labelled toggle
- GetWindowText((HWND) m_radioButtons[i], buf, 300);
- GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL, & GetFont());
- eachWidth = (int)(current_width + RADIO_SIZE);
- eachHeight = (int)((3*cyf)/2);
- }
- else
- {
- eachWidth = m_radioWidth[i];
- eachHeight = m_radioHeight[i];
- }
- if (maxWidth<eachWidth) maxWidth = eachWidth;
- if (maxHeight<eachHeight) maxHeight = eachHeight;
- }
-
- if (m_hWnd)
- {
- int totWidth;
- int totHeight;
-
- int nbHor = GetNumHor(),
- nbVer = GetNumVer();
-
- // 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);
-
-#if (!CTL3D)
- // Requires a bigger group box in plain Windows
- MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE);
+ 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
- MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE);
+ int y_offset = yy;
+ int x_offset = xx;
#endif
- x_offset += cx1;
- y_offset += cy1;
- }
-#if (!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;
+ int current_width, cyf;
- 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)
+ int cx1,cy1;
+ wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
+
+ // Attempt to have a look coherent with other platforms: We compute the
+ // biggest toggle dim, then we align all items according this value.
+ int maxWidth = -1;
+ int maxHeight = -1;
+
+ int i;
+ for (i = 0 ; i < m_noItems; i++)
{
- // It's a labeled item
- GetWindowText((HWND) m_radioButtons[i], buf, 300);
- GetTextExtent(buf, ¤t_width, &cyf,NULL,NULL, & 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);
+ int eachWidth;
+ int eachHeight;
+ if (m_radioWidth[i]<0)
+ {
+ // It's a labelled toggle
+ GetTextExtent(wxGetWindowText(m_radioButtons[i]),
+ ¤t_width, &cyf);
+ eachWidth = (int)(current_width + RADIO_SIZE);
+ eachHeight = (int)((3*cyf)/2);
+ }
+ else
+ {
+ eachWidth = m_radioWidth[i];
+ eachHeight = m_radioHeight[i];
+ }
+
+ if (maxWidth<eachWidth)
+ maxWidth = eachWidth;
+ if (maxHeight<eachHeight)
+ maxHeight = eachHeight;
}
- else
+
+ if (m_hWnd)
{
- eachWidth = m_radioWidth[i];
- eachHeight = m_radioHeight[i];
+ int totWidth;
+ int totHeight;
+
+ int nbHor = GetNumHor(),
+ nbVer = GetNumVer();
+
+ // 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;
+
+#if defined(CTL3D) && !CTL3D
+ // Requires a bigger group box in plain Windows
+ extraHeight *= 3;
+ extraHeight /= 2;
+#endif
+
+ // only change our width/height if asked for
+ if ( width == -1 )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+ width = totWidth + cx1;
+ else
+ width = widthOld;
+ }
+
+ if ( height == -1 )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+ height = totHeight + extraHeight;
+ else
+ height = heightOld;
+ }
+
+ ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+
+ x_offset += cx1;
+ y_offset += cy1;
}
- MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
- if (m_windowStyle & wxRA_SPECIFY_ROWS)
+#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;
+
+ for ( i = 0 ; i < m_noItems; i++)
{
- y_offset += maxHeight;
- if (m_radioWidth[0]>0)
- y_offset += cy1/2;
+ // 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];
+ }
+
+ // VZ: make all buttons of the same, maximal size - like this they
+ // cover the radiobox entirely and the radiobox tooltips are always
+ // shown (otherwise they are not when the mouse pointer is in the
+ // radiobox part not belonging to any radiobutton)
+ ::MoveWindow((HWND)m_radioButtons[i],
+ x_offset, y_offset, maxWidth, maxHeight,
+ TRUE);
+
+ if (m_windowStyle & wxRA_SPECIFY_ROWS)
+ {
+ y_offset += maxHeight;
+ if (m_radioWidth[0]>0)
+ y_offset += cy1/2;
+ }
+ else
+ x_offset += maxWidth + cx1;
}
- else
- x_offset += maxWidth + cx1;
- }
}
-
void wxRadioBox::GetSize(int *width, int *height) const
{
RECT rect;
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++)
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;
{
::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());
void wxRadioBox::Enable(int item, bool enable)
{
wxCHECK_RET( item >= 0 && item < m_noItems,
- _T("invalid item in wxRadioBox::Enable()") );
+ wxT("invalid item in wxRadioBox::Enable()") );
::EnableWindow((HWND) m_radioButtons[item], enable);
}
void wxRadioBox::Show(int item, bool show)
{
wxCHECK_RET( item >= 0 && item < m_noItems,
- _T("invalid item in wxRadioBox::Show()") );
+ 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)
-{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif
-
- if (GetParent()->GetTransparentBackground())
- SetBkMode((HDC) pDC, TRANSPARENT);
- else
- SetBkMode((HDC) pDC, OPAQUE);
-
- ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
- ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
- wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
- return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
-
// For single selection items only
wxString wxRadioBox::GetStringSelection() const
{
return FALSE;
}
-void wxRadioBox::Command (wxCommandEvent & event)
+void wxRadioBox::Command(wxCommandEvent & event)
{
SetSelection (event.m_commandInt);
ProcessCommand (event);
}
-long wxRadioBox::MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
-{
- long rc = 0;
- bool processed = FALSE;
-
- switch ( msg )
- {
- 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 )
- {
- rc = HTCLIENT;
- processed = TRUE;
- }
- }
- break;
- }
-
- if ( !processed )
- rc = wxControl::MSWWindowProc(msg, wParam, lParam);
-
- return rc;
-}
-
void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
{
#ifdef __WIN32__
{
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++ )
+ {
+ ::SendMessage((HWND)m_radioButtons[n], WM_SETFONT, (WPARAM)hfont, 0L);
+ }
+
+ return TRUE;
+}
+
+long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+ // This is required for the radiobox to be sensitive to mouse input,
+ // e.g. for Dialog Editor.
+ if (nMsg == 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;
+ }
+
+ return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
// ---------------------------------------------------------------------------
// window proc for radio buttons
// ---------------------------------------------------------------------------
WPARAM wParam,
LPARAM lParam)
{
- bool processed = TRUE;
- if ( msg != WM_KEYDOWN )
- processed = FALSE;
-
- if ( processed )
+ 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, "radio button without radio box?" );
-
- int sel = radiobox->GetSelection();
+ wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
- switch ( wParam )
+#if wxUSE_TOOLTIPS
+ if ( msg == WM_NOTIFY )
{
- case VK_UP:
- sel--;
- break;
-
- case VK_LEFT:
- sel -= radiobox->GetNumVer();
- break;
-
- case VK_DOWN:
- sel++;
- break;
-
- case VK_RIGHT:
- sel += radiobox->GetNumVer();
- break;
-
- case VK_TAB:
+ NMHDR* hdr = (NMHDR *)lParam;
+ if ( (int)hdr->code == TTN_NEEDTEXT )
+ {
+ wxToolTip *tt = radiobox->GetToolTip();
+ if ( tt )
{
- wxNavigationKeyEvent event;
- event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
- event.SetWindowChange(FALSE);
- event.SetEventObject(radiobox);
+ TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
+ ttt->lpszText = (wxChar *)tt->GetTip().c_str();
- if ( radiobox->GetEventHandler()->ProcessEvent(event) )
- return 0;
+ processed = TRUE;
}
- // fall through
-
- default:
- processed = FALSE;
+ }
}
-
- if ( processed )
+ else // msg == WM_KEYDOWN
+#endif // wxUSE_TOOLTIPS
{
- if ( sel >= 0 && sel < radiobox->Number() )
+ processed = TRUE;
+
+ int sel = radiobox->GetSelection();
+
+ switch ( wParam )
+ {
+ case VK_UP:
+ sel--;
+ break;
+
+ case VK_LEFT:
+ sel -= radiobox->GetNumVer();
+ break;
+
+ case VK_DOWN:
+ sel++;
+ break;
+
+ case VK_RIGHT:
+ sel += radiobox->GetNumVer();
+ break;
+
+ case VK_TAB:
+ {
+ wxNavigationKeyEvent event;
+ event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
+ event.SetWindowChange(FALSE);
+ event.SetEventObject(radiobox);
+
+ if ( radiobox->GetEventHandler()->ProcessEvent(event) )
+ return 0;
+ }
+ // fall through
+
+ default:
+ processed = FALSE;
+ }
+
+ if ( processed )
{
- radiobox->SetSelection(sel);
+ if ( sel >= 0 && sel < radiobox->Number() )
+ {
+ radiobox->SetSelection(sel);
- // emulate the button click
- radiobox->SendNotificationEvent();
+ // emulate the button click
+ radiobox->SendNotificationEvent();
+ }
}
}
}
- if ( !processed )
- return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
- else
+ if ( processed )
return 0;
+
+ return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
}
#endif // __WIN32__
projects / wxWidgets.git / blobdiff