X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65f3f920ba3601249efdd84efc1a9299d80d1b4f..5d7792236f7e4fcbb94cdc2a5213e0c5788e8c28:/src/os2/button.cpp diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 746e0300c4..0dfafaa3b3 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -231,26 +231,24 @@ bool wxButton::SendClickEvent() return ProcessCommand(vEvent); } // end of wxButton::SendClickEvent -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { - wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - - wxCHECK_RET( tlw, _T("button without top level window?") ); - // // Set this one as the default button both for wxWidgets and Windows // - wxWindow* pWinOldDefault = tlw->SetDefaultItem(this); + wxWindow* pWinOldDefault = wxButtonBase::SetDefault(); SetDefaultStyle( wxDynamicCast(pWinOldDefault, wxButton), false); SetDefaultStyle( this, true ); + + return pWinOldDefault; } // end of wxButton::SetDefault void wxButton::SetTmpDefault() { wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - wxCHECK_RET( tlw, _T("button without top level window?") ); + wxCHECK_RET( tlw, wxT("button without top level window?") ); wxWindow* pWinOldDefault = tlw->GetDefaultItem(); @@ -263,7 +261,7 @@ void wxButton::UnsetTmpDefault() { wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); - wxCHECK_RET( tlw, _T("button without top level window?") ); + wxCHECK_RET( tlw, wxT("button without top level window?") ); tlw->SetTmpDefaultItem(NULL);