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 a341e977a8eb8ad50acba30538279f33c5b2896b..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,13 +13,12 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

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

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

-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

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


@@ -48,6 +46,7 @@ void wxRadioBox::Init()
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;

+    m_labelWidget = (WXWidget) 0;

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


@@ -58,6 +57,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 {
     if( !CreateControl( parent, id, pos, size, style, val, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, val, name ) )
         return false;

+    PreCreation();

 
     m_noItems = (unsigned int)n;
     m_noRowsOrCols = majorDim;
 
     m_noItems = (unsigned int)n;
     m_noRowsOrCols = majorDim;


@@ -73,13 +73,13 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
                                      XmNresizeWidth, True,
                                      NULL);
 
                                      XmNresizeWidth, True,
                                      NULL);
 

-    wxString label1(wxStripMenuCodes(title));
+    wxString label1(GetLabelText(title));

 
     if (!label1.empty())
     {
         wxXmString text(label1);
         m_labelWidget = (WXWidget)
 
     if (!label1.empty())
     {
         wxXmString text(label1);
         m_labelWidget = (WXWidget)

-            XtVaCreateManagedWidget( label1.c_str(),
+            XtVaCreateManagedWidget( label1.mb_str(),

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


@@ -117,10 +117,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     int i;
     for (i = 0; i < n; i++)
     {
     int i;
     for (i = 0; i < n; i++)
     {

-        wxString str(wxStripMenuCodes(choices[i]));
+        wxString str(GetLabelText(choices[i]));

         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (
         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (

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

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


@@ -134,18 +134,15 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
                        (XtPointer) this);
     }
 
                        (XtPointer) this);
     }
 

-    ChangeFont(false);
-

     SetSelection (0);
 
     XtRealizeWidget((Widget)m_mainWidget);
     XtManageChild (radioBoxWidget);
     XtManageChild ((Widget)m_mainWidget);
 
     SetSelection (0);
 
     XtRealizeWidget((Widget)m_mainWidget);
     XtManageChild (radioBoxWidget);
     XtManageChild ((Widget)m_mainWidget);
 

+    PostCreation();

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

-    ChangeBackgroundColour();
-

     return true;
 }
 
     return true;
 }
 


@@ -176,7 +173,7 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label)
     Widget widget = (Widget)m_radioButtons[item];
     if (!label.empty())
     {
     Widget widget = (Widget)m_radioButtons[item];
     if (!label.empty())
     {

-        wxString label1(wxStripMenuCodes(label));
+        wxString label1(GetLabelText(label));

         wxXmString text( label1 );
         m_radioButtonLabels[item] = label1;
         XtVaSetValues (widget,
         wxXmString text( label1 );
         m_radioButtonLabels[item] = label1;
         XtVaSetValues (widget,


@@ -347,7 +344,8 @@ void wxRadioBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
 {
     wxWindow::ChangeBackgroundColour();
 

-    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));

 
     for (unsigned int i = 0; i < m_noItems; i++)
     {
 
     for (unsigned int i = 0; i < m_noItems; i++)
     {


@@ -391,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);