String changes for translations,

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 2120279d45cf938ee7b3cc522477e5c724429683..547dd8b7b4cc96d8ae92641d4e2776de9c9e86e2 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

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


@@ -21,42 +29,115 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #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/log.h"

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

+#if wxUSE_TOOLTIPS
+    #include <commctrl.h>
+
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+

 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 

-bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
+// VZ: the new behaviour is to create the radio buttons as children of the
+//     radiobox instead of creating them as children of the radiobox' parent.
+//
+//     This seems more logical, more consistent with what other frameworks do
+//     and allows tooltips to work with radioboxes, so there should be no
+//     reason to revert to the backward compatible behaviour - but I still
+//     leave this possibility just in case.
+#define RADIOBTN_PARENT_IS_RADIOBOX 1
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+// wnd proc for radio buttons
+#ifdef __WIN32__
+LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
+                                           UINT message,
+                                           WPARAM wParam,
+                                           LPARAM lParam);
+
+// ---------------------------------------------------------------------------
+// global vars
+// ---------------------------------------------------------------------------
+
+// the pointer to standard radio button wnd proc
+static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
+
+#endif // __WIN32__
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxRadioBox
+// ---------------------------------------------------------------------------
+
+int wxRadioBox::GetNumVer() const

 {
 {

-    if (param == BN_CLICKED)
+    if ( m_windowStyle & wxRA_SPECIFY_ROWS )

     {
     {

-#ifdef __WIN32__
-        int i;
-        for (i = 0; i < m_noItems; i++)
-            if (id == GetWindowLong((HWND) m_radioButtons[i], GWL_ID))
-                m_selectedButton = i;
-#else
-        int i;
-        for (i = 0; i < m_noItems; i++)
-            if (id == GetWindowWord((HWND) m_radioButtons[i], GWW_ID))
-                m_selectedButton = i;
-#endif
+        return m_majorDim;
+    }
+    else
+    {
+        return (m_noItems + m_majorDim - 1)/m_majorDim;
+    }
+}
+
+int wxRadioBox::GetNumHor() const
+{
+    if ( m_windowStyle & wxRA_SPECIFY_ROWS )
+    {
+        return (m_noItems + m_majorDim - 1)/m_majorDim;
+    }
+    else
+    {
+        return m_majorDim;
+    }
+}
+
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
+{
+    if ( cmd == BN_CLICKED )
+    {
+        int selectedButton = -1;
+
+        for ( int i = 0; i < m_noItems; i++ )
+        {
+            if ( id == wxGetWindowId(m_radioButtons[i]) )
+            {
+                selectedButton = i;
+
+                break;
+            }
+        }
+
+        wxASSERT_MSG( selectedButton != -1, wxT("click from alien button?") );
+
+        if ( selectedButton != m_selectedButton )
+        {
+            m_selectedButton = selectedButton;
+
+            SendNotificationEvent();
+        }
+        //else: don't generate events when the selection doesn't change

 
 

-        wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
-        event.SetInt( m_selectedButton );
-        event.SetEventObject( this );
-        ProcessCommand(event);

         return TRUE;
     }
         return TRUE;
     }

-    else return FALSE;
+    else
+        return FALSE;

 }
 
 #if WXWIN_COMPATIBILITY
 }
 
 #if WXWIN_COMPATIBILITY


@@ -76,240 +157,117 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
 #endif
 
 // Radio box item
 #endif
 
 // Radio box item

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

 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_radioButtons = NULL;
 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_radioButtons = NULL;

