applied numpad keys patch

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 0c1467a2373b9f1d65bd6e7e23da28eafb2e0877..026f8a283080f7c3eb9a09d23fed2e0392272dd2 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -28,19 +28,49 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_RADIOBOX
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

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

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

 #endif
 
 #include "wx/msw/private.h"
 
 #endif
 
 #include "wx/msw/private.h"
 

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

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


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

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

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


@@ -82,6 +128,7 @@ int wxRadioBox::GetNumVer() const
     }
 }
 
     }
 }
 

+// returns the number of columns

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


@@ -98,6 +145,9 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
 {
     if ( cmd == BN_CLICKED )
     {
 {
     if ( cmd == BN_CLICKED )
     {

+        if (id == GetId())
+            return TRUE;
+

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


@@ -110,7 +160,14 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
             }
         }
 
             }
         }
 

-        wxASSERT_MSG( selectedButton != -1, _T("click from alien button?") );
+        if ( selectedButton == -1 )
+        {
+            // just ignore it - due to a hack with WM_NCHITTEST handling in our
+            // wnd proc, we can receive dummy click messages when we click near
+            // the radiobox edge (this is ugly but Julian wouldn't let me get
+            // rid of this...)
+            return FALSE;
+        }

 
         if ( selectedButton != m_selectedButton )
         {
 
         if ( selectedButton != m_selectedButton )
         {


@@ -140,7 +197,7 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
     delete choices2;
 }
 
     delete choices2;
 }
 

-#endif
+#endif // WXWIN_COMPATIBILITY

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


@@ -154,116 +211,103 @@ wxRadioBox::wxRadioBox()
     m_radioHeight = NULL;
 }
 
     m_radioHeight = NULL;
 }
 

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

 {
 {

+    // initialize members

     m_selectedButton = -1;
     m_selectedButton = -1;

-    m_noItems = n;
-
-    SetName(name);
-    SetValidator(val);
-
-    parent->AddChild(this);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-
-    m_windowStyle = (long&)style;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    m_noItems = 0;

 
 

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

     m_noRowsOrCols = majorDim;
 
     m_noRowsOrCols = majorDim;
 

-    long msStyle = GROUP_FLAGS;
-
-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(0, &want3D);
-
-    HWND hwndParent = (HWND)parent->GetHWND();
-
-    m_hWnd = (WXHWND)::CreateWindowEx
-                        (
-                         (DWORD)exStyle,
-                         GROUP_CLASS,
-                         title,
-                         msStyle,
-                         0, 0, 0, 0,
-                         hwndParent,
-                         (HMENU)m_windowId,
-                         wxGetInstance(),
-                         NULL
-                        );
-
-#if wxUSE_CTL3D
-    if (want3D)
-    {
-        Ctl3dSubclassCtl((HWND)m_hWnd);
-        m_useCtl3D = TRUE;
-    }
-#endif // wxUSE_CTL3D
+    // common initialization
+    if ( !CreateControl(parent, id, pos, size, style, val, name) )
+        return FALSE;

 
 

-    SetFont(parent->GetFont());
+    // create the static box
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX | WS_GROUP,
+                           pos, size, title, 0) )
+        return FALSE;

 
 

-    SubclassWin(m_hWnd);
+    // and now create the buttons
+    m_noItems = n;
+#if RADIOBTN_PARENT_IS_RADIOBOX
+    HWND hwndParent = GetHwnd();
+#else
+    HWND hwndParent = GetHwndOf(parent);
+#endif

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

-    int i;
-    for (i = 0; i < n; i++)
+
+    WXHFONT hfont = 0;
+    wxFont& font = GetFont();
+    if ( font.Ok() )
+    {
+        hfont = font.GetResourceHandle();
+    }
+
+    for ( int i = 0; i < n; i++ )

     {
     {

-        m_radioWidth[i] = m_radioHeight[i] = -1;
-        long groupStyle = 0;
+        m_radioWidth[i] =
+        m_radioHeight[i] = -1;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;

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

-            groupStyle = WS_GROUP;
+            styleBtn |= WS_GROUP;
+

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

-        long msStyle = groupStyle | RADIO_FLAGS;

 
 

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

                                       hwndParent,
                                       hwndParent,

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

                                       NULL);
 
                                       NULL);
 

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

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

