correct GetBestSize() to return correct best size, i.e. the same size as AutoSize...

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

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 42bbdc43e558bbcaa6cced7eeb8ca2fa4f6b52fa..dddab3e26a2d23f1a86d2e19068d3cf498e4d940 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:


@@ -26,8 +26,9 @@
 
 #if wxUSE_RADIOBTN
 
 
 #if wxUSE_RADIOBTN
 

+#include "wx/radiobut.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/radiobut.h"

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


@@ -164,7 +165,7 @@ void wxRadioButton::SetValue(bool value)
     // buttons in the same group: Windows doesn't do it automatically
     if ( m_isChecked )
     {
     // buttons in the same group: Windows doesn't do it automatically
     if ( m_isChecked )
     {

-        // If another radiobutton in the group currently has the focus, we have to 
+        // If another radiobutton in the group currently has the focus, we have to

         // set it to this radiobutton, else the old readiobutton will be reselected
         // automatically, if a parent window loses the focus and regains it.
         bool shouldSetFocus = false;
         // set it to this radiobutton, else the old readiobutton will be reselected
         // automatically, if a parent window loses the focus and regains it.
         bool shouldSetFocus = false;


@@ -189,7 +190,7 @@ void wxRadioButton::SetValue(bool value)
                     // A wxRB_SINGLE button isn't part of this group
                     break;
                 }
                     // A wxRB_SINGLE button isn't part of this group
                     break;
                 }

-                
+

                 if (btn)
                 {
                     if (btn == pFocusWnd)
                 if (btn)
                 {
                     if (btn == pFocusWnd)


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

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

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


@@ -313,5 +314,14 @@ wxSize wxRadioButton::DoGetBestSize() const
     return best;
 }
 
     return best;
 }
 

-#endif // wxUSE_RADIOBTN
+WXDWORD wxRadioButton::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD styleMSW = wxControl::MSWGetStyle(style, exstyle);

 
 

+    if ( style & wxRB_GROUP )
+        styleMSW |= WS_GROUP;
+
+    return styleMSW;
+}
+
+#endif // wxUSE_RADIOBTN