X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15d5ab675769cc0cbbeb634f18fca9b5f304eaeb..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/motif/radiobox.cpp

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 9ca15fe708..96a2f01808 100644
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -6,31 +6,42 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "radiobox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #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 <Xm/Frame.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
-#include <wx/motif/private.h>
+#include "wx/motif/private.h"
 
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
-		    XmToggleButtonCallbackStruct * cbs);
+                    XmToggleButtonCallbackStruct * cbs);
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 // Radio box item
 wxRadioBox::wxRadioBox()
@@ -41,6 +52,7 @@ wxRadioBox::wxRadioBox()
     m_majorDim = 0 ;
 
     m_formWidget = (WXWidget) 0;
+    m_frameWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;
     m_radioButtons = (WXWidget*) NULL;
     m_radioButtonLabels = (wxString*) NULL;
@@ -54,12 +66,14 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 {
     m_selectedButton = -1;
     m_noItems = n;
+    m_formWidget = (WXWidget) 0;
+    m_frameWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;
     m_radioButtons = (WXWidget*) NULL;
     m_radioButtonLabels = (wxString*) NULL;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();
 
     SetName(name);
     SetValidator(val);
@@ -84,60 +98,66 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 
     wxString label1(wxStripMenuCodes(title));
 
-    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
-
-    Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
-					xmFormWidgetClass, parentWidget,
-					XmNmarginHeight, 0,
-					XmNmarginWidth, 0,
-					NULL);
+    Widget formWidget = XtVaCreateManagedWidget (name.c_str(),
+                                        xmFormWidgetClass, parentWidget,
+                                        XmNmarginHeight, 0,
+                                        XmNmarginWidth, 0,
+                                        NULL);
 
     m_formWidget = (WXWidget) formWidget;
 
-    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
     if (label1 != "")
     {
-        text = XmStringCreateSimple ((char*) (const char*) label1);
-        Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) label1,
+        wxXmString text(label1);
+        (void)XtVaCreateManagedWidget(label1.c_str(),
 #if wxUSE_GADGETS
-					     style & wxCOLOURED ?
-				    xmLabelWidgetClass : xmLabelGadgetClass,
-					     formWidget,
+                                             style & wxCOLOURED ? xmLabelWidgetClass
+                                                                : xmLabelGadgetClass,
+                                             formWidget,
 #else
-					     xmLabelWidgetClass, formWidget,
+                                             xmLabelWidgetClass, formWidget,
 #endif
                                              XmNfontList, fontList,
-					     XmNlabelString, text,
-					     NULL);
-
-        XmStringFree (text);
+                                             XmNlabelString, text(),
+                                             NULL);
     }
 
+    Widget frameWidget = XtVaCreateManagedWidget ("frame",
+                                        xmFrameWidgetClass, formWidget,
+                                        XmNshadowType, XmSHADOW_IN,
+//                                        XmNmarginHeight, 0,
+//                                        XmNmarginWidth, 0,
+                                        NULL);
+
+    m_frameWidget = (WXWidget) frameWidget;
+
     Arg args[3];
 
-    majorDim = (n + majorDim - 1) / majorDim;
+    m_majorDim = (n + m_majorDim - 1) / m_majorDim;
 
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
-  	                                XmHORIZONTAL : XmVERTICAL));
-    XtSetArg (args[1], XmNnumColumns, majorDim);
+                                          XmHORIZONTAL : XmVERTICAL));
+    XtSetArg (args[1], XmNnumColumns, m_majorDim);
 
-    Widget radioBoxWidget = XmCreateRadioBox (formWidget, "radioBoxWidget", args, 2);
+    Widget radioBoxWidget = XmCreateRadioBox (frameWidget, "radioBoxWidget", args, 2);
     m_mainWidget = (WXWidget) radioBoxWidget;
 
 
     if (m_labelWidget)
-	    XtVaSetValues ((Widget) m_labelWidget,
-		       XmNtopAttachment, XmATTACH_FORM,
-		       XmNleftAttachment, XmATTACH_FORM,
-		       XmNalignment, XmALIGNMENT_BEGINNING,
-		       NULL);
+            XtVaSetValues ((Widget) m_labelWidget,
+                       XmNtopAttachment, XmATTACH_FORM,
+                       XmNleftAttachment, XmATTACH_FORM,
+                       XmNalignment, XmALIGNMENT_BEGINNING,
+                       NULL);
 
     XtVaSetValues (radioBoxWidget,
-	    XmNtopAttachment, m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
-		     XmNtopWidget, m_labelWidget ? (Widget) m_labelWidget : formWidget,
-		     XmNbottomAttachment, XmATTACH_FORM,
-		     XmNleftAttachment, XmATTACH_FORM,
-		     NULL);
+            XmNtopAttachment, m_labelWidget ? XmATTACH_WIDGET : XmATTACH_FORM,
+                     XmNtopWidget, m_labelWidget ? (Widget) m_labelWidget : formWidget,
+                     XmNbottomAttachment, XmATTACH_FORM,
+                     XmNleftAttachment, XmATTACH_FORM,
+                     XmNrightAttachment, XmATTACH_FORM,
+                     NULL);
 
     //    if (style & wxFLAT)
     //        XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL);
