Call wxTLW::SetDefaultItem() from wxButtonBase::SetDefault() instead of doing
it in wxButton implementations in (almost) all ports; changed its return type to "wxWindow *" from "void" to accommodate the ports needing the old default item (replaces part of patch 1696563) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,8 +15,6 @@
|
||||
// Pushbutton
|
||||
class WXDLLEXPORT wxButton: public wxButtonBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxButton)
|
||||
|
||||
public:
|
||||
wxButton() { }
|
||||
wxButton(wxWindow *parent,
|
||||
@@ -37,23 +35,23 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxButtonNameStr);
|
||||
|
||||
virtual void SetDefault();
|
||||
virtual wxWindow *SetDefault();
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
|
||||
static wxSize GetDefaultSize();
|
||||
|
||||
// Implementation
|
||||
protected:
|
||||
virtual wxSize GetMinSize() const;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
private:
|
||||
|
||||
virtual wxSize GetMinSize() const;
|
||||
wxSize OldGetBestSize() const;
|
||||
wxSize OldGetMinSize() const;
|
||||
void SetDefaultShadowThicknessAndResize();
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxButton)
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_BUTTON_H_
|
||||
#endif // _WX_BUTTON_H_
|
||||
|
Reference in New Issue
Block a user