-    m_majorDim = 0 ;
-    m_radioWidth = NULL ;
-    m_radioHeight = NULL ;
+    m_majorDim = 0;
+    m_radioWidth = NULL;
+    m_radioHeight = NULL;

 }
 
 }
 

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

 {
 {

+    // initialize members

     m_selectedButton = -1;
     m_noItems = n;
 
     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_majorDim =  majorDim == 0 ? n : majorDim;

     m_noRowsOrCols = majorDim;
     m_noRowsOrCols = majorDim;

-    if (majorDim==0)
-        m_majorDim = n ;
-    else // Seemed to make sense to put this 'else' here...  (RD)
-        m_majorDim = majorDim ;
-
-    long msStyle = GROUP_FLAGS;

 
 

-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    /*
-       if ( want3D || wxStyleHasBorder(m_windowStyle) )
-       msStyle |= WS_BORDER;
-     */
-
-
-    HWND the_handle = (HWND) parent->GetHWND() ;
+    // common initialization
+    if ( !CreateControl(parent, id, pos, size, style, val, name) )
+        return FALSE;

 
 

-    m_hWnd = (WXHWND)::CreateWindowEx
-        (
-         (DWORD)exStyle,
-         GROUP_CLASS,
-         title,
-         msStyle,
-         0, 0, 0, 0,
-         the_handle,
-         (HMENU)m_windowId,
-         wxGetInstance(),
-         NULL
-        );
+    // create the static box
+    if ( !MSWCreateControl(wxT("BUTTON"), BS_GROUPBOX, pos, size, title, 0) )
+        return FALSE;

 
 

-#if CTL3D
-    if (want3D)
-    {
-        Ctl3dSubclassCtl((HWND)m_hWnd);
-        m_useCtl3D = TRUE;
-    }
+    // and now create the buttons
+#if RADIOBTN_PARENT_IS_RADIOBOX
+    HWND hwndParent = GetHwnd();
+#else
+    HWND hwndParent = GetHwndOf(parent);

 #endif
 
 #endif
 

-    SetFont(parent->GetFont());
-
-    SubclassWin((WXHWND)m_hWnd);
-

     // Some radio boxes test consecutive id.
     // Some radio boxes test consecutive id.

-    (void)NewControlId() ;
+    (void)NewControlId();

     m_radioButtons = new WXHWND[n];
     m_radioButtons = new WXHWND[n];

-    m_radioWidth = new int[n] ;
-    m_radioHeight = new int[n] ;
-    int i;
-    for (i = 0; i < n; i++)
-    {
-        m_radioWidth[i] = m_radioHeight[i] = -1 ;
-        long groupStyle = 0;
-        if (i == 0 && style==0)
-            groupStyle = WS_GROUP;
-        long newId = NewControlId();
-        long msStyle = groupStyle | RADIO_FLAGS;
+    m_radioWidth = new int[n];
+    m_radioHeight = new int[n];

 
 

-        m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, choices[i],
-                msStyle,0,0,0,0,
-                the_handle, (HMENU)newId, wxGetInstance(), NULL);
-#if CTL3D
-        if (want3D)
-        {
-            Ctl3dSubclassCtl((HWND) m_hWnd);
-            m_useCtl3D = TRUE;
-        }
-#endif
-        if (GetFont().Ok())
-        {
-            SendMessage((HWND)m_radioButtons[i],WM_SETFONT,
-                    (WPARAM)GetFont().GetResourceHandle(),0L);
-        }
-        m_subControls.Append((wxObject *)newId);
+    WXHFONT hfont = 0;
+    wxFont& font = GetFont();
+    if ( font.Ok() )
+    {
+        hfont = font.GetResourceHandle();

     }
 
     }
 

-    // Create a dummy radio control to end the group.
-    (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);
-
-    SetSelection(0);
-
-    SetSize(x, y, width, height);
-
-    return TRUE;
-}
-
-#if 0
-bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
-        const wxPoint& pos, const wxSize& size,
-        int n, const wxBitmap *choices[],
-        int majorDim, long style,
-        const wxValidator& val, const wxString& name)
-{
-    m_selectedButton = -1;
-    m_noRowsOrCols = 0;
-    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_noRowsOrCols = majorDim;
-    if (majorDim==0)
-        m_majorDim = n ;
-    m_majorDim = majorDim ;
-    HWND the_handle ;
-
-    long msStyle = GROUP_FLAGS;
-
-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    if ( want3D || wxStyleHasBorder(m_windowStyle) )
-        msStyle |= WS_BORDER;
+    for ( int i = 0; i < n; i++ )
+    {
+        m_radioWidth[i] =
+        m_radioHeight[i] = -1;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE;
+        if ( i == 0 && style == 0 )
+            styleBtn |= WS_GROUP;

 
 

-    m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
-            msStyle,
-            0,0,0,0,
-            (HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ;
+        long newId = NewControlId();

 
 

-    the_handle = (HWND) parent->GetHWND();
+        HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
+                                      choices[i],
+                                      styleBtn,
+                                      0, 0, 0, 0,   // will be set in SetSize()
+                                      hwndParent,
+                                      (HMENU)newId,
+                                      wxGetInstance(),
+                                      NULL);

 
 

-#if CTL3D
-    if (want3D)
-    {
-        Ctl3dSubclassCtl((HWND) m_hWnd);
-        m_useCtl3D = TRUE;
-    }
-#endif
+        if ( !hwndBtn )
+        {
+            wxLogLastError("CreateWindow(radio btn)");

 
 

-    SetFont(parent->GetFont());
+            return FALSE;
+        }

 
 

-    // Subclass again for purposes of dialog editing mode
-    SubclassWin((WXHWND)m_hWnd);
+        m_radioButtons[i] = (WXHWND)hwndBtn;

 
 

-    (void)NewControlId() ;
-    m_radioButtons = new WXHWND[n];
-    m_radioWidth = new int[n] ;
-    m_radioHeight = new int[n] ;
+        SubclassRadioButton((WXHWND)hwndBtn);

 
 

-    int i;
-    for (i = 0; i < n; i++)
-    {
-        long groupStyle = 0;
-        if (i == 0 && style==0)
-            groupStyle = WS_GROUP;
-        long newId = NewControlId();
-        m_radioWidth[i]  = ((wxBitmap *)choices[i])->GetWidth();
-        m_radioHeight[i] = ((wxBitmap *)choices[i])->GetHeight();
-        char tmp[32] ;
-        sprintf(tmp,"Toggle%d",i) ;
-        long msStyle = groupStyle | RADIO_FLAGS;
-        m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, tmp,
-                msStyle,0,0,0,0,
-                the_handle, (HMENU)newId, wxhInstance, NULL);
-#if CTL3D
-        if (want3D)
+        if ( hfont )

         {
         {

-            Ctl3dSubclassCtl((HWND) m_hWnd);
-            m_useCtl3D = TRUE;
+            ::SendMessage(hwndBtn, WM_SETFONT, (WPARAM)hfont, 0L);

         }
         }

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

     }
     }

+

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

-    (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);
+    (void)::CreateWindow(_T("BUTTON"),
+                         _T(""),
+                         WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
+                         0, 0, 0, 0, hwndParent,
+                         (HMENU)NewControlId(), wxGetInstance(), NULL);

 
     SetSelection(0);
 
 
     SetSelection(0);
 

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

 
     return TRUE;
 }
 
     return TRUE;
 }

-#endif

 
 

-wxRadioBox::~wxRadioBox(void)
+wxRadioBox::~wxRadioBox()

 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 


@@ -317,66 +275,68 @@ wxRadioBox::~wxRadioBox(void)
     {
         int i;
         for (i = 0; i < m_noItems; i++)
     {
         int i;
         for (i = 0; i < m_noItems; i++)

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

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

+

     if (m_radioWidth)
     if (m_radioWidth)

-        delete[] m_radioWidth ;
+        delete[] m_radioWidth;

     if (m_radioHeight)
     if (m_radioHeight)

-        delete[] m_radioHeight ;
-    if (m_hWnd)
-        ::DestroyWindow((HWND) m_hWnd) ;
-    m_hWnd = 0 ;
+        delete[] m_radioHeight;

 
 }
 
 wxString wxRadioBox::GetLabel(int item) const
 {
 
 }
 
 wxString wxRadioBox::GetLabel(int item) const
 {

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

 }
 
 void wxRadioBox::SetLabel(int item, const wxString& label)
 {
 }
 
 void wxRadioBox::SetLabel(int item, const wxString& label)
 {

-    m_radioWidth[item] = m_radioHeight[item] = -1 ;
-    SetWindowText((HWND)m_radioButtons[item], (const char *)label);
+    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());

 }
 
 void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
 {
     /*
 }
 
 void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
 {
     /*

-       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ;
-       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN ;
+       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN;
+       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN;

      */
      */

+    wxFAIL_MSG(wxT("not implemented"));

 }
 
 int wxRadioBox::FindString(const wxString& s) const
 {
 }
 
 int wxRadioBox::FindString(const wxString& s) const
 {

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

     {
     {

-        GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000);
-        if (s == wxBuffer)
+        if ( s == wxGetWindowText(m_radioButtons[i]) )

             return i;
     }
             return i;
     }

-    return -1;
+
+    return wxNOT_FOUND;

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

-    if ((N < 0) || (N >= m_noItems))
-        return;
+    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)

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

 
 

-    SendMessage((HWND) m_radioButtons[N], BM_SETCHECK, 1, 0L);

     m_selectedButton = N;
 }
 
 // Get single selection, for single choice list items
     m_selectedButton = N;
 }
 
 // Get single selection, for single choice list items

-int wxRadioBox::GetSelection(void) const
+int wxRadioBox::GetSelection() const

 {
     return m_selectedButton;
 }
 {
     return m_selectedButton;
 }


