Provide saner UI for setting status bar fields.

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index c66fcf832e73356ac638e29f01f36fbc563526ef..98741b960af028edebae618023ebc4d83893d034 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -1,29 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxRadioButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobut.h"
-#endif
-

 // 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


@@ -54,22 +47,22 @@ 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();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

+    Display* dpy = XtDisplay(parentWidget);

 
 

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

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

-    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
-

     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
         xmToggleButtonGadgetClass, parentWidget,
 #else
         xmToggleButtonWidgetClass, parentWidget,
 #endif
     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
         XmNlabelString, text(),
         XmNfillOnSelect, True,
         XmNindicatorType, XmONE_OF_MANY, // diamond-shape


@@ -84,14 +77,13 @@ 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 ;

-  
+

     if (HasFlag(wxRB_GROUP))
     {
         AddInCycle( NULL ) ;
     if (HasFlag(wxRB_GROUP))
     {
         AddInCycle( NULL ) ;


@@ -99,7 +91,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)
         {


@@ -145,14 +137,15 @@ void wxRadioButton::ChangeBackgroundColour()
     wxWindow::ChangeBackgroundColour();
 
     // What colour should this be?
     wxWindow::ChangeBackgroundColour();
 
     // What colour should this be?

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

 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
           NULL);
 }
 
 
     XtVaSetValues ((Widget) GetMainWidget(),
           XmNselectColor, selectPixel,
           NULL);
 }
 

-void wxRadioButtonCallback (Widget w, XtPointer clientData,
+void wxRadioButtonCallback (Widget WXUNUSED(w), XtPointer clientData,

                             XmToggleButtonCallbackStruct * cbs)
 {
     if (!cbs->set)
                             XmToggleButtonCallbackStruct * cbs)
 {
     if (!cbs->set)


@@ -182,23 +175,20 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
 
 wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {
 
 wxRadioButton* wxRadioButton::AddInCycle(wxRadioButton *cycle)
 {

-    wxRadioButton* next;
-    wxRadioButton* current;
-       

     if (cycle == NULL)
     {
         m_cycle = this;
     if (cycle == NULL)
     {
         m_cycle = this;

-        return this;

     }
     else
     {
     }
     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;
             current = current->m_cycle;
         m_cycle = cycle;
         current->m_cycle = this;

-        return cycle;

     }
     }

+
+    return cycle;

 }
 
 wxRadioButton* wxRadioButton::ClearSelections()
 }
 
 wxRadioButton* wxRadioButton::ClearSelections()