Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 4fc11d862cd2638f102354c4b874468441067fa9..70665bdf845c7c589b698c79312223a75deab9f5 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/radiobox.cpp
+// Name:        src/msw/radiobox.cpp

 // Purpose:     wxRadioBox implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioBox implementation
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "radiobox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,110 +26,82 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/hashmap.h"

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

-    #include "wx/radiobox.h"

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

-#include "wx/msw/private.h"
+#include "wx/msw/subwin.h"

 
 #if wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS

-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif

     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 

-// TODO: WX_CONSTRUCTOR
+// TODO: wxCONSTRUCTOR

 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )
 
 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )
 

-WX_BEGIN_FLAGS( wxRadioBoxStyle )
+wxBEGIN_FLAGS( wxRadioBoxStyle )

     // new style border flags, we put them first to
     // use them for streaming out
     // new style border flags, we put them first to
     // use them for streaming out

-    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
-    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
-    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
-    WX_FLAGS_MEMBER(wxBORDER_RAISED)
-    WX_FLAGS_MEMBER(wxBORDER_STATIC)
-    WX_FLAGS_MEMBER(wxBORDER_NONE)
-    
+    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
     // old style border flags

-    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
-    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
-    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
-    WX_FLAGS_MEMBER(wxRAISED_BORDER)
-    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
-    WX_FLAGS_MEMBER(wxNO_BORDER)
+    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
 
     // standard window styles

-    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
-    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
-    WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    WX_FLAGS_MEMBER(wxWANTS_CHARS)
-    WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    WX_FLAGS_MEMBER(wxVSCROLL)
-    WX_FLAGS_MEMBER(wxHSCROLL)
-
-    WX_FLAGS_MEMBER(wxRA_SPECIFY_COLS)
-    WX_FLAGS_MEMBER(wxRA_HORIZONTAL)
-    WX_FLAGS_MEMBER(wxRA_SPECIFY_ROWS)
-    WX_FLAGS_MEMBER(wxRA_VERTICAL)
-
-WX_END_FLAGS( wxRadioBoxStyle )
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
+    wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
+wxEND_FLAGS( wxRadioBoxStyle )

 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
 
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
 

-WX_BEGIN_PROPERTIES_TABLE(wxRadioBox)
-    WX_DELEGATE( OnSelect , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
-    WX_PROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-WX_END_PROPERTIES_TABLE()
+wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
+    wxEVENT_PROPERTY( Select , wxEVT_RADIOBOX , wxCommandEvent )
+    wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 
 /*
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 
 /*

-       selection
-       content
-               label
-               dimension
-               item
+    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
 // ---------------------------------------------------------------------------
 
 // wnd proc for radio buttons
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
 // wnd proc for radio buttons

-#ifdef __WIN32__

 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
                                            UINT message,
                                            WPARAM wParam,
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
                                            UINT message,
                                            WPARAM wParam,


@@ -143,86 +111,247 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
 // global vars
 // ---------------------------------------------------------------------------
 
 // global vars
 // ---------------------------------------------------------------------------
 

+namespace
+{
+

 // the pointer to standard radio button wnd proc
 // the pointer to standard radio button wnd proc

-static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+
+// Hash allowing to find wxRadioBox containing the given radio button by its
+// HWND. This is used by (subclassed) radio button window proc to find the
+// radio box it belongs to.
+WX_DECLARE_HASH_MAP(HWND, wxRadioBox *,
+                    wxPointerHash, wxPointerEqual,
+                    RadioBoxFromButton);
+
+RadioBoxFromButton gs_boxFromButton;

 
 

-#endif // __WIN32__
+} // anonymous namespace

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

+/* static */
+wxRadioBox* wxRadioBox::GetFromRadioButtonHWND(WXHWND hwnd)
+{
+    const RadioBoxFromButton::const_iterator it = gs_boxFromButton.find(hwnd);
+    return it == gs_boxFromButton.end() ? NULL : it->second;
+}
+

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

-// wxRadioBox
+// wxRadioBox creation

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

-int wxRadioBox::GetCount() const
+// Radio box item
+void wxRadioBox::Init()

 {
 {

-    return m_noItems;
+    m_selectedButton = wxNOT_FOUND;
+    m_radioButtons = NULL;
+    m_dummyHwnd = NULL;
+    m_radioWidth = NULL;
+    m_radioHeight = NULL;

 }
 
 }
 

-int wxRadioBox::GetColumnCount() const
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        int n,
+                        const wxString choices[],
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)

 {
 {

-    return GetNumHor();
+    // common initialization
+    if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
+        return false;
+
+    // the code elsewhere in this file supposes that either wxRA_SPECIFY_COLS
+    // or wxRA_SPECIFY_ROWS is set, ensure that this is indeed the case
+    if ( !(style & (wxRA_SPECIFY_ROWS | wxRA_SPECIFY_COLS)) )
+        style |= wxRA_SPECIFY_COLS;
+
+#if wxUSE_VALIDATORS
+    SetValidator(val);
+#else
+    wxUnusedVar(val);
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
+
+    // We need an extra one to keep track of the 'dummy' item we
+    // create to end the radio group, so it will be destroyed and
+    // it's id will be released.  But we want it separate from the
+    // other buttons since the wxSubwindows will operate on it as
+    // well and we just want to ignore it until destroying it.
+    // For instance, we don't want the bounding box of the radio
+    // buttons to include the dummy button
+    m_radioButtons = new wxSubwindows(n);
+
+    m_radioWidth = new int[n];
+    m_radioHeight = new int[n];
+
+    for ( int i = 0; i < n; i++ )
+    {
+        m_radioWidth[i] =
+        m_radioHeight[i] = wxDefaultCoord;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
+        if ( i == 0 )
+            styleBtn |= WS_GROUP;
+
+        wxWindowIDRef subid = NewControlId();
+
+        HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
+                                      choices[i].t_str(),
+                                      styleBtn,
+                                      0, 0, 0, 0,   // will be set in SetSize()
+                                      GetHwndOf(parent),
+                                      (HMENU)wxUIntToPtr(subid.GetValue()),
+                                      wxGetInstance(),
+                                      NULL);
+
+        if ( !hwndBtn )
+        {
+            wxLogLastError(wxT("CreateWindow(radio btn)"));
+
+            return false;
+        }
+
+        // Keep track of the subwindow
+        m_radioButtons->Set(i, hwndBtn, subid);
+
+        SubclassRadioButton((WXHWND)hwndBtn);
+
+        // Also, make it a subcontrol of this control
+        m_subControls.Add(subid);
+    }
+
+    // Create a dummy radio control to end the group.
+    m_dummyId = NewControlId();
+
+    m_dummyHwnd = (WXHWND)::CreateWindow(wxT("BUTTON"),
+                         wxEmptyString,
+                         WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
+                         0, 0, 0, 0, GetHwndOf(parent),
+                         (HMENU)wxUIntToPtr(m_dummyId.GetValue()),
+                         wxGetInstance(), NULL);
+
+
+    m_radioButtons->SetFont(GetFont());
+
+#ifdef __WXWINCE__
+    // Set the z-order correctly
+    SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#endif
+
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);
+    SetSelection(0);
+    SetSize(pos.x, pos.y, size.x, size.y);
+
+    // Now that we have items determine what is the best size and set it.
+    SetInitialSize(size);
+
+    // And update all the buttons positions to match it.
+    const wxSize actualSize = GetSize();
+    PositionAllButtons(pos.x, pos.y, actualSize.x, actualSize.y);
+
+    return true;

 }
 
 }
 

