Remove unnecessary IsRadioButton().

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index d583c4f33710ff238969ff5d8fab8ae359f771ac..4fc2d2acbd9e373c572a30683c6eb208bffa20f3 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,27 +26,21 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #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
 

-#if defined(__WXWINCE__) && !defined(WS_EX_TRANSPARENT)
-#define WS_EX_TRANSPARENT 0
-#endif
-

 // TODO: wxCONSTRUCTOR
 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )
 // TODO: wxCONSTRUCTOR
 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )


@@ -109,35 +99,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
         item
 */
 
         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,


@@ -150,107 +116,20 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
 // the pointer to standard radio button wnd proc
 static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 
 // the pointer to standard radio button wnd proc
 static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 

-#endif // __WIN32__
-

 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ---------------------------------------------------------------------------

-// wxRadioBox
+// wxRadioBox creation

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

-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 )
-    {
-        return m_majorDim;
-    }
-    else
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-}
-
-// returns the number of columns
-int wxRadioBox::GetNumHor() const
-{
-    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
-    {
-        return (m_noItems + m_majorDim - 1)/m_majorDim;
-    }
-    else
-    {
-        return m_majorDim;
-    }
-}
-
-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
-{
-    if ( cmd == BN_CLICKED )
-    {
-        if (id == GetId())
-            return true;
-
-        int selectedButton = wxID_ANY;
-
-        for ( int i = 0; i < m_noItems; i++ )
-        {
-            if ( id == wxGetWindowId(m_radioButtons[i]) )
-            {
-                selectedButton = i;
-
-                break;
-            }
-        }
-
-        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 )
-        {
-            m_selectedButton = selectedButton;
-
-            SendNotificationEvent();
-        }
-        //else: don't generate events when the selection doesn't change
-
-        return true;
-    }
-    else
-        return false;
-}
-

 // Radio box item
 // Radio box item

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

 {
 {

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

     m_radioButtons = NULL;
     m_radioButtons = NULL;

-    m_majorDim = 0;
+    m_dummyHwnd = NULL;

     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }
     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }


@@ -267,59 +146,44 @@ bool wxRadioBox::Create(wxWindow *parent,
                         const wxValidator& val,
                         const wxString& name)
 {
                         const wxValidator& val,
                         const wxString& name)
 {

-    // initialize members
-    m_selectedButton = wxID_ANY;
-    m_noItems = 0;
-
-    m_majorDim = majorDim == 0 ? n : majorDim;
-    m_noRowsOrCols = majorDim;
-

     // common initialization
     // 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, WS_EX_TRANSPARENT) )
+    if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )

         return false;
 
         return false;
 

-    // and now create the buttons
-    m_noItems = n;
-#if RADIOBTN_PARENT_IS_RADIOBOX
-    HWND hwndParent = GetHwnd();
+#if wxUSE_VALIDATORS
+    SetValidator(val);

 #else
 #else

-    HWND hwndParent = GetHwndOf(parent);
-#endif
+    wxUnusedVar(val);
+#endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
+
+    // We need an extra one to keep track of the 'dummy' item we
+    // create to end the radio group, so it will be destroyed and
+    // it's id will be released.  But we want it separate from the
+    // other buttons since the wxSubwindows will operate on it as
+    // well and we just want to ignore it until destroying it.
+    // For instance, we don't want the bounding box of the radio
+    // buttons to include the dummy button
+    m_radioButtons = new wxSubwindows(n);

 
 

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

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

-    WXHFONT hfont = 0;
-    wxFont font = GetFont();
-    if ( font.Ok() )
-    {
-        hfont = font.GetResourceHandle();
-    }
-

     for ( int i = 0; i < n; i++ )
     {
         m_radioWidth[i] =
         m_radioHeight[i] = wxDefaultCoord;
         long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
     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 )

             styleBtn |= WS_GROUP;
 
             styleBtn |= WS_GROUP;
 

-        long newId = NewControlId();
+        wxWindowIDRef subid = NewControlId();

 
         HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
 
         HWND hwndBtn = ::CreateWindow(_T("BUTTON"),

-                                      choices[i],
+                                      choices[i].wx_str(),

                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()

-                                      hwndParent,
-                                      (HMENU)newId,
+                                      GetHwndOf(parent),
+                                      (HMENU)subid.GetValue(),

                                       wxGetInstance(),
                                       NULL);
 
                                       wxGetInstance(),
                                       NULL);
 


@@ -330,35 +194,38 @@ bool wxRadioBox::Create(wxWindow *parent,
             return false;
         }
 
             return false;
         }
 

-        m_radioButtons[i] = (WXHWND)hwndBtn;
+        // Keep track of the subwindow
+        m_radioButtons->Set(i, hwndBtn, subid);

 
         SubclassRadioButton((WXHWND)hwndBtn);
 
 
         SubclassRadioButton((WXHWND)hwndBtn);
 

-        if ( hfont )
-        {
-            ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
-        }
-
-        m_subControls.Add(newId);
+        // Also, make it a subcontrol of this control
+        m_subControls.Add(subid);

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

-    (void)::CreateWindow(_T("BUTTON"),
+    m_dummyId = NewControlId();
+
+    m_dummyHwnd = (WXHWND)::CreateWindow(_T("BUTTON"),

                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,

-                         0, 0, 0, 0, hwndParent,
-                         (HMENU)NewControlId(), wxGetInstance(), NULL);
+                         0, 0, 0, 0, GetHwndOf(parent),
+                         (HMENU)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
 
 
 #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.
     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.

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -383,57 +250,219 @@ wxRadioBox::~wxRadioBox()
 {
     m_isBeingDeleted = true;
 
 {
     m_isBeingDeleted = true;
 

-    if (m_radioButtons)
+    delete m_radioButtons;
+    if ( m_dummyHwnd )
+        DestroyWindow((HWND)m_dummyHwnd);
+    delete[] m_radioWidth;
+    delete[] m_radioHeight;
+}
+
+// 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)wxGetWindowProc(hwndBtn);
+
+    wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
+    wxSetWindowUserData(hwndBtn, this);
+}
+
+// ----------------------------------------------------------------------------
+// events generation
+// ----------------------------------------------------------------------------
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)
+{
+    const int id = (signed short)id_;
+
+    if ( cmd == BN_CLICKED )

     {
     {

-        int i;
-        for (i = 0; i < m_noItems; i++)
-            ::DestroyWindow((HWND)m_radioButtons[i]);
-        delete[] m_radioButtons;
+        if (id == GetId())
+            return true;
+
+        int selectedButton = wxNOT_FOUND;
+
+        const unsigned int count = GetCount();
+        for ( unsigned int i = 0; i < count; i++ )
+        {
+            const HWND hwndBtn = (*m_radioButtons)[i];
+            if ( id == wxGetWindowId(hwndBtn) )
+            {
+                // we can get BN_CLICKED for a button which just became focused
+                // but it may not be checked, in which case we shouldn't
+                // generate a radiobox selection changed event for it
+                if ( ::SendMessage(hwndBtn, BM_GETCHECK, 0, 0) == BST_CHECKED )
+                    selectedButton = i;
+
+                break;
+            }
+        }
+
+        if ( selectedButton == wxNOT_FOUND )
+        {
+            // just ignore it - due to a hack with WM_NCHITTEST handling in our
+            // wnd proc, we can receive dummy click messages when we click near
+            // the radiobox edge (this is ugly but Julian wouldn't let me get
+            // rid of this...)
+            return false;
+        }
+
+        if ( selectedButton != m_selectedButton )
+        {
+            m_selectedButton = selectedButton;
+
+            SendNotificationEvent();
+        }
+        //else: don't generate events when the selection doesn't change
+
+        return true;

     }
     }

+    else
+        return false;
+}

 
 

-    if (m_radioWidth)
-        delete[] m_radioWidth;
-    if (m_radioHeight)
-        delete[] m_radioHeight;
+void wxRadioBox::Command(wxCommandEvent & event)
+{
+    SetSelection (event.GetInt());
+    SetFocus();
+    ProcessCommand(event);
+}

 
 

+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);
+}
+
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------
+
+unsigned int wxRadioBox::GetCount() const
+{
+    return m_radioButtons ? m_radioButtons->GetCount() : 0u;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );
+    wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
+
+    m_radioWidth[item] =
+    m_radioHeight[item] = wxDefaultCoord;

 
 

-    m_radioWidth[item] = m_radioHeight[item] = wxDefaultCoord;
-    SetWindowText((HWND)m_radioButtons[item], label.c_str());
+    ::SetWindowText((*m_radioButtons)[item], label.c_str());
+
+    InvalidateBestSize();

 }
 
 void wxRadioBox::SetSelection(int N)
 {
 }
 
 void wxRadioBox::SetSelection(int N)
 {

-    wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") );
+    wxCHECK_RET( IsValid(N), 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);
+    // unselect the old button
+    if ( m_selectedButton != wxNOT_FOUND )
+        ::SendMessage((*m_radioButtons)[m_selectedButton], BM_SETCHECK, 0, 0L);

 
 

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

 
     m_selectedButton = N;
 }
 
 
     m_selectedButton = N;
 }
 

