compilation fixes after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
// Pushbutton
|
// Pushbutton
|
||||||
class WXDLLEXPORT wxButton: public wxButtonBase
|
class WXDLLEXPORT wxButton: public wxButtonBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline wxButton() {}
|
inline wxButton() {}
|
||||||
inline wxButton( wxWindow* pParent
|
inline wxButton( wxWindow* pParent
|
||||||
,wxWindowID vId
|
,wxWindowID vId
|
||||||
@@ -52,6 +52,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase
|
|||||||
|
|
||||||
virtual ~wxButton();
|
virtual ~wxButton();
|
||||||
|
|
||||||
|
virtual wxWindow *SetDefault();
|
||||||
|
|
||||||
static wxSize GetDefaultSize(void);
|
static wxSize GetDefaultSize(void);
|
||||||
virtual void Command(wxCommandEvent& rEvent);
|
virtual void Command(wxCommandEvent& rEvent);
|
||||||
virtual bool OS2Command( WXUINT uParam
|
virtual bool OS2Command( WXUINT uParam
|
||||||
|
@@ -231,12 +231,12 @@ bool wxButton::SendClickEvent()
|
|||||||
return ProcessCommand(vEvent);
|
return ProcessCommand(vEvent);
|
||||||
} // end of wxButton::SendClickEvent
|
} // end of wxButton::SendClickEvent
|
||||||
|
|
||||||
void wxButton::SetDefault()
|
wxWindow *wxButton::SetDefault()
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Set this one as the default button both for wxWidgets and Windows
|
// Set this one as the default button both for wxWidgets and Windows
|
||||||
//
|
//
|
||||||
wxWindow* pWinOldDefault = wxButtonBase::Set();
|
wxWindow* pWinOldDefault = wxButtonBase::SetDefault();
|
||||||
|
|
||||||
SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
|
SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false);
|
||||||
SetDefaultStyle( this, true );
|
SetDefaultStyle( this, true );
|
||||||
|
Reference in New Issue
Block a user