applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 4ab115b8a6dc4e1d988f8d7f63c0b39c594c6d05..8c0dda0668c3a49c147df1db26378c0de1c11577 100644 (file)
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -13,8 +13,16 @@
 #pragma implementation "gauge.h"
 #endif
 
-#ifdef __VMS__
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
 #include <wx/vms_x_fix.h>
+#undef XtDisplay
+#undef XtScreen
+#undef XtWindow
+#undef XtIsRealized
+#undef XtParent
 #endif
 
 # include "wx/gauge.h"
@@ -134,14 +142,14 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 
-    ChangeFont(FALSE);
+    ChangeFont(false);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y,
                   best.x, best.y);
 
     ChangeBackgroundColour();
 
-    return TRUE;
+    return true;
 }
 
 wxSize wxGauge::DoGetBestSize() const
@@ -552,7 +560,7 @@ XmGaugeClassRec xmGaugeClassRec = {
             sizeof(XmGaugeRec),        /* widget_size          */
             NULL,                      /* class_initialize             */
             NULL,                      /* class_part_initialize        */
-            FALSE,                     /* class_inited         */
+            False,                     /* class_inited         */
             Initialize,                /* initialize           */
             NULL,                      /* initialize_hook              */
             XtInheritRealize,  /* realize                      */
@@ -561,10 +569,10 @@ XmGaugeClassRec xmGaugeClassRec = {
             resources,         /* resources            */
             XtNumber(resources),       /* num_resources                */
             NULLQUARK,         /* xrm_class            */
-            TRUE,                      /* compress_motion              */
-            TRUE,                      /* compress_exposure    */
-            TRUE,                      /* compress_enterleave  */
-            FALSE,                     /* visible_interest             */
+            True,                      /* compress_motion              */
+            True,                      /* compress_exposure    */
+            True,                      /* compress_enterleave  */
+            False,                     /* visible_interest             */
             Destroy,           /* destroy                      */
             NULL,                      /* resize                       */
             ExposeProc,                /* expose                       */
@@ -603,7 +611,7 @@ WidgetClass xmGaugeWidgetClass = (WidgetClass)&xmGaugeClassRec;
 void
 GaugePick(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
@@ -669,7 +677,7 @@ GaugePick(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardi
 void
 GaugeDrag(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
@@ -738,7 +746,7 @@ GaugeDrag(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardi
 void
 GaugeDrop(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
-    /* Commented out for a read-only gauge in wxWindows */
+    /* Commented out for a read-only gauge in wxWidgets */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge