applying patch, fixes #10524

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

diff --git a/src/palmos/checkbox.cpp b/src/palmos/checkbox.cpp
index e05cb527cda77086d1ca54139da4b877363d6285..8a74d281262f41653b3017974ee2e584507dc34c 100644 (file)
--- a/src/palmos/checkbox.cpp
+++ b/src/palmos/checkbox.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "checkbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,8 +26,9 @@
 
 #if wxUSE_CHECKBOX
 
 
 #if wxUSE_CHECKBOX
 

+#include "wx/checkbox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/checkbox.h"

     #include "wx/brush.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"


@@ -111,6 +108,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     if(!wxControl::Create(parent, id, pos, size, style, validator, name))
         return false;
 
     if(!wxControl::Create(parent, id, pos, size, style, validator, name))
         return false;
 

+    m_state = wxCHK_UNCHECKED;

     return wxControl::PalmCreateControl(checkboxCtl, label, pos, size);
 }
 
     return wxControl::PalmCreateControl(checkboxCtl, label, pos, size);
 }
 


@@ -139,15 +137,41 @@ bool wxCheckBox::SendClickEvent()
 
 void wxCheckBox::Command(wxCommandEvent& event)
 {
 
 void wxCheckBox::Command(wxCommandEvent& event)
 {

+    int state = event.GetInt();
+    wxCHECK_RET( (state == wxCHK_UNCHECKED) || (state == wxCHK_CHECKED)
+        || (state == wxCHK_UNDETERMINED),
+        wxT("event.GetInt() returned an invalid checkbox state") );
+
+    Set3StateValue((wxCheckBoxState) state);
+    ProcessCommand(event);

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {

+    Int16 newValue;
+    ControlType *control = (ControlType *)GetObjectPtr();
+    if(NULL == control) {
+        return;
+    }
+    m_state = state;
+    switch (state) {
+    case wxCHK_UNCHECKED:
+        newValue = 0;
+        break;
+    case wxCHK_CHECKED:
+        newValue = 1;
+        break;
+    case wxCHK_UNDETERMINED:
+    default:
+        return;
+        break;
+    }
+    CtlSetValue (control, newValue);

 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

-    return (wxCheckBoxState) 0;
+    return m_state;

 }
 
 #endif // wxUSE_CHECKBOX
 }
 
 #endif // wxUSE_CHECKBOX