@@ -384,14 +344,17 @@ int wxRadioBox::GetSelection(void) const
 // Find string for position
 wxString wxRadioBox::GetString(int N) const
 {
 // Find string for position
 wxString wxRadioBox::GetString(int N) const
 {

-    GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000);
-    return wxString(wxBuffer);
+    return wxGetWindowText(m_radioButtons[N]);

 }
 
 }
 

-void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+// Restored old code.
+void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);
 {
     int currentX, currentY;
     GetPosition(&currentX, &currentY);

+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);
+

     int xx = x;
     int yy = y;
 
     int xx = x;
     int yy = y;
 


@@ -400,112 +363,104 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         yy = currentY;
 
     if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         yy = currentY;
 

-    AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-    wxString textRadioButton;
-
+#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 current_width, cyf;
 
     int cx1,cy1;
     int current_width, cyf;
 
     int cx1,cy1;

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

 
 

-    // number of radio boxes in both directions
-    int nbHor, nbVer;
-    if (m_windowStyle & wxRA_VERTICAL)
-    {
-        nbVer = m_majorDim ;
-        nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;
-    }
-    else
-    {
-        nbHor = m_majorDim ;
-        nbVer = (m_noItems+m_majorDim-1)/m_majorDim ;
-    }
+    // 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;

 
 

-    // 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 = width,
-        maxHeight = height;
-
-    // if we're given the width or height explicitly do not recalculate it, but
-    // use what we have
-    bool calcWidth = maxWidth == -1,
-         calcHeight = maxHeight == -1;
-
-    if ( calcWidth || calcHeight )
+    int i;
+    for (i = 0 ; i < m_noItems; i++)

     {
     {

-        // init vars to avoid compiler warnings, even if we don't use them
-        int eachWidth = 0,
-            eachHeight = 0;
-
-        for ( int i = 0 ; i < m_noItems; i++ )
+        int eachWidth;
+        int eachHeight;
+        if (m_radioWidth[i]<0)

         {
         {

-            if ( m_radioWidth[i] < 0 )
-            {
-                // It's a labelled toggle
-                textRadioButton = wxGetWindowText(m_radioButtons[i]);
-                GetTextExtent(textRadioButton, &current_width, &cyf,
-                        NULL,NULL, & this->GetFont());
-
-                if ( calcWidth )
-                    eachWidth = (int)(current_width + RADIO_SIZE);
-                if ( calcHeight )
-                    eachHeight = (int)((3*cyf)/2);
-            }
-            else
-            {
-                if ( calcWidth )
-                    eachWidth = m_radioWidth[i] ;
-                if ( calcHeight )
-                    eachHeight = m_radioHeight[i] ;
-            }
-
-            if ( calcWidth && maxWidth < eachWidth )
-                maxWidth = eachWidth;
-            if ( calcHeight && maxHeight < eachHeight )
-                maxHeight = eachHeight;
+            // It's a labelled toggle
+            GetTextExtent(wxGetWindowText(m_radioButtons[i]),
+                          &current_width, &cyf);
+            eachWidth = (int)(current_width + RADIO_SIZE);
+            eachHeight = (int)((3*cyf)/2);

         }
         }

-    }
-    else
-    {
-        maxHeight = height/nbVer;
-        maxWidth = width/nbHor;
+        else
+        {
+            eachWidth = m_radioWidth[i];
+            eachHeight = m_radioHeight[i];
+        }
+
+        if (maxWidth<eachWidth)
+            maxWidth = eachWidth;
+        if (maxHeight<eachHeight)
+            maxHeight = eachHeight;

     }
 
     if (m_hWnd)
     {
     }
 
     if (m_hWnd)
     {

-        int totWidth ;
+        int totWidth;

         int totHeight;
 
         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)
         // 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 ;
+            totHeight = (nbVer * maxHeight) + cy1/2;

         else
         else

-            totHeight = nbVer * (maxHeight+cy1/2) ;
-        totWidth  = nbHor * (maxWidth+cx1) ;
+            totHeight = nbVer * (maxHeight+cy1/2);
+        totWidth  = nbHor * (maxWidth+cx1);
+
+        int extraHeight = cy1;

 
 

-#if (!CTL3D)
+#if defined(CTL3D) && !CTL3D

         // Requires a bigger group box in plain Windows
         // Requires a bigger group box in plain Windows

-        MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ;
-#else
-        MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ;
+        extraHeight *= 3;
+        extraHeight /= 2;

 #endif
 #endif

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

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

-#if (!CTL3D)
+#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
     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 ( int i = 0 ; i < m_noItems; i++)
+    for ( i = 0 ; i < m_noItems; i++)

     {
         // Bidimensional radio adjustment
         if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
     {
         // Bidimensional radio adjustment
         if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?


@@ -513,24 +468,23 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
             if (m_windowStyle & wxRA_VERTICAL)
             {
                 y_offset = startY;
             if (m_windowStyle & wxRA_VERTICAL)
             {
                 y_offset = startY;

-                x_offset += maxWidth + cx1 ;
+                x_offset += maxWidth + cx1;

             }
             else
             {
             }
             else
             {

-                x_offset = startX ;
-                y_offset += maxHeight ;
+                x_offset = startX;
+                y_offset += maxHeight;

                 if (m_radioWidth[0]>0)
                 if (m_radioWidth[0]>0)

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

             }
         }
             }
         }

-        int eachWidth ;
-        int eachHeight ;
+        int eachWidth;
+        int eachHeight;

         if (m_radioWidth[i]<0)
         {
             // It's a labeled item
         if (m_radioWidth[i]<0)
         {
             // It's a labeled item

-            textRadioButton = wxGetWindowText(m_radioButtons[i]);
-            GetTextExtent(textRadioButton, &current_width, &cyf,
-                          NULL,NULL, & this->GetFont());
+            GetTextExtent(wxGetWindowText(m_radioButtons[i]),
+                          &current_width, &cyf);

 
             // How do we find out radio button bitmap size!!
             // By adjusting them carefully, manually :-)
 
             // How do we find out radio button bitmap size!!
             // By adjusting them carefully, manually :-)


@@ -539,16 +493,23 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
         }
         else
         {
         }
         else
         {

-            eachWidth = m_radioWidth[i] ;
-            eachHeight = m_radioHeight[i] ;
+            eachWidth = m_radioWidth[i];
+            eachHeight = m_radioHeight[i];

         }
 
         }
 

-        MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
-        if (m_windowStyle & wxRA_VERTICAL)
+        // 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, maxWidth, maxHeight,
+                     TRUE);
+
+        if (m_windowStyle & wxRA_SPECIFY_ROWS)

         {
             y_offset += maxHeight;
             if (m_radioWidth[0]>0)
         {
             y_offset += maxHeight;
             if (m_radioWidth[0]>0)

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

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


@@ -574,8 +535,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++)


@@ -584,8 +544,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;


@@ -593,9 +553,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());