-// Get single selection, for single choice list items
-int wxRadioBox::GetSelection() const
+// Find string for position
+wxString wxRadioBox::GetString(unsigned int item) const

 {
 {

-    return m_selectedButton;
+    wxCHECK_MSG( IsValid(item), wxEmptyString,
+                 wxT("invalid radiobox index") );
+
+    return wxGetWindowText((*m_radioButtons)[item]);

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
-                 wxT("invalid radiobox index") );
+    if ( GetCount() > 0 )
+    {
+        ::SetFocus((*m_radioButtons)[m_selectedButton == wxNOT_FOUND
+                                        ? 0
+                                        : m_selectedButton]);
+    }
+}
+
+// Enable a specific button
+bool wxRadioBox::Enable(unsigned int item, bool enable)
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::Enable()") );
+
+    BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
+
+    return (ret == 0) != enable;
+}
+
+bool wxRadioBox::IsItemEnabled(unsigned int item) const
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::IsItemEnabled()") );
+
+    return ::IsWindowEnabled((*m_radioButtons)[item]) != 0;
+}
+
+// Show a specific button
+bool wxRadioBox::Show(unsigned int item, bool show)
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::Show()") );
+
+    BOOL ret = ::ShowWindow((*m_radioButtons)[item], show ? SW_SHOW : SW_HIDE);
+
+    bool changed = (ret != 0) != show;
+    if ( changed )
+    {
+        InvalidateBestSize();
+    }
+
+    return changed;
+}
+
+bool wxRadioBox::IsItemShown(unsigned int item) const
+{
+    wxCHECK_MSG( IsValid(item), false,
+                 wxT("invalid item in wxRadioBox::IsItemShown()") );

 
 

-    return wxGetWindowText(m_radioButtons[item]);
+    // 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;

 }
 
 }
 

+#if wxUSE_TOOLTIPS
+
+bool wxRadioBox::HasToolTips() const
+{
+    return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips();
+}
+
+void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
+{
+    // we have already checked for the item to be valid in wxRadioBoxBase
+    const HWND hwndRbtn = (*m_radioButtons)[item];
+    if ( tooltip != NULL )
+        tooltip->Add(hwndRbtn);
+    else // unset the tooltip
+        wxToolTip::Remove(hwndRbtn);
+}
+
+#endif // wxUSE_TOOLTIPS
+
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
+

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


@@ -443,12 +472,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!


@@ -479,24 +509,16 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 
     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;


@@ -506,7 +528,16 @@ 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.
 }
 
 // Restored old code.


@@ -525,13 +556,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         yy = currentY;
 
     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;
     int y_offset = yy;
     int x_offset = xx;

-#endif

 
     int cx1, cy1;
     wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
 
     int cx1, cy1;
     wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());


@@ -563,7 +589,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             height = heightOld;
     }
 
             height = heightOld;
     }
 

-    ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);
+    DoMoveWindow(xx, yy, width, height);

 
     // 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


@@ -572,21 +598,22 @@ 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;
 
     // Add extra space under the label, if it exists.
 
     x_offset += cx1;
     y_offset += cy1;
 
     // 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


@@ -596,17 +623,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 )
             {


@@ -637,13 +664,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 )


@@ -661,207 +686,56 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 }
 
     }
 }
 

-void wxRadioBox::GetSize(int *width, int *height) const
-{
-    RECT rect = { -1, -1, -1, -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()
+int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const

 {
 {

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

     {
     {

-        ::SetFocus((HWND)m_radioButtons[m_selectedButton == wxID_ANY
-                                            ? 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);
-}
+        RECT rect = wxGetWindowRect((*m_radioButtons)[i]);

 
 

-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
-    size_t count = GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( GetRadioButtons()[i] == hWnd )
-            return true;
+        if ( rect.left <= pt.x && pt.x < rect.right &&
+                rect.top  <= pt.y && pt.y < rect.bottom )
+        {
+            return i;
+        }

     }
 
     }
 

-    return false;
+    return wxNOT_FOUND;

 }
 
 }
 

-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)wxGetWindowProc(hwndBtn);
-
-    wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
-    wxSetWindowUserData(hwndBtn, this);
-}
+// ----------------------------------------------------------------------------
+// radio box drawing
+// ----------------------------------------------------------------------------

 
 

-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);
-}
+#ifndef __WXWINCE__

 
 

-bool wxRadioBox::SetFont(const wxFont& font)
+WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()

 {
 {

-    if ( !wxControl::SetFont(font) )
-    {
-        // nothing to do
-        return false;
-    }
+    RECT rc;
+    ::GetWindowRect(GetHwnd(), &rc);
+    HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);

 
 

-    // also set the font of our radio buttons
-    WXHFONT hfont = wxFont(font).GetResourceHandle();
-    for ( int n = 0; n < m_noItems; n++ )
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; ++i )

     {
     {

-        HWND hwndBtn = (HWND)m_radioButtons[n];
-        ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
+        // don't clip out hidden children
+        if ( !IsItemShown(i) )
+            continue;

 
 

-        // otherwise the buttons are not redrawn correctly
-        ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);
+        ::GetWindowRect((*m_radioButtons)[i], &rc);
+        AutoHRGN hrgnchild(::CreateRectRgnIndirect(&rc));
+        ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);

     }
 
     }
 

-    return true;
+    return (WXHRGN)hrgn;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// 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);
-}
+#endif // __WXWINCE__

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


@@ -880,32 +754,6 @@ 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 *)wxGetWindowUserData(hwnd);
-
-                    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:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
         case WM_KEYDOWN:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);


@@ -982,62 +830,51 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
             }
             break;
 
             }
             break;
 

-#ifdef __WIN32__
+#ifndef __WXWINCE__

         case WM_HELP:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
 
                 wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 
         case WM_HELP:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
 
                 wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
 

-                bool processed wxDUMMY_INITIALIZE(true);
+                bool processed = false;
+
+                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