[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 681d9482f090f9c5b7db55828302aedec80342e8..c2a317b6456b13ada8b14cf1e1c0fad25ed31cca 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -16,6 +16,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/defs.h"
 
 #include "wx/checkbox.h"
@@ -34,8 +38,7 @@
 #endif
 
 // define symbols that are missing in old versions of Motif.
-#if defined(__VMS) || (XmVersion < 2000)
-#define XtDisplay XTDISPLAY
+#if (XmVersion < 2000)
 #define XmNtoggleMode 0
 #define XmTOGGLE_INDETERMINATE 1
 #define XmTOGGLE_BOOLEAN 2
@@ -61,7 +64,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )
-        return FALSE;
+        return false;
 
     wxString label1(wxStripMenuCodes(label));
     wxXmString text( label1 );
@@ -82,13 +85,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 
-    XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
+    XmToggleButtonSetState ((Widget) m_mainWidget, False, True);
 
     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 
     ChangeBackgroundColour();
-    return TRUE;
+    return true;
 }
 
 void wxCheckBox::SetValue(bool val)