Fix warnings for the OSX WebKit backend.

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index d4cc561bab90567044f0607d78fc7a8a307ec271..3b85eff91d08aebf4030950b7c9d606d8c8793b9 100644 (file)
--- 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:
 // Purpose:     wxRadioButton
 // Author:      David Webster
 // Modified by:


@@ -13,106 +13,99 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"

 #include "wx/radiobut.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"
 
 #endif
 
 #include "wx/os2/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+extern void  wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );

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

-    m_bFocusJustSet = FALSE;
+    m_bFocusJustSet = false;

 } // end of wxRadioButton::Init
 
 } // end of wxRadioButton::Init
 

-void wxRadioButton::Command (
-  wxCommandEvent&                   rEvent
-)
+void wxRadioButton::Command ( wxCommandEvent& rEvent )

 {
     SetValue ((rEvent.GetInt() != 0) );
     ProcessCommand (rEvent);
 } // end of wxRadioButton::Command
 
 {
     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
-#if wxUSE_VALIDATORS
-, const wxValidator&                rValidator
-#endif
-, 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
                         ,rPos
                         ,rSize
                         ,lStyle
 {
     if ( !CreateControl( pParent
                         ,vId
                         ,rPos
                         ,rSize
                         ,lStyle

-#if wxUSE_VALIDATORS

                         ,rValidator
                         ,rValidator

-#endif

                         ,rsName))
                         ,rsName))

-        return FALSE;
+        return false;
+
+    long                            lSstyle = WS_TABSTOP;

 
 

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

 
 

-    lSstyle |= BS_AUTORADIOBUTTON;
+    //
+    // wxRB_SINGLE is a temporary workaround for the following problem: if you
+    // have 2 radiobuttons in the same group but which are not consecutive in
+    // the dialog, Windows can enter an infinite loop! The simplest way to
+    // reproduce it is to create radio button, then a panel and then another
+    // radio button: then checking the last button hangs the app.
+    //
+    // Ideally, we'd detect (and avoid) such situation automatically but for
+    // now, as I don't know how to do it, just allow the user to create
+    // BS_RADIOBUTTON buttons for such situations.
+    //
+    lSstyle |= HasFlag(wxRB_SINGLE) ? BS_RADIOBUTTON : BS_AUTORADIOBUTTON;

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

-    if (!OS2CreateControl( _T("BUTTON")
+    if (!OS2CreateControl( wxT("BUTTON")

                           ,lSstyle
                           ,rPos
                           ,rSize
                           ,rsLabel
                           ,0
                          ))
                           ,lSstyle
                           ,rPos
                           ,rSize
                           ,rsLabel
                           ,0
                          ))

-        return FALSE;
+        return false;

 
 

+    wxAssociateWinWithHandle(m_hWnd, this);

     if (HasFlag(wxRB_GROUP))
     if (HasFlag(wxRB_GROUP))

-        SetValue(TRUE);
-
-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
-    SetSize( rPos.x
-            ,rPos.y
-            ,rSize.x
-            ,rSize.y
-           );
-    delete pTextFont;
-    return TRUE;
+        SetValue(true);
+
+    SetFont(*wxSMALL_FONT);
+    SetSize( rPos.x, rPos.y, rSize.x, rSize.y );
+    return true;

 } // end of wxRadioButton::Create
 
 wxSize wxRadioButton::DoGetBestSize() const
 {
 } // end of wxRadioButton::Create
 
 wxSize wxRadioButton::DoGetBestSize() const
 {

-    static int                      snRadioSize = 0;
-
-    if (!snRadioSize)
-    {
-        wxScreenDC                  vDC;
+    // 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;

 
 

-        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;
 


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

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

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


@@ -144,23 +137,37 @@ 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;
+
+    if (m_bFocusJustSet)
+    {
+        //
+        // See above: we want to ignore this event
+        //
+        m_bFocusJustSet = false;
+    }
+    else

     {
     {

-        wxCommandEvent              rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED
-                                           ,m_windowId
-                                          );
+        bool bIsChecked = GetValue();

 
 

+        if (HasFlag(wxRB_SINGLE))
+        {
+            //
+            // When we use a "manual" radio button, we have to check the button
+            // ourselves -- but it's reset to unchecked state by the user code
+            // (presumably when another button is pressed)
+            //
+            if (!bIsChecked )
+                SetValue(true);
+        }
+        wxCommandEvent rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId );

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

-        return TRUE;

     }
     }

-    else
-        return FALSE;
+    return true;

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


@@ -172,25 +179,85 @@ 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();
 }
 

-void wxRadioButton::SetLabel(
-  const wxString&                   rsLabel
-)
+void wxRadioButton::SetLabel( 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
 
 } // end of wxRadioButton::SetLabel
 

-void wxRadioButton::SetValue(
-  bool                              bValue
-)
+void wxRadioButton::SetValue( bool bValue )

 {
     ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
 {
     ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);

+    if (bValue)
+    {
+        const wxWindowList&         rSiblings = GetParent()->GetChildren();
+        wxWindowList::compatibility_iterator nodeThis = rSiblings.Find(this);
+
+        wxCHECK_RET(nodeThis, wxT("radio button not a child of its parent?"));
+
+        //
+        // If it's not the first item of the group ...
+        //
+        if ( !HasFlag(wxRB_GROUP) )
+        {
+            //
+            // ...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
+                                                        );
+                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
+        //
+        for (wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();
+             nodeAfter;
+             nodeAfter = nodeAfter->GetNext())
+        {
+            wxRadioButton*          pBtn = wxDynamicCast( nodeAfter->GetData()
+                                                         ,wxRadioButton
+                                                        );
+
+            if (!pBtn || pBtn->HasFlag(wxRB_GROUP) )
+            {
+                //
+                // No more buttons or the first button of the next group
+                //
+                break;
+            }
+            pBtn->SetValue(false);
+        }
+    }

 } // end of wxRadioButton::SetValue
 
 MRESULT wxRadioButton::OS2WindowProc(
 } // end of wxRadioButton::SetValue
 
 MRESULT wxRadioButton::OS2WindowProc(


@@ -201,14 +268,14 @@ MRESULT wxRadioButton::OS2WindowProc(
 {
     if (uMsg == WM_SETFOCUS)
     {
 {
     if (uMsg == WM_SETFOCUS)
     {

-        m_bFocusJustSet = TRUE;
+        m_bFocusJustSet = true;

 
         MRESULT                     mRc = wxControl::OS2WindowProc( uMsg
                                                                    ,wParam
                                                                    ,lParam
                                                                   );
 
 
         MRESULT                     mRc = wxControl::OS2WindowProc( uMsg
                                                                    ,wParam
                                                                    ,lParam
                                                                   );
 

-        m_bFocusJustSet = FALSE;
+        m_bFocusJustSet = false;

         return mRc;
     }
     return wxControl::OS2WindowProc( uMsg
         return mRc;
     }
     return wxControl::OS2WindowProc( uMsg