Merged modifications from the 2.6 branch

[wxWidgets.git] / src / palmos / tglbtn.cpp

diff --git a/src/palmos/tglbtn.cpp b/src/palmos/tglbtn.cpp
index 9e69fc4b8291ea8ff0001e1559be4ea822d63b24..d9de36c03ffc1f37a4ce97356373a5ffaef6feaf 100644 (file)
--- a/src/palmos/tglbtn.cpp
+++ b/src/palmos/tglbtn.cpp
@@ -37,6 +37,8 @@
 
 #include "wx/tglbtn.h"
 
+#include <Control.h>
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
@@ -60,8 +62,10 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
-    wxControl::PalmCreateControl(pushButtonCtl, parent, id, label, pos, size);
-    return true;
+    if(!wxControl::Create(parent, id, pos, size, style, validator, name))
+        return false;
+
+    return wxControl::PalmCreateControl(pushButtonCtl, label, pos, size);
 }
 
 wxBorder wxToggleButton::GetDefaultBorder() const
@@ -76,11 +80,20 @@ wxSize wxToggleButton::DoGetBestSize() const
 
 void wxToggleButton::SetValue(bool val)
 {
+    SetBoolValue(val);
 }
 
 bool wxToggleButton::GetValue() const
 {
-    return false;
+    return GetBoolValue();
+}
+
+bool wxToggleButton::SendClickEvent()
+{
+    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId());
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    return ProcessCommand(event);
 }
 
 void wxToggleButton::Command(wxCommandEvent & event)