Moved #if wxUSE_COMBOBOX after real wx/wxprec.h include.

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

diff --git a/src/palmos/checkbox.cpp b/src/palmos/checkbox.cpp
index 4d756ff5fe6406b8bae22f1c220e831e091450ed..e6ebf0bd09bc0ce63bec2f77cc3658527eafa120 100644 (file)
--- a/src/palmos/checkbox.cpp
+++ b/src/palmos/checkbox.cpp
@@ -2,10 +2,10 @@
 // Name:        src/palmos/checkbox.cpp
 // Purpose:     wxCheckBox
 // Author:      William Osborne - minimal working wxPalmOS port
-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native implementation
 // Created:     10/13/04
 // RCS-ID:      $Id$
-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -37,20 +37,6 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/palmos/private.h"
-
-#ifndef BST_UNCHECKED
-    #define BST_UNCHECKED 0x0000
-#endif
-
-#ifndef BST_CHECKED
-    #define BST_CHECKED 0x0001
-#endif
-
-#ifndef BST_INDETERMINATE
-    #define BST_INDETERMINATE 0x0002
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -112,11 +98,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
-bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-    return true;
-}
-
 bool wxCheckBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& label,
@@ -125,11 +106,10 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
-    return false;
-}
+    if(!wxControl::Create(parent, id, pos, size, style, validator, name))
+        return false;
 
-void wxCheckBox::SetLabel(const wxString& label)
-{
+    return wxControl::PalmCreateControl(checkboxCtl, label, pos, size);
 }
 
 wxSize wxCheckBox::DoGetBestSize() const
@@ -139,20 +119,25 @@ wxSize wxCheckBox::DoGetBestSize() const
 
 void wxCheckBox::SetValue(bool val)
 {
+    SetBoolValue(val);
 }
 
 bool wxCheckBox::GetValue() const
 {
-    return false;
+    return GetBoolValue();
 }
 
-void wxCheckBox::Command(wxCommandEvent& event)
+bool wxCheckBox::SendClickEvent()
 {
+    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId());
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    return ProcessCommand(event);
 }
 
-wxCOMPILE_TIME_ASSERT(wxCHK_UNCHECKED == BST_UNCHECKED
-    && wxCHK_CHECKED == BST_CHECKED
-    && wxCHK_UNDETERMINED == BST_INDETERMINATE, EnumValuesIncorrect);
+void wxCheckBox::Command(wxCommandEvent& event)
+{
+}
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {