Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't generate clicked events when we just get the focus

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-17 23:54:14 +00:00
parent 0e08299321
commit 5f199b71e3
2 changed files with 169 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
include/wx/msw/radiobut.h
View File

@@ -13,41 +13,59 @@
#define _WX_RADIOBUT_H_ #define _WX_RADIOBUT_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "radiobut.h" #pragma interface "radiobut.h"
#endif #endif
class WXDLLEXPORT wxRadioButton: public wxControl class WXDLLEXPORT wxRadioButton: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxRadioButton) public:
protected: // ctors and creation functions
public: wxRadioButton() { Init(); }
inline wxRadioButton(void) {}
inline wxRadioButton(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr)
{
Create(parent, id, label, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id, wxRadioButton(wxWindow *parent,
const wxString& label, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxString& label,
const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition,
const wxValidator& validator = wxDefaultValidator, const wxSize& size = wxDefaultSize,
const wxString& name = wxRadioButtonNameStr); long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr)
{
Init();
virtual void SetLabel(const wxString& label); Create(parent, id, label, pos, size, style, validator, name);
virtual void SetValue(bool val); }
virtual bool GetValue(void) const ;
bool MSWCommand(WXUINT param, WXWORD id); bool Create(wxWindow *parent,
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, wxWindowID id,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam); const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr);
void Command(wxCommandEvent& event); // implement the radio button interface
virtual void SetValue(bool value);
virtual bool GetValue() const;
// implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void Command(wxCommandEvent& event);
virtual void SetFocus();
protected:
virtual wxSize DoGetBestSize() const;
private:
// common part of all ctors
void Init();
// see the comments in SetFocus()
bool m_focusJustSet;
DECLARE_DYNAMIC_CLASS(wxRadioButton)
}; };
#endif #endif

350
src/msw/radiobut.cpp
View File

