Make sure text part of combobox is enabled/disabled too

[wxWidgets.git] / src / msw / radiobox.cpp

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index eff9d9a74b40ead73566f4e5041deb73d8082fe1..09abc323191c48ab4e5fede8800459c62514acb1 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.cpp
-// Purpose:     wxRadioBox
+// Name:        msw/radiobox.cpp
+// Purpose:     wxRadioBox implementation

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "radiobox.h"
 #endif
 
     #pragma implementation "radiobox.h"
 #endif
 


@@ -28,45 +28,103 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_RADIOBOX
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include <stdio.h>
-    #include "wx/setup.h"

     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/radiobox.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/radiobox.h"

+    #include "wx/settings.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
+#include "wx/msw/subwin.h"
+
+// This is switched off because in some situations, the radiobox
+// buttons simply don't appear when deferred sizing is on.
+// Instead, refreshing on WM_MOVE seems to at least cure the droppings.
+#define USE_DEFERRED_SIZING 0
+
+#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_HORIZONTAL)
+    wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
+    wxFLAGS_MEMBER(wxRA_VERTICAL)
+
+wxEND_FLAGS( wxRadioBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
+    wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()

 
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

 #endif
 
 #endif
 

+/*
+    selection
+    content
+        label
+        dimension
+        item
+*/
+

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 

-// get the id of the window
-#ifdef __WIN32__
-    #define GET_WIN_ID(hwnd) ::GetWindowLong((HWND)hwnd, GWL_ID)
-#else // Win16
-    #define GET_WIN_ID(hwnd) ::GetWindowWord((HWND)hwnd, GWW_ID)
-#endif // Win32/16
-

 // wnd proc for radio buttons
 // wnd proc for radio buttons

-#ifdef __WIN32__

 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
                                            UINT message,
                                            WPARAM wParam,
                                            LPARAM lParam);
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
                                            UINT message,
                                            WPARAM wParam,
                                            LPARAM lParam);

-#endif

 
 // ---------------------------------------------------------------------------
 // global vars
 // ---------------------------------------------------------------------------
 
 // the pointer to standard radio button wnd proc
 
 // ---------------------------------------------------------------------------
 // global vars
 // ---------------------------------------------------------------------------
 
 // the pointer to standard radio button wnd proc

-// static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL;

 static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 
 // ===========================================================================
 static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 
 // ===========================================================================


@@ -74,717 +132,761 @@ static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
 // ===========================================================================
 
 // ---------------------------------------------------------------------------

-// wxRadioBox
+// wxRadioBox creation

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-int wxRadioBox::GetNumVer() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return m_majorDim;
-    }
-    else
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-}
-
-int wxRadioBox::GetNumHor() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-    else
-    {
-        return m_majorDim;
-    }
-}
-
-bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
-{
-    if ( param == BN_CLICKED )
-    {
-        m_selectedButton = -1;
-
-        for ( int i = 0; i < m_noItems; i++ )
-        {
-            if ( id == GET_WIN_ID(m_radioButtons[i]) )
-            {
-                m_selectedButton = i;
-
-                break;
-            }
-        }
-
-        wxASSERT_MSG( m_selectedButton != -1, "click from alien button?" );
-
-        wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
-        event.SetInt( m_selectedButton );
-        event.SetEventObject( this );
-        ProcessCommand(event);
-
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-#if WXWIN_COMPATIBILITY
-wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
-        int x, int y, int width, int height,
-        int n, char **choices,
-        int majorDim, long style, const char *name)
-{
-    wxString *choices2 = new wxString[n];
-    for ( int i = 0; i < n; i ++) choices2[i] = choices[i];
-    Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style,
-            wxDefaultValidator, name);
-    Callback(func);
-    delete choices2;
-}
-
-#endif
-

 // Radio box item
 // Radio box item

