X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/motif/radiobut.cpp

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 87c20587a9..d6832a3f6d 100644
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -1,36 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobut.cpp
+// Name:        src/motif/radiobut.cpp
 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
-#endif
-
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/radiobut.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
-#include <Xm/Label.h>
-#include <Xm/LabelG.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
-#include <Xm/RowColumn.h>
-#include <Xm/Form.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
@@ -40,8 +32,6 @@
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs);
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
 wxRadioButton::wxRadioButton()
 {
 }
@@ -53,55 +43,45 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
                            const wxValidator& validator,
                            const wxString& name)
 {
-    SetName(name);
-    SetValidator(validator);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style ;
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+    PreCreation();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
+    Display* dpy = XtDisplay(parentWidget);
 
-    wxString label1(wxStripMenuCodes(label));
+    wxString label1(GetLabelText(label));
 
     wxXmString text( label1 );
 
-    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
         xmToggleButtonGadgetClass, parentWidget,
 #else
         xmToggleButtonWidgetClass, parentWidget,
 #endif
-        wxFont::GetFontTag(), fontType,
+        wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
         XmNlabelString, text(),
         XmNfillOnSelect, True,
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape
         NULL);
 
-    XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
-        (XtPointer) this);
+    XtAddCallback (radioButtonWidget,
+                   XmNvalueChangedCallback,
+                   (XtCallbackProc)wxRadioButtonCallback,
+                   (XtPointer)this);
 
     m_mainWidget = (WXWidget) radioButtonWidget;
 
     XtManageChild (radioButtonWidget);
 
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    ChangeBackgroundColour();
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, size.x, size.y);
 
-    //copied from mac/radiobut.cpp (from here till "return TRUE;")
+    //copied from mac/radiobut.cpp (from here till "return true;")
     m_cycle = this ;
-  
+
     if (HasFlag(wxRB_GROUP))
     {
         AddInCycle( NULL ) ;
@@ -109,8 +89,8 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     else
     {
         /* search backward for last group start */
-        wxRadioButton *chief = (wxRadioButton*) NULL;
-        wxWindowList::Node *node = parent->GetChildren().GetLast();
+        wxRadioButton *chief = NULL;
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
         while (node)
         {
             wxWindow *child = node->GetData();
@@ -123,7 +103,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
         }
         AddInCycle( chief ) ;
     }
-    return TRUE;
+    return true;
 }
 
 void wxRadioButton::SetValue(bool value)
@@ -131,9 +111,9 @@ void wxRadioButton::SetValue(bool value)
     if (GetValue() == value)
         return;
 
-    m_inSetValue = TRUE;
-    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, FALSE);
-    m_inSetValue = FALSE;
+    m_inSetValue = true;
+    XmToggleButtonSetState ((Widget) m_mainWidget, (Boolean) value, False);
+    m_inSetValue = false;
 
     ClearSelections();
 }
@@ -146,33 +126,24 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
-    SetValue ( (event.m_commandInt != 0) );
+    SetValue ( (event.GetInt() != 0) );
     ProcessCommand (event);
 }
 
-void wxRadioButton::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 
     // What colour should this be?
-    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
           NULL);
 }
 
-void wxRadioButton::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-
-void wxRadioButtonCallback (Widget w, XtPointer clientData,
+void wxRadioButtonCallback (Widget WXUNUSED(w), XtPointer clientData,
                             XmToggleButtonCallbackStruct * cbs)
 {
     if (!cbs->set)
@@ -184,41 +155,38 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
 
     //based on mac/radiobut.cpp
     wxRadioButton* old = item->ClearSelections();
-    item->SetValue(TRUE);
+    item->SetValue(true);
 
     if ( old )
     {
         wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED,
                              old->GetId() );
         event.SetEventObject(old);
-        event.SetInt( FALSE );
+        event.SetInt( false );
         old->ProcessCommand(event);
     }
     wxCommandEvent event2(wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId() );
     event2.SetEventObject(item);
-    event2.SetInt( TRUE );
+    event2.SetInt( true );
     item->ProcessCommand(event2);
 }
 
 wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
-    wxRadioButton* next;
-    wxRadioButton* current;
-	
     if (cycle == NULL)
     {
         m_cycle = this;
-        return this;
     }
     else
     {
-        current = cycle;
-        while ((next = current->m_cycle) != cycle) 
+        wxRadioButton* current = cycle;
+        while ( current->m_cycle != cycle )
             current = current->m_cycle;
         m_cycle = cycle;
         current->m_cycle = this;
-        return cycle;
     }
+
+    return cycle;
 }
 
 wxRadioButton* wxRadioButton::ClearSelections()
@@ -233,7 +201,7 @@ wxRadioButton* wxRadioButton::ClearSelections()
             if ( cycle->GetValue() )
             {
                 old = cycle;
-                cycle->SetValue(FALSE);
+                cycle->SetValue(false);
             }
             cycle = cycle->NextInCycle();
         }