Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false, -1/wxID_ANY/wxDefaultCoor...

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 94708cf8bbf87e4febb80e70a005673f54542e5f..c21d758ecdca558765b59f038e5a4958e83199f3 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif


@@ -21,6 +24,7 @@
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 
 #include "wx/radiobox.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -43,15 +47,12 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 // Radio box item
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 // Radio box item

-wxRadioBox::wxRadioBox()
+void wxRadioBox::Init()

 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_majorDim = 0 ;
 {
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_majorDim = 0 ;

-
-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;

 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,


@@ -60,26 +61,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
              int majorDim, long style,
              const wxValidator& val, const wxString& name)
 {
              int majorDim, long style,
              const wxValidator& val, const wxString& name)
 {

-    m_selectedButton = -1;
-    m_noItems = n;
-    m_radioButtons = (WXWidget*) NULL;
-    m_radioButtonLabels = (wxString*) NULL;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    SetName(name);
-    SetValidator(val);
-
-    parent->AddChild(this);
-
-    m_windowStyle = (long&)style;
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    if( !CreateControl( parent, id, pos, size, style, val, name ) )
+        return false;

 
 

+    m_noItems = n;

     m_noRowsOrCols = majorDim;
 
     if (majorDim==0)
     m_noRowsOrCols = majorDim;
 
     if (majorDim==0)


@@ -102,7 +87,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     if (label1 != "")
     {
         wxXmString text(label1);
     if (label1 != "")
     {
         wxXmString text(label1);

-        (void)XtVaCreateManagedWidget( label1.c_str(),
+        m_labelWidget = (WXWidget)
+            XtVaCreateManagedWidget( label1.c_str(),

 #if wxUSE_GADGETS
                                        style & wxCOLOURED ? xmLabelWidgetClass
                                                           : xmLabelGadgetClass,
 #if wxUSE_GADGETS
                                        style & wxCOLOURED ? xmLabelWidgetClass
                                                           : xmLabelGadgetClass,


@@ -133,20 +119,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
     XtSetArg (args[1], XmNnumColumns, m_majorDim);
     XtSetArg (args[0], XmNorientation, ((style & wxHORIZONTAL) == wxHORIZONTAL ?
                                           XmHORIZONTAL : XmVERTICAL));
     XtSetArg (args[1], XmNnumColumns, m_majorDim);

+    XtSetArg (args[2], XmNadjustLast, False);

 
 

-    Widget radioBoxWidget = XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 2);
+    Widget radioBoxWidget =
+        XmCreateRadioBox ((Widget)m_mainWidget, "radioBoxWidget", args, 3);

 
 

-    //    if (style & wxFLAT)
-    //        XtVaSetValues (radioBoxWidget, XmNborderWidth, 1, NULL);
+    m_radioButtons.reserve(n);
+    m_radioButtonLabels.reserve(n);

 
 

-    m_radioButtons = new WXWidget[n];
-    m_radioButtonLabels = new wxString[n];

     int i;
     for (i = 0; i < n; i++)
     {
         wxString str(wxStripMenuCodes(choices[i]));
     int i;
     for (i = 0; i < n; i++)
     {
         wxString str(wxStripMenuCodes(choices[i]));

-        m_radioButtonLabels[i] = str;
-        m_radioButtons[i] = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) str,
+        m_radioButtonLabels.push_back(str);
+        Widget radioItem =  XtVaCreateManagedWidget (wxConstCast(str.c_str(), char),

 #if wxUSE_GADGETS
                             xmToggleButtonGadgetClass, radioBoxWidget,
 #else
 #if wxUSE_GADGETS
                             xmToggleButtonGadgetClass, radioBoxWidget,
 #else


@@ -154,11 +140,12 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 #endif
                             wxFont::GetFontTag(), fontType,
                                                  NULL);
 #endif
                             wxFont::GetFontTag(), fontType,
                                                  NULL);

-        XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
-                     (XtPointer) this);
+        m_radioButtons.push_back((WXWidget)radioItem);
+        XtAddCallback (radioItem, XmNvalueChangedCallback,
+                       (XtCallbackProc) wxRadioBoxCallback,
+                       (XtPointer) this);

     }
 
     }
 

-    m_font = parent->GetFont();

     ChangeFont(FALSE);
 
     SetSelection (0);
     ChangeFont(FALSE);
 
     SetSelection (0);


@@ -167,7 +154,6 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     XtManageChild (radioBoxWidget);
     XtManageChild ((Widget)m_mainWidget);
 
     XtManageChild (radioBoxWidget);
     XtManageChild ((Widget)m_mainWidget);
 

-    SetCanAddEventHandler(TRUE);

     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();


@@ -175,12 +161,19 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     return TRUE;
 }
 
     return TRUE;
 }
 

+bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
+             const wxPoint& pos, const wxSize& size,
+             const wxArrayString& choices,
+             int majorDim, long style,
+             const wxValidator& val, const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);
+}

 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    delete[] m_radioButtonLabels;
-    delete[] m_radioButtons;
-

     DetachWidget(m_mainWidget);
     XtDestroyWidget((Widget) m_mainWidget);
 
     DetachWidget(m_mainWidget);
     XtDestroyWidget((Widget) m_mainWidget);
 


@@ -197,6 +190,7 @@ void wxRadioBox::SetString(int item, const wxString& label)
     {
         wxString label1(wxStripMenuCodes(label));
         wxXmString text( label1 );
     {
         wxString label1(wxStripMenuCodes(label));
         wxXmString text( label1 );

+        m_radioButtonLabels[item] = label1;

         XtVaSetValues (widget,
                         XmNlabelString, text(),
                         XmNlabelType, XmSTRING,
         XtVaSetValues (widget,
                         XmNlabelString, text(),
                         XmNlabelType, XmSTRING,


@@ -377,14 +371,14 @@ void wxRadioBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
 {
     wxWindow::ChangeBackgroundColour();
 

-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));

 
     int i;
     for (i = 0; i < m_noItems; i++)
     {
         WXWidget radioButton = m_radioButtons[i];
 
 
     int i;
     for (i = 0; i < m_noItems; i++)
     {
         WXWidget radioButton = m_radioButtons[i];
 

-        DoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);
+        wxDoChangeBackgroundColour(radioButton, m_backgroundColour, TRUE);

 
         XtVaSetValues ((Widget) radioButton,
           XmNselectColor, selectPixel,
 
         XtVaSetValues ((Widget) radioButton,
           XmNselectColor, selectPixel,


@@ -401,7 +395,7 @@ void wxRadioBox::ChangeForegroundColour()
     {
         WXWidget radioButton = m_radioButtons[i];
 
     {
         WXWidget radioButton = m_radioButtons[i];
 

-        DoChangeForegroundColour(radioButton, m_foregroundColour);
+        wxDoChangeForegroundColour(radioButton, m_foregroundColour);

     }
 }
 
     }
 }
 


@@ -431,8 +425,9 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
   int i;
   wxRadioBox *item = (wxRadioBox *) clientData;
   int sel = -1;
   int i;

+  const wxWidgetArray& buttons = item->GetRadioButtons();

   for (i = 0; i < item->GetCount(); i++)
   for (i = 0; i < item->GetCount(); i++)

-    if (item->GetRadioButtons() && ((Widget) (item->GetRadioButtons()[i]) == w))
+    if (((Widget)buttons[i]) == w)

       sel = i;
   item->SetSel(sel);
 
       sel = i;
   item->SetSel(sel);