applied the workaround for XUnionRectWithRegion() returning ampty result if the rect...

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 8878abed12d2730a2a89bcdb4c22926c49991a53..0b8784621c5f4a493388bfe26cf85f2ca90e0656 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -21,12 +21,23 @@
 #include "wx/setup.h"
 #include "wx/radiobut.h"
 #include "wx/brush.h"
+#include "wx/dcscreen.h"
+#include "wx/settings.h"
 #endif
 
 #include "wx/os2/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
+extern void  wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );
+
+void wxRadioButton::Init()
+{
+    m_bFocusJustSet = FALSE;
+} // end of wxRadioButton::Init
+
 void wxRadioButton::Command (
   wxCommandEvent&                   rEvent
 )
@@ -48,93 +59,81 @@ bool wxRadioButton::Create(
 , const wxString&                   rsName
 )
 {
-    int                             nX          = rPos.x;
-    int                             nY          = rPos.y;
-    int                             nWidth      = rSize.x;
-    int                             nHeight     = rSize.y;
-    long                            lsStyle     = 0L;
-    long                            lGroupStyle = 0L;
-
-    SetName(rsName);
+    if ( !CreateControl( pParent
+                        ,vId
+                        ,rPos
+                        ,rSize
+                        ,lStyle
 #if wxUSE_VALIDATORS
-    SetValidator(rValidator);
+                        ,rValidator
 #endif
+                        ,rsName))
+        return FALSE;
 
-    if (pParent)
-        pParent->AddChild(this);
+    long                            lSstyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0;
 
-    SetBackgroundColour(pParent->GetBackgroundColour());
-    SetForegroundColour(pParent->GetForegroundColour());
+    lSstyle |= BS_AUTORADIOBUTTON;
 
-    if (vId == -1)
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = vId;
+    if (HasFlag(wxCLIP_SIBLINGS))
+        lSstyle |= WS_CLIPSIBLINGS;
+
+    if (!OS2CreateControl( _T("BUTTON")
+                          ,lSstyle
+                          ,rPos
+                          ,rSize
+                          ,rsLabel
+                          ,0
+                         ))
+        return FALSE;
 
+    wxAssociateWinWithHandle(m_hWnd, this);
+    if (HasFlag(wxRB_GROUP))
+        SetValue(TRUE);
 
-    m_windowStyle = lStyle ;
+    SetFont(*wxSMALL_FONT);
+    SetSize( rPos.x
+            ,rPos.y
+            ,rSize.x
+            ,rSize.y
+           );
+    return TRUE;
+} // end of wxRadioButton::Create
 
-    if (m_windowStyle & wxRB_GROUP)
-        lGroupStyle = WS_GROUP;
+wxSize wxRadioButton::DoGetBestSize() const
+{
+    static int                      snRadioSize = 0;
 
-    lsStyle = lGroupStyle | BS_AUTORADIOBUTTON | WS_VISIBLE ;
+    if (!snRadioSize)
+    {
+        wxScreenDC                  vDC;
 
-    if (m_windowStyle & wxCLIP_SIBLINGS )
-        lsStyle |= WS_CLIPSIBLINGS;
-    m_hWnd = (WXHWND)::WinCreateWindow ( GetHwndOf(pParent)
-                                        ,WC_BUTTON
-                                        ,rsLabel.c_str()
-                                        ,lsStyle
-                                        ,0, 0, 0, 0
-                                        ,GetWinHwnd(pParent)
-                                        ,HWND_TOP
-                                        ,(HMENU)m_windowId
-                                        ,NULL
-                                        ,NULL
-                                       );
-    wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create radiobutton"));
+        vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+        snRadioSize = vDC.GetCharHeight();
+    }
+
+    wxString                        sStr = GetLabel();
+    int                             nRadioWidth;
+    int                             nRadioHeight;
 
-    if (rsLabel != wxT(""))
+    if (!sStr.empty())
     {
-        int                         nLabelWidth;
-        int                         nLabelHeight;
-
-        GetTextExtent( rsLabel
-                      ,&nLabelWidth
-                      ,&nLabelHeight
-                      ,NULL
-                      ,NULL
-                      ,&this->GetFont()
+        GetTextExtent( sStr
+                      ,&nRadioWidth
+                      ,&nRadioHeight
                      );
-        if (nWidth < 0)
-            nWidth = (int)(nLabelWidth + RADIO_SIZE);
-        if (nHeight<0)
-        {
-            nHeight = (int)(nLabelHeight);
-            if (nHeight < RADIO_SIZE)
-                nHeight = RADIO_SIZE;
-        }
+        nRadioWidth += snRadioSize + GetCharWidth();
+        if (nRadioHeight < snRadioSize)
+            nRadioHeight = snRadioSize;
     }
     else
     {
-        if (nWidth < 0)
-            nWidth = RADIO_SIZE;
-        if (nHeight < 0)
-            nHeight = RADIO_SIZE;
+        nRadioWidth  = snRadioSize;
+        nRadioHeight = snRadioSize;
     }
-
-    //
-    // Subclass again for purposes of dialog editing mode
-    //
-    SubclassWin((WXHWND)m_hWnd);
-    SetFont(pParent->GetFont());
-    SetSize( nX
-            ,nY
-            ,nWidth
-            ,nHeight
-           );
-    return FALSE;
-} // end of wxRadioButton::Create
+    return wxSize( nRadioWidth
+                  ,nRadioHeight
+                 );
+} // end of wxRadioButton::DoGetBestSize
 
 //
 // Get single selection, for single choice list items
@@ -163,6 +162,22 @@ bool wxRadioButton::OS2Command(
         return FALSE;
 } // end of wxRadioButton::OS2Command
 
+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_bFocusJustSet = TRUE;
+
+    wxControl::SetFocus();
+}
+
 void wxRadioButton::SetLabel(
   const wxString&                   rsLabel
 )
@@ -177,3 +192,26 @@ void wxRadioButton::SetValue(
     ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
 } // end of wxRadioButton::SetValue
 
+MRESULT wxRadioButton::OS2WindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    if (uMsg == WM_SETFOCUS)
+    {
+        m_bFocusJustSet = TRUE;
+
+        MRESULT                     mRc = wxControl::OS2WindowProc( uMsg
+                                                                   ,wParam
+                                                                   ,lParam
+                                                                  );
+
+        m_bFocusJustSet = FALSE;
+        return mRc;
+    }
+    return wxControl::OS2WindowProc( uMsg
+                                    ,wParam
+                                    ,lParam
+                                   );
+} // end of wxRadioButton::OS2WindowProc