X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..25c702609db6a749ffd5f3e659ec348e4aa3a3c8:/src/palmos/button.cpp diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp index b2b7b6ef30..7b9be28910 100644 --- a/src/palmos/button.cpp +++ b/src/palmos/button.cpp @@ -26,9 +26,10 @@ #if wxUSE_BUTTON +#include "wx/button.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/button.h" #include "wx/brush.h" #include "wx/panel.h" #include "wx/bmpbuttn.h" @@ -168,7 +169,7 @@ bool wxButton::Create(wxWindow *parent, // take the stock label wxString palmLabel = label; if( palmLabel.empty() && wxIsStockID(id) ) - palmLabel = wxGetStockLabel(id, false); + palmLabel = wxGetStockLabel(id, wxSTOCK_NOFLAGS); if(!wxControl::Create(parent, id, palmPos, palmSize, style, validator, name)) return false; @@ -195,12 +196,14 @@ wxSize wxButtonBase::GetDefaultSize() return wxSize(36,12); } -void wxButton::SetDefault() +wxWindow *wxButton::SetDefault() { FormType* form = (FormType* )GetParentForm(); if(form==NULL) return; FrmSetDefaultButtonID(form,GetId()); + + return wxButtonBase::SetDefault(); } void wxButton::SetTmpDefault() @@ -234,4 +237,3 @@ void wxButton::Command(wxCommandEvent &event) } #endif // wxUSE_BUTTON -