4cf1a9bf4a
This commit fixes the following bug: when an in-place editor control containing an embedded button was used in wxDataViewCtrl, pressing Enter on the button would close the editor, accepting changes, instead as (generic) wxDataViewCtrl intercepts WXK_RETURN in its EVT_CHAR_HOOK handler. To prevent this from happening, wxButton now handles EVT_CHAR_HOOK itself and never lets the parent window intercept it if it's for WXK_RETURN. To ensure that normal wxEVT_KEY_DOWN and wxEVT_CHAR are still generated in this case, wxButton handler calls the new wxKeyEvent::DoAllowNextEvent() method that was added to allow suppressing EVT_CHAR_HOOK only, without affecting the subsequent events. DoAllowNextEvent() is currently only used in wxMSW but support for it was also added to wxGTK and (both) wxOSX ports. See #9102. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
87 lines
2.5 KiB
C++
87 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/button.h
|
|
// Purpose: wxButton class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_BUTTON_H_
|
|
#define _WX_MSW_BUTTON_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// Pushbutton
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
|
|
{
|
|
public:
|
|
wxButton() { Init(); }
|
|
wxButton(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxButtonNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent, id, label, pos, size, style, validator, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent,
|
|
wxWindowID id,
|
|
const wxString& label = wxEmptyString,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = 0,
|
|
const wxValidator& validator = wxDefaultValidator,
|
|
const wxString& name = wxButtonNameStr);
|
|
|
|
virtual ~wxButton();
|
|
|
|
virtual wxWindow *SetDefault();
|
|
|
|
// implementation from now on
|
|
virtual void Command(wxCommandEvent& event);
|
|
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
|
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
|
|
|
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
|
|
|
protected:
|
|
// send a notification event, return true if processed
|
|
bool SendClickEvent();
|
|
|
|
// default button handling
|
|
void SetTmpDefault();
|
|
void UnsetTmpDefault();
|
|
|
|
// set or unset BS_DEFPUSHBUTTON style
|
|
static void SetDefaultStyle(wxButton *btn, bool on);
|
|
|
|
virtual bool DoGetAuthNeeded() const;
|
|
virtual void DoSetAuthNeeded(bool show);
|
|
|
|
// true if the UAC symbol is shown
|
|
bool m_authNeeded;
|
|
|
|
private:
|
|
void Init()
|
|
{
|
|
m_authNeeded = false;
|
|
}
|
|
|
|
void OnCharHook(wxKeyEvent& event);
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
|
|
};
|
|
|
|
#endif // _WX_MSW_BUTTON_H_
|