/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name: src/os2/radiobut.cpp
// Purpose: wxRadioButton
// Author: David Webster
// Modified by:
#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"
+ #include <stdio.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;
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
,rPos
,rSize
,lStyle
-#if wxUSE_VALIDATORS
,rValidator
-#endif
,rsName))
return FALSE;
- long lSstyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0;
+ long lSstyle = WS_TABSTOP;
- lSstyle |= BS_AUTORADIOBUTTON;
+ if (HasFlag(wxRB_GROUP))
+ lSstyle |= WS_GROUP;
+
+ //
+ // 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;
))
return FALSE;
+ wxAssociateWinWithHandle(m_hWnd, this);
if (HasFlag(wxRB_GROUP))
SetValue(TRUE);
- wxFont* pTextFont = new wxFont( 10
- ,wxMODERN
- ,wxNORMAL
- ,wxNORMAL
- );
- SetFont(*pTextFont);
+ SetFont(*wxSMALL_FONT);
SetSize( rPos.x
,rPos.y
,rSize.x
,rSize.y
);
- delete pTextFont;
return TRUE;
} // 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;
,&nRadioWidth
,&nRadioHeight
);
- nRadioWidth += snRadioSize + GetCharWidth();
+ nRadioWidth += snRadioSize;
if (nRadioHeight < snRadioSize)
nRadioHeight = snRadioSize;
}
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);
- return TRUE;
}
- else
- return FALSE;
+ return true;
} // end of wxRadioButton::OS2Command
void wxRadioButton::SetFocus()
// 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
- m_bFocusJustSet = TRUE;
+ m_bFocusJustSet = true;
wxControl::SetFocus();
}
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(
)
{
::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, _T("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(
projects / wxWidgets.git / blobdiff