-        wxFont& font = GetFont();
-        if ( font.Ok() )
+        if ( hfont )

         {
         {

-            SendMessage(hwndBtn, WM_SETFONT,
-                        (WPARAM)font.GetResourceHandle(), 0L);
+            ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);

         }
 
         }
 

-        m_subControls.Append((wxObject *)(WXWORD)newId);
+        m_subControls.Add(newId);

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

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

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

-    SetSize(x, y, width, height);
+    SetSize(pos.x, pos.y, size.x, size.y);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -287,44 +331,17 @@ wxRadioBox::~wxRadioBox()
 
 }
 
 
 }
 

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

 {
 {

-    wxCHECK_MSG( item >= 0 && item < m_noItems, _T(""), _T("invalid radiobox index") );
-
-    return wxGetWindowText(m_radioButtons[item]);
-}
-
-void wxRadioBox::SetLabel(int item, const wxString& label)
-{
-    wxCHECK_RET( item >= 0 && item < m_noItems, _T("invalid radiobox index") );
+    wxCHECK_RET( item >= 0 && item < m_noItems, wxT("invalid radiobox index") );

 
     m_radioWidth[item] = m_radioHeight[item] = -1;
     SetWindowText((HWND)m_radioButtons[item], label.c_str());
 }
 
 
     m_radioWidth[item] = m_radioHeight[item] = -1;
     SetWindowText((HWND)m_radioButtons[item], label.c_str());
 }
 

-void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
-{
-    /*
-       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
-       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;
-     */
-    wxFAIL_MSG(_T("not implemented"));
-}
-
-int wxRadioBox::FindString(const wxString& s) const
-{
-    for (int i = 0; i < m_noItems; i++)
-    {
-        if ( s == wxGetWindowText(m_radioButtons[i]) )
-            return i;
-    }
-
-    return wxNOT_FOUND;
-}
-

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

-    wxCHECK_RET( (N >= 0) && (N < m_noItems), _T("invalid radiobox index") );
+    wxCHECK_RET( (N >= 0) && (N < m_noItems), wxT("invalid radiobox index") );

 
     // Following necessary for Win32s, because Win32s translate BM_SETCHECK
     if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
 
     // Following necessary for Win32s, because Win32s translate BM_SETCHECK
     if (m_selectedButton >= 0 && m_selectedButton < m_noItems)


@@ -343,9 +360,81 @@ int wxRadioBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

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

 {
 {

-    return wxGetWindowText(m_radioButtons[N]);
+    wxCHECK_MSG( item >= 0 && item < m_noItems, wxEmptyString,
+                 wxT("invalid radiobox index") );
+
+    return wxGetWindowText(m_radioButtons[item]);
+}
+
+// ----------------------------------------------------------------------------
+// size calculations
+// ----------------------------------------------------------------------------
+
+wxSize wxRadioBox::GetMaxButtonSize() const
+{
+    // calculate the max button size
+    int widthMax = 0,
+        heightMax = 0;
+    for ( int i = 0 ; i < m_noItems; i++ )
+    {
+        int width, height;
+        if ( m_radioWidth[i] < 0 )
+        {
+            GetTextExtent(wxGetWindowText(m_radioButtons[i]), &width, &height);
+
+            // adjust the size to take into account the radio box itself
+            // FIXME this is totally bogus!
+            width += RADIO_SIZE;
+            height *= 3;
+            height /= 2;
+        }
+        else
+        {
+            width = m_radioWidth[i];
+            height = m_radioHeight[i];
+        }
+
+        if ( widthMax < width )
+            widthMax = width;
+        if ( heightMax < height )
+            heightMax = height;
+    }
+
+    return wxSize(widthMax, heightMax);
+}
+
+wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
+{
+    // the radiobox should be big enough for its buttons
+    int cx1, cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, &GetFont());
+
+    int extraHeight = cy1;
+
+#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;
+
+    // and also wide enough for its label
+    int widthLabel;
+    GetTextExtent(GetTitle(), &widthLabel, NULL);
+    widthLabel += RADIO_SIZE; // FIXME this is bogus too
+    if ( widthLabel > width )
+        width = widthLabel;
+
+    return wxSize(width, height);
+}
+
+wxSize wxRadioBox::DoGetBestSize() const
+{
+    return GetTotalButtonSize(GetMaxButtonSize());

 }
 
 // Restored old code.
 }
 
 // Restored old code.


@@ -359,115 +448,102 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int xx = x;
     int yy = y;
 
     int xx = x;
     int yy = y;
 

-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         xx = currentX;
         xx = currentX;

-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+    if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

         yy = currentY;
 
         yy = currentY;
 

-    wxString buf;
-
+#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;

-    int current_width, cyf;
+#endif

 
 

-    int cx1,cy1;
+    int cx1, cy1;

     wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
 
     // Attempt to have a look coherent with other platforms: We compute the
     // biggest toggle dim, then we align all items according this value.
     wxGetCharSize(m_hWnd, &cx1, &cy1, & GetFont());
 
     // Attempt to have a look coherent with other platforms: We compute the
     // biggest toggle dim, then we align all items according this value.

-    int maxWidth =  -1;
-    int maxHeight = -1;
+    wxSize maxSize = GetMaxButtonSize();
+    int maxWidth = maxSize.x,
+        maxHeight = maxSize.y;

 
 

-    int i;
-    for (i = 0 ; i < m_noItems; i++)
+    wxSize totSize = GetTotalButtonSize(maxSize);
+    int totWidth = totSize.x,
+        totHeight = totSize.y;
+
+    // only change our width/height if asked for
+    if ( width == -1 )

     {
     {

-        int eachWidth;
-        int eachHeight;
-        if (m_radioWidth[i]<0)
-        {
-            // It's a labelled toggle
-            buf = wxGetWindowText(m_radioButtons[i]);
-            GetTextExtent(buf, &current_width, &cyf);
-            eachWidth = (int)(current_width + RADIO_SIZE);
-            eachHeight = (int)((3*cyf)/2);
-        }
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth;

         else
         else

-        {
-            eachWidth = m_radioWidth[i];
-            eachHeight = m_radioHeight[i];
-        }
-
-        if (maxWidth<eachWidth)
-            maxWidth = eachWidth;
-        if (maxHeight<eachHeight)
-            maxHeight = eachHeight;
+            width = widthOld;

     }
 
     }
 