-int wxRadioBox::GetRowCount() const
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)

 {
 {

-    return GetNumVer();
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);

 }
 
 }
 

-// returns the number of rows
-int wxRadioBox::GetNumVer() const
+wxRadioBox::~wxRadioBox()

 {
 {

-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return m_majorDim;
-    }
-    else
+    SendDestroyEvent();
+
+    // Unsubclass all the radio buttons and remove their soon-to-be-invalid
+    // HWNDs from the global map. Notice that we need to unsubclass because
+    // otherwise we'd need the entries in gs_boxFromButton for the buttons
+    // being deleted to handle the messages generated during their destruction.
+    for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )

     {
     {

-        return (m_noItems + m_majorDim - 1)/m_majorDim;
+        HWND hwnd = m_radioButtons->Get(item);
+
+        wxSetWindowProc(hwnd, reinterpret_cast<WNDPROC>(s_wndprocRadioBtn));
+        gs_boxFromButton.erase(hwnd);

     }
     }

+
+    delete m_radioButtons;
+
+    if ( m_dummyHwnd )
+        DestroyWindow((HWND)m_dummyHwnd);
+
+    delete[] m_radioWidth;
+    delete[] m_radioHeight;

 }
 
 }
 

-// returns the number of columns
-int wxRadioBox::GetNumHor() const
+// NB: if this code is changed, wxGetWindowForHWND() which relies on having the
+//     radiobox pointer in GWL_USERDATA for radio buttons must be updated too!
+void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)

 {
 {

-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-    else
-    {
-        return m_majorDim;
-    }
+    HWND hwndBtn = (HWND)hWndBtn;
+
+    if ( !s_wndprocRadioBtn )
+        s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
+
+    wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+
+    gs_boxFromButton[hwndBtn] = this;

 }
 
 }
 

