Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index f038fd099a7120cd59a975d0987a926a81349c72..bc0fa69092f0a28005eaf5b9ff6c7223aa73cd8f 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,24 +17,21 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
-#endif
-

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_RADIOBTN
 
 #endif
 
 #if wxUSE_RADIOBTN
 

-#ifndef WX_PRECOMP

 #include "wx/radiobut.h"
 #include "wx/radiobut.h"

-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/dcscreen.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/dcscreen.h"
+    #include "wx/toplevel.h"

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


@@ -47,11 +44,9 @@
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-

 void wxRadioButton::Init()
 {
 void wxRadioButton::Init()
 {

-    m_focusJustSet = FALSE;
+    m_isChecked = false;

 }
 
 bool wxRadioButton::Create(wxWindow *parent,
 }
 
 bool wxRadioButton::Create(wxWindow *parent,


@@ -64,26 +59,37 @@ bool wxRadioButton::Create(wxWindow *parent,
                            const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
                            const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
 

-    long msStyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0;
+    long msStyle = WS_TABSTOP;
+    if ( HasFlag(wxRB_GROUP) )
+        msStyle |= WS_GROUP;

 
 

-    msStyle |= BS_AUTORADIOBUTTON;
+    // we use BS_RADIOBUTTON and not BS_AUTORADIOBUTTON because the use of the
+    // latter can easily result in the application entering an infinite loop
+    // inside IsDialogMessage()
+    //
+    // we used to use BS_RADIOBUTTON only for wxRB_SINGLE buttons but there
+    // doesn't seem to be any harm to always use it and it prevents some hangs,
+    // see #9786
+    msStyle |= BS_RADIOBUTTON;

 
     if ( HasFlag(wxCLIP_SIBLINGS) )
         msStyle |= WS_CLIPSIBLINGS;
 
     if ( HasFlag(wxCLIP_SIBLINGS) )
         msStyle |= WS_CLIPSIBLINGS;

+    if ( HasFlag(wxALIGN_RIGHT) )
+        msStyle |= BS_LEFTTEXT | BS_RIGHT;

 
 

-    if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) )
-        return FALSE;
+    if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0) )
+        return false;

 
     // for compatibility with wxGTK, the first radio button in a group is
     // always checked (this makes sense anyhow as you need to ensure that at
 
     // for compatibility with wxGTK, the first radio button in a group is
     // always checked (this makes sense anyhow as you need to ensure that at

-    // least one button in the group is checked and this is the simlpest way to
+    // least one button in the group is checked and this is the simplest way to

     // do it)
     if ( HasFlag(wxRB_GROUP) )
     // do it)
     if ( HasFlag(wxRB_GROUP) )

-        SetValue(TRUE);
+        SetValue(true);

 
 

-    return TRUE;
+    return true;

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


