Added makeg295.env file for building with gcc-2.95/mingw

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 7fe7f99d31aef3bf846d2a5dcead9f383f2d3e19..7be3126b54eae76ad92d57fa0f793e75fd7e0a75 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -47,25 +47,25 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     SetValidator(validator);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     SetValidator(validator);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();

-    m_windowFont = parent->GetFont();
-    
+    m_font = parent->GetFont();
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;

-    
+

     m_windowStyle = style ;
     m_windowStyle = style ;

-    
+

     Widget parentWidget = (Widget) parent->GetClientWidget();
     Widget parentWidget = (Widget) parent->GetClientWidget();

-    
+

     wxString label1(wxStripMenuCodes(label));
     wxString label1(wxStripMenuCodes(label));

-    
+

     XmString text = XmStringCreateSimple ((char*) (const char*) label1);
     XmString text = XmStringCreateSimple ((char*) (const char*) label1);

-    
-    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
-    
+
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+

     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
         xmToggleButtonGadgetClass, parentWidget,
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
         xmToggleButtonGadgetClass, parentWidget,


@@ -78,19 +78,19 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape
         NULL);
     XmStringFree (text);
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape
         NULL);
     XmStringFree (text);

-    
+

     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
         (XtCallbackProc) this);
     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
         (XtCallbackProc) this);

-    
+

     m_mainWidget = (WXWidget) radioButtonWidget;
     m_mainWidget = (WXWidget) radioButtonWidget;

-    
+

     XtManageChild (radioButtonWidget);
     XtManageChild (radioButtonWidget);

-    
+

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

-    
+

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -140,14 +140,14 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
 {
     if (!cbs->set)
         return;
 {
     if (!cbs->set)
         return;

-    
+

     wxRadioButton *item = (wxRadioButton *) clientData;
     if (item->InSetValue())
         return;
     wxRadioButton *item = (wxRadioButton *) clientData;
     if (item->InSetValue())
         return;

-    
+

     wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
     event.SetEventObject(item);
     wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
     event.SetEventObject(item);

-    
+

     item->ProcessCommand (event);
 }
 
     item->ProcessCommand (event);
 }