Backed-out PNG8 patch (no time to look at why

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 5d237df03d7d4acfb05dcb2a7e85dbd295ebacdf..d583c4f33710ff238969ff5d8fab8ae359f771ac 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,47 +28,130 @@
     #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
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+#if wxUSE_TOOLTIPS
+    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
+        #include <commctrl.h>
+    #endif
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
+#if defined(__WXWINCE__) && !defined(WS_EX_TRANSPARENT)
+#define WS_EX_TRANSPARENT 0

 #endif
 
 #endif
 

+// 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()
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+#endif
+
+/*
+    selection
+    content
+        label
+        dimension
+        item
+*/
+
+// there are two possible ways to create the radio buttons: either as children
+// of the radiobox or as siblings of it - allow playing with both variants for
+// now, eventually we will choose the best one for our purposes
+//
+// two main problems are the keyboard navigation inside the radiobox (arrows
+// should switch between buttons, not pass focus to the next control) and the
+// tooltips - a tooltip is associated with the radiobox itself, not the
+// children...
+//
+// the problems with setting this to 1:
+// a) Alt-<mnemonic of radiobox> isn't handled properly by IsDialogMessage()
+//    because it sets focus to the next control accepting it which is not a
+//    radio button but a radiobox sibling in this case - the only solution to
+//    this would be to handle Alt-<mnemonic> ourselves
+// b) the problems with setting radiobox colours under Win98/2K were reported
+//    but I couldn't reproduce it so I have no idea about what causes it
+//
+// the problems with setting this to 0:
+// a) the tooltips are not shown for the radiobox - possible solution: make
+//    TTM_WINDOWFROMPOS handling code in msw/tooltip.cpp work (easier said than
+//    done because I don't know why it doesn't work)
+#define RADIOBTN_PARENT_IS_RADIOBOX 0
+

 // ---------------------------------------------------------------------------
 // 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
 #ifdef __WIN32__
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
                                            UINT message,
                                            WPARAM wParam,
                                            LPARAM lParam);
 // wnd proc for radio buttons
 #ifdef __WIN32__
 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;
 

+#endif // __WIN32__
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 // ===========================================================================
 // implementation
 // ===========================================================================


@@ -77,6 +160,22 @@ static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 // wxRadioBox
 // ---------------------------------------------------------------------------
 
 // wxRadioBox
 // ---------------------------------------------------------------------------
 

+int wxRadioBox::GetCount() const
+{
+    return m_noItems;
+}
+
+int wxRadioBox::GetColumnCount() const
+{
+    return GetNumHor();
+}
+
+int wxRadioBox::GetRowCount() const
+{
+    return GetNumVer();
+}
+
+// returns the number of rows

 int wxRadioBox::GetNumVer() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
 int wxRadioBox::GetNumVer() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )


@@ -89,6 +188,7 @@ int wxRadioBox::GetNumVer() const
     }
 }
 
     }
 }
 

+// returns the number of columns

 int wxRadioBox::GetNumHor() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
 int wxRadioBox::GetNumHor() const
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )


@@ -101,15 +201,18 @@ int wxRadioBox::GetNumHor() const
     }
 }
 
     }
 }
 

-bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)

 {
 {

-    if ( param == BN_CLICKED )
+    if ( cmd == BN_CLICKED )

     {
     {

-        int selectedButton = -1;
+        if (id == GetId())
+            return true;
+
+        int selectedButton = wxID_ANY;

 
         for ( int i = 0; i < m_noItems; i++ )
         {
 
         for ( int i = 0; i < m_noItems; i++ )
         {

-            if ( id == GET_WIN_ID(m_radioButtons[i]) )
+            if ( id == wxGetWindowId(m_radioButtons[i]) )

             {
                 selectedButton = i;
 
             {
                 selectedButton = i;
 


@@ -117,7 +220,14 @@ bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
             }
         }
 
             }
         }
 

-        wxASSERT_MSG( selectedButton != -1, "click from alien button?" );
+        if ( selectedButton == wxID_ANY )
+        {
+            // 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 )
         {
 
         if ( selectedButton != m_selectedButton )
         {


@@ -127,32 +237,16 @@ bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
         }
         //else: don't generate events when the selection doesn't change
 
         }
         //else: don't generate events when the selection doesn't change
 

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 }
 

-#if WXWIN_COMPATIBILITY
-wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
-        int x, int y, int width, int height,
-        int n, char **choices,
-        int majorDim, long style, const char *name)
-{
-    wxString *choices2 = new wxString[n];
-    for ( int i = 0; i < n; i ++) choices2[i] = choices[i];
-    Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style,
-            wxDefaultValidator, name);
-    Callback(func);
-    delete choices2;
-}
-
-#endif
-

 // Radio box item
 wxRadioBox::wxRadioBox()
 {
 // Radio box item
 wxRadioBox::wxRadioBox()
 {

-    m_selectedButton = -1;
+    m_selectedButton = wxID_ANY;

     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_radioButtons = NULL;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_radioButtons = NULL;


@@ -161,188 +255,166 @@ wxRadioBox::wxRadioBox()
     m_radioHeight = 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;
+    // initialize members
+    m_selectedButton = wxID_ANY;
+    m_noItems = 0;

 
 

-    if ( majorDim == 0 )
-        m_majorDim = n;
-    else
-        m_majorDim = majorDim;
+    m_majorDim = majorDim == 0 ? n : majorDim;

     m_noRowsOrCols = 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
+    // 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 | WS_GROUP,
+                           pos, size, title, WS_EX_TRANSPARENT) )
+        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];
 
     // 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] = wxDefaultCoord;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;

         if ( i == 0 && style == 0 )
         if ( i == 0 && style == 0 )

-            groupStyle = WS_GROUP;
+            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,
+        HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
+                                      choices[i],
+                                      styleBtn,
+                                      0, 0, 0, 0,   // will be set in SetSize()

                                       hwndParent,
                                       hwndParent,

-                                      (HMENU)newId, wxGetInstance(),
+                                      (HMENU)newId,
+                                      wxGetInstance(),

                                       NULL);
 
                                       NULL);
 

+        if ( !hwndBtn )
+        {
+            wxLogLastError(wxT("CreateWindow(radio btn)"));
+
+            return false;
+        }
+

         m_radioButtons[i] = (WXHWND)hwndBtn;
         m_radioButtons[i] = (WXHWND)hwndBtn;

+

         SubclassRadioButton((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 *)newId);
+        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,
+    (void)::CreateWindow(_T("BUTTON"),
+                         wxEmptyString,
+                         WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,

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

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

     SetSelection(0);
     SetSelection(0);

+    SetSize(pos.x, pos.y, size.x, size.y);

 
 

-    SetSize(x, y, width, height);
+    // Now that we have items determine what is the best size and set it.
+    SetBestSize(size);

 
 

-    return TRUE;
+    return true;
+}
+
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);

 }
 
 wxRadioBox::~wxRadioBox()
 {
 }
 
 wxRadioBox::~wxRadioBox()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     if (m_radioButtons)
     {
         int i;
         for (i = 0; i < m_noItems; i++)
 
     if (m_radioButtons)
     {
         int i;
         for (i = 0; i < m_noItems; i++)

-            DestroyWindow((HWND) m_radioButtons[i]);
+            ::DestroyWindow((HWND)m_radioButtons[i]);

         delete[] m_radioButtons;
     }
         delete[] m_radioButtons;
     }

+

     if (m_radioWidth)
         delete[] m_radioWidth;
     if (m_radioHeight)
         delete[] m_radioHeight;
     if (m_radioWidth)
         delete[] m_radioWidth;
     if (m_radioHeight)
         delete[] m_radioHeight;

-    if (m_hWnd)
-        ::DestroyWindow((HWND) m_hWnd);
-    m_hWnd = 0;

 
 }
 
 
 }
 

-wxString wxRadioBox::GetLabel(int item) const
+void wxRadioBox::SetString(int item, const wxString& label)

 {
 {

-    GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300);
-    return wxString(wxBuffer);
-}
+    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );

 
 

-void wxRadioBox::SetLabel(int item, const wxString& label)
-{
-    m_radioWidth[item] = m_radioHeight[item] = -1;
-    SetWindowText((HWND)m_radioButtons[item], (const char *)label);
-}
-
-void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
-{
-    /*
-       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
-       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
-     */
-}
-
-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    for (i = 0; i < m_noItems; i++)
-    {
-        GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000);
-        if (s == wxBuffer)
-            return i;
-    }
-    return -1;
+    m_radioWidth[item] = m_radioHeight[item] = wxDefaultCoord;
+    SetWindowText((HWND)m_radioButtons[item], label.c_str());

 }
 
 void wxRadioBox::SetSelection(int N)
 {
 }
 
 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)
         ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
 
     ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);
 
     // Following necessary for Win32s, because Win32s translate BM_SETCHECK
     if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
         ::SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
 
     ::SendMessage((HWND)m_radioButtons[N], BM_SETCHECK, 1, 0L);

-    ::SetFocus((HWND)m_radioButtons[N]);

 
     m_selectedButton = N;
 }
 
     m_selectedButton = N;
 }


@@ -354,147 +426,244 @@ int wxRadioBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxRadioBox::GetString(int N) const
+wxString wxRadioBox::GetString(int item) const

 {
 {

-    return wxGetWindowText(m_radioButtons[N]);
+    wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
+                 wxT("invalid radiobox index") );
+
+    return wxGetWindowText(m_radioButtons[item]);

 }
 
 }
 

-// Restored old code.
-void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+// ----------------------------------------------------------------------------
+// size calculations
+// ----------------------------------------------------------------------------
+
+wxSize wxRadioBox::GetMaxButtonSize() 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)
-    {
-      // 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);
-    }
-    else
+    // calculate the max button size
+    int widthMax = 0,
+        heightMax = 0;
+    for ( int i = 0 ; i < m_noItems; i++ )

     {
     {

-      eachWidth = m_radioWidth[i];
-      eachHeight = m_radioHeight[i];
+        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
+        {
+            width = m_radioWidth[i];
+            height = m_radioHeight[i];
+        }
+
+        if ( widthMax < width )
+            widthMax = width;
+        if ( heightMax < height )
+            heightMax = height;

     }
     }

-    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)
+    return wxSize(widthMax, heightMax);
+}
+
+wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
+{
+    // the radiobox should be big enough for its buttons
+    int cx1, cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+    int extraHeight = cy1;
+
+    /* We'll assume the adjustments below are OK for Win 3.1 too
+#if defined(CTL3D) && !CTL3D

     // Requires a bigger group box in plain Windows
     // 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);
+    extraHeight *= 3;
+    extraHeight /= 2;

 #endif
 #endif

-    x_offset += cx1;
-    y_offset += cy1;
-  }
+    */
+
+    int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
+    int width  = GetNumHor() * (sizeBtn.x + cx1) + cx1;

 
 

-#if (!CTL3D)
-  y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
-                            // JACS 2/12/93. CTL3D draws group label quite high.
+    // Add extra space under the label, if it exists.
+    if (!wxControl::GetLabel().IsEmpty())
+        height += cy1/2;
+
+    // and also wide enough for its label
+    int widthLabel;
+    GetTextExtent(GetTitle(), &widthLabel, NULL);
+    widthLabel += RADIO_SIZE; // FIXME this is bogus too
+    if ( widthLabel > width )
+        width = widthLabel;
+
+    return wxSize(width, height);
+}
+
+wxSize wxRadioBox::DoGetBestSize() const
+{
+    return GetTotalButtonSize(GetMaxButtonSize());
+}
+
+// Restored old code.
+void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);
+
+    int xx = x;
+    int yy = y;
+
+    if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        xx = currentX;
+    if (y == wxDefaultCoord && !(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
 #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)
+    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 )

     {
     {

-      // 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);
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth;
+        else
+            width = widthOld;

     }
     }

-    else
+
+    if ( height == wxDefaultCoord )

     {
     {

-      eachWidth = m_radioWidth[i];
-      eachHeight = m_radioHeight[i];
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight;
+        else
+            height = heightOld;

     }
 
     }
 

-    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)
+    ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+
+    // Now position all the buttons: the current button will be put at
+    // wxPoint(x_offset, y_offset) and the new row/column will start at
+    // startX/startY. The size of all buttons will be the same wxSize(maxWidth,
+    // 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 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.
+
+    x_offset += cx1;
+    y_offset += cy1;
+
+    // Add extra space under the label, if it exists.
+    if (!wxControl::GetLabel().IsEmpty())

         y_offset += cy1/2;
         y_offset += cy1/2;

+
+    int startX = x_offset;
+    int startY = y_offset;
+
+    for ( int i = 0; i < m_noItems; 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 == m_noItems);
+        }
+        else // wxRA_SPECIFY_ROWS
+        {
+            // item is the last in the row if it is in the last columns
+            isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim;
+        }
+
+        // is this the start of new row/column?
+        if ( i && (i % m_majorDim == 0) )
+        {
+            if ( m_windowStyle & wxRA_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;
+        }
+
+        // VZ: make all buttons of the same, maximal size - like this they
+        //     cover the radiobox entirely and the radiobox tooltips are always
+        //     shown (otherwise they are not when the mouse pointer is in the
+        //     radiobox part not belonging to any radiobutton)
+        ::MoveWindow((HWND)m_radioButtons[i],
+                     x_offset, y_offset, widthBtn, maxHeight,
+                     TRUE);
+
+        // where do we put the next button?
+        if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+        {
+            // below this one
+            y_offset += maxHeight;
+            if (m_radioWidth[0]>0)
+                y_offset += cy1/2;
+        }
+        else
+        {
+            // to the right of this one
+            x_offset += widthBtn + cx1;
+        }

     }
     }

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

 }
 
 }
 

-

 void wxRadioBox::GetSize(int *width, int *height) const
 {
 void wxRadioBox::GetSize(int *width, int *height) const
 {

-    RECT rect;
-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    RECT rect = { -1, -1, -1, -1 };

 
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);
 
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);


@@ -510,8 +679,7 @@ void wxRadioBox::GetSize(int *width, int *height) const
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
     wxWindow *parent = GetParent();
 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++)
 
     int i;
     for (i = 0; i < m_noItems; i++)


@@ -520,8 +688,8 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &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
+    // 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;
     POINT point;
     point.x = rect.left;
     point.y = rect.top;


@@ -529,9 +697,9 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     {
         ::ScreenToClient((HWND) parent->GetHWND(), &point);
     }
     {
         ::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());
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());


@@ -543,190 +711,151 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     *y = point.y;
 }
 
     *y = point.y;
 }
 

-wxString wxRadioBox::GetLabel() const
-{
-    if (m_hWnd)
-    {
-        GetWindowText((HWND) m_hWnd, wxBuffer, 300);
-        return wxString(wxBuffer);
-    }
-    else return wxString("");
-}
-
-void wxRadioBox::SetLabel(const wxString& label)
-{
-    if (m_hWnd)
-        SetWindowText((HWND) m_hWnd, label);
-}
-

 void wxRadioBox::SetFocus()
 {
     if (m_noItems > 0)
     {
 void wxRadioBox::SetFocus()
 {
     if (m_noItems > 0)
     {

-        if (m_selectedButton == -1)
-            ::SetFocus((HWND) m_radioButtons[0]);
-        else
-            ::SetFocus((HWND) m_radioButtons[m_selectedButton]);
+        ::SetFocus((HWND)m_radioButtons[m_selectedButton == wxID_ANY
+                                            ? 0
+                                            : m_selectedButton]);

     }
 
 }
 
 bool wxRadioBox::Show(bool show)
 {
     }
 
 }
 
 bool wxRadioBox::Show(bool show)
 {

-    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;
+    if ( !wxControl::Show(show) )
+        return false;
+
+    int nCmdShow = show ? SW_SHOW : SW_HIDE;
+    for ( int i = 0; i < m_noItems; i++ )
+    {
+        ::ShowWindow((HWND)m_radioButtons[i], nCmdShow);
+    }
+
+    return true;

 }
 
 // Enable a specific button
 void wxRadioBox::Enable(int item, bool enable)
 {
 }
 
 // Enable a specific button
 void wxRadioBox::Enable(int item, bool enable)
 {

-    if (item<0)
-        wxWindow::Enable(enable);
-    else if (item < m_noItems)
-        ::EnableWindow((HWND) m_radioButtons[item], enable);
+    wxCHECK_RET( item >= 0 && item < m_noItems,
+                 wxT("invalid item in wxRadioBox::Enable()") );
+
+    ::EnableWindow((HWND) m_radioButtons[item], enable);

 }
 
 // Enable all controls
 }
 
 // Enable all controls