-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()

 {
 {

-    m_selectedButton = -1;
-    m_noItems = 0;
-    m_noRowsOrCols = 0;
+    m_selectedButton = wxNOT_FOUND;

     m_radioButtons = NULL;
     m_majorDim = 0;
     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }
 
     m_radioButtons = NULL;
     m_majorDim = 0;
     m_radioWidth = NULL;
     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)

 {
 {

-    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;
-
-    if ( majorDim == 0 )
-        m_majorDim = n;
-    else
-        m_majorDim = majorDim;
-    m_noRowsOrCols = majorDim;
-
-    long msStyle = GROUP_FLAGS;
-
-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(0, &want3D);
-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    /*
-       if ( want3D || wxStyleHasBorder(m_windowStyle) )
-       msStyle |= WS_BORDER;
-     */
-
-    HWND 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
+    // initialize members
+    m_majorDim = majorDim == 0 ? n : majorDim;

 
 

-    SetFont(parent->GetFont());
+    // common initialization
+    if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
+        return false;

 
 

-    SubclassWin(m_hWnd);
+#if wxUSE_VALIDATORS
+    SetValidator(val);
+#else
+    wxUnusedVar(val);
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS

 
 

-    // Some radio boxes test consecutive id.
-    (void)NewControlId();
-    m_radioButtons = new WXHWND[n];
+    m_radioButtons = new wxSubwindows(n);

     m_radioWidth = new int[n];
     m_radioHeight = new int[n];
     m_radioWidth = new int[n];
     m_radioHeight = new int[n];

-    int i;
-    for (i = 0; i < n; i++)
+
+    for ( int i = 0; i < n; i++ )

     {
     {

-        m_radioWidth[i] = m_radioHeight[i] = -1;
-        long groupStyle = 0;
-        if ( i == 0 && style == 0 )
-            groupStyle = WS_GROUP;
+        m_radioWidth[i] =
+        m_radioHeight[i] = wxDefaultCoord;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
+        if ( i == 0 )
+            styleBtn |= WS_GROUP;
+

         long newId = NewControlId();
         long newId = NewControlId();

-        long msStyle = groupStyle | RADIO_FLAGS;

 
 

-        HWND hwndBtn = CreateWindowEx(exStyle, RADIO_CLASS,
-                                      choices[i], msStyle,
-                                      0,0,0,0,
-                                      hwndParent,
-                                      (HMENU)newId, wxGetInstance(),
+        HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
+                                      choices[i],
+                                      styleBtn,
+                                      0, 0, 0, 0,   // will be set in SetSize()
+                                      GetHwnd(),
+                                      (HMENU)newId,
+                                      wxGetInstance(),

                                       NULL);
 
                                       NULL);
 

-        m_radioButtons[i] = (WXHWND)hwndBtn;
-        SubclassRadioButton((WXHWND)hwndBtn);
-
-        wxFont& font = GetFont();
-        if ( font.Ok() )
+        if ( !hwndBtn )

         {
         {

-            SendMessage(hwndBtn, WM_SETFONT,
-                        (WPARAM)font.GetResourceHandle(), 0L);
+            wxLogLastError(wxT("CreateWindow(radio btn)"));
+
+            return false;

         }
 
         }
 

-        m_subControls.Append((wxObject *)newId);
+        (*m_radioButtons)[i] = hwndBtn;
+
+        SubclassRadioButton((WXHWND)hwndBtn);
+
+        m_subControls.Add(newId);

     }
 
     // Create a dummy radio control to end the group.
     }
 
     // Create a dummy radio control to end the group.

-    (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP | RADIO_FLAGS,
-                         0, 0, 0, 0, hwndParent,
+    (void)::CreateWindow(_T("BUTTON"),
+                         wxEmptyString,
+                         WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
+                         0, 0, 0, 0, GetHwnd(),

                          (HMENU)NewControlId(), wxGetInstance(), NULL);
 
                          (HMENU)NewControlId(), wxGetInstance(), NULL);
 

-    SetSelection(0);
-
-    SetSize(x, y, width, height);
+    m_radioButtons->SetFont(GetFont());

 
 

-    return TRUE;
-}
+#ifdef __WXWINCE__
+    // Set the z-order correctly
+    SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#endif

 
 

-wxRadioBox::~wxRadioBox()
-{
-    m_isBeingDeleted = TRUE;
+    SetSelection(0);
+    SetSize(pos.x, pos.y, size.x, size.y);

 
 

-    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;
-    if (m_hWnd)
-        ::DestroyWindow((HWND) m_hWnd);
-    m_hWnd = 0;
+    // Now that we have items determine what is the best size and set it.
+    SetBestSize(size);

 
 

+    return true;

 }
 
 }
 

-wxString wxRadioBox::GetLabel(int item) 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)

 {
 {

-    GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300);
-    return wxString(wxBuffer);
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);

 }
 
 }
 

-void wxRadioBox::SetLabel(int item, const wxString& label)
+wxRadioBox::~wxRadioBox()

 {
 {

-    m_radioWidth[item] = m_radioHeight[item] = -1;
-    SetWindowText((HWND)m_radioButtons[item], (const char *)label);
+    m_isBeingDeleted = true;
+
+    delete m_radioButtons;
+    delete[] m_radioWidth;
+    delete[] m_radioHeight;

 }
 
 }
 

-void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
+// 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)

 {
 {

-    /*
-       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
-       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
-     */
+    HWND hwndBtn = (HWND)hWndBtn;
+
+    if ( !s_wndprocRadioBtn )
+        s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
+
+    wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+    wxSetWindowUserData(hwndBtn, this);

 }
 
 }
 

-int wxRadioBox::FindString(const wxString& s) const
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)

 {
 {

-    int i;
-    for (i = 0; i < m_noItems; i++)
+    if ( cmd == BN_CLICKED )

     {
     {

-        GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000);
-        if (s == wxBuffer)
-            return i;
-    }
-    return -1;
-}
+        if (id == GetId())
+            return true;

 
 

-void wxRadioBox::SetSelection(int N)
-{
-    wxCHECK_RET( (N >= 0) && (N < m_noItems), "invalid radiobox index" );
+        int selectedButton = wxNOT_FOUND;

 
 

-    // 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);
+        int count = GetCount();
+        for ( int i = 0; i < count; i++ )
+        {
+            if ( id == wxGetWindowId((*m_radioButtons)[i]) )
+            {
+                selectedButton = i;

 
 

-    ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
-    ::SetFocus((HWND)m_radioButtons[N]);
+                break;
+            }
+        }

 
 

-    m_selectedButton = N;
+        if ( selectedButton == wxNOT_FOUND )
+        {
+            // just ignore it - due to a hack with WM_NCHITTEST handling in our
+            // wnd proc, we can receive dummy click messages when we click near
+            // the radiobox edge (this is ugly but Julian wouldn't let me get
+            // rid of this...)
+            return false;
+        }
+
+        if ( selectedButton != m_selectedButton )
+        {
+            m_selectedButton = selectedButton;
+
+            SendNotificationEvent();
+        }
+        //else: don't generate events when the selection doesn't change
+
+        return true;
+    }
+    else
+        return false;

 }
 
 }
 

-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
+void wxRadioBox::Command(wxCommandEvent & event)

 {
 {

-    return m_selectedButton;
+    SetSelection (event.GetInt());
+    SetFocus();
+    ProcessCommand(event);

 }
 
 }
 

-// Find string for position
-wxString wxRadioBox::GetString(int N) const
+void wxRadioBox::SendNotificationEvent()

 {
 {

-    return wxGetWindowText(m_radioButtons[N]);
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+    event.SetInt( m_selectedButton );
+    event.SetString( GetString(m_selectedButton) );
+    event.SetEventObject( this );
+    ProcessCommand(event);

 }
 
 }
 

-// Restored old code.
-void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------
+
+int wxRadioBox::GetCount() const
+{
+    return m_radioButtons->GetCount();
+}
+
+// returns the number of rows
+int wxRadioBox::GetNumVer() const

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  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)
+    if ( m_windowStyle & wxRA_SPECIFY_ROWS )

     {
     {

-      // It's a labelled toggle
-      GetWindowText((HWND) m_radioButtons[i], buf, 300);
-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & GetFont());
-      eachWidth = (int)(current_width + RADIO_SIZE);
-      eachHeight = (int)((3*cyf)/2);
+        return m_majorDim;

     }
     else
     {
     }
     else
     {

-      eachWidth = m_radioWidth[i];
-      eachHeight = m_radioHeight[i];
+        return (GetCount() + m_majorDim - 1)/m_majorDim;

     }
     }

-    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);
-#else
-    MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE);
-#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;
+}

 
 

-  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)
+// returns the number of columns
+int wxRadioBox::GetNumHor() const
+{
+    if ( m_windowStyle & wxRA_SPECIFY_ROWS )

     {
     {

-      // It's a labeled item
-      GetWindowText((HWND) m_radioButtons[i], buf, 300);
-      GetTextExtent(buf, &current_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);
+        return (GetCount() + m_majorDim - 1)/m_majorDim;

     }
     else
     {
     }
     else
     {

-      eachWidth = m_radioWidth[i];
-      eachHeight = m_radioHeight[i];
-    }
-
-    MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
-    if (m_windowStyle & wxRA_SPECIFY_ROWS)
-    {
-      y_offset += maxHeight;
-      if (m_radioWidth[0]>0)
-        y_offset += cy1/2;
+        return m_majorDim;

     }
     }

-    else
-      x_offset += maxWidth + cx1;
-  }

 }
 
 }
 

