Applied patch from Ticket #9563. Use just the rectangle of the widget with the focus...

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

diff --git a/src/palmos/radiobut.cpp b/src/palmos/radiobut.cpp
index 3a344102aaafacb7e4cdb0c1ea5920ad37027a9e..de723d660737f3bebdaf1165dbe0bb3c1b49568a 100644 (file)
--- a/src/palmos/radiobut.cpp
+++ b/src/palmos/radiobut.cpp
@@ -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,12 +26,15 @@
 
 #if wxUSE_RADIOBTN
 
+#include "wx/radiobut.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/radiobut.h"
     #include "wx/settings.h"
     #include "wx/dcscreen.h"
 #endif
 
+#include <Control.h>
+
 // ============================================================================
 // wxRadioButton implementation
 // ============================================================================
@@ -103,6 +102,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 void wxRadioButton::Init()
 {
     m_radioStyle = pushButtonCtl;
+    m_groupID = 0;
 }
 
 bool wxRadioButton::Create(wxWindow *parent,
@@ -115,7 +115,7 @@ bool wxRadioButton::Create(wxWindow *parent,
                            const wxString& name)
 {
     // replace native push button with native checkbox
-    if ( style & wxRB_USE_SUBSTITUTE )
+    if ( style & wxRB_USE_CHECKBOX )
         m_radioStyle = checkboxCtl;
 
     if(!wxControl::Create(parent, id, pos, size, style, validator, name))
@@ -126,10 +126,16 @@ bool wxRadioButton::Create(wxWindow *parent,
                           m_radioStyle == checkboxCtl ? checkboxCtl : pushButtonCtl,
                           label,
                           pos,
-                          size
+                          size,
+                          m_groupID
                       );
 }
 
+void wxRadioButton::SetGroup(uint8_t group)
+{
+    m_groupID = group;
+}
+
 // ----------------------------------------------------------------------------
 // wxRadioButton functions
 // ----------------------------------------------------------------------------