-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)

 {
 {

+    const int id = (signed short)id_;
+

     if ( cmd == BN_CLICKED )
     {
         if (id == GetId())
     if ( cmd == BN_CLICKED )
     {
         if (id == GetId())

-            return TRUE;
+            return true;

 
 

-        int selectedButton = -1;
+        int selectedButton = wxNOT_FOUND;

 
 

-        for ( int i = 0; i < m_noItems; i++ )
+        const unsigned int count = GetCount();
+        for ( unsigned int i = 0; i < count; i++ )

         {
         {

-            if ( id == wxGetWindowId(m_radioButtons[i]) )
+            const HWND hwndBtn = (*m_radioButtons)[i];
+            if ( id == wxGetWindowId(hwndBtn) )

             {
             {

-                selectedButton = i;
+                // we can get BN_CLICKED for a button which just became focused
+                // but it may not be checked, in which case we shouldn't
+                // generate a radiobox selection changed event for it
+                if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+                    selectedButton = i;

 
                 break;
             }
         }
 
 
                 break;
             }
         }
 

-        if ( selectedButton == -1 )
+        if ( selectedButton == wxNOT_FOUND )

         {
             // just ignore it - due to a hack with WM_NCHITTEST handling in our
             // wnd proc, we can receive dummy click messages when we click near
             // the radiobox edge (this is ugly but Julian wouldn't let me get
             // rid of this...)
         {
             // just ignore it - due to a hack with WM_NCHITTEST handling in our
             // wnd proc, we can receive dummy click messages when we click near
             // the radiobox edge (this is ugly but Julian wouldn't let me get
             // rid of this...)

-            return FALSE;
+            return false;

         }
 
         if ( selectedButton != m_selectedButton )
         }
 
         if ( selectedButton != m_selectedButton )


@@ -233,180 +362,172 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, 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;

 }
 
 }
 

-// Radio box item
-wxRadioBox::wxRadioBox()
+void wxRadioBox::Command(wxCommandEvent & event)

 {
 {

-    m_selectedButton = -1;
-    m_noItems = 0;
-    m_noRowsOrCols = 0;
-    m_radioButtons = NULL;
-    m_majorDim = 0;
-    m_radioWidth = NULL;
-    m_radioHeight = NULL;
+    SetSelection (event.GetInt());
+    SetFocus();
+    ProcessCommand(event);

 }
 
 }
 

-bool wxRadioBox::Create(wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        int n,
-                        const wxString choices[],
-                        int majorDim,
-                        long style,
-                        const wxValidator& val,
-                        const wxString& name)
+void wxRadioBox::SendNotificationEvent()

 {
 {

-    // initialize members
-    m_selectedButton = -1;
-    m_noItems = 0;
+    wxCommandEvent event(wxEVT_RADIOBOX, m_windowId);
+    event.SetInt( m_selectedButton );
+    event.SetString(GetString(m_selectedButton));
+    event.SetEventObject( this );
+    ProcessCommand(event);
+}

 
 

-    m_majorDim = majorDim == 0 ? n : majorDim;
-    m_noRowsOrCols = majorDim;
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------

 
 

-    // common initialization
-    if ( !CreateControl(parent, id, pos, size, style, val, name) )
-        return FALSE;
-
-    // create the static box
-    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP,
-                           pos, size, title, 0) )
-        return FALSE;
-
-    // and now create the buttons
-    m_noItems = n;
-#if RADIOBTN_PARENT_IS_RADIOBOX
-    HWND hwndParent = GetHwnd();
-#else
-    HWND hwndParent = GetHwndOf(parent);
-#endif
+unsigned int wxRadioBox::GetCount() const
+{
+    return m_radioButtons ? m_radioButtons->GetCount() : 0u;
+}

 
 

-    // Some radio boxes test consecutive id.
-    (void)NewControlId();
-    m_radioButtons = new WXHWND[n];
-    m_radioWidth = new int[n];
-    m_radioHeight = new int[n];
+void wxRadioBox::SetString(unsigned int item, const wxString& label)
+{
+    wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );

 
 

-    WXHFONT hfont = 0;
-    wxFont& font = GetFont();
-    if ( font.Ok() )
-    {
-        hfont = font.GetResourceHandle();
-    }
+    m_radioWidth[item] =
+    m_radioHeight[item] = wxDefaultCoord;

 
 

-    for ( int i = 0; i < n; i++ )
-    {
-        m_radioWidth[i] =
-        m_radioHeight[i] = -1;
-        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
-        if ( i == 0 && style == 0 )
-            styleBtn |= WS_GROUP;
+    ::SetWindowText((*m_radioButtons)[item], label.c_str());

 
 

-        long newId = NewControlId();
+    InvalidateBestSize();
+}

 
 

-        HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
-                                      choices[i],
-                                      styleBtn,
-                                      0, 0, 0, 0,   // will be set in SetSize()
-                                      hwndParent,
-                                      (HMENU)newId,
-                                      wxGetInstance(),
-                                      NULL);
+void wxRadioBox::SetSelection(int N)
+{
+    wxCHECK_RET( IsValid(N), wxT("invalid radiobox index") );

 
 

-        if ( !hwndBtn )
-        {
-            wxLogLastError(wxT("CreateWindow(radio btn)"));
+    // unselect the old button
+    if ( m_selectedButton != wxNOT_FOUND )
+        ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L);

 
 

-            return FALSE;
-        }
+    // and select the new one
+    ::SendMessage((*m_radioButtons)[N], BM_SETCHECK, 1, 0L);

 
 

-        m_radioButtons[i] = (WXHWND)hwndBtn;
+    m_selectedButton = N;
+}

 
 

-        SubclassRadioButton((WXHWND)hwndBtn);
+// Find string for position
+wxString wxRadioBox::GetString(unsigned int item) const
+{
+    wxCHECK_MSG( IsValid(item), wxEmptyString,
+                 wxT("invalid radiobox index") );

 
 

-        if ( hfont )
-        {
-            ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
-        }
+    return wxGetWindowText((*m_radioButtons)[item]);
+}

 
 

-        m_subControls.Add(newId);
+void wxRadioBox::SetFocus()
+{
+    if ( GetCount() > 0 )
+    {
+        ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND
+                                        ? 0
+                                        : m_selectedButton]);

     }
     }

+}

 
 

-    // Create a dummy radio control to end the group.
-    (void)::CreateWindow(_T("BUTTON"),
-                         wxEmptyString,
-                         WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
-                         0, 0, 0, 0, hwndParent,
-                         (HMENU)NewControlId(), wxGetInstance(), NULL);
+// Enable a specific button
+bool wxRadioBox::Enable(unsigned int item, bool enable)
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::Enable()") );

 
 

-    SetSelection(0);
+    BOOL ret = MSWEnableHWND((*m_radioButtons)[item], enable);

 
 

-    SetSize(pos.x, pos.y, size.x, size.y);
+    return (ret == 0) != enable;
+}

 
 

-    return TRUE;
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::IsItemEnabled()") );
+
+    return ::IsWindowEnabled((*m_radioButtons)[item]) != 0;

 }
 
 }
 

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

 {
 {

-    m_isBeingDeleted = TRUE;
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::Show()") );
+
+    BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);

 
 

-    if (m_radioButtons)
+    bool changed = (ret != 0) != show;
+    if ( changed )

     {
     {

-        int i;
-        for (i = 0; i < m_noItems; i++)
-            ::DestroyWindow((HWND)m_radioButtons[i]);
-        delete[] m_radioButtons;
+        InvalidateBestSize();

     }
 
     }
 

-    if (m_radioWidth)
-        delete[] m_radioWidth;
-    if (m_radioHeight)
-        delete[] m_radioHeight;
-
+    return changed;

 }
 
 }
 

-void wxRadioBox::SetString(int item, const wxString& label)
+bool wxRadioBox::IsItemShown(unsigned int item) const

 {
 {

-    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::IsItemShown()") );

 
 

-    m_radioWidth[item] = m_radioHeight[item] = -1;
-    SetWindowText((HWND)m_radioButtons[item], label.c_str());
+    // don't use IsWindowVisible() here because it would return false if the
+    // radiobox itself is hidden while we want to only return false if this
+    // button specifically is hidden
+    return (::GetWindowLong((*m_radioButtons)[item],
+                            GWL_STYLE) & WS_VISIBLE) != 0;

 }
 
 }
 

-void wxRadioBox::SetSelection(int N)
-{
-    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);
+#if wxUSE_TOOLTIPS

 
 

-    m_selectedButton = N;
+bool wxRadioBox::HasToolTips() const
+{
+    return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips();

 }
 
 }
 

-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
+void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)

 {
 {

-    return m_selectedButton;
+    // we have already checked for the item to be valid in wxRadioBoxBase
+    const HWND hwndRbtn = (*m_radioButtons)[item];
+    if ( tooltip != NULL )
+        tooltip->AddOtherWindow(hwndRbtn);
+    else // unset the tooltip
+        wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
+        // the second parameter can be zero since it's ignored by Remove()
+        // as we pass a rect for which wxRect::IsEmpty()==true...

 }
 
 }
 

-// Find string for position
-wxString wxRadioBox::GetString(int item) const
+#endif // wxUSE_TOOLTIPS
+
+bool wxRadioBox::Reparent(wxWindowBase *newParent)

 {
 {

-    wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
-                 wxT("invalid radiobox index") );
+    if ( !wxStaticBox::Reparent(newParent) )
+    {
+        return false;
+    }

 
 

-    return wxGetWindowText(m_radioButtons[item]);
+    HWND hwndParent = GetHwndOf(GetParent());
+    for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
+    {
+        ::SetParent((*m_radioButtons)[item], hwndParent);
+    }
+#ifdef __WXWINCE__
+    // put static box under the buttons in the Z-order
+    SetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+#endif
+    return true;

 }
 
 }
 

+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
+

 // ----------------------------------------------------------------------------
 // size calculations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // size calculations
 // ----------------------------------------------------------------------------


@@ -416,12 +537,13 @@ wxSize wxRadioBox::GetMaxButtonSize() const
     // calculate the max button size
     int widthMax = 0,
         heightMax = 0;
     // calculate the max button size
     int widthMax = 0,
         heightMax = 0;

-    for ( int i = 0 ; i < m_noItems; i++ )
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0 ; i < count; i++ )

     {
         int width, height;
         if ( m_radioWidth[i] < 0 )
         {
     {
         int width, height;
         if ( m_radioWidth[i] < 0 )
         {

-            GetTextExtent(wxGetWindowText(m_radioButtons[i]), &width, &height);
+            GetTextExtent(wxGetWindowText((*m_radioButtons)[i]), &width, &height);

 
             // adjust the size to take into account the radio box itself
             // FIXME this is totally bogus!
 
             // adjust the size to take into account the radio box itself
             // FIXME this is totally bogus!


@@ -448,28 +570,20 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 {
     // the radiobox should be big enough for its buttons
     int cx1, cy1;
 {
     // the radiobox should be big enough for its buttons
     int cx1, cy1;

-    wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont());
+    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());

 
     int extraHeight = cy1;
 
 
     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
-    extraHeight *= 3;
-    extraHeight /= 2;
-#endif
-    */
-    
-    int height = GetNumVer() * sizeBtn.y + cy1/2 + extraHeight;
-    int width  = GetNumHor() * (sizeBtn.x + cx1) + cx1;
+    int height = GetRowCount() * sizeBtn.y + cy1/2 + extraHeight;
+    int width  = GetColumnCount() * (sizeBtn.x + cx1) + cx1;

 
     // Add extra space under the label, if it exists.
 
     // Add extra space under the label, if it exists.

-    if (!wxControl::GetLabel().IsEmpty())
+    if (!wxControl::GetLabel().empty())

         height += cy1/2;
 
     // and also wide enough for its label
     int widthLabel;
         height += cy1/2;
 
     // and also wide enough for its label
     int widthLabel;

-    GetTextExtent(GetTitle(), &widthLabel, NULL);
+    GetTextExtent(GetLabelText(), &widthLabel, NULL);

     widthLabel += RADIO_SIZE; // FIXME this is bogus too
     if ( widthLabel > width )
         width = widthLabel;
     widthLabel += RADIO_SIZE; // FIXME this is bogus too
     if ( widthLabel > width )
         width = widthLabel;


@@ -479,64 +593,51 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 
 wxSize wxRadioBox::DoGetBestSize() const
 {
 
 wxSize wxRadioBox::DoGetBestSize() const
 {

-    return GetTotalButtonSize(GetMaxButtonSize());
+    if ( !m_radioButtons )
+    {
+        // if we're not fully initialized yet, we can't meaningfully compute
+        // our best size, we'll do it later
+        return wxSize(1, 1);
+    }
+
+    wxSize best = GetTotalButtonSize(GetMaxButtonSize());
+    CacheBestSize(best);
+    return best;

 }
 
 }
 

-// Restored old code.

 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 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 == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        xx = currentX;
-    if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        yy = currentY;
-
-#if RADIOBTN_PARENT_IS_RADIOBOX
-    int y_offset = 0;
-    int x_offset = 0;
-#else
-    int y_offset = yy;
-    int x_offset = xx;
-#endif
+    if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
+            (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
+    {
+        // Attempt to have a look coherent with other platforms: We compute the
+        // biggest toggle dim, then we align all items according this value.
+        const wxSize totSize = GetTotalButtonSize(GetMaxButtonSize());

 
 

-    int cx1, cy1;
-    wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
+        // only change our width/height if asked for
+        if ( width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH) )
+            width = totSize.x;

 
 

-    // 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;
+        if ( height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT) )
+            height = totSize.y;
+    }

 
 

-    wxSize totSize = GetTotalButtonSize(maxSize);
-    int totWidth = totSize.x,
-        totHeight = totSize.y;
+    wxStaticBox::DoSetSize(x, y, width, height);
+}

 
 

-    // only change our width/height if asked for
-    if ( width == -1 )
-    {
-        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
-            width = totWidth;
-        else
-            width = widthOld;
-    }
+void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
+{
+    wxStaticBox::DoMoveWindow(x, y, width, height);

 
 

-    if ( height == -1 )
-    {
-        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-            height = totHeight;
-        else
-            height = heightOld;
-    }
+    PositionAllButtons(x, y, width, height);
+}

 
 

-    ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+void
+wxRadioBox::PositionAllButtons(int x, int y, int width, int WXUNUSED(height))
+{
+    wxSize maxSize = GetMaxButtonSize();
+    int maxWidth = maxSize.x,
+        maxHeight = maxSize.y;

 
     // Now position all the buttons: the current button will be put at
     // wxPoint(x_offset, y_offset) and the new row/column will start at
 
     // 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


@@ -545,21 +646,25 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     // 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
     // to the right border of radiobox and thus can be wider than this.
 
     // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in

-    // left to right order and m_majorDim is the number of columns while
+    // left to right order and GetMajorDim() is the number of columns while

     // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
     // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and

-    // m_majorDim is the number of rows.
+    // GetMajorDim() is the number of rows.

 
 

-    x_offset += cx1;
-    y_offset += cy1;
+    int cx1, cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
+
+    int x_offset = x + cx1;
+    int y_offset = y + cy1;

 
     // Add extra space under the label, if it exists.
 
     // Add extra space under the label, if it exists.

-    if (!wxControl::GetLabel().IsEmpty())
+    if (!wxControl::GetLabel().empty())

         y_offset += cy1/2;
 
     int startX = x_offset;
     int startY = y_offset;
 
         y_offset += cy1/2;
 
     int startX = x_offset;
     int startY = y_offset;
 

-    for ( int i = 0; i < m_noItems; i++ )
+    const unsigned int count = GetCount();
+    for (unsigned int i = 0; i < count; i++)

     {
         // the last button in the row may be wider than the other ones as the
         // radiobox may be wider than the sum of the button widths (as it
     {
         // 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


@@ -569,17 +674,17 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             // 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
         {
             // item is the last in its row if it is a multiple of the number of
             // columns or if it is just the last item

-            int n = i + 1;
-            isLastInTheRow = ((n % m_majorDim) == 0) || (n == m_noItems);
+            unsigned int n = i + 1;
+            isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);

         }
         else // wxRA_SPECIFY_ROWS
         {
             // item is the last in the row if it is in the last columns
         }
         else // wxRA_SPECIFY_ROWS
         {
             // item is the last in the row if it is in the last columns

-            isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim;
+            isLastInTheRow = i >= (count/GetMajorDim())*GetMajorDim();

         }
 
         // is this the start of new row/column?
         }
 
         // is this the start of new row/column?

-        if ( i && (i % m_majorDim == 0) )
+        if ( i && (i % GetMajorDim() == 0) )

         {
             if ( m_windowStyle & wxRA_SPECIFY_ROWS )
             {
         {
             if ( m_windowStyle & wxRA_SPECIFY_ROWS )
             {


@@ -610,13 +715,11 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             widthBtn = maxWidth;
         }
 
             widthBtn = maxWidth;
         }
 

-        // VZ: make all buttons of the same, maximal size - like this they
-        //     cover the radiobox entirely and the radiobox tooltips are always
-        //     shown (otherwise they are not when the mouse pointer is in the
-        //     radiobox part not belonging to any radiobutton)
-        ::MoveWindow((HWND)m_radioButtons[i],
-                     x_offset, y_offset, widthBtn, maxHeight,
-                     TRUE);
+        // make all buttons of the same, maximal size - like this they cover
+        // the radiobox entirely and the radiobox tooltips are always shown
+        // (otherwise they are not when the mouse pointer is in the radiobox
+        // part not belonging to any radiobutton)
+        DoMoveSibling((*m_radioButtons)[i], x_offset, y_offset, widthBtn, maxHeight);

 
         // where do we put the next button?
         if ( m_windowStyle & wxRA_SPECIFY_ROWS )
 
         // where do we put the next button?
         if ( m_windowStyle & wxRA_SPECIFY_ROWS )


@@ -634,270 +737,65 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 }
 
     }
 }
 

-void wxRadioBox::GetSize(int *width, int *height) const
-{
-    RECT rect;
-    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
-
-    if (m_hWnd)
-        wxFindMaxSize(m_hWnd, &rect);
-
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        wxFindMaxSize(m_radioButtons[i], &rect);
-
-    *width = rect.right - rect.left;
-    *height = rect.bottom - rect.top;
-}
-
-void wxRadioBox::GetPosition(int *x, int *y) const
-{
-    wxWindow *parent = GetParent();
-    RECT rect = { -1, -1, -1, -1 };
-
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        wxFindMaxSize(m_radioButtons[i], &rect);
-
-    if (m_hWnd)
-        wxFindMaxSize(m_hWnd, &rect);
-
-    // Since we now have the absolute screen coords, if there's a parent we
-    // must subtract its top left corner
-    POINT point;
-    point.x = rect.left;
-    point.y = rect.top;
-    if (parent)
-    {
-        ::ScreenToClient((HWND) parent->GetHWND(), &point);
-    }
-
-    // We may be faking the client origin. So a window that's really at (0, 30)
-    // may appear (to wxWin apps) to be at (0, 0).
-    if (GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        point.x -= pt.x;
-        point.y -= pt.y;
-    }
-
-    *x = point.x;
-    *y = point.y;
-}
-
-void wxRadioBox::SetFocus()
-{
-    if (m_noItems > 0)
-    {
-        ::SetFocus((HWND)m_radioButtons[m_selectedButton == -1
-                                            ? 0
-                                            : m_selectedButton]);
-    }
-
-}
-
-bool wxRadioBox::Show(bool show)
-{
-    if ( !wxControl::Show(show) )
-        return FALSE;
-
-    int nCmdShow = show ? SW_SHOW : SW_HIDE;
-    for ( int i = 0; i < m_noItems; i++ )
-    {
-        ::ShowWindow((HWND)m_radioButtons[i], nCmdShow);
-    }
-
-    return TRUE;
-}
-
-// Enable a specific button
-void wxRadioBox::Enable(int item, bool enable)
-{
-    wxCHECK_RET( item >= 0 && item < m_noItems,
-                 wxT("invalid item in wxRadioBox::Enable()") );
-
-    ::EnableWindow((HWND) m_radioButtons[item], enable);
-}
-
-// Enable all controls
-bool wxRadioBox::Enable(bool enable)
-{
-    if ( !wxControl::Enable(enable) )
-        return FALSE;
-
-    for (int i = 0; i < m_noItems; i++)
-        ::EnableWindow((HWND) m_radioButtons[i], enable);
-
-    return TRUE;
-}
-
-// Show a specific button
-void wxRadioBox::Show(int item, bool show)
-{
-    wxCHECK_RET( item >= 0 && item < m_noItems,
-                 wxT("invalid item in wxRadioBox::Show()") );
-
-    ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);
-}
-
-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
-    size_t count = GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( GetRadioButtons()[i] == hWnd )
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
-void wxRadioBox::Command(wxCommandEvent & event)
-{
-    SetSelection (event.m_commandInt);
-    SetFocus();
-    ProcessCommand (event);
-}
-
-// NB: if this code is changed, wxGetWindowForHWND() which relies on having the
-//     radiobox pointer in GWL_USERDATA for radio buttons must be updated too!
-void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
-{
-    HWND hwndBtn = (HWND)hWndBtn;
-
-    if ( !s_wndprocRadioBtn )
-        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
-
-    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
-    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-}
-
-void wxRadioBox::SendNotificationEvent()
-{
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
-    event.SetInt( m_selectedButton );
-    event.SetString( GetString(m_selectedButton) );
-    event.SetEventObject( this );
-    ProcessCommand(event);
-}
-
-bool wxRadioBox::SetFont(const wxFont& font)
+int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const

 {
 {

-    if ( !wxControl::SetFont(font) )
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; i++ )

     {
     {

-        // 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);
+        RECT rect = wxGetWindowRect((*m_radioButtons)[i]);

 
 

-        // otherwise the buttons are not redrawn correctly
-        ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);
+        if ( rect.left <= pt.x && pt.x < rect.right &&
+                rect.top  <= pt.y && pt.y < rect.bottom )
+        {
+            return i;
+        }

     }
 
     }
 

-    return TRUE;
+    return wxNOT_FOUND;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// our window proc
+// radio box drawing

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

-long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch ( nMsg )
-    {
-#ifdef __WIN32__
-        case WM_CTLCOLORSTATIC:
-            // set the colour of the radio buttons to be the same as ours
-            {
-                HDC hdc = (HDC)wParam;
-
-                const wxColour& colBack = GetBackgroundColour();
-                ::SetBkColor(hdc, wxColourToRGB(colBack));
-                ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-
-                wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
-
-                return (WXHBRUSH)brush->GetResourceHandle();
-            }
-#endif // Win32
-
-        // VZ: this code breaks radiobox redrawing under Windows XP, don't use
-        //     it. If you need to get messages from the static controls,
-        //     create them as a child of another (non static) window
-#if 0
-        // This is required for the radiobox to be sensitive to mouse input,
-        // e.g. for Dialog Editor.
-        case WM_NCHITTEST:
-            {
-                int xPos = LOWORD(lParam);  // horizontal position of cursor
-                int yPos = HIWORD(lParam);  // vertical position of cursor
-
-                ScreenToClient(&xPos, &yPos);
-
-                // Make sure you can drag by the top of the groupbox, but let
-                // other (enclosed) controls get mouse events also
-                if (yPos < 10)
-                    return (long)HTCLIENT;
-            }
-            break;
-#endif // 0
-    }
-
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
+#ifndef __WXWINCE__

 
 

-WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-#if wxUSE_CTL3D
-                               WXUINT message,
-                               WXWPARAM wParam,
-                               WXLPARAM lParam
-#else
-                               WXUINT WXUNUSED(message),
-                               WXWPARAM WXUNUSED(wParam),
-                               WXLPARAM WXUNUSED(lParam)
-#endif
-    )
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()

 {
 {

-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
-    {
-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
-    }
-#endif // wxUSE_CTL3D
-
-    HDC hdc = (HDC)pDC;
-    wxColour colBack = GetBackgroundColour();
+    RECT rc;
+    ::GetWindowRect(GetHwnd(), &rc);
+    HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);

 
 

-    if (!IsEnabled())
-        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
-    ::SetBkColor(hdc, wxColourToRGB(colBack));
-    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; ++i )
+    {
+        // don't clip out hidden children
+        if ( !IsItemShown(i) )
+            continue;

 
 

-    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+        ::GetWindowRect((*m_radioButtons)[i], &rc);
+        AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+        ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+    }

 
 

-    return (WXHBRUSH)brush->GetResourceHandle();
+    return (WXHRGN)hrgn;

 }
 
 }
 

+#endif // __WXWINCE__

 
 // ---------------------------------------------------------------------------
 // window proc for radio buttons
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // window 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)
 {

+
+    wxRadioBox * const radiobox = wxRadioBox::GetFromRadioButtonHWND(hwnd);
+    wxCHECK_MSG( radiobox, 0, wxT("Should have the associated radio box") );
+

     switch ( message )
     {
         case WM_GETDLGCODE:
     switch ( message )
     {
         case WM_GETDLGCODE:


@@ -911,40 +809,9 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                 return lDlgCode | DLGC_WANTARROWS;
             }
 
                 return lDlgCode | DLGC_WANTARROWS;
             }
 

-#if wxUSE_TOOLTIPS
-        case WM_NOTIFY:
-            {
-                NMHDR* hdr = (NMHDR *)lParam;
-                if ( hdr->code == TTN_NEEDTEXT )
-                {
-                    wxRadioBox *radiobox = (wxRadioBox *)
-                        ::GetWindowLong(hwnd, GWL_USERDATA);
-
-                    wxCHECK_MSG( radiobox, 0,
-                                 wxT("radio button without radio box?") );
-
-                    wxToolTip *tooltip = radiobox->GetToolTip();
-                    if ( tooltip )
-                    {
-                        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
-                        ttt->lpszText = (wxChar *)tooltip->GetTip().c_str();
-                    }
-
-                    // processed
-                    return 0;
-                }
-            }
-            break;
-#endif // wxUSE_TOOLTIPS
-

         case WM_KEYDOWN:
             {
         case WM_KEYDOWN:
             {

-                wxRadioBox *radiobox = (wxRadioBox *)
-                    ::GetWindowLong(hwnd, GWL_USERDATA);
-
-                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
-
-                bool processed = TRUE;
+                bool processed = true;

 
                 wxDirection dir;
                 switch ( wParam )
 
                 wxDirection dir;
                 switch ( wParam )


@@ -966,7 +833,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                         break;
 
                     default:
                         break;
 
                     default:

-                        processed = FALSE;
+                        processed = false;

 
                         // just to suppress the compiler warning
                         dir = wxALL;
 
                         // just to suppress the compiler warning
                         dir = wxALL;


@@ -996,63 +863,61 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
             }
             break;
 
             }
             break;
 

-#ifdef __WIN32__
-        case WM_HELP:
+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:

             {
             {

-                wxRadioBox *radiobox = (wxRadioBox *)
-                        ::GetWindowLong(hwnd, GWL_USERDATA);
+                // if we don't do this, no focus events are generated for the
+                // radiobox and, besides, we need to notify the parent about
+                // the focus change, otherwise the focus handling logic in
+                // wxControlContainer doesn't work
+                if ( message == WM_SETFOCUS )
+                    radiobox->HandleSetFocus((WXHWND)wParam);
+                else
+                    radiobox->HandleKillFocus((WXHWND)wParam);
+            }
+            break;

 
 

-                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+#ifndef __WXWINCE__
+        case WM_HELP:
+            {
+                bool processed = false;

 
 

-                bool processed = TRUE;
+                wxEvtHandler * const handler = radiobox->GetEventHandler();

 
 

-                // HELPINFO doesn't seem to be supported on WinCE.
-#ifndef __WXWINCE__

                 HELPINFO* info = (HELPINFO*) lParam;
                 HELPINFO* info = (HELPINFO*) lParam;

-                // Don't yet process menu help events, just windows
-                if (info->iContextType == HELPINFO_WINDOW)
-#endif
+                if ( info->iContextType == HELPINFO_WINDOW )

                 {
                 {

-                    wxWindow* subjectOfHelp = radiobox;
-                    bool eventProcessed = FALSE;
-                    while (subjectOfHelp && !eventProcessed)
+                    for ( wxWindow* subjectOfHelp = radiobox;
+                          subjectOfHelp;
+                          subjectOfHelp = subjectOfHelp->GetParent() )

                     {
                     {

-                        wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(),
-#ifdef __WXWINCE__
-                                              wxPoint(0, 0)
-#else
-                                              wxPoint(info->MousePos.x, info->MousePos.y)
-#endif
-                            ) ; // info->iCtrlId);
+                        wxHelpEvent helpEvent(wxEVT_HELP,
+                                              subjectOfHelp->GetId(),
+                                              wxPoint(info->MousePos.x,
+                                                      info->MousePos.y));

                         helpEvent.SetEventObject(radiobox);
                         helpEvent.SetEventObject(radiobox);

-                        eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
-
-                        // Go up the window hierarchy until the event is handled (or not)
-                        subjectOfHelp = subjectOfHelp->GetParent();
+                        if ( handler->ProcessEvent(helpEvent) )
+                        {
+                            processed = true;
+                            break;
+                        }

                     }
                     }

-                    processed = eventProcessed;

                 }
                 }

-#ifndef __WXWINCE__

                 else if (info->iContextType == HELPINFO_MENUITEM)
                 {
                 else if (info->iContextType == HELPINFO_MENUITEM)
                 {

-                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
+                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);

                     helpEvent.SetEventObject(radiobox);
                     helpEvent.SetEventObject(radiobox);

-                    processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+                    processed = handler->ProcessEvent(helpEvent);

                 }
                 }

-                else
-                    processed = FALSE;
-#endif
-                if (processed)
-                    return 0;

 
 

-                break;
+                if ( processed )
+                    return 0;

             }
             }

-#endif // __WIN32__
+            break;
+#endif // !__WXWINCE__

     }
 
     return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 
     }
 
     return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);
 }
 

-#endif // __WIN32__
-

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX