ignore clicks on a toolbar but outside any button

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

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 73beaae217e1c35c81b55cad0970a204259dbe12..104f66536c2c63b1878f341c2e39c9074cb2d64b 100644 (file)
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -13,14 +13,22 @@
 #pragma implementation "gauge.h"
 #endif
 
 #pragma implementation "gauge.h"
 #endif
 

-#include "wx/gauge.h"
+#ifdef __VMS__
+#include <wx/vms_x_fix.h>
+#endif
+
+# include "wx/gauge.h"

 
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

-#include <wx/motif/private.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+#include "wx/motif/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)

-#endif

 
 // XmGauge copyright notice:
 
 
 // XmGauge copyright notice:
 


@@ -43,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 * indirect or consequential damages or any damages
 * whatsoever resulting from loss of use, data or profits,
 * whether in an action of contract, negligence or other tortious
 * indirect or consequential damages or any damages
 * whatsoever resulting from loss of use, data or profits,
 * whether in an action of contract, negligence or other tortious

-* action, arising out of or in connection with the use 
+* action, arising out of or in connection with the use

 * or performance of this software.
 *
 */
 * or performance of this software.
 *
 */


@@ -87,16 +95,16 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();

-    
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;

-    
+

     Widget parentWidget = (Widget) parent->GetClientWidget();
     Widget parentWidget = (Widget) parent->GetClientWidget();

-    
+

     Arg args[4];
     int count = 4;
     if (style & wxHORIZONTAL)
     Arg args[4];
     int count = 4;
     if (style & wxHORIZONTAL)


@@ -113,30 +121,25 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     XtSetArg(args[3], XmNmaximum, range);
     Widget gaugeWidget = XtCreateManagedWidget("gauge", xmGaugeWidgetClass, parentWidget, args, count);
     m_mainWidget = (WXWidget) gaugeWidget ;
     XtSetArg(args[3], XmNmaximum, range);
     Widget gaugeWidget = XtCreateManagedWidget("gauge", xmGaugeWidgetClass, parentWidget, args, count);
     m_mainWidget = (WXWidget) gaugeWidget ;

-    
+

     XtManageChild (gaugeWidget);
     XtManageChild (gaugeWidget);

-    
+

     int x = pos.x; int y = pos.y;
     int width = size.x; int height = size.y;
     if (width == -1)
         width = 150;
     if (height == -1)
         height = 80;
     int x = pos.x; int y = pos.y;
     int width = size.x; int height = size.y;
     if (width == -1)
         width = 150;
     if (height == -1)
         height = 80;

-    
-    m_windowFont = parent->GetFont();
+
+    m_font = parent->GetFont();

     ChangeFont(FALSE);
     ChangeFont(FALSE);

-    
+

     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);

-    
+

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
-    return TRUE;
-}

 
 

-void wxGauge::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::SetSize(x, y, width, height, sizeFlags);
+    return TRUE;

 }
 
 void wxGauge::SetShadowWidth(int w)
 }
 
 void wxGauge::SetShadowWidth(int w)


@@ -146,7 +149,7 @@ void wxGauge::SetShadowWidth(int w)
     XtVaSetValues((Widget) m_mainWidget, XmNshadowThickness, w, NULL);
 }
 
     XtVaSetValues((Widget) m_mainWidget, XmNshadowThickness, w, NULL);
 }
 

-void wxGauge::SetBezelFace(int w)
+void wxGauge::SetBezelFace(int WXUNUSED(w))

 {
 }
 
 {
 }
 


@@ -214,7 +217,7 @@ typedef struct {
     int empty;
 } XmGaugeClassPart;
 
     int empty;
 } XmGaugeClassPart;
 

-typedef struct _XmGaugeClassRec {    
+typedef struct _XmGaugeClassRec {

     CoreClassPart              core_class;
     XmPrimitiveClassPart       primitive_class;
     XmGaugeClassPart           gauge_class;
     CoreClassPart              core_class;
     XmPrimitiveClassPart       primitive_class;
     XmGaugeClassPart           gauge_class;


@@ -227,10 +230,10 @@ typedef struct _XmGaugePart{
     int maximum;
     unsigned char orientation;
     unsigned char processingDirection;
     int maximum;
     unsigned char orientation;
     unsigned char processingDirection;

-    
+

     XtCallbackList dragCallback;
     XtCallbackList valueChangedCallback;
     XtCallbackList dragCallback;
     XtCallbackList valueChangedCallback;

-    
+

     /* private fields */
     Boolean dragging;          /* drag in progress ? */
     int oldx, oldy;
     /* private fields */
     Boolean dragging;          /* drag in progress ? */
     int oldx, oldy;


@@ -252,9 +255,9 @@ extern XmGaugeClassRec xmGaugeClassRec;
 
 void
 GaugePick(Widget w, XEvent *e, String *args, Cardinal  *num_args);
 
 void
 GaugePick(Widget w, XEvent *e, String *args, Cardinal  *num_args);

-void 
+void

 GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *num_args);
 GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *num_args);

-void 
+void

 GaugeDrop(Widget w, XEvent *e, String *args, Cardinal  *num_args);
 
 
 GaugeDrop(Widget w, XEvent *e, String *args, Cardinal  *num_args);
 
 


@@ -285,9 +288,9 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
     unsigned long backgr,foregr;
     XRectangle rects[1];
     ***/
     unsigned long backgr,foregr;
     XRectangle rects[1];
     ***/

-    
+

     sht = gw->primitive.shadow_thickness;
     sht = gw->primitive.shadow_thickness;

-    
+

     ratio =  (float)THIS.value/
         (float)(THIS.maximum - THIS.minimum);
         /***chubraev
     ratio =  (float)THIS.value/
         (float)(THIS.maximum - THIS.minimum);
         /***chubraev


@@ -295,7 +298,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
         len=strlen(string);
         XtVaGetValues(gw,XmNbackground,&backgr,XmNforeground,&foregr,NULL);
     ***/
         len=strlen(string);
         XtVaGetValues(gw,XmNbackground,&backgr,XmNforeground,&foregr,NULL);
     ***/

-    
+

     if(clear) {
         XClearArea(XtDisplay(gw), XtWindow(gw), sht, sht,
             gw->core.width - 2 * sht, gw->core.height - 2 * sht, False);
     if(clear) {
         XClearArea(XtDisplay(gw), XtWindow(gw), sht, sht,
             gw->core.width - 2 * sht, gw->core.height - 2 * sht, False);


@@ -304,7 +307,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
     case XmHORIZONTAL:
         size = (int) ((gw->core.width - 2 * sht)*ratio);
         /***chubraev
     case XmHORIZONTAL:
         size = (int) ((gw->core.width - 2 * sht)*ratio);
         /***chubraev

-        XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht+gw->core.width/2, 
+        XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht+gw->core.width/2,

         gw->core.height - 2 * sht, string, len);
         ***/
         switch(THIS.processingDirection) {
         gw->core.height - 2 * sht, string, len);
         ***/
         switch(THIS.processingDirection) {


@@ -312,7 +315,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
         case XmMAX_ON_BOTTOM:
             XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                 sht, sht, size, gw->core.height - 2 * sht);
         case XmMAX_ON_BOTTOM:
             XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                 sht, sht, size, gw->core.height - 2 * sht);

-            
+

                 /***chubraev
                 rects[0].x = sht; rects[0].y = sht;
                 rects[0].width = size; rects[0].height = gw->core.height - 2 * sht;
                 /***chubraev
                 rects[0].x = sht; rects[0].y = sht;
                 rects[0].width = size; rects[0].height = gw->core.height - 2 * sht;


@@ -323,7 +326,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
             XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                 gw->core.width - size - sht, sht,
                 size, gw->core.height - 2 * sht);
             XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                 gw->core.width - size - sht, sht,
                 size, gw->core.height - 2 * sht);

-            
+

                 /***chubraev
                 rects[0].x = gw->core.width - size - sht; rects[0].y = sht;
                 rects[0].width = size; rects[0].height = gw->core.height - 2 * sht;
                 /***chubraev
                 rects[0].x = gw->core.width - size - sht; rects[0].y = sht;
                 rects[0].width = size; rects[0].height = gw->core.height - 2 * sht;


@@ -333,15 +336,15 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
         /***chubraev
         XSetClipRectangles(XtDisplay(gw), THIS.gc, 0, 0, rects, 1, Unsorted);
         XSetForeground(XtDisplay(gw), THIS.gc, backgr);
         /***chubraev
         XSetClipRectangles(XtDisplay(gw), THIS.gc, 0, 0, rects, 1, Unsorted);
         XSetForeground(XtDisplay(gw), THIS.gc, backgr);

-        XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht+gw->core.width/2, 
+        XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht+gw->core.width/2,

         gw->core.height - 2 * sht, string, len);
         ***/
         gw->core.height - 2 * sht, string, len);
         ***/

-        
+

         break;
         case XmVERTICAL:
             size = (int) ((gw->core.height - 2 * sht)*ratio);
             /***chubraev
         break;
         case XmVERTICAL:
             size = (int) ((gw->core.height - 2 * sht)*ratio);
             /***chubraev

-            XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht, 
+            XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht,

             sht+gw->core.height/2, string,len);
             ***/
             switch(THIS.processingDirection) {
             sht+gw->core.height/2, string,len);
             ***/
             switch(THIS.processingDirection) {


@@ -349,7 +352,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
             case XmMAX_ON_BOTTOM:
                 XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                     sht, sht, gw->core.width - 2 * sht, size);
             case XmMAX_ON_BOTTOM:
                 XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                     sht, sht, gw->core.width - 2 * sht, size);

-                
+

                     /***chubraev
                     rects[0].x = sht; rects[0].y = sht;
                     rects[0].width = gw->core.width - 2 * sht; rects[0].height = size;
                     /***chubraev
                     rects[0].x = sht; rects[0].y = sht;
                     rects[0].width = gw->core.width - 2 * sht; rects[0].height = size;


@@ -360,7 +363,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
                 XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                     sht, gw->core.height - size - sht,
                     gw->core.width - 2 * sht, size);
                 XFillRectangle(XtDisplay(gw), XtWindow(gw), THIS.gc,
                     sht, gw->core.height - size - sht,
                     gw->core.width - 2 * sht, size);

-                
+

                     /***chubraev
                     rects[0].x = sht; rects[0].y = gw->core.height - size - sht;
                     rects[0].width = gw->core.width - 2 * sht; rects[0].height = size;
                     /***chubraev
                     rects[0].x = sht; rects[0].y = gw->core.height - size - sht;
                     rects[0].width = gw->core.width - 2 * sht; rects[0].height = size;


@@ -369,7 +372,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
             /***chubraev
             XSetClipRectangles(XtDisplay(gw), THIS.gc, 0, 0, rects, 1, Unsorted);
             XSetForeground(XtDisplay(gw), THIS.gc, backgr);
             /***chubraev
             XSetClipRectangles(XtDisplay(gw), THIS.gc, 0, 0, rects, 1, Unsorted);
             XSetForeground(XtDisplay(gw), THIS.gc, backgr);

-            XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht, 
+            XDrawString(XtDisplay(gw), XtWindow(gw), THIS.gc, sht,

             sht+gw->core.height/2, string,len);
             ***/
             break;
             sht+gw->core.height/2, string,len);
             ***/
             break;


@@ -378,7 +381,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
     XSetClipMask(XtDisplay(gw), THIS.gc, None);
     XSetForeground(XtDisplay(gw), THIS.gc, foregr);
     ***/
     XSetClipMask(XtDisplay(gw), THIS.gc, None);
     XSetForeground(XtDisplay(gw), THIS.gc, foregr);
     ***/

-#undef THIS    
+#undef THIS

 }
 
 /* Old code
 }
 
 /* Old code


@@ -390,7 +393,7 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
 #define THIS gw->gauge
     int size, sht;
     /*    float ratio; */
 #define THIS gw->gauge
     int size, sht;
     /*    float ratio; */

-    
+

     sht = gw->primitive.shadow_thickness;
     /* See fix comment below: can cause divide by zero error.
     ratio = (float)((float)THIS.maximum -
     sht = gw->primitive.shadow_thickness;
     /* See fix comment below: can cause divide by zero error.
     ratio = (float)((float)THIS.maximum -


@@ -436,22 +439,22 @@ DrawSlider(XmGaugeWidget gw, Boolean clear)
             }
             break;
     }
             }
             break;
     }

-#undef THIS    
+#undef THIS

 }
 #endif
 
 static void
 }
 #endif
 
 static void

-Initialize(Widget req, Widget new_w, ArgList args, Cardinal *num_args )
+Initialize(Widget WXUNUSED(req), Widget new_w, ArgList WXUNUSED(args), Cardinal *WXUNUSED(num_args ))

 {
     XmGaugeWidget gw = (XmGaugeWidget)new_w;
 #define THIS gw->gauge
     XGCValues values;
 {
     XmGaugeWidget gw = (XmGaugeWidget)new_w;
 #define THIS gw->gauge
     XGCValues values;

-    
+

     values.foreground = gw->primitive.foreground;
     THIS.gc = XtGetGC(new_w, GCForeground, &values);
     values.foreground = gw->primitive.foreground;
     THIS.gc = XtGetGC(new_w, GCForeground, &values);

-    
-#undef THIS    
-    
+
+#undef THIS
+

 }
 
 
 }
 
 


@@ -462,7 +465,7 @@ Destroy(Widget w)
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     XtReleaseGC(w, THIS.gc);
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     XtReleaseGC(w, THIS.gc);

-#undef THIS    
+#undef THIS

 }
 
 
 }
 
 


@@ -471,18 +474,18 @@ Destroy(Widget w)
 static Boolean
 SetValues(
           Widget cw,
 static Boolean
 SetValues(
           Widget cw,

-          Widget rw,
+          Widget WXUNUSED(rw),

           Widget nw,
           Widget nw,

-          ArgList args,
-          Cardinal *num_args )
+          ArgList WXUNUSED(args),
+          Cardinal *WXUNUSED(num_args) )

 {
     XmGaugeWidget cgw = (XmGaugeWidget)cw;
     XmGaugeWidget ngw = (XmGaugeWidget)nw;
 {
     XmGaugeWidget cgw = (XmGaugeWidget)cw;
     XmGaugeWidget ngw = (XmGaugeWidget)nw;

-    
+

     Boolean redraw = False;
     if(cgw->primitive.foreground != ngw->primitive.foreground) {
         XGCValues values;
     Boolean redraw = False;
     if(cgw->primitive.foreground != ngw->primitive.foreground) {
         XGCValues values;

-        
+

         redraw = True;
         XtReleaseGC(nw, ngw->gauge.gc);
         values.foreground = ngw->primitive.foreground;
         redraw = True;
         XtReleaseGC(nw, ngw->gauge.gc);
         values.foreground = ngw->primitive.foreground;


@@ -498,12 +501,12 @@ SetValues(
 
 
 static void
 
 
 static void

-ExposeProc(Widget w, XEvent *event, Region r)
+ExposeProc(Widget w, XEvent *WXUNUSED(event), Region WXUNUSED(r))

 {
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     int sht;
 {
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     int sht;

-    
+

     sht = gw->primitive.shadow_thickness;
     _XmDrawShadows(XtDisplay(w), XtWindow(w),
         gw->primitive.top_shadow_GC,
     sht = gw->primitive.shadow_thickness;
     _XmDrawShadows(XtDisplay(w), XtWindow(w),
         gw->primitive.top_shadow_GC,


@@ -511,39 +514,39 @@ ExposeProc(Widget w, XEvent *event, Region r)
         0, 0, w->core.width, w->core.height,
         sht, XmSHADOW_IN);
     DrawSlider(gw, False);
         0, 0, w->core.width, w->core.height,
         sht, XmSHADOW_IN);
     DrawSlider(gw, False);

-#undef THIS    
+#undef THIS

 }
 
 
 
 
 
 }
 
 
 
 
 

-static XtResource 
+static XtResource

 resources[] = {
 #define offset(field) XtOffset(XmGaugeWidget, gauge.field)
     {XmNvalue, XmCValue, XtRInt, sizeof(int),
         offset(value), XtRImmediate, (caddr_t)10},
 resources[] = {
 #define offset(field) XtOffset(XmGaugeWidget, gauge.field)
     {XmNvalue, XmCValue, XtRInt, sizeof(int),
         offset(value), XtRImmediate, (caddr_t)10},

-        
+

     {XmNminimum, XmCValue, XtRInt, sizeof(int),
     offset(minimum), XtRImmediate, (caddr_t)0},
     {XmNminimum, XmCValue, XtRInt, sizeof(int),
     offset(minimum), XtRImmediate, (caddr_t)0},

-    
+

     {XmNmaximum, XmCValue, XtRInt, sizeof(int),
     offset(maximum), XtRImmediate, (caddr_t)100},
     {XmNmaximum, XmCValue, XtRInt, sizeof(int),
     offset(maximum), XtRImmediate, (caddr_t)100},

-    
+

     {XmNorientation, XmCOrientation, XmROrientation, sizeof(unsigned char),
     offset(orientation), XtRImmediate, (caddr_t)XmVERTICAL},
     {XmNorientation, XmCOrientation, XmROrientation, sizeof(unsigned char),
     offset(orientation), XtRImmediate, (caddr_t)XmVERTICAL},

-    
+

     {XmNprocessingDirection, XmCProcessingDirection,
     XmRProcessingDirection, sizeof(unsigned char),
     offset(processingDirection), XtRImmediate, (caddr_t)XmMAX_ON_RIGHT},
     {XmNprocessingDirection, XmCProcessingDirection,
     XmRProcessingDirection, sizeof(unsigned char),
     offset(processingDirection), XtRImmediate, (caddr_t)XmMAX_ON_RIGHT},

-    
+

     {XmNdragCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList),
     offset(dragCallback), XtRImmediate, (caddr_t)NULL},
     {XmNdragCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList),
     offset(dragCallback), XtRImmediate, (caddr_t)NULL},

-    
+

     {XmNvalueChangedCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList),
     offset(valueChangedCallback), XtRImmediate, (caddr_t)NULL},
     {XmNvalueChangedCallback, XmCCallback, XmRCallback, sizeof(XtCallbackList),
     offset(valueChangedCallback), XtRImmediate, (caddr_t)NULL},

-    
-    
+
+

 #undef offset
 };
 
 #undef offset
 };
 


@@ -603,8 +606,8 @@ WidgetClass xmGaugeWidgetClass = (WidgetClass)&xmGaugeClassRec;
 
 
 
 
 
 

-void 
-GaugePick(Widget w, XEvent *e, String *args, Cardinal  *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 */
 #if 0
 {
     /* Commented out for a read-only gauge in wxWindows */
 #if 0


@@ -615,7 +618,7 @@ GaugePick(Widget w, XEvent *e, String *args, Cardinal  *num_args)
     Boolean dragging = False;
     XButtonEvent *event = (XButtonEvent *)e;
     int x, y;
     Boolean dragging = False;
     XButtonEvent *event = (XButtonEvent *)e;
     int x, y;

-    
+

     x = event->x;
     y = event->y;
     sht = gw->primitive.shadow_thickness;
     x = event->x;
     y = event->y;
     sht = gw->primitive.shadow_thickness;


@@ -624,10 +627,10 @@ GaugePick(Widget w, XEvent *e, String *args, Cardinal  *num_args)
         gw->primitive.bottom_shadow_GC,
         0, 0, w->core.width, w->core.height,
         sht, XmSHADOW_IN);
         gw->primitive.bottom_shadow_GC,
         0, 0, w->core.width, w->core.height,
         sht, XmSHADOW_IN);

