Committing in .

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 540bb7deffc33561595ace19b5c6edc863e34880..7134de72b4d1ec71cb154b7cfdd6c214c40349e3 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -111,17 +111,11 @@ bool wxRadioButton::Create(
 
 wxSize wxRadioButton::DoGetBestSize() const
 {
 
 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;
 
     int                             nRadioWidth;
     int                             nRadioHeight;
 


@@ -131,7 +125,7 @@ wxSize wxRadioButton::DoGetBestSize() const
                       ,&nRadioWidth
                       ,&nRadioHeight
                      );
                       ,&nRadioWidth
                       ,&nRadioHeight
                      );

-        nRadioWidth += snRadioSize + GetCharWidth();
+        nRadioWidth += snRadioSize;

         if (nRadioHeight < snRadioSize)
             nRadioHeight = snRadioSize;
     }
         if (nRadioHeight < snRadioSize)
             nRadioHeight = snRadioSize;
     }


@@ -153,24 +147,21 @@ bool wxRadioButton::GetValue() const
     return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0));
 } // end of wxRadioButton::GetValue
 
     return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0));
 } // end of wxRadioButton::GetValue
 

-bool wxRadioButton::OS2Command(
-  WXUINT                            wParam
-, WXWORD                            wId
-)
+bool wxRadioButton::OS2Command( WXUINT wParam, WXWORD WXUNUSED(wId) )

 {
     if (wParam != BN_CLICKED)
 {
     if (wParam != BN_CLICKED)

-        return FALSE;
+        return false;

 
     if (m_bFocusJustSet)
     {
         //
         // See above: we want to ignore this event
         //
 
     if (m_bFocusJustSet)
     {
         //
         // See above: we want to ignore this event
         //

-        m_bFocusJustSet = FALSE;
+        m_bFocusJustSet = false;

     }
     else
     {
     }
     else
     {

-        bool                        bIsChecked = GetValue();
+        bool bIsChecked = GetValue();

 
         if (HasFlag(wxRB_SINGLE))
         {
 
         if (HasFlag(wxRB_SINGLE))
         {


@@ -182,14 +173,11 @@ bool wxRadioButton::OS2Command(
             if (!bIsChecked )
                 SetValue(TRUE);
         }
             if (!bIsChecked )
                 SetValue(TRUE);
         }

-        wxCommandEvent              rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED
-                                           ,m_windowId
-                                          );
-
+        wxCommandEvent rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );

         rEvent.SetEventObject(this);
         ProcessCommand(rEvent);
     }
         rEvent.SetEventObject(this);
         ProcessCommand(rEvent);
     }

-    return TRUE;
+    return true;

 } // end of wxRadioButton::OS2Command
 
 void wxRadioButton::SetFocus()
 } // end of wxRadioButton::OS2Command
 
 void wxRadioButton::SetFocus()


@@ -201,9 +189,9 @@ void wxRadioButton::SetFocus()
     // generates BN_CLICKED which leads to showing another dialog and so on
     // without end!
     //
     // 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
+    // to avoid this, we drop the pseudo BN_CLICKED events generated when the

     // button gains focus
     // button gains focus

-    m_bFocusJustSet = TRUE;
+    m_bFocusJustSet = true;

 
     wxControl::SetFocus();
 }
 
     wxControl::SetFocus();
 }


@@ -212,7 +200,8 @@ void wxRadioButton::SetLabel(
   const wxString&                   rsLabel
 )
 {
   const wxString&                   rsLabel
 )
 {

-    ::WinSetWindowText((HWND)GetHWND(), (const char *)rsLabel.c_str());
+    wxString                        sLabel = ::wxPMTextToLabel(rsLabel);
+    ::WinSetWindowText((HWND)GetHWND(), (const char *)sLabel.c_str());

 } // end of wxRadioButton::SetLabel
 
 void wxRadioButton::SetValue(
 } // end of wxRadioButton::SetLabel
 
 void wxRadioButton::SetValue(


@@ -223,53 +212,59 @@ void wxRadioButton::SetValue(
     if (bValue)
     {
         const wxWindowList&         rSiblings = GetParent()->GetChildren();
     if (bValue)
     {
         const wxWindowList&         rSiblings = GetParent()->GetChildren();

-        wxWindowList::Node*         pNodeThis = rSiblings.Find(this);
+        wxWindowList::compatibility_iterator nodeThis = rSiblings.Find(this);

 
 

-        wxCHECK_RET(pNodeThis, _T("radio button not a child of its parent?"));
+        wxCHECK_RET(nodeThis, _T("radio button not a child of its parent?"));

 
 

-        // 
-        // Turn off all radio buttons before this one

         //
         //

-        for ( wxWindowList::Node* pNodeBefore = pNodeThis->GetPrevious();
-              pNodeBefore;
-              pNodeBefore = pNodeBefore->GetPrevious() )
+        // If it's not the first item of the group ...
+        //
+        if ( !HasFlag(wxRB_GROUP) )

         {
         {

-            wxRadioButton*          pBtn = wxDynamicCast( pNodeBefore->GetData()
+            //
+            // ...turn off all radio buttons before this one
+            //
+            for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious();
+                  nodeBefore;
+                  nodeBefore = nodeBefore->GetPrevious() )
+            {
+                wxRadioButton*      pBtn = wxDynamicCast( nodeBefore->GetData()

                                                          ,wxRadioButton
                                                         );
                                                          ,wxRadioButton
                                                         );

-            if (!pBtn)
-            {
-                // 
-                // The radio buttons in a group must be consecutive, so there
-                // are no more of them
-                //
-                break;
-            }
-            pBtn->SetValue(FALSE);
-            if (pBtn->HasFlag(wxRB_GROUP))
-            {
-                // 
-                // Even if there are other radio buttons before this one,
-                // they're not in the same group with us
-                //
-                break;
+                if (!pBtn)
+                {
+                    //
+                    // The radio buttons in a group must be consecutive, so there
+                    // are no more of them
+                    //
+                    break;
+                }
+                pBtn->SetValue(FALSE);
+                if (pBtn->HasFlag(wxRB_GROUP))
+                {
+                    //
+                    // Even if there are other radio buttons before this one,
+                    // they're not in the same group with us
+                    //
+                    break;
+                }

             }
         }
 
             }
         }
 

-        // 
+        //

         // ... and all after this one
         //
         // ... and all after this one
         //

-        for (wxWindowList::Node* pNodeAfter = pNodeThis->GetNext();
-             pNodeAfter;
-             pNodeAfter = pNodeAfter->GetNext())
+        for (wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();
+             nodeAfter;
+             nodeAfter = nodeAfter->GetNext())

         {
         {

-            wxRadioButton*          pBtn = wxDynamicCast( pNodeAfter->GetData()
+            wxRadioButton*          pBtn = wxDynamicCast( nodeAfter->GetData()

                                                          ,wxRadioButton
                                                         );
 
             if (!pBtn || pBtn->HasFlag(wxRB_GROUP) )
             {
                                                          ,wxRadioButton
                                                         );
 
             if (!pBtn || pBtn->HasFlag(wxRB_GROUP) )
             {

-                // 
+                //

                 // No more buttons or the first button of the next group
                 //
                 break;
                 // No more buttons or the first button of the next group
                 //
                 break;