X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1e01716310cb6e3bfcf5894b442d277bc32789a..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/palmos/button.cpp?ds=sidebyside

diff --git a/src/palmos/button.cpp b/src/palmos/button.cpp
index 2e036b19aa..93fd0d6690 100644
--- a/src/palmos/button.cpp
+++ b/src/palmos/button.cpp
@@ -169,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;
@@ -196,12 +196,16 @@ wxSize wxButtonBase::GetDefaultSize()
     return wxSize(36,12);
 }
 
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
 {
     FormType* form = (FormType* )GetParentForm();
     if(form==NULL)
-        return;
+        return NULL;
+#ifdef __WXPALMOS6__
     FrmSetDefaultButtonID(form,GetId());
+#endif // __WXPALMOS6__
+
+    return wxButtonBase::SetDefault();
 }
 
 void wxButton::SetTmpDefault()