@@ -92,16 +98,117 @@ bool wxRadioButton::Create(wxWindow *parent,
 
 void wxRadioButton::SetValue(bool value)
 {
 
 void wxRadioButton::SetValue(bool value)
 {

-    // BST_CHECKED is defined as 1, BST_UNCHECKED as 0, so we can just pass
-    // value as is (we don't sue BST_XXX here as they're not defined for Win16)
-    (void)::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM)value, 0L);
+    ::SendMessage(GetHwnd(), BM_SETCHECK,
+                  value ? BST_CHECKED : BST_UNCHECKED, 0);
+
+    m_isChecked = value;
+
+    if ( !value )
+        return;
+
+    // if we set the value of one radio button we also must clear all the other
+    // buttons in the same group: Windows doesn't do it automatically
+    //
+    // moreover, if another radiobutton in the group currently has the focus,
+    // we have to set it to this radiobutton, else the old radiobutton will be
+    // reselected automatically, if a parent window loses the focus and regains
+    // it.
+    wxWindow * const focus = FindFocus();
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    wxCHECK_RET( tlw, wxT("radio button outside of TLW?") );
+    wxWindow * const focusInTLW = tlw->GetLastFocus();
+
+    const wxWindowList& siblings = GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);
+    wxCHECK_RET( nodeThis, wxT("radio button not a child of its parent?") );
+
+    // this will be set to true in the code below if the focus is in our TLW
+    // and belongs to one of the other buttons in the same group
+    bool shouldSetFocus = false;
+
+    // this will be set to true if the focus is outside of our TLW currently
+    // but the remembered focus of this TLW is one of the other buttons in the
+    // same group
+    bool shouldSetTLWFocus = false;
+
+    // if it's not the first item of the group ...
+    if ( !HasFlag(wxRB_GROUP) )
+    {
+        // ... turn off all radio buttons before it
+        for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious();
+              nodeBefore;
+              nodeBefore = nodeBefore->GetPrevious() )
+        {
+            wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
+                                               wxRadioButton);
+            if ( !btn )
+            {
+                // don't stop on non radio buttons, we could have intermixed
+                // buttons and e.g. static labels
+                continue;
+            }
+
+            if ( btn->HasFlag(wxRB_SINGLE) )
+                {
+                    // A wxRB_SINGLE button isn't part of this group
+                    break;
+                }
+
+            if ( btn == focus )
+                shouldSetFocus = true;
+            else if ( btn == focusInTLW )
+                shouldSetTLWFocus = true;
+
+            btn->SetValue(false);
+
+            if ( btn->HasFlag(wxRB_GROUP) )
+            {
+                // even if there are other radio buttons before this one,
+                // they're not in the same group with us
+                break;
+            }
+        }
+    }
+
+    // ... and also turn off all buttons after this one
+    for ( wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();
+          nodeAfter;
+          nodeAfter = nodeAfter->GetNext() )
+    {
+        wxRadioButton *btn = wxDynamicCast(nodeAfter->GetData(),
+                                           wxRadioButton);
+
+        if ( !btn )
+            continue;
+
+        if ( btn->HasFlag(wxRB_GROUP | wxRB_SINGLE) )
+        {
+            // no more buttons or the first button of the next group
+            break;
+        }
+
+        if ( btn == focus )
+            shouldSetFocus = true;
+        else if ( btn == focusInTLW )
+            shouldSetTLWFocus = true;
+
+        btn->SetValue(false);
+    }
+
+    if ( shouldSetFocus )
+        SetFocus();
+    else if ( shouldSetTLWFocus )
+        tlw->SetLastFocus(this);

 }
 
 bool wxRadioButton::GetValue() const
 {
 }
 
 bool wxRadioButton::GetValue() const
 {

-    // NB: this will also return TRUE for BST_INDETERMINATE value if we ever
-    //     have 3-state radio buttons
-    return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0;
+    wxASSERT_MSG( m_isChecked ==
+                    (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0),
+                  wxT("wxRadioButton::m_isChecked is out of sync?") );
+
+    return m_isChecked;

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


@@ -110,46 +217,29 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent& event)
 {
 
 void wxRadioButton::Command (wxCommandEvent& event)
 {

-    SetValue(event.m_commandInt != 0);
+    SetValue(event.GetInt() != 0);

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

-void wxRadioButton::SetFocus()
-{
-    // when the radio button receives a WM_SETFOCUS message it generates a
-    // BN_CLICKED which is totally unexpected and leads to catastrophic results
-    // if you pop up a dialog from the radio button event handler as, when the
-    // dialog is dismissed, the focus is returned to the radio button which
-    // generates BN_CLICKED which leads to showing another dialog and so on
-    // without end!
-    //
-    // to aviod this, we drop the pseudo BN_CLICKED events generated when the
-    // button gains focus
-    m_focusJustSet = TRUE;
-
-    wxControl::SetFocus();
-}
-

 bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     if ( param != BN_CLICKED )
 bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     if ( param != BN_CLICKED )

-        return FALSE;
+        return false;

 
 

-    if ( m_focusJustSet )
-    {
-        // see above: we want to ignore this event
-        m_focusJustSet = FALSE;
-    }
-    else // a real clicked event
+    if ( !m_isChecked )

     {
     {

+        // we need to manually update the button state as we use BS_RADIOBUTTON
+        // and not BS_AUTORADIOBUTTON
+        SetValue(true);
+

         wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
         event.SetEventObject( this );
         wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
         event.SetEventObject( this );

-        event.SetInt( GetValue() );
+        event.SetInt(true); // always checked

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

-    return TRUE;
+    return true;

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


@@ -166,6 +256,13 @@ wxSize wxRadioButton::DoGetBestSize() const
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
         s_radioSize = dc.GetCharHeight();
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
         s_radioSize = dc.GetCharHeight();

+
+        // radio button bitmap size under CE is bigger than the font height,
+        // adding just one pixel seems to work fine for the default font but it
+        // would be nice to find some better way to find the correct height
+#ifdef __WXWINCE__
+        s_radioSize++;
+#endif // __WXWINCE__

     }
 
     wxString str = GetLabel();
     }
 
     wxString str = GetLabel();


@@ -173,7 +270,7 @@ wxSize wxRadioButton::DoGetBestSize() const
     int wRadio, hRadio;
     if ( !str.empty() )
     {
     int wRadio, hRadio;
     if ( !str.empty() )
     {

-        GetTextExtent(str, &wRadio, &hRadio);
+        GetTextExtent(GetLabelText(str), &wRadio, &hRadio);

         wRadio += s_radioSize + GetCharWidth();
 
         if ( hRadio < s_radioSize )
         wRadio += s_radioSize + GetCharWidth();
 
         if ( hRadio < s_radioSize )


@@ -185,22 +282,19 @@ wxSize wxRadioButton::DoGetBestSize() const
         hRadio = s_radioSize;
     }
 
         hRadio = s_radioSize;
     }
 

-    return wxSize(wRadio, hRadio);
+    wxSize best(wRadio, hRadio);
+    CacheBestSize(best);
+    return best;

 }
 
 }
 

-long wxRadioButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const

 {
 {

-    if (nMsg == WM_SETFOCUS)
-    {
-        m_focusJustSet = TRUE;
+    WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle);

 
 

-        long ret = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    if ( style & wxRB_GROUP )
+        styleMSW |= WS_GROUP;

 
 

-        m_focusJustSet = FALSE;
-
-        return ret;
-    }
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);    
+    return styleMSW;

 }
 
 #endif // wxUSE_RADIOBTN
 }
 
 #endif // wxUSE_RADIOBTN