Applied patch [ 1845819 ] wxMSW Top level window freeze fix for trunk

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

diff --git a/src/palmos/radiobut.cpp b/src/palmos/radiobut.cpp
index 20135cce58b2501cbf6558fe89e40380376017ea..de723d660737f3bebdaf1165dbe0bb3c1b49568a 100644 (file)
--- a/src/palmos/radiobut.cpp
+++ b/src/palmos/radiobut.cpp
@@ -2,10 +2,10 @@
 // Name:        src/palmos/radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      William Osborne - minimal working wxPalmOS port
-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - native wxRadioButton implementation
 // Created:     10/13/04
 // RCS-ID:      $Id$
-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "radiobut.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -30,13 +26,14 @@
 
 #if wxUSE_RADIOBTN
 
+#include "wx/radiobut.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/radiobut.h"
     #include "wx/settings.h"
     #include "wx/dcscreen.h"
 #endif
 
-#include "wx/palmos/private.h"
+#include <Control.h>
 
 // ============================================================================
 // wxRadioButton implementation
@@ -104,6 +101,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 void wxRadioButton::Init()
 {
+    m_radioStyle = pushButtonCtl;
+    m_groupID = 0;
 }
 
 bool wxRadioButton::Create(wxWindow *parent,
@@ -115,7 +114,26 @@ bool wxRadioButton::Create(wxWindow *parent,
                            const wxValidator& validator,
                            const wxString& name)
 {
-    return false;
+    // replace native push button with native checkbox
+    if ( style & wxRB_USE_CHECKBOX )
+        m_radioStyle = checkboxCtl;
+
+    if(!wxControl::Create(parent, id, pos, size, style, validator, name))
+        return false;
+
+    return wxControl::PalmCreateControl(
+                          // be sure only one of two possibilities was taken
+                          m_radioStyle == checkboxCtl ? checkboxCtl : pushButtonCtl,
+                          label,
+                          pos,
+                          size,
+                          m_groupID
+                      );
+}
+
+void wxRadioButton::SetGroup(uint8_t group)
+{
+    m_groupID = group;
 }
 
 // ----------------------------------------------------------------------------
@@ -124,24 +142,28 @@ bool wxRadioButton::Create(wxWindow *parent,
 
 void wxRadioButton::SetValue(bool value)
 {
+    SetBoolValue(value);
 }
 
 bool wxRadioButton::GetValue() const
 {
-    return false;
+    return GetBoolValue();
 }
 
 // ----------------------------------------------------------------------------
 // wxRadioButton event processing
 // ----------------------------------------------------------------------------
 
-void wxRadioButton::Command (wxCommandEvent& event)
+bool wxRadioButton::SendClickEvent()
 {
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    return ProcessCommand(event);
 }
 
-bool wxRadioButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+void wxRadioButton::Command (wxCommandEvent& event)
 {
-    return false;
 }
 
 // ----------------------------------------------------------------------------