projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New Visualage C++ Version 4.0 Project Configuration files
[wxWidgets.git]
/
src
/
motif
/
gauge.cpp
diff --git
a/src/motif/gauge.cpp
b/src/motif/gauge.cpp
index 5804f0b9b4856b06d3b502b66c6989a6d67a66a8..b933ec5c8727d7db4426bb19faff70adcc557bb0 100644
(file)
--- a/
src/motif/gauge.cpp
+++ b/
src/motif/gauge.cpp
@@
-15,12
+15,16
@@
#include "wx/gauge.h"
#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
+47,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
+91,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,24
+117,24
@@
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_
windowF
ont = parent->GetFont();
+
+ m_
f
ont = 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;
}
return TRUE;
}
@@
-141,7
+145,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)
)
{
}
{
}
@@
-209,7
+213,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;
@@
-222,10
+226,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;
@@
-247,9
+251,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);
@@
-280,9
+284,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
@@
-290,7
+294,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);
@@
-299,7
+303,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) {
@@
-307,7
+311,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;
@@
-318,7
+322,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;
@@
-328,15
+332,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) {
@@
-344,7
+348,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;
@@
-355,7
+359,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;
@@
-364,7
+368,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;
@@
-373,7
+377,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
@@
-385,7
+389,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 -
@@
-431,22
+435,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
+
}
}
@@
-457,7
+461,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
}
}
@@
-466,18
+470,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;
@@
-493,12
+497,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,
@@
-506,39
+510,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
};
@@
-598,8
+602,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
@@
-610,7
+614,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;
@@
-619,10
+623,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;
@@
-658,14
+662,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
@@
-674,13
+678,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) {
@@
-706,21
+710,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;
@@
-728,20
+732,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;
@@
-750,7
+754,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
}
@@
-758,7
+762,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));
@@
-766,8
+770,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;
}