-    if (m_hWnd)
+    if ( height == -1 )

     {
     {

-        int totWidth;
-        int totHeight;
-
-        int nbHor = GetNumHor(),
-        nbVer = GetNumVer();
-
-        // this formula works, but I don't know why.
-        // Please, be sure what you do if you modify it!!
-        if (m_radioWidth[0]<0)
-            totHeight = (nbVer * maxHeight) + cy1/2;
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight;

         else
         else

-            totHeight = nbVer * (maxHeight+cy1/2);
-        totWidth  = nbHor * (maxWidth+cx1);
-
-        int extraHeight = cy1;
-
-#if defined(CTL3D) && !CTL3D
-        // Requires a bigger group box in plain Windows
-        extraHeight *= 3;
-        extraHeight /= 2;
-#endif
+            height = heightOld;
+    }

 
 

-        // only change our width/height if asked for
-        if ( width == -1 )
-        {
-            if ( sizeFlags & wxSIZE_AUTO_WIDTH )
-                width = totWidth + cx1;
-            else
-                width = widthOld;
-        }
+    ::MoveWindow(GetHwnd(), xx, yy, width, height, TRUE);

 
 

-        if ( height == -1 )
-        {
-            if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-                height = totHeight + extraHeight;
-            else 
-                height = heightOld;
-        }
+    // Now position all the buttons: the current button will be put at
+    // wxPoint(x_offset, y_offset) and the new row/column will start at
+    // startX/startY. The size of all buttons will be the same wxSize(maxWidth,
+    // maxHeight) except for the buttons in the last column which should extend
+    // to the right border of radiobox and thus can be wider than this.

 
 

-        MoveWindow(GetHwnd(), x_offset, y_offset, width, height, TRUE);
+    // Also, remember that wxRA_SPECIFY_COLS means that we arrange buttons in
+    // left to right order and m_majorDim is the number of columns while
+    // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
+    // m_majorDim is the number of rows.

 
 

-        x_offset += cx1;
-        y_offset += cy1;
-    }
+    x_offset += cx1;
+    y_offset += cy1;

 
 #if defined(CTL3D) && (!CTL3D)
     y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
     // JACS 2/12/93. CTL3D draws group label quite high.
 #endif
 
 #if defined(CTL3D) && (!CTL3D)
     y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
     // JACS 2/12/93. CTL3D draws group label quite high.
 #endif

+

     int startX = x_offset;
     int startY = y_offset;
 
     int startX = x_offset;
     int startY = y_offset;
 

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

     {
     {

-        // Bidimensional radio adjustment
-        if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
+        // the last button in the row may be wider than the other ones as the
+        // radiobox may be wider than the sum of the button widths (as it
+        // happens, for example, when the radiobox label is very long)
+        bool isLastInTheRow;
+        if ( m_windowStyle & wxRA_SPECIFY_COLS )

         {
         {

-            if (m_windowStyle & wxRA_VERTICAL)
+            // item is the last in its row if it is a multiple of the number of
+            // columns or if it is just the last item
+            int n = i + 1;
+            isLastInTheRow = ((n % m_majorDim) == 0) || (n == m_noItems);
+        }
+        else // wxRA_SPECIFY_ROWS
+        {
+            // item is the last in the row if it is in the last columns
+            isLastInTheRow = i >= (m_noItems/m_majorDim)*m_majorDim;
+        }
+
+        // is this the start of new row/column?
+        if ( i && (i % m_majorDim == 0) )
+        {
+            if ( m_windowStyle & wxRA_SPECIFY_ROWS )

             {
             {

+                // start of new column

                 y_offset = startY;
                 x_offset += maxWidth + cx1;
             }
                 y_offset = startY;
                 x_offset += maxWidth + cx1;
             }

-            else
+            else // start of new row

             {
                 x_offset = startX;
                 y_offset += maxHeight;
             {
                 x_offset = startX;
                 y_offset += maxHeight;


@@ -475,37 +551,42 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                     y_offset += cy1/2;
             }
         }
                     y_offset += cy1/2;
             }
         }

-        int eachWidth;
-        int eachHeight;
-        if (m_radioWidth[i]<0)
+
+        int widthBtn;
+        if ( isLastInTheRow )

         {
         {

-            // It's a labeled item
-            buf = wxGetWindowText(m_radioButtons[i]);
-            GetTextExtent(buf, &current_width, &cyf);
-
-            // How do we find out radio button bitmap size!!
-            // By adjusting them carefully, manually :-)
-            eachWidth = (int)(current_width + RADIO_SIZE);
-            eachHeight = (int)((3*cyf)/2);
+            // make the button go to the end of radio box
+            widthBtn = startX + width - x_offset - 2*cx1;
+            if ( widthBtn < maxWidth )
+                widthBtn = maxWidth;

         }
         else
         {
         }
         else
         {

-            eachWidth = m_radioWidth[i];
-            eachHeight = m_radioHeight[i];
+            // normal button, always of the same size
+            widthBtn = maxWidth;

         }
 
         }
 

-        MoveWindow((HWND)m_radioButtons[i], x_offset, y_offset,
-                   eachWidth, eachHeight,
-                   TRUE);
+        // 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);

 
 

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

         {
         {

+            // below this one

             y_offset += maxHeight;
             if (m_radioWidth[0]>0)
                 y_offset += cy1/2;
         }
         else
             y_offset += maxHeight;
             if (m_radioWidth[0]>0)
                 y_offset += cy1/2;
         }
         else

-            x_offset += maxWidth + cx1;
+        {
+            // to the right of this one
+            x_offset += widthBtn + cx1;
+        }

     }
 }
 
     }
 }
 


@@ -528,8 +609,7 @@ void wxRadioBox::GetSize(int *width, int *height) const
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
     wxWindow *parent = GetParent();
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
     wxWindow *parent = GetParent();

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

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


@@ -538,8 +618,8 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);
 
     if (m_hWnd)
         wxFindMaxSize(m_hWnd, &rect);
 

-    // Since we now have the absolute screen coords,
-    // if there's a parent we must subtract its top left corner
+    // Since we now have the absolute screen coords, if there's a parent we
+    // must subtract its top left corner

     POINT point;
     point.x = rect.left;
     point.y = rect.top;
     POINT point;
     point.x = rect.left;
     point.y = rect.top;


@@ -547,9 +627,9 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     {
         ::ScreenToClient((HWND) parent->GetHWND(), &point);
     }
     {
         ::ScreenToClient((HWND) parent->GetHWND(), &point);
     }

-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
+
+    // We may be faking the client origin. So a window that's really at (0, 30)
+    // may appear (to wxWin apps) to be at (0, 0).

     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());


@@ -591,7 +671,7 @@ bool wxRadioBox::Show(bool show)
 void wxRadioBox::Enable(int item, bool enable)
 {
     wxCHECK_RET( item >= 0 && item < m_noItems,
 void wxRadioBox::Enable(int item, bool enable)
 {
     wxCHECK_RET( item >= 0 && item < m_noItems,

-                 _T("invalid item in wxRadioBox::Enable()") );
+                 wxT("invalid item in wxRadioBox::Enable()") );

 
     ::EnableWindow((HWND) m_radioButtons[item], enable);
 }
 
     ::EnableWindow((HWND) m_radioButtons[item], enable);
 }


@@ -612,83 +692,102 @@ bool wxRadioBox::Enable(bool enable)
 void wxRadioBox::Show(int item, bool show)
 {
     wxCHECK_RET( item >= 0 && item < m_noItems,
 void wxRadioBox::Show(int item, bool show)
 {
     wxCHECK_RET( item >= 0 && item < m_noItems,

-                 _T("invalid item in wxRadioBox::Show()") );
+                 wxT("invalid item in wxRadioBox::Show()") );

 
     ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);
 }
 
 
     ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);
 }
 

-WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxRadioBox::ContainsHWND(WXHWND hWnd) const

 {
 {

-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
+    size_t count = GetCount();
+    for ( size_t i = 0; i < count; i++ )

     {
     {

-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
+        if ( GetRadioButtons()[i] == hWnd )
+            return TRUE;

     }
     }

-#endif

 
 

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);
-    else
-        SetBkMode((HDC) pDC, OPAQUE);
+    return FALSE;
+}

 
 

-    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+void wxRadioBox::Command(wxCommandEvent & event)
+{
+    SetSelection (event.m_commandInt);
+    ProcessCommand (event);
+}

 
 

-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+// 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)
+{
+    // No GWL_USERDATA in Win16, so omit this subclassing.
+#ifdef __WIN32__
+    HWND hwndBtn = (HWND)hWndBtn;

 
 

-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    if ( !s_wndprocRadioBtn )
+        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+
+    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
+    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
+#endif // __WIN32__

 }
 
 }
 

-// For single selection items only
-wxString wxRadioBox::GetStringSelection() const
+void wxRadioBox::SendNotificationEvent()

 {
 {

-    wxString result;
-    int sel = GetSelection();
-    if (sel > -1)
-        result = GetString(sel);
-
-    return result;
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+    event.SetInt( m_selectedButton );
+    event.SetString( GetString(m_selectedButton) );
+    event.SetEventObject( this );
+    ProcessCommand(event);

 }
 
 }
 

-bool wxRadioBox::SetStringSelection(const wxString& s)
+bool wxRadioBox::SetFont(const wxFont& font)

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
+    if ( !wxControl::SetFont(font) )

     {
     {

-        SetSelection (sel);
-        return TRUE;
-    }
-    else
+        // nothing to do

         return FALSE;
         return FALSE;

-}
+    }

 
 

-bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
-{
-    int i;
-    for (i = 0; i < Number(); i++)
+    // also set the font of our radio buttons
+    WXHFONT hfont = wxFont(font).GetResourceHandle();
+    for ( int n = 0; n < m_noItems; n++ )

     {
     {

-        if (GetRadioButtons()[i] == hWnd)
-            return TRUE;
+        HWND hwndBtn = (HWND)m_radioButtons[n];
+        ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);
+
+        // otherwise the buttons are not redrawn correctly
+        ::InvalidateRect(hwndBtn, NULL, FALSE /* don't erase bg */);

     }
 
     }
 

-    return FALSE;
+    return TRUE;

 }
 
 }
 

-void wxRadioBox::Command (wxCommandEvent & event)
-{
-    SetSelection (event.m_commandInt);
-    ProcessCommand (event);
-}
+// ----------------------------------------------------------------------------
+// our window proc
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-    long rc = 0;
-    bool processed = FALSE;
-
-    switch ( msg )
+    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
+
+        // 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
         case WM_NCHITTEST:
             {
                 int xPos = LOWORD(lParam);  // horizontal position of cursor


@@ -698,43 +797,55 @@ long wxRadioBox::MSWWindowProc(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 
                 // Make sure you can drag by the top of the groupbox, but let
                 // other (enclosed) controls get mouse events also
 
                 // Make sure you can drag by the top of the groupbox, but let
                 // other (enclosed) controls get mouse events also

-                if ( yPos < 10 )
-                {
-                    rc = HTCLIENT;
-                    processed = TRUE;
-                }
+                if (yPos < 10)
+                    return (long)HTCLIENT;

             }
             break;
     }
 
             }
             break;
     }
 

-    if ( !processed )
-        rc = wxControl::MSWWindowProc(msg, wParam, lParam);
-
-    return rc;
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }
 

-void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
+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
+    )

 {
 {

-#ifdef __WIN32__
-    HWND hwndBtn = (HWND)hWndBtn;
+#if wxUSE_CTL3D
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
+#endif // wxUSE_CTL3D

 
 

-    if ( !s_wndprocRadioBtn )
-        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+    HDC hdc = (HDC)pDC;
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode(hdc, TRANSPARENT);
+    else
+        SetBkMode(hdc, OPAQUE);

 
 

-    // No GWL_USERDATA in Win16, so omit this subclassing.
-    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
-    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
-#endif // __WIN32__
-}
+    wxColour colBack = GetBackgroundColour();

 
 

-void wxRadioBox::SendNotificationEvent()
-{
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
-    event.SetInt( m_selectedButton );
-    event.SetEventObject( this );
-    ProcessCommand(event);
+    if (!IsEnabled())
+        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+
+    ::SetBkColor(hdc, wxColourToRGB(colBack));
+    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+
+    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+    return (WXHBRUSH)brush->GetResourceHandle();

 }
 
 }
 

+

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


@@ -742,73 +853,153 @@ void wxRadioBox::SendNotificationEvent()
 #ifdef __WIN32__
 
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 #ifdef __WIN32__
 
 LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,

-                                           UINT msg,
+                                           UINT message,

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

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

     {
     {

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-            case VK_RIGHT:
-                sel += radiobox->GetNumVer();
-                break;
+        case WM_KEYDOWN:
+            {
+                wxRadioBox *radiobox = (wxRadioBox *)
+                    ::GetWindowLong(hwnd, GWL_USERDATA);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                bool processed = TRUE;

 
 

-            case VK_TAB:
+                wxDirection dir;
+                switch ( wParam )

                 {
                 {

-                    wxNavigationKeyEvent event;
-                    event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
-                    event.SetWindowChange(FALSE);
-                    event.SetEventObject(radiobox);
+                    case VK_UP:
+                        dir = wxUP;
+                        break;

 
 

-                    if ( radiobox->GetEventHandler()->ProcessEvent(event) )
-                        return 0;
+                    case VK_LEFT:
+                        dir = wxLEFT;
+                        break;
+
+                    case VK_DOWN:
+                        dir = wxDOWN;
+                        break;
+
+                    case VK_RIGHT:
+                        dir = wxRIGHT;
+                        break;
+
+                    default:
+                        processed = FALSE;
+
+                        // just to suppress the compiler warning
+                        dir = wxALL;

                 }
                 }

-                // fall through

 
 

-            default:
-                processed = FALSE;        
-        }
+                if ( processed )
+                {
+                    int selOld = radiobox->GetSelection();
+                    int selNew = radiobox->GetNextItem
+                                 (
+                                  selOld,
+                                  dir,
+                                  radiobox->GetWindowStyle()
+                                 );

 
 

-        if ( processed )
-        {
-            if ( sel >= 0 && sel < radiobox->Number() )
+                    if ( selNew != selOld )
+                    {
+                        radiobox->SetSelection(selNew);
+
+                        // emulate the button click
+                        radiobox->SendNotificationEvent();
+
+                        return 0;
+                    }
+                }
+            }
+            break;
+
+#ifdef __WIN32__
+        case WM_HELP:

             {
             {

-                radiobox->SetSelection(sel);
+                wxRadioBox *radiobox = (wxRadioBox *)
+                        ::GetWindowLong(hwnd, GWL_USERDATA);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
+                bool processed = TRUE;
+
+                HELPINFO* info = (HELPINFO*) lParam;
+                // Don't yet process menu help events, just windows
+                if (info->iContextType == HELPINFO_WINDOW)
+                {
+                    wxWindow* subjectOfHelp = radiobox;
+                    bool eventProcessed = FALSE;
+                    while (subjectOfHelp && !eventProcessed)
+                    {
+                        wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), wxPoint(info->MousePos.x, info->MousePos.y) ) ; // info->iCtrlId);
+                        helpEvent.SetEventObject(radiobox);
+                        eventProcessed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+
+                        // Go up the window hierarchy until the event is handled (or not)
+                        subjectOfHelp = subjectOfHelp->GetParent();
+                    }
+                    processed = eventProcessed;
+                }
+                else if (info->iContextType == HELPINFO_MENUITEM)
+                {
+                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
+                    helpEvent.SetEventObject(radiobox);
+                    processed = radiobox->GetEventHandler()->ProcessEvent(helpEvent);
+                }
+                else processed = FALSE;
+
+                if (processed)
+                    return 0;

 
 

-                // emulate the button click
-                radiobox->SendNotificationEvent();
+                break;

             }
             }

-        }
+#endif // __WIN32__

     }
 
     }
 

-    if ( !processed )
-        return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
-    else
-        return 0;
+    return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, message, wParam, lParam);

 }
 
 #endif // __WIN32__
 
 }
 
 #endif // __WIN32__
 

+#endif // wxUSE_RADIOBOX