-void wxRadioBox::Enable(bool enable)
+bool wxRadioBox::Enable(bool enable)

 {
 {

-    wxControl::Enable(enable);
+    if ( !wxControl::Enable(enable) )
+        return false;

 
 

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

         ::EnableWindow((HWND) m_radioButtons[i], enable);
         ::EnableWindow((HWND) m_radioButtons[i], enable);

+
+    return true;

 }
 
 // Show a specific button
 void wxRadioBox::Show(int item, bool show)
 {
 }
 
 // Show a specific button
 void wxRadioBox::Show(int item, bool show)
 {

-    if (item<0)
-        wxRadioBox::Show(show);
-    else if (item < m_noItems)
-    {
-        int cshow;
-        if (show)
-            cshow = SW_SHOW;
-        else
-            cshow = SW_HIDE;
-        ShowWindow((HWND) m_radioButtons[item], cshow);
-    }
-}
-
-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);
-
-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    //  backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
-
-// For single selection items only
-wxString wxRadioBox::GetStringSelection() const
-{
-    wxString result;
-    int sel = GetSelection();
-    if (sel > -1)
-        result = GetString(sel);
+    wxCHECK_RET( item >= 0 && item < m_noItems,
+                 wxT("invalid item in wxRadioBox::Show()") );

 
 

-    return result;
+    ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);

 }
 
 }
 

-bool wxRadioBox::SetStringSelection(const wxString& s)
+bool wxRadioBox::ContainsHWND(WXHWND hWnd) const

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
+    size_t count = GetCount();
+    for ( size_t i = 0; i < count; i++ )

     {
     {

-        SetSelection (sel);
-        return TRUE;
+        if ( GetRadioButtons()[i] == hWnd )
+            return true;

     }
     }

-    else
-        return FALSE;
-}

 
 

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

 }
 
 }
 

-void wxRadioBox::Command (wxCommandEvent & event)
+void wxRadioBox::Command(wxCommandEvent & event)

 {
     SetSelection (event.m_commandInt);
 {
     SetSelection (event.m_commandInt);

+    SetFocus();

     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    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);
-}
-
+// NB: if this code is changed, wxGetWindowForHWND() which relies on having the
+//     radiobox pointer in GWL_USERDATA for radio buttons must be updated too!

 void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
 {
     HWND hwndBtn = (HWND)hWndBtn;
 
     if ( !s_wndprocRadioBtn )
 void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
 {
     HWND hwndBtn = (HWND)hWndBtn;
 
     if ( !s_wndprocRadioBtn )

-        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+        s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);

 
 

-    // No GWL_USERDATA in Win16, so omit this subclassing.
-#ifdef __WIN32__
-    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
-    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-#endif
+    wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+    wxSetWindowUserData(hwndBtn, this);

 }
 
 void wxRadioBox::SendNotificationEvent()
 {
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
     event.SetInt( m_selectedButton );
 }
 
 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);
 }
 
     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++ )
+    {
+        HWND hwndBtn = (HWND)m_radioButtons[n];
+        ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
+
+        // otherwise the buttons are not redrawn correctly
+        ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// our window proc
+// ----------------------------------------------------------------------------
+
+WXLRESULT wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+#if RADIOBTN_PARENT_IS_RADIOBOX
+    switch ( nMsg )
+    {
+        // handle this message to set correct colours for our buttons here
+        case WM_CTLCOLORSTATIC:
+            {
+                WXHDC hdc;
+                WXHWND hwnd;
+                UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
+
+                WXHBRUSH hbr = MSWControlColor((WXHDC)hdc);
+                if ( hbr )
+                    return (WXLRESULT)hbr;
+                //else: fall through to default window proc
+            }
+    }
+#endif // RADIOBTN_PARENT_IS_RADIOBOX
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+

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


@@ -734,72 +863,181 @@ void wxRadioBox::SendNotificationEvent()
 #ifdef __WIN32__
 
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 #ifdef __WIN32__
 
 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?") );

 
 

-            case VK_TAB:
+                bool processed = true;
+
+                wxDirection dir;
+                switch ( wParam )

                 {
                 {

-                    wxNavigationKeyEvent event;
-                    event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
-                    event.SetWindowChange(FALSE);
-                    event.SetEventObject(radiobox);
+                    case VK_UP:
+                        dir = wxUP;
+                        break;
+
+                    case VK_LEFT:
+                        dir = wxLEFT;
+                        break;
+
+                    case VK_DOWN:
+                        dir = wxDOWN;
+                        break;
+
+                    case VK_RIGHT:
+                        dir = wxRIGHT;
+                        break;
+
+                    default:
+                        processed = false;
+
+                        // just to suppress the compiler warning
+                        dir = wxALL;
+                }
+
+                if ( processed )
+                {
+                    int selOld = radiobox->GetSelection();
+                    int selNew = radiobox->GetNextItem
+                                 (
+                                  selOld,
+                                  dir,
+                                  radiobox->GetWindowStyle()
+                                 );
+
+                    if ( selNew != selOld )
+                    {
+                        radiobox->SetSelection(selNew);
+                        radiobox->SetFocus();
+
+                        // emulate the button click
+                        radiobox->SendNotificationEvent();

 
 

-                    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() )
+#ifdef __WIN32__
+        case WM_HELP:

             {
             {

-                radiobox->SetSelection(sel);
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                bool processed wxDUMMY_INITIALIZE(true);

 
 

-                // emulate the button click
-                radiobox->SendNotificationEvent();
+                // HELPINFO doesn't seem to be supported on WinCE.
+#ifndef __WXWINCE__
+                HELPINFO* info = (HELPINFO*) lParam;
+                // Don't yet process menu help events, just windows
+                if (info->iContextType == HELPINFO_WINDOW)
+#endif
+                {
+                    wxWindow* subjectOfHelp = radiobox;
+                    bool eventProcessed = false;
+                    while (subjectOfHelp && !eventProcessed)
+                    {
+                        wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(),
+#ifdef __WXWINCE__
+                                              wxPoint(0, 0)
+#else
+                                              wxPoint(info->MousePos.x, info->MousePos.y)
+#endif
+                            ) ; // info->iCtrlId);
+                        helpEvent.SetEventObject(radiobox);
+                        eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+
+                        // Go up the window hierarchy until the event is handled (or not)
+                        subjectOfHelp = subjectOfHelp->GetParent();
+                    }
+                    processed = eventProcessed;
+                }
+#ifndef __WXWINCE__
+                else if (info->iContextType == HELPINFO_MENUITEM)
+                {
+                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
+                    helpEvent.SetEventObject(radiobox);
+                    processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+                }
+                else
+                    processed = false;
+#endif
+                if (processed)
+                    return 0;
+
+                break;

             }
             }

-        }
+#endif // __WIN32__

     }
 
     }
 

-    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 // __WIN32__
+
+#endif // wxUSE_RADIOBOX