-    
-    
+
+

     ratio = (float)((float)THIS.maximum -
     ratio = (float)((float)THIS.maximum -

-        (float)THIS.minimum) / (float)THIS.value;                 
+        (float)THIS.minimum) / (float)THIS.value;

     switch(THIS.orientation) {
     case XmHORIZONTAL:
         size = (w->core.width - 2 * sht) / ratio;
     switch(THIS.orientation) {
     case XmHORIZONTAL:
         size = (w->core.width - 2 * sht) / ratio;


@@ -663,14 +666,14 @@ GaugePick(Widget w, XEvent *e, String *args, Cardinal  *num_args)
     THIS.dragging = dragging;
     THIS.oldx = x;
     THIS.oldy = y;
     THIS.dragging = dragging;
     THIS.oldx = x;
     THIS.oldy = y;

-#undef THIS    
+#undef THIS

 #endif
 }
 
 #define round(x) ( (x) > 0 ? ((x) + 0.5) : -(-(x) + 0.5) )
 
 #endif
 }
 
 #define round(x) ( (x) > 0 ? ((x) + 0.5) : -(-(x) + 0.5) )
 

-void 
-GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *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 */
 #if 0
 {
     /* Commented out for a read-only gauge in wxWindows */
 #if 0


@@ -679,13 +682,13 @@ GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *num_args)
     int sht, x, y, max, value;
     float ratio, nratio, size, nsize, fvalue, delta;
     XMotionEvent *event = (XMotionEvent *)e;
     int sht, x, y, max, value;
     float ratio, nratio, size, nsize, fvalue, delta;
     XMotionEvent *event = (XMotionEvent *)e;

-    
+

     if( ! THIS.dragging) return;
     if( ! THIS.dragging) return;

-    
+

     x = event->x;
     y = event->y;
     sht = gw->primitive.shadow_thickness;
     x = event->x;
     y = event->y;
     sht = gw->primitive.shadow_thickness;

-    
+

     ratio = (float)THIS.value / (float)((float)THIS.maximum -
         (float)THIS.minimum);
     switch(THIS.orientation) {
     ratio = (float)THIS.value / (float)((float)THIS.maximum -
         (float)THIS.minimum);
     switch(THIS.orientation) {


@@ -711,21 +714,21 @@ GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *num_args)
     if(nsize > (float)max) nsize = (float)max;
     if(nsize < (float)0 ) nsize = (float)0;
     nratio =  nsize / (float)max;
     if(nsize > (float)max) nsize = (float)max;
     if(nsize < (float)0 ) nsize = (float)0;
     nratio =  nsize / (float)max;

-    
+

     fvalue = (int)((float)THIS.maximum -
         (float)THIS.minimum) * (float)nsize / (float)max;
     value = round(fvalue);
     fvalue = (int)((float)THIS.maximum -
         (float)THIS.minimum) * (float)nsize / (float)max;
     value = round(fvalue);

-    
+

     THIS.value = value;
     THIS.oldx = x;
     THIS.oldy = y;
     THIS.value = value;
     THIS.oldx = x;
     THIS.oldy = y;

-    
+

     /* clear old slider only if it was larger */
     DrawSlider(gw, (nsize < size));
     /* clear old slider only if it was larger */
     DrawSlider(gw, (nsize < size));

-    
+

     {
         XmGaugeCallbackStruct call;
     {
         XmGaugeCallbackStruct call;

-        
+

         if(NULL  != THIS.dragCallback) {
             call.reason = XmCR_DRAG;
             call.event = e;
         if(NULL  != THIS.dragCallback) {
             call.reason = XmCR_DRAG;
             call.event = e;


@@ -733,20 +736,20 @@ GaugeDrag(Widget w, XEvent *e, String *args, Cardinal  *num_args)
             XtCallCallbacks(w, XmNdragCallback, &call);
         }
     }
             XtCallCallbacks(w, XmNdragCallback, &call);
         }
     }

-#undef THIS    
+#undef THIS

 #endif
 }
 
 
 #endif
 }
 
 

-void 
-GaugeDrop(Widget w, XEvent *e, String *args, Cardinal  *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 */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     if( ! THIS.dragging) return;
 {
     /* Commented out for a read-only gauge in wxWindows */
 #if 0
     XmGaugeWidget gw = (XmGaugeWidget)w;
 #define THIS gw->gauge
     if( ! THIS.dragging) return;

-    
+

     if(NULL  != THIS.valueChangedCallback) {
         XmGaugeCallbackStruct call;
         call.reason = XmCR_VALUE_CHANGED;
     if(NULL  != THIS.valueChangedCallback) {
         XmGaugeCallbackStruct call;
         call.reason = XmCR_VALUE_CHANGED;


@@ -755,7 +758,7 @@ GaugeDrop(Widget w, XEvent *e, String *args, Cardinal  *num_args)
         XtCallCallbacks(w, XmNvalueChangedCallback, &call);
     }
     THIS.dragging = False;
         XtCallCallbacks(w, XmNvalueChangedCallback, &call);
     }
     THIS.dragging = False;

-#undef THIS    
+#undef THIS

 #endif
 }
 
 #endif
 }
 


@@ -763,7 +766,7 @@ void
 XmGaugeSetValue(Widget w, int value)
 {
     XmGaugeWidget gw = (XmGaugeWidget)w;
 XmGaugeSetValue(Widget w, int value)
 {
     XmGaugeWidget gw = (XmGaugeWidget)w;

-    
+

     gw->gauge.value = value;
     DrawSlider(gw, True);
     XFlush(XtDisplay(w));
     gw->gauge.value = value;
     DrawSlider(gw, True);
     XFlush(XtDisplay(w));


@@ -771,8 +774,8 @@ XmGaugeSetValue(Widget w, int value)
 
 int
 XmGaugeGetValue(Widget w)
 
 int
 XmGaugeGetValue(Widget w)

-{    
+{

     XmGaugeWidget gw = (XmGaugeWidget)w;
     XmGaugeWidget gw = (XmGaugeWidget)w;

-    
+

     return gw->gauge.value;
 }
     return gw->gauge.value;
 }