Fix AdjustForOverflow to use item->CalcMin, not item->GetSize

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

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index fa7aba0fa4a77eea18a14c5ca975e7a522093689..00303033a4a737a972f876b8fd75cd703c4ff07e 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -14,10 +14,6 @@
 
 #if wxUSE_RADIOBOX
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP
@@ -51,6 +47,7 @@ void wxRadioBox::Init()
     m_selectedButton = -1;
     m_noItems = 0;
     m_noRowsOrCols = 0;
+    m_labelWidget = (WXWidget) 0;
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
@@ -61,6 +58,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 {
     if( !CreateControl( parent, id, pos, size, style, val, name ) )
         return false;
+    PreCreation();
 
     m_noItems = (unsigned int)n;
     m_noRowsOrCols = majorDim;
@@ -82,7 +80,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     {
         wxXmString text(label1);
         m_labelWidget = (WXWidget)
-            XtVaCreateManagedWidget( label1.c_str(),
+            XtVaCreateManagedWidget( label1.mb_str(),
 #if wxUSE_GADGETS
                 style & wxCOLOURED ? xmLabelWidgetClass
                                    : xmLabelGadgetClass,
@@ -123,7 +121,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         wxString str(GetLabelText(choices[i]));
         m_radioButtonLabels.push_back(str);
         Widget radioItem =  XtVaCreateManagedWidget (
-                                wxConstCast(str.c_str(), char),
+                                str.mb_str(),
 #if wxUSE_GADGETS
                                 xmToggleButtonGadgetClass, radioBoxWidget,
 #else
@@ -137,18 +135,15 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
                        (XtPointer) this);
     }
 
-    ChangeFont(false);
-
     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);
 
-    ChangeBackgroundColour();
-
     return true;
 }