X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6670f56440ae9209b3e2e51e06acf3bc5aaf1905..d989875a52208e35afbcbd04de7758089e06b985:/src/os2/radiobut.cpp

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 61fd55f4b0..81d6d46344 100644
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobut.cpp
+// Name:        src/os2/radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      David Webster
 // Modified by:
@@ -13,16 +13,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
 #include "wx/radiobut.h"
-#include "wx/brush.h"
-#include "wx/dcscreen.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/brush.h"
+    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -35,27 +35,23 @@ extern void  wxAssociateWinWithHandle( HWND         hWnd
 
 void wxRadioButton::Init()
 {
-    m_bFocusJustSet = FALSE;
+    m_bFocusJustSet = false;
 } // end of wxRadioButton::Init
 
-void wxRadioButton::Command (
-  wxCommandEvent&                   rEvent
-)
+void wxRadioButton::Command ( wxCommandEvent& rEvent )
 {
     SetValue ((rEvent.GetInt() != 0) );
     ProcessCommand (rEvent);
 } // end of wxRadioButton::Command
 
-bool wxRadioButton::Create(
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxString&                   rsLabel
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, long                              lStyle
-, const wxValidator&                rValidator
-, const wxString&                   rsName
-)
+bool wxRadioButton::Create( wxWindow* pParent,
+                            wxWindowID vId,
+                            const wxString& rsLabel,
+                            const wxPoint& rPos,
+                            const wxSize& rSize,
+                            long lStyle,
+                            const wxValidator& rValidator,
+                            const wxString& rsName )
 {
     if ( !CreateControl( pParent
                         ,vId
@@ -64,7 +60,7 @@ bool wxRadioButton::Create(
                         ,lStyle
                         ,rValidator
                         ,rsName))
-        return FALSE;
+        return false;
 
     long                            lSstyle = WS_TABSTOP;
 
@@ -94,34 +90,24 @@ bool wxRadioButton::Create(
                           ,rsLabel
                           ,0
                          ))
-        return FALSE;
+        return false;
 
     wxAssociateWinWithHandle(m_hWnd, this);
     if (HasFlag(wxRB_GROUP))
-        SetValue(TRUE);
+        SetValue(true);
 
     SetFont(*wxSMALL_FONT);
-    SetSize( rPos.x
-            ,rPos.y
-            ,rSize.x
-            ,rSize.y
-           );
-    return TRUE;
+    SetSize( rPos.x, rPos.y, rSize.x, rSize.y );
+    return true;
 } // end of wxRadioButton::Create
 
 wxSize wxRadioButton::DoGetBestSize() const
 {
-    static int                      snRadioSize = 0;
+    // We should probably compute snRadioSize but it seems to be a constant
+    // independent of its label's font size and not made available by OS/2.
+    static int                      snRadioSize = RADIO_SIZE;
 
-    if (!snRadioSize)
-    {
-        wxScreenDC                  vDC;
-
-        vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-        snRadioSize = vDC.GetCharHeight();
-    }
-
-    wxString                        sStr = GetLabel();
+    wxString                        sStr = wxGetWindowText(GetHwnd());
     int                             nRadioWidth;
     int                             nRadioHeight;
 
@@ -131,7 +117,7 @@ wxSize wxRadioButton::DoGetBestSize() const
                       ,&nRadioWidth
                       ,&nRadioHeight
                      );
-        nRadioWidth += snRadioSize + GetCharWidth();
+        nRadioWidth += snRadioSize;
         if (nRadioHeight < snRadioSize)
             nRadioHeight = snRadioSize;
     }
@@ -177,7 +163,7 @@ bool wxRadioButton::OS2Command( WXUINT wParam, WXWORD WXUNUSED(wId) )
             // (presumably when another button is pressed)
             //
             if (!bIsChecked )
-                SetValue(TRUE);
+                SetValue(true);
         }
         wxCommandEvent rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );
         rEvent.SetEventObject(this);
@@ -202,17 +188,13 @@ void wxRadioButton::SetFocus()
     wxControl::SetFocus();
 }
 
-void wxRadioButton::SetLabel(
-  const wxString&                   rsLabel
-)
+void wxRadioButton::SetLabel( const wxString& rsLabel )
 {
     wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
     ::WinSetWindowText((HWND)GetHWND(), (const char *)sLabel.c_str());
 } // end of wxRadioButton::SetLabel
 
-void wxRadioButton::SetValue(
-  bool                              bValue
-)
+void wxRadioButton::SetValue( bool bValue )
 {
     ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
     if (bValue)
@@ -245,7 +227,7 @@ void wxRadioButton::SetValue(
                     //
                     break;
                 }
-                pBtn->SetValue(FALSE);
+                pBtn->SetValue(false);
                 if (pBtn->HasFlag(wxRB_GROUP))
                 {
                     //
@@ -275,7 +257,7 @@ void wxRadioButton::SetValue(
                 //
                 break;
             }
-            pBtn->SetValue(FALSE);
+            pBtn->SetValue(false);
         }
     }
 } // end of wxRadioButton::SetValue
@@ -288,14 +270,14 @@ MRESULT wxRadioButton::OS2WindowProc(
 {
     if (uMsg == WM_SETFOCUS)
     {
-        m_bFocusJustSet = TRUE;
+        m_bFocusJustSet = true;
 
         MRESULT                     mRc = wxControl::OS2WindowProc( uMsg
                                                                    ,wParam
                                                                    ,lParam
                                                                   );
 
-        m_bFocusJustSet = FALSE;
+        m_bFocusJustSet = false;
         return mRc;
     }
     return wxControl::OS2WindowProc( uMsg