X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4294b7832a5aed3c1cccc06aecd227d43da8830..031bc97f4629f95d445f9716a9d4d61665a19dc9:/src/motif/radiobut.cpp?ds=sidebyside

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 29223c6d9a..7fe7f99d31 100644
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -26,7 +26,7 @@
 #include <wx/motif/private.h>
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
-  XmToggleButtonCallbackStruct * cbs);
+                            XmToggleButtonCallbackStruct * cbs);
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
@@ -34,104 +34,63 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 wxRadioButton::wxRadioButton()
 {
-    m_labelWidget = (WXWidget) 0;
-    m_formWidget = (WXWidget) 0;
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
-		   const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                           const wxString& label,
+                           const wxPoint& pos,
+                           const wxSize& size, long style,
+                           const wxValidator& validator,
+                           const wxString& name)
 {
     SetName(name);
     SetValidator(validator);
-
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
+    
     if (parent) parent->AddChild(this);
-
+    
     if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();
     else
-	    m_windowId = id;
-
+        m_windowId = id;
+    
     m_windowStyle = style ;
-
+    
     Widget parentWidget = (Widget) parent->GetClientWidget();
-
+    
     wxString label1(wxStripMenuCodes(label));
-
+    
     XmString text = XmStringCreateSimple ((char*) (const char*) label1);
-
-    Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
-					xmFormWidgetClass, parentWidget,
-					XmNmarginHeight, 0,
-					XmNmarginWidth, 0,
-					NULL);
-
-    m_formWidget = (WXWidget) formWidget;
-
-    Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1,
-#if wxUSE_GADGETS
-				        xmLabelGadgetClass,
-					    formWidget,
-#else
-					    xmLabelWidgetClass, formWidget,
-#endif
-					    XmNlabelString, text,
-					    NULL);
-    m_labelWidget = (WXWidget) labelWidget;
-/* TODO
-      if (labelFont)
-	XtVaSetValues (labelWidget,
-		       XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)),
-		       NULL);
-*/
-
-    XmStringFree (text);
-
+    
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+    
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
-                    xmToggleButtonGadgetClass, formWidget,
+        xmToggleButtonGadgetClass, parentWidget,
 #else
-                    xmToggleButtonWidgetClass, formWidget,
+        xmToggleButtonWidgetClass, parentWidget,
 #endif
-						 NULL);
+        XmNfontList, fontList,
+        XmNlabelString, text,
+        XmNfillOnSelect, True,
+        XmNindicatorType, XmONE_OF_MANY, // diamond-shape
+        NULL);
+    XmStringFree (text);
+    
     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
-		     (XtCallbackProc) this);
-
+        (XtCallbackProc) this);
+    
     m_mainWidget = (WXWidget) radioButtonWidget;
-
-/* TODO
-  if (labelFont)
-   XtVaSetValues (radioButtonWidget,
-                  XmNfontList, labelFont->GetInternalFont (XtDisplay(formWidget)),
-                  NULL);
-*/
-
-    if (labelWidget)
-	    XtVaSetValues (labelWidget,
-		       XmNtopAttachment, XmATTACH_FORM,
-		       XmNleftAttachment, XmATTACH_FORM,
-		       XmNbottomAttachment, XmATTACH_FORM,
-		       XmNalignment, XmALIGNMENT_BEGINNING,
-		       NULL);
-    XtVaSetValues (radioButtonWidget,
-		     XmNleftOffset, 4,
-		     XmNtopAttachment, XmATTACH_FORM,
-		     XmNbottomAttachment, XmATTACH_FORM,
-	   XmNleftAttachment, (Widget) m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
-		     XmNleftWidget, (Widget) m_labelWidget ? (Widget) m_labelWidget : formWidget,
-		     NULL);
-
+    
     XtManageChild (radioButtonWidget);
-
+    
     SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
-
-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
-
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    
+    ChangeBackgroundColour();
+    
     return TRUE;
 }
 
@@ -150,23 +109,45 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
+    SetValue ( (event.m_commandInt != 0) );
+    ProcessCommand (event);
 }
 
-void wxRadioButtonCallback (Widget w, XtPointer clientData,
-		    XmToggleButtonCallbackStruct * cbs)
+void wxRadioButton::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxRadioButton::ChangeBackgroundColour()
 {
-  if (!cbs->set)
-    return;
+    wxWindow::ChangeBackgroundColour();
 
-  wxRadioButton *item = (wxRadioButton *) clientData;
-  if (item->InSetValue())
-    return;
+    // What colour should this be?
+    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
+    XtVaSetValues ((Widget) GetMainWidget(),
+          XmNselectColor, selectPixel,
+          NULL);
+}
 
-  wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
-  event.SetEventObject(item);
+void wxRadioButton::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}
 
-  item->ProcessCommand (event);
+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);
 }