Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index e6a71ba4fbe646e340a45d48736d6b1c817c693d..fff613adb60a30cebdfc09881179441de11c42e1 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,10 +13,6 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

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

 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP


@@ -125,7 +120,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         wxString str(GetLabelText(choices[i]));
         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (
         wxString str(GetLabelText(choices[i]));
         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (

-                                wxConstCast(str.mb_str(), char),
+                                str.mb_str(),

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


@@ -394,7 +389,7 @@ void wxRadioBoxCallback (Widget w, XtPointer clientData,
   if (item->InSetValue())
     return;
 
   if (item->InSetValue())
     return;
 

-  wxCommandEvent event (wxEVT_COMMAND_RADIOBOX_SELECTED, item->GetId());
+  wxCommandEvent event (wxEVT_RADIOBOX, item->GetId());

   event.SetInt(sel);
   event.SetString(item->GetStringSelection());
   event.SetEventObject(item);
   event.SetInt(sel);
   event.SetString(item->GetStringSelection());
   event.SetEventObject(item);