+void wxRadioBox::SetString(int item, const wxString& label)
+{
+    wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
+
+    m_radioWidth[item] =
+    m_radioHeight[item] = wxDefaultCoord;
+
+    ::SetWindowText((*m_radioButtons)[item], label.c_str());
+
+    InvalidateBestSize();
+}

 
 

-void wxRadioBox::GetSize(int *width, int *height) const
+void wxRadioBox::SetSelection(int N)

 {
 {

-    RECT rect;
-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );

 
 

-    if (m_hWnd)
-        wxFindMaxSize(m_hWnd, &rect);
+    // unselect the old button
+    if ( m_selectedButton != wxNOT_FOUND )
+        ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L);

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
-        wxFindMaxSize(m_radioButtons[i], &rect);
+    // and select the new one
+    ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L);

 
 

-    *width = rect.right - rect.left;
-    *height = rect.bottom - rect.top;
+    m_selectedButton = N;

 }
 
 }
 

-void wxRadioBox::GetPosition(int *x, int *y) const
+// Find string for position
+wxString wxRadioBox::GetString(int item) const

 {
 {

-    wxWindow *parent = GetParent();
-    RECT rect;
-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -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;
-    }
+    wxCHECK_MSG( IsValid(item), wxEmptyString,
+                 wxT("invalid radiobox index") );

 
 

-    *x = point.x;
-    *y = point.y;
+    return wxGetWindowText((*m_radioButtons)[item]);

 }
 
 }
 

-wxString wxRadioBox::GetLabel() const
+void wxRadioBox::SetFocus()

 {
 {

-    if (m_hWnd)
+    if ( GetCount() > 0 )

     {
     {

-        GetWindowText((HWND) m_hWnd, wxBuffer, 300);
-        return wxString(wxBuffer);
+        ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND
+                                        ? 0
+                                        : m_selectedButton]);

     }
     }

-    else return wxString("");

 }
 
 }
 

-void wxRadioBox::SetLabel(const wxString& label)
+// Enable a specific button
+bool wxRadioBox::Enable(int item, bool enable)

 {
 {

-    if (m_hWnd)
-        SetWindowText((HWND) m_hWnd, label);
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::Enable()") );
+
+    BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
+
+    return (ret == 0) == enable;

 }
 
 }
 

-void wxRadioBox::SetFocus()
+// Show a specific button
+bool wxRadioBox::Show(int item, bool show)

 {
 {

-    if (m_noItems > 0)
+    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();
+    return changed;
+}
+
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
+
+// ----------------------------------------------------------------------------
+// size calculations
+// ----------------------------------------------------------------------------
+
+wxSize wxRadioBox::GetMaxButtonSize() const
+{
+    // calculate the max button size
+    int widthMax = 0,
+        heightMax = 0;
+    const int count = GetCount();
+    for ( int i = 0 ; i < count; i++ )

     {
     {

-        if (m_selectedButton == -1)
-            ::SetFocus((HWND) m_radioButtons[0]);
+        int width, height;
+        if ( m_radioWidth[i] < 0 )
+        {
+            GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height);
+
+            // adjust the size to take into account the radio box itself
+            // FIXME this is totally bogus!
+            width += RADIO_SIZE;
+            height *= 3;
+            height /= 2;
+        }

         else
         else

-            ::SetFocus((HWND) m_radioButtons[m_selectedButton]);
+        {
+            width = m_radioWidth[i];
+            height = m_radioHeight[i];
+        }
+
+        if ( widthMax < width )
+            widthMax = width;
+        if ( heightMax < height )
+            heightMax = height;

     }
 
     }
 

+    return wxSize(widthMax, heightMax);

 }
 
 }
 

-bool wxRadioBox::Show(bool show)
+wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const

 {
 {

-    m_isShown = show;
-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
-    if (m_hWnd)
-        ShowWindow((HWND) m_hWnd, cshow);
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        ShowWindow((HWND) m_radioButtons[i], cshow);
-    return TRUE;
+    // the radiobox should be big enough for its buttons
+    int cx1, cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+    int extraHeight = cy1;
+
+    int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
+    int width  = GetNumHor() * (sizeBtn.x + cx1) + cx1;
+
+    // Add extra space under the label, if it exists.
+    if (!wxControl::GetLabel().empty())
+        height += cy1/2;
+
+    // and also wide enough for its label
+    int widthLabel;
+    GetTextExtent(GetTitle(), &widthLabel, NULL);
+    widthLabel += RADIO_SIZE; // FIXME this is bogus too
+    if ( widthLabel > width )
+        width = widthLabel;
+
+    return wxSize(width, height);

 }
 
 }
 

-// Enable a specific button
-void wxRadioBox::Enable(int item, bool enable)
+wxSize wxRadioBox::DoGetBestSize() const

 {
 {

-    if (item<0)
-        wxWindow::Enable(enable);
-    else if (item < m_noItems)
-        ::EnableWindow((HWND) m_radioButtons[item], enable);
+    wxSize best = GetTotalButtonSize(GetMaxButtonSize());
+    CacheBestSize(best);
+    return best;

 }
 
 }
 

-// Enable all controls
-void wxRadioBox::Enable(bool enable)
+// Restored old code.
+void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    wxControl::Enable(enable);
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);

 
 

-    int i;
-    for (i = 0; i < m_noItems; i++)
-        ::EnableWindow((HWND) m_radioButtons[i], enable);
-}
+    int xx = x;
+    int yy = y;

 
 

-// Show a specific button
-void wxRadioBox::Show(int item, bool show)
-{
-    if (item<0)
-        wxRadioBox::Show(show);
-    else if (item < m_noItems)
+    if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        xx = currentX;
+    if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        yy = currentY;
+
+    int y_offset = 0;
+    int x_offset = 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.
+    wxSize maxSize = GetMaxButtonSize();
+    int maxWidth = maxSize.x,
+        maxHeight = maxSize.y;
+
+    wxSize totSize = GetTotalButtonSize(maxSize);
+    int totWidth = totSize.x,
+        totHeight = totSize.y;
+
+    // only change our width/height if asked for
+    if ( width == wxDefaultCoord )

     {
     {

-        int cshow;
-        if (show)
-            cshow = SW_SHOW;
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth;

         else
         else

-            cshow = SW_HIDE;
-        ShowWindow((HWND) m_radioButtons[item], cshow);
+            width = widthOld;

     }
     }

-}

 
 

-WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
+    if ( height == wxDefaultCoord )

     {
     {

-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight;
+        else
+            height = heightOld;

     }
     }

+
+    // if our parent had prepared a defer window handle for us, use it (unless
+    // we are a top level window)
+
+#if USE_DEFERRED_SIZING
+    wxWindowMSW *parent = GetParent();
+    HDWP hdwp = parent && !IsTopLevel() ? (HDWP)parent->m_hDWP : NULL;
+#else
+    HDWP hdwp = 0;

 #endif
 
 #endif
 

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);
-    else
-        SetBkMode((HDC) pDC, OPAQUE);
+    wxMoveWindowDeferred(hdwp, this, GetHwnd(), xx, yy, width, height);

 
 

-    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    // 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.

 
 

-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in
+    // left to right order and m_majorDim is the number of columns while
+    // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
+    // m_majorDim is the number of rows.

 
 

-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    //  backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
+    x_offset += cx1;
+    y_offset += cy1;

 
 

-// For single selection items only
-wxString wxRadioBox::GetStringSelection() const
-{
-    wxString result;
-    int sel = GetSelection();
-    if (sel > -1)
-        result = GetString(sel);
+    // Add extra space under the label, if it exists.
+    if (!wxControl::GetLabel().empty())
+        y_offset += cy1/2;

 
 

-    return result;
-}
+    int startX = x_offset;
+    int startY = y_offset;

 
 

-bool wxRadioBox::SetStringSelection(const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
+    const int count = GetCount();
+    for ( int i = 0; i < count; i++ )
+    {
+        // the last button in the row may be wider than the other ones as the
+        // radiobox may be wider than the sum of the button widths (as it
+        // happens, for example, when the radiobox label is very long)
+        bool isLastInTheRow;
+        if ( m_windowStyle & wxRA_SPECIFY_COLS )
+        {
+            // item is the last in its row if it is a multiple of the number of
+            // columns or if it is just the last item
+            int n = i + 1;
+            isLastInTheRow = ((n % m_majorDim) == 0) || (n == count);
+        }
+        else // wxRA_SPECIFY_ROWS
+        {
+            // item is the last in the row if it is in the last columns
+            isLastInTheRow = i >= (count/m_majorDim)*m_majorDim;
+        }
+
+        // is this the start of new row/column?
+        if ( i && (i % m_majorDim == 0) )
+        {
+            if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+            {
+                // start of new column
+                y_offset = startY;
+                x_offset += maxWidth + cx1;
+            }
+            else // start of new row
+            {
+                x_offset = startX;
+                y_offset += maxHeight;
+                if (m_radioWidth[0]>0)
+                    y_offset += cy1/2;
+            }
+        }
+
+        int widthBtn;
+        if ( isLastInTheRow )
+        {
+            // make the button go to the end of radio box
+            widthBtn = startX + width - x_offset - 2*cx1;
+            if ( widthBtn < maxWidth )
+                widthBtn = maxWidth;
+        }
+        else
+        {
+            // normal button, always of the same size
+            widthBtn = maxWidth;
+        }
+
+        // make all buttons of the same, maximal size - like this they cover
+        // the radiobox entirely and the radiobox tooltips are always shown
+        // (otherwise they are not when the mouse pointer is in the radiobox
+        // part not belonging to any radiobutton)
+        ::MoveWindow((*m_radioButtons)[i],
+                     x_offset, y_offset, widthBtn, maxHeight,
+                     TRUE);
+
+        // where do we put the next button?
+        if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+        {
+            // below this one
+            y_offset += maxHeight;
+            if (m_radioWidth[0]>0)
+                y_offset += cy1/2;
+        }
+        else
+        {
+            // to the right of this one
+            x_offset += widthBtn + cx1;
+        }
+    }
+
+#if USE_DEFERRED_SIZING
+    if (parent)

     {
     {

-        SetSelection (sel);
-        return TRUE;
+        // hdwp must be updated as it may have been changed
+        parent->m_hDWP = (WXHANDLE)hdwp;

     }
     }

-    else
-        return FALSE;
+#endif

 }
 
 }
 

-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
-    int i;
-    for (i = 0; i < Number(); i++)
-        if (GetRadioButtons()[i] == hWnd)
-            return TRUE;
-    return FALSE;
-}
+// ----------------------------------------------------------------------------
+// radio box drawing
+// ----------------------------------------------------------------------------

 
 

-void wxRadioBox::Command (wxCommandEvent & event)
-{
-    SetSelection (event.m_commandInt);
-    ProcessCommand (event);
-}
+#ifndef __WXWINCE__

 
 

-long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()

 {
 {

-    if (nMsg == WM_NCHITTEST)
-    {
-        int xPos = LOWORD(lParam);  // horizontal position of cursor
-        int yPos = HIWORD(lParam);  // vertical position of cursor
-
-        ScreenToClient(&xPos, &yPos);
+    RECT rc;
+    ::GetWindowRect(GetHwnd(), &rc);
+    HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);

 
 

-        // 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;
+    const size_t count = GetCount();
+    for ( size_t i = 0; i < count; ++i )
+    {
+        ::GetWindowRect((*m_radioButtons)[i], &rc);
+        AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+        ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);

     }
 
     }
 

-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    return (WXHRGN)hrgn;

 }
 
 }
 

-void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
+WXLRESULT
+wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    HWND hwndBtn = (HWND)hWndBtn;
-
-    if ( !s_wndprocRadioBtn )
-        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
-//        s_wndprocRadioBtn = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+    // FIXME: Without this, the radiobox corrupts other controls as it moves
+    // in a dynamic layout. Refreshing causes flicker, but it's better than
+    // leaving droppings. Note that for some reason, wxStaticBox doesn't need
+    // this (perhaps because it has no real children?)
+    if ( nMsg == WM_MOVE )
+    {
+        WXLRESULT res = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+        wxRect rect = GetRect();
+        GetParent()->Refresh(true, & rect);
+        return res;
+    }

 
 

-    // No GWL_USERDATA in Win16, so omit this subclassing.
-#ifdef __WIN32__
-    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
-    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-#endif
+    return wxStaticBox::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }
 

+#endif // __WXWINCE__
+

 // ---------------------------------------------------------------------------
 // window proc for radio buttons
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // window proc for radio buttons
 // ---------------------------------------------------------------------------
 

-#ifdef __WIN32__
-

 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,

-                                           UINT msg,
+                                           UINT message,

                                            WPARAM wParam,
                                            LPARAM lParam)
 {
                                            WPARAM wParam,
                                            LPARAM lParam)
 {

-    bool processed = TRUE;
-    if ( msg != WM_KEYDOWN )
-        processed = FALSE;        
-
-    if ( processed )
+    switch ( message )

     {
     {

-        wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);
+        case WM_GETDLGCODE:
+            // we must tell IsDialogMessage()/our kbd processing code that we
+            // want to process arrows ourselves because neither of them is
+            // smart enough to handle arrows properly for us
+            {
+                long lDlgCode = ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd,
+                                                 message, wParam, lParam);

 
 

-        wxCHECK_MSG( radiobox, 0, "radio button without radio box?" );
+                return lDlgCode | DLGC_WANTARROWS;
+            }

 
 

-        int sel = radiobox->GetSelection();
+#if wxUSE_TOOLTIPS
+        case WM_NOTIFY:
+            {
+                NMHDR* hdr = (NMHDR *)lParam;
+                if ( hdr->code == TTN_NEEDTEXT )
+                {
+                    wxRadioBox *
+                        radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);

 
 

-        switch ( wParam )
-        {
-            case VK_UP:
-                sel--;
-                break;
+                    wxCHECK_MSG( radiobox, 0,
+                                 wxT("radio button without radio box?") );

 
 

-            case VK_LEFT:
-                sel -= radiobox->GetNumVer();
-                break;
+                    wxToolTip *tooltip = radiobox->GetToolTip();
+                    if ( tooltip )
+                    {
+                        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
+                        ttt->lpszText = (wxChar *)tooltip->GetTip().c_str();
+                    }

 
 

-            case VK_DOWN:
-                sel++;
-                break;
+                    // processed
+                    return 0;
+                }
+            }
+            break;
+#endif // wxUSE_TOOLTIPS

 
 

-            case VK_RIGHT:
-                sel += radiobox->GetNumVer();
-                break;
+        case WM_KEYDOWN:
+            {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                bool processed = true;
+
+                wxDirection dir;
+                switch ( wParam )
+                {
+                    case VK_UP:
+                        dir = wxUP;
+                        break;
+
+                    case VK_LEFT:
+                        dir = wxLEFT;
+                        break;
+
+                    case VK_DOWN:
+                        dir = wxDOWN;
+                        break;
+
+                    case VK_RIGHT:
+                        dir = wxRIGHT;
+                        break;
+
+                    default:
+                        processed = false;

 
 

-            case VK_TAB:
+                        // just to suppress the compiler warning
+                        dir = wxALL;
+                }
+
+                if ( processed )

                 {
                 {

-                    wxNavigationKeyEvent event;
-                    event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
-                    event.SetWindowChange(FALSE);
-                    event.SetEventObject(radiobox);
+                    int selOld = radiobox->GetSelection();
+                    int selNew = radiobox->GetNextItem
+                                 (
+                                  selOld,
+                                  dir,
+                                  radiobox->GetWindowStyle()
+                                 );
+
+                    if ( selNew != selOld )
+                    {
+                        radiobox->SetSelection(selNew);
+                        radiobox->SetFocus();
+
+                        // emulate the button click
+                        radiobox->SendNotificationEvent();

 
 

-                    if ( radiobox->GetEventHandler()->ProcessEvent(event) )

                         return 0;
                         return 0;

+                    }

                 }
                 }

-                // fall through
+            }
+            break;

 
 

-            default:
-                processed = FALSE;        
-        }
+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:
+            {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                // if we don't do this, no focus events are generated for the
+                // radiobox and, besides, we need to notify the parent about
+                // the focus change, otherwise the focus handling logic in
+                // wxControlContainer doesn't work
+                if ( message == WM_SETFOCUS )
+                    radiobox->HandleSetFocus((WXHWND)wParam);
+                else
+                    radiobox->HandleKillFocus((WXHWND)wParam);
+            }
+            break;

 
 

-        if ( processed )
-        {
-            if ( sel >= 0 && sel < radiobox->Number() )
-                radiobox->SetSelection(sel);
-        }
+#ifndef __WXWINCE__
+        case WM_HELP:
+            {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                bool processed = false;
+
+                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 ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
-    else
-        return 0;
+    return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);

 }
 }

-#endif
+
+#endif // wxUSE_RADIOBOX