@@ -151,21 +171,21 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         m_radioButtonLabels[i] = str;
         m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) str,
 #if wxUSE_GADGETS
-		            xmToggleButtonGadgetClass, radioBoxWidget,
+                            xmToggleButtonGadgetClass, radioBoxWidget,
 #else
-				    xmToggleButtonWidgetClass, radioBoxWidget,
+                                    xmToggleButtonWidgetClass, radioBoxWidget,
 #endif
                                     XmNfontList, fontList,
-						 NULL);
+                                                 NULL);
         XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
-		     (XtCallbackProc) this);
-
+                     (XtPointer) this);
     }
     SetSelection (0);
 
-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();
     ChangeFont(FALSE);
 
+    //    XtManageChild((Widget) m_formWidget);
     XtManageChild (radioBoxWidget);
 
     SetCanAddEventHandler(TRUE);
@@ -204,8 +224,8 @@ wxString wxRadioBox::GetLabel(int item) const
     XmString text;
     char *s;
     XtVaGetValues (widget,
-		    XmNlabelString, &text,
-		    NULL);
+                    XmNlabelString, &text,
+                    NULL);
 
     if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
     {
@@ -233,9 +253,9 @@ void wxRadioBox::SetLabel(int item, const wxString& label)
         wxString label1(wxStripMenuCodes(label));
         XmString text = XmStringCreateSimple ((char*) (const char*) label1);
         XtVaSetValues (widget,
-		        XmNlabelString, text,
-		        XmNlabelType, XmSTRING,
-		        NULL);
+                        XmNlabelString, text,
+                        XmNlabelType, XmSTRING,
+                        NULL);
         XmStringFree (text);
     }
 }
@@ -282,7 +302,7 @@ wxString wxRadioBox::GetString(int n) const
     return m_radioButtonLabels[n];
 }
 
-void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     bool managed = XtIsManaged((Widget) m_formWidget);
 
@@ -294,10 +314,10 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         XtVaSetValues ((Widget) m_formWidget, XmNleftAttachment, XmATTACH_SELF,
-		   XmNx, xx, NULL);
+                   XmNx, xx, NULL);
     if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
         XtVaSetValues ((Widget) m_formWidget, XmNtopAttachment, XmATTACH_SELF,
-		   XmNy, yy, NULL);
+                   XmNy, yy, NULL);
 
     // Must set the actual RadioBox to be desired size MINUS label size
     Dimension labelWidth = 0, labelHeight = 0, actualWidth = 0, actualHeight = 0;
@@ -330,13 +350,22 @@ void wxRadioBox::Enable(int n, bool enable)
 }
 
 // Enable all controls
-void wxRadioBox::Enable(bool enable)
+bool wxRadioBox::Enable(bool enable)
 {
-    wxControl::Enable(enable);
+    if ( !wxControl::Enable(enable) )
+        return FALSE;
 
     int i;
     for (i = 0; i < m_noItems; i++)
         XtSetSensitive ((Widget) m_radioButtons[i], (Boolean) enable);
+
+    return TRUE;
+}
+
+bool wxRadioBox::Show(bool show)
+{
+    // TODO: show/hide all children
+    return wxControl::Show(show);
 }
 
 // Show a specific button
@@ -400,7 +429,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);
 
-    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay((Widget) GetTopWidget()));
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) GetTopWidget()));
 
     int i;
     for (i = 0; i < m_noItems; i++)
@@ -409,7 +438,7 @@ void wxRadioBox::ChangeFont(bool keepOriginalSize)
 
         XtVaSetValues ((Widget) radioButton,
                        XmNfontList, fontList,
-		       XmNtopAttachment, XmATTACH_FORM,
+                       XmNtopAttachment, XmATTACH_FORM,
                        NULL);
     }
 }
@@ -418,12 +447,20 @@ void wxRadioBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
+    DoChangeBackgroundColour((Widget) m_frameWidget, m_backgroundColour);
+
+    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
     int i;
     for (i = 0; i < m_noItems; i++)
     {
         WXWidget radioButton = m_radioButtons[i];
 
         DoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);
+
+        XtVaSetValues ((Widget) radioButton,
+          XmNselectColor, selectPixel,
+          NULL);
     }
 }
 
@@ -441,7 +478,7 @@ void wxRadioBox::ChangeForegroundColour()
 }
 
 void wxRadioBoxCallback (Widget w, XtPointer clientData,
-		    XmToggleButtonCallbackStruct * cbs)
+                    XmToggleButtonCallbackStruct * cbs)
 {
   if (!cbs->set)
     return;