Warning fix.

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 629a00791518544986cb3836d2cb46ad57da6837..82c359104b8dc28a90fd12ca7638b8d4203070f2 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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


@@ -56,20 +52,19 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
         return false;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
         return false;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

+    Display* dpy = XtDisplay(parentWidget);

 
     wxString label1(wxStripMenuCodes(label));
 
     wxXmString text( label1 );
 
 
     wxString label1(wxStripMenuCodes(label));
 
     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


@@ -89,9 +84,9 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 

-    //copied from mac/radiobut.cpp (from here till "return TRUE;")
+    //copied from mac/radiobut.cpp (from here till "return true;")

     m_cycle = this ;
     m_cycle = this ;

-  
+

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


@@ -113,7 +108,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
         }
         AddInCycle( chief ) ;
     }
         }
         AddInCycle( chief ) ;
     }

-    return TRUE;
+    return true;

 }
 
 void wxRadioButton::SetValue(bool value)
 }
 
 void wxRadioButton::SetValue(bool value)


@@ -121,9 +116,9 @@ void wxRadioButton::SetValue(bool value)
     if (GetValue() == value)
         return;
 
     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();
 }
 
     ClearSelections();
 }


@@ -136,7 +131,7 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {

-    SetValue ( (event.m_commandInt != 0) );
+    SetValue ( (event.GetInt() != 0) );

     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 


@@ -152,7 +147,7 @@ void wxRadioButton::ChangeBackgroundColour()
           NULL);
 }
 
           NULL);
 }
 

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

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


@@ -164,41 +159,38 @@ void wxRadioButtonCallback (Widget w, XtPointer clientData,
 
     //based on mac/radiobut.cpp
     wxRadioButton* old = item->ClearSelections();
 
     //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);
 
     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);
         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)
 {
     item->ProcessCommand(event2);
 }
 
 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()


@@ -213,7 +205,7 @@ wxRadioButton* wxRadioButton::ClearSelections()
             if ( cycle->GetValue() )
             {
                 old = cycle;
             if ( cycle->GetValue() )
             {
                 old = cycle;

-                cycle->SetValue(FALSE);
+                cycle->SetValue(false);

             }
             cycle = cycle->NextInCycle();
         }
             }
             cycle = cycle->NextInCycle();
         }