@@ -9,6 +9,14 @@
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "radiobut.h" #pragma implementation "radiobut.h"
#endif #endif
@@ -30,263 +38,153 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) // ============================================================================
// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton) // wxRadioButton implementation
// ============================================================================
bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) // ----------------------------------------------------------------------------
// wxRadioButton creation
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
void wxRadioButton::Init()
{ {
if (param == BN_CLICKED) m_focusJustSet = FALSE;
{
wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, m_windowId);
event.SetEventObject( this );
event.SetInt( GetValue() );
ProcessCommand(event);
return TRUE;
}
else return FALSE;
} }
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, bool wxRadioButton::Create(wxWindow *parent,
const wxString& label, wxWindowID id,
const wxPoint& pos, const wxString& label,
const wxSize& size, long style, const wxPoint& pos,
const wxValidator& validator, const wxSize& size,
const wxString& name) long style,
const wxValidator& validator,
const wxString& name)
{ {
SetName(name); if ( !CreateControl(parent, id, pos, size, style, validator, name) )
#if wxUSE_VALIDATORS return FALSE;
SetValidator(validator);
#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this); long msStyle = HasFlag(wxRB_GROUP) ? WS_GROUP : 0;
SetBackgroundColour(parent->GetBackgroundColour()); msStyle |= BS_AUTORADIOBUTTON;
SetForegroundColour(parent->GetForegroundColour());
if ( id == -1 ) if ( HasFlag(wxCLIP_SIBLINGS) )
m_windowId = (int)NewControlId();
else
m_windowId = id;
int x = pos.x;
int y = pos.y;
int width = size.x;
int height = size.y;
m_windowStyle = style ;
long groupStyle = 0;
if (m_windowStyle & wxRB_GROUP)
groupStyle = WS_GROUP;
// long msStyle = groupStyle | RADIO_FLAGS;
long msStyle = groupStyle | BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS; msStyle |= WS_CLIPSIBLINGS;
if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) )
return FALSE;
bool want3D; // for compatibility with wxGTK, the first radio button in a group is
WXDWORD exStyle = Determine3DEffects(0, &want3D) ; // always checked (this makes sense anyhow as you need to ensure that at
// least one button in the group is checked and this is the simlpest way to
// do it)
if ( HasFlag(wxRB_GROUP) )
SetValue(TRUE);
// Even with extended styles, need to combine with WS_BORDER return TRUE;
// for them to look right.
/*
if ( want3D || wxStyleHasBorder(m_windowStyle) )
msStyle |= WS_BORDER;
*/
m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const wxChar *)label,
msStyle,0,0,0,0,
(HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create radiobutton") );
#if wxUSE_CTL3D
if (want3D)
{
Ctl3dSubclassCtl((HWND) m_hWnd);
m_useCtl3D = TRUE;
}
#endif
SetFont(parent->GetFont());
// Subclass again for purposes of dialog editing mode
SubclassWin((WXHWND)m_hWnd);
// SetValue(value);
// start GRW fix
if (label != wxT(""))
{
int label_width, label_height;
GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont());
if (width < 0)
width = (int)(label_width + RADIO_SIZE);
if (height<0)
{
height = (int)(label_height);
if (height < RADIO_SIZE)
height = RADIO_SIZE;
}
}
else
{
if (width < 0)
width = RADIO_SIZE;
if (height < 0)
height = RADIO_SIZE;
}
// end GRW fix
SetSize(x, y, width, height);
// for compatibility with wxGTK, the first radio button in a group is
// always checked (this makes sense anyhow as you need to ensure that at
// least one button in the group is checked and this is the simlpest way to
// do it)
if ( m_windowStyle & wxRB_GROUP )
SetValue(TRUE);
return TRUE;
} }
// ----------------------------------------------------------------------------
void wxRadioButton::SetLabel(const wxString& label) // wxRadioButton functions
{ // ----------------------------------------------------------------------------
SetWindowText((HWND) GetHWND(), (const wxChar *)label);
}
void wxRadioButton::SetValue(bool value) void wxRadioButton::SetValue(bool value)
{ {
// Following necessary for Win32s, because Win32s translate BM_SETCHECK // BST_CHECKED is defined as 1, BST_UNCHECKED as 0, so we can just pass
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L); // value as is (we don't sue BST_XXX here as they're not defined for Win16)
(void)::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM)value, 0L);
} }
// Get single selection bool wxRadioButton::GetValue() const
bool wxRadioButton::GetValue(void) const
{ {
return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L) != 0); // NB: this will also return TRUE for BST_INDETERMINATE value if we ever
// have 3-state radio buttons
return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0;
} }
void wxRadioButton::Command (wxCommandEvent & event) // ----------------------------------------------------------------------------
// wxRadioButton event processing
// ----------------------------------------------------------------------------
void wxRadioButton::Command (wxCommandEvent& event)
{ {
SetValue ( (event.m_commandInt != 0) ); SetValue(event.m_commandInt != 0);
ProcessCommand (event); ProcessCommand(event);
} }
WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), void wxRadioButton::SetFocus()
#if wxUSE_CTL3D
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam
#else
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam)
#endif
)
{ {
#if wxUSE_CTL3D // when the radio button receives a WM_SETFOCUS message it generates a
if ( m_useCtl3D ) // 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_focusJustSet = TRUE;
wxControl::SetFocus();
}
bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
if ( param != BN_CLICKED )
return FALSE;
if ( m_focusJustSet )
{ {
HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); // see above: we want to ignore this event
return (WXHBRUSH) hbrush; m_focusJustSet = FALSE;
} }
#endif // wxUSE_CTL3D else // a real clicked event
{
wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
event.SetEventObject( this );
event.SetInt( GetValue() );
HDC hdc = (HDC)pDC; ProcessCommand(event);
if (GetParent()->GetTransparentBackground()) }
SetBkMode(hdc, TRANSPARENT);
return TRUE;
}
// ----------------------------------------------------------------------------
// wxRadioButton geometry
// ----------------------------------------------------------------------------
wxSize wxRadioButton::DoGetBestSize() const
{
static int s_radioSize = 0;
if ( !s_radioSize )
{
wxScreenDC dc;
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
s_radioSize = dc.GetCharHeight();
}
wxString str = GetLabel();
int wRadio, hRadio;
if ( !str.empty() )
{
GetTextExtent(str, &wRadio, &hRadio);
wRadio += s_radioSize + GetCharWidth();
if ( hRadio < s_radioSize )
hRadio = s_radioSize;
}
else else
SetBkMode(hdc, OPAQUE); {
wRadio = s_radioSize;
hRadio = s_radioSize;
}
wxColour colBack = GetBackgroundColour(); return wxSize(wRadio, hRadio);
if (!IsEnabled())
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
} }
// Not implemented
#if 0
bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
const wxBitmap *bitmap,
const wxPoint& pos,
const wxSize& size, long style,
const wxValidator& validator,
const wxString& name)
{
SetName(name);
SetValidator(validator);
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour());
SetForegroundColour(parent->GetForegroundColour());
if ( id == -1 )
m_windowId = (int)NewControlId();
else
m_windowId = id;
int x = pos.x;
int y = pos.y;
int width = size.x;
int height = size.y;
m_windowStyle = style ;
long groupStyle = 0;
if (m_windowStyle & wxRB_GROUP)
groupStyle = WS_GROUP;
// long msStyle = groupStyle | RADIO_FLAGS;
long msStyle = groupStyle | BS_RADIOBUTTON | WS_CHILD | WS_VISIBLE ;
m_hWnd = (WXHWND) CreateWindowEx(MakeExtendedStyle(m_windowStyle), RADIO_CLASS, "toggle",
msStyle,0,0,0,0,
(HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
wxCHECK_MSG( m_hWnd, "Failed to create radio button", FALSE );
#if wxUSE_CTL3D
if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
{
Ctl3dSubclassCtl((HWND) GetHWND());
m_useCtl3D = TRUE;
}
#endif
// Subclass again for purposes of dialog editing mode
SubclassWin(GetHWND());
SetSize(x, y, width, height);
return TRUE;
}
void wxBitmapRadioButton::SetLabel(const wxBitmap *bitmap)
{
}
void wxBitmapRadioButton::SetValue(bool value)
{
// Following necessary for Win32s, because Win32s translate BM_SETCHECK
SendMessage((HWND) GetHWND(), BM_SETCHECK, (WPARAM)value, 0L);
}
// Get single selection, for single choice list items
bool wxBitmapRadioButton::GetValue(void) const
{
return (bool)SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0L);
}
#endif
#endif // wxUSE_RADIOBTN #endif // wxUSE_RADIOBTN