drawing optimization fix

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 31c7504715a99fd02ceb2587383fa747c953f38d..d73b55569bb1b4ad1222e65653a8e1cc16d34db2 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -14,11 +14,28 @@
 #endif
 
 #include "wx/radiobut.h"
+#include "wx/utils.h"
+
+#include <Xm/Label.h>
+#include <Xm/LabelG.h>
+#include <Xm/ToggleB.h>
+#include <Xm/ToggleBG.h>
+#include <Xm/RowColumn.h>
+#include <Xm/Form.h>
+
+#include <wx/motif/private.h>
+
+void wxRadioButtonCallback (Widget w, XtPointer clientData,
+  XmToggleButtonCallbackStruct * cbs);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 #endif
 
+wxRadioButton::wxRadioButton()
+{
+}
+
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                   const wxString& label,
            const wxPoint& pos,
@@ -28,6 +45,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 {
     SetName(name);
     SetValidator(validator);
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
 
     if (parent) parent->AddChild(this);
 
@@ -38,25 +58,53 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style ;
 
-    // TODO create radiobutton
-    return FALSE;
-}
+    Widget parentWidget = (Widget) parent->GetClientWidget();
 
-void wxRadioButton::SetLabel(const wxString& label)
-{
-    // TODO
+    wxString label1(wxStripMenuCodes(label));
+
+    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+
+    Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
+#if wxUSE_GADGETS
+                    xmToggleButtonGadgetClass, parentWidget,
+#else
+                    xmToggleButtonWidgetClass, parentWidget,
+#endif
+                    XmNfontList, fontList,
+                    XmNlabelString, text,
+                    XmNfillOnSelect, True,
+                    XmNindicatorType, XmONE_OF_MANY, // diamond-shape
+                                                NULL);
+    XmStringFree (text);
+
+    XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
+                    (XtCallbackProc) this);
+
+    m_mainWidget = (WXWidget) radioButtonWidget;
+
+    XtManageChild (radioButtonWidget);
+
+    SetCanAddEventHandler(TRUE);
+    AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
+
+    ChangeBackgroundColour();
+
+    return TRUE;
 }
 
 void wxRadioButton::SetValue(bool value)
 {
-    // TODO
+    m_inSetValue = TRUE;
+    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE);
+    m_inSetValue = FALSE;
 }
 
 // Get single selection, for single choice list items
 bool wxRadioButton::GetValue() const
 {
-    // TODO
-    return FALSE;
+    return (XmToggleButtonGetState ((Widget) m_mainWidget) != 0);
 }
 
 void wxRadioButton::Command (wxCommandEvent & event)
@@ -65,4 +113,34 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
+void wxRadioButton::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxRadioButton::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxRadioButton::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}
+
+void wxRadioButtonCallback (Widget w, XtPointer clientData,
+                   XmToggleButtonCallbackStruct * cbs)
+{
+  if (!cbs->set)
+    return;
+
+  wxRadioButton *item = (wxRadioButton *) clientData;
+  if (item->InSetValue())
+    return;
+
+  wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
+  event.SetEventObject(item);
+
+  item->ProcessCommand (event);
+}