Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 70847aee230b36116f6d3af682a5a68859860f7a..d6832a3f6df942ca99731bb237740045cf506b28 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -12,14 +12,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
-

 #include "wx/radiobut.h"
 #include "wx/radiobut.h"

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

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


@@ -35,8 +32,6 @@
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs);
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs);
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-

 wxRadioButton::wxRadioButton()
 {
 }
 wxRadioButton::wxRadioButton()
 {
 }


@@ -50,11 +45,12 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     Display* dpy = XtDisplay(parentWidget);
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     Display* dpy = XtDisplay(parentWidget);
 

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

 
     wxXmString text( label1 );
 
 
     wxXmString text( label1 );
 


@@ -79,11 +75,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     XtManageChild (radioButtonWidget);
 
 
     XtManageChild (radioButtonWidget);
 

+    PostCreation();

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

-    ChangeBackgroundColour();
-

     //copied from mac/radiobut.cpp (from here till "return true;")
     m_cycle = this ;
 
     //copied from mac/radiobut.cpp (from here till "return true;")
     m_cycle = this ;
 


@@ -94,7 +89,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     else
     {
         /* search backward for last group start */
     else
     {
         /* search backward for last group start */

-        wxRadioButton *chief = (wxRadioButton*) NULL;
+        wxRadioButton *chief = NULL;

         wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
         while (node)
         {
         wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
         while (node)
         {


@@ -141,7 +136,7 @@ void wxRadioButton::ChangeBackgroundColour()
 
     // What colour should this be?
     wxColour colour = *wxBLACK;
 
     // What colour should this be?
     wxColour colour = *wxBLACK;

-    int selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));

 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,