compilation fix

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 65baab38b6731c39dd876d22546002a693ce1e41..0b8784621c5f4a493388bfe26cf85f2ca90e0656 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -1,68 +1,217 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobut.cpp
 // Purpose:     wxRadioButton

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/12/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#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"
+#endif
+
+#include "wx/os2/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 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
+)
+{
+    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
+)
+{
+    if ( !CreateControl( pParent
+                        ,vId
+                        ,rPos
+                        ,rSize
+                        ,lStyle
+#if wxUSE_VALIDATORS
+                        ,rValidator

 #endif
 #endif

+                        ,rsName))
+        return FALSE;
+
+    long                            lSstyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0;
+
+    lSstyle |= BS_AUTORADIOBUTTON;
+
+    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);

 
 

-bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
-                  const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+    SetFont(*wxSMALL_FONT);
+    SetSize( rPos.x
+            ,rPos.y
+            ,rSize.x
+            ,rSize.y
+           );
+    return TRUE;
+} // end of wxRadioButton::Create
+
+wxSize wxRadioButton::DoGetBestSize() const

 {
 {

-    SetName(name);
-    SetValidator(validator);
+    static int                      snRadioSize = 0;
+
+    if (!snRadioSize)
+    {
+        wxScreenDC                  vDC;

 
 

-    if (parent) parent->AddChild(this);
+        vDC.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+        snRadioSize = vDC.GetCharHeight();
+    }

 
 

-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
+    wxString                        sStr = GetLabel();
+    int                             nRadioWidth;
+    int                             nRadioHeight;
+
+    if (!sStr.empty())
+    {
+        GetTextExtent( sStr
+                      ,&nRadioWidth
+                      ,&nRadioHeight
+                     );
+        nRadioWidth += snRadioSize + GetCharWidth();
+        if (nRadioHeight < snRadioSize)
+            nRadioHeight = snRadioSize;
+    }

     else
     else

-           m_windowId = id;
+    {
+        nRadioWidth  = snRadioSize;
+        nRadioHeight = snRadioSize;
+    }
+    return wxSize( nRadioWidth
+                  ,nRadioHeight
+                 );
+} // end of wxRadioButton::DoGetBestSize

 
 

-    m_windowStyle = style ;
+//
+// Get single selection, for single choice list items
+//
+bool wxRadioButton::GetValue() const
+{
+    return((::WinSendMsg((HWND) GetHWND(), BM_QUERYCHECK, (MPARAM)0L, (MPARAM)0L) != 0));
+} // end of wxRadioButton::GetValue

 
 

-    // TODO create radiobutton
-    return FALSE;
-}
+bool wxRadioButton::OS2Command(
+  WXUINT                            wParam
+, WXWORD                            wId
+)
+{
+    if (wParam == BN_CLICKED)
+    {
+        wxCommandEvent              rEvent( wxEVT_COMMAND_RADIOBUTTON_SELECTED
+                                           ,m_windowId
+                                          );

 
 

-void wxRadioButton::SetLabel(const wxString& label)
+        rEvent.SetEventObject(this);
+        ProcessCommand(rEvent);
+        return TRUE;
+    }
+    else
+        return FALSE;
+} // end of wxRadioButton::OS2Command
+
+void wxRadioButton::SetFocus()

 {
 {

-    // TODO
+    // 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::SetValue(bool value)
+void wxRadioButton::SetLabel(
+  const wxString&                   rsLabel
+)

 {
 {

-    // TODO
-}
+    ::WinSetWindowText((HWND)GetHWND(), (const char *)rsLabel.c_str());
+} // end of wxRadioButton::SetLabel

 
 

-// Get single selection, for single choice list items
-bool wxRadioButton::GetValue() const
+void wxRadioButton::SetValue(
+  bool                              bValue
+)

 {
 {

-    // TODO
-    return FALSE;
-}
+    ::WinSendMsg((HWND)GetHWND(), BM_SETCHECK, (MPARAM)bValue, (MPARAM)0);
+} // end of wxRadioButton::SetValue

 
 

-void wxRadioButton::Command (wxCommandEvent & event)
+MRESULT wxRadioButton::OS2WindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)

 {
 {

-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
-}
+    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