@@ -607,23 +567,7 @@ void wxRadioBox::GetPosition(int *x, int *y) const
     *y = point.y;
 }
 
     *y = point.y;
 }
 

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

 {
     if (m_noItems > 0)
     {
 {
     if (m_noItems > 0)
     {


@@ -637,92 +581,60 @@ void wxRadioBox::SetFocus(void)
 
 bool wxRadioBox::Show(bool show)
 {
 
 bool wxRadioBox::Show(bool show)
 {

-    int cshow;
-    if (show)
-        cshow = SW_SHOW;
-    else
-        cshow = SW_HIDE;
-    if (m_hWnd)
-        ShowWindow((HWND) m_hWnd, cshow);
-    int i;
-    for (i = 0; i < m_noItems; i++)
-        ShowWindow((HWND) m_radioButtons[i], cshow);
+    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)
 {
     return TRUE;
 }
 
 // Enable a specific button
 void wxRadioBox::Enable(int item, bool enable)
 {

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

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

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

 {
 {

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

 
 

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

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

+
+    return TRUE;

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

-    if (item<0)
-        wxRadioBox::Show(show) ;
-    else if (item < m_noItems)
-    {
-        int cshow;
-        if (show)
-            cshow = SW_SHOW;
-        else
-            cshow = SW_HIDE;
-        ShowWindow((HWND) m_radioButtons[item], cshow);
-    }
-}
-
-WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if CTL3D
-    if ( m_useCtl3D )
-    {
-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
-    }
-#endif
+    wxCHECK_RET( item >= 0 && item < m_noItems,
+                 wxT("invalid item in wxRadioBox::Show()") );

 
 

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);
-    else
-        SetBkMode((HDC) pDC, OPAQUE);
-
-    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    //  backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    ::ShowWindow((HWND)m_radioButtons[item], show ? SW_SHOW : SW_HIDE);

 }
 
 // For single selection items only
 }
 
 // For single selection items only

-wxString wxRadioBox::GetStringSelection (void) const
+wxString wxRadioBox::GetStringSelection() const

 {
 {

-    int sel = GetSelection ();
+    wxString result;
+    int sel = GetSelection();

     if (sel > -1)
     if (sel > -1)

-        return this->GetString (sel);
-    else
-        return wxString("");
+        result = GetString(sel);
+
+    return result;

 }
 
 }
 

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

 {
     int sel = FindString (s);
     if (sel > -1)
 {
     int sel = FindString (s);
     if (sel > -1)


@@ -738,8 +650,11 @@ bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
 {
     int i;
     for (i = 0; i < Number(); i++)
 {
     int i;
     for (i = 0; i < Number(); i++)

+    {

         if (GetRadioButtons()[i] == hWnd)
             return TRUE;
         if (GetRadioButtons()[i] == hWnd)
             return TRUE;

+    }
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -749,21 +664,126 @@ void wxRadioBox::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
+{
+#ifdef __WIN32__
+    HWND hwndBtn = (HWND)hWndBtn;
+
+    if ( !s_wndprocRadioBtn )
+        s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
+
+    // No GWL_USERDATA in Win16, so omit this subclassing.
+    ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
+    ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);
+#endif // __WIN32__
+}
+
+void wxRadioBox::SendNotificationEvent()

 {
 {

-    if (nMsg == WM_NCHITTEST)
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+    event.SetInt( m_selectedButton );
+    event.SetString( GetString(m_selectedButton) );
+    event.SetEventObject( this );
+    ProcessCommand(event);
+}
+
+// ---------------------------------------------------------------------------
+// window proc for radio buttons
+// ---------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
+                                           UINT msg,
+                                           WPARAM wParam,
+                                           LPARAM lParam)
+{
+    bool processed = FALSE;
+    if ( msg == WM_KEYDOWN
+#if wxUSE_TOOLTIPS
+         || msg == WM_NOTIFY
+#endif // wxUSE_TOOLTIPS
+       )

     {
     {

-        int xPos = LOWORD(lParam);  // horizontal position of cursor
-        int yPos = HIWORD(lParam);  // vertical position of cursor
+        wxRadioBox *radiobox = (wxRadioBox *)::GetWindowLong(hwnd, GWL_USERDATA);
+
+        wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );

 
 

-        ScreenToClient(&xPos, &yPos);
+#if wxUSE_TOOLTIPS
+        if ( msg == WM_NOTIFY )
+        {
+            NMHDR* hdr = (NMHDR *)lParam;
+            if ( (int)hdr->code == TTN_NEEDTEXT )
+            {
+                wxToolTip *tt = radiobox->GetToolTip();
+                if ( tt )
+                {
+                    TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
+                    ttt->lpszText = (wxChar *)tt->GetTip().c_str();
+
+                    processed = TRUE;
+                }
+            }
+        }
+        else // msg == WM_KEYDOWN
+#endif // wxUSE_TOOLTIPS
+        {
+            processed = TRUE;
+
+            int sel = radiobox->GetSelection();

 
 

-        // 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;
+            switch ( wParam )
+            {
+                case VK_UP:
+                    sel--;
+                    break;
+
+                case VK_LEFT:
+                    sel -= radiobox->GetNumVer();
+                    break;
+
+                case VK_DOWN:
+                    sel++;
+                    break;
+
+                case VK_RIGHT:
+                    sel += radiobox->GetNumVer();
+                    break;
+
+                case VK_TAB:
+                    {
+                        wxNavigationKeyEvent event;
+                        event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
+                        event.SetWindowChange(FALSE);
+                        event.SetEventObject(radiobox);
+
+                        if ( radiobox->GetEventHandler()->ProcessEvent(event) )
+                            return 0;
+                    }
+                    // fall through
+
+                default:
+                    processed = FALSE;
+            }
+
+            if ( processed )
+            {
+                if ( sel >= 0 && sel < radiobox->Number() )
+                {
+                    radiobox->SetSelection(sel);
+
+                    // emulate the button click
+                    radiobox->SendNotificationEvent();
+                }
+            }
+        }

     }
 
     }
 

-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    if ( processed )
+        return 0;
+
+    return ::CallWindowProc(CASTWNDPROC s_wndprocRadioBtn, hwnd, msg, wParam, lParam);

 }
 
 }
 

+#endif // __WIN32__
+