64 bit compilation fix (pointer can't be cast to int); code simplification (don't...

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

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 3cd261e8a17805aa4f65fff346c866b779825071..4f80e2b196a6de95fb8300a076fb333a58ccca12 100644 (file)
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -13,6 +13,9 @@
 #pragma implementation "gauge.h"
 #endif
 
 #pragma implementation "gauge.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #include <wx/vms_x_fix.h>
 #undef XtDisplay
 #ifdef __VMS
 #include <wx/vms_x_fix.h>
 #undef XtDisplay


@@ -20,6 +23,7 @@
 #undef XtWindow
 #undef XtIsRealized
 #undef XtParent
 #undef XtWindow
 #undef XtIsRealized
 #undef XtParent

+#undef XtClass

 #endif
 
 # include "wx/gauge.h"
 #endif
 
 # include "wx/gauge.h"


@@ -139,14 +143,14 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 
     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();
 
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y,
                   best.x, best.y);
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 wxSize wxGauge::DoGetBestSize() const
 }
 
 wxSize wxGauge::DoGetBestSize() const


@@ -557,7 +561,7 @@ XmGaugeClassRec xmGaugeClassRec = {
             sizeof(XmGaugeRec),        /* widget_size          */
             NULL,                      /* class_initialize             */
             NULL,                      /* class_part_initialize        */
             sizeof(XmGaugeRec),        /* widget_size          */
             NULL,                      /* class_initialize             */
             NULL,                      /* class_part_initialize        */

-            FALSE,                     /* class_inited         */
+            False,                     /* class_inited         */

             Initialize,                /* initialize           */
             NULL,                      /* initialize_hook              */
             XtInheritRealize,  /* realize                      */
             Initialize,                /* initialize           */
             NULL,                      /* initialize_hook              */
             XtInheritRealize,  /* realize                      */


@@ -566,10 +570,10 @@ XmGaugeClassRec xmGaugeClassRec = {
             resources,         /* resources            */
             XtNumber(resources),       /* num_resources                */
             NULLQUARK,         /* xrm_class            */
             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                       */
             Destroy,           /* destroy                      */
             NULL,                      /* resize                       */
             ExposeProc,                /* expose                       */


@@ -608,7 +612,7 @@ WidgetClass xmGaugeWidgetClass = (WidgetClass)&xmGaugeClassRec;
 void
 GaugePick(Widget WXUNUSED(w), XEvent *WXUNUSED(e), String *WXUNUSED(args), Cardinal  *WXUNUSED(num_args))
 {
 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
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge


@@ -674,7 +678,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))
 {
 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
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge


@@ -743,7 +747